Remove macOS navigate code that was messing up performance

This commit is contained in:
Maurice Parker 2020-07-19 20:34:20 -05:00
parent 797b8cd428
commit 6853535b96
1 changed files with 13 additions and 22 deletions

View File

@ -17,7 +17,6 @@ struct SidebarView: View {
@EnvironmentObject private var refreshProgress: RefreshProgressModel @EnvironmentObject private var refreshProgress: RefreshProgressModel
@EnvironmentObject private var sceneModel: SceneModel @EnvironmentObject private var sceneModel: SceneModel
@EnvironmentObject private var sidebarModel: SidebarModel @EnvironmentObject private var sidebarModel: SidebarModel
@State var navigate = false
private let threshold: CGFloat = 80 private let threshold: CGFloat = 80
@State private var previousScrollOffset: CGFloat = 0 @State private var previousScrollOffset: CGFloat = 0
@ -45,28 +44,20 @@ struct SidebarView: View {
.buttonStyle(PlainButtonStyle()) .buttonStyle(PlainButtonStyle())
.help(sidebarModel.isReadFiltered ? "Show Read Feeds" : "Filter Read Feeds") .help(sidebarModel.isReadFiltered ? "Show Read Feeds" : "Filter Read Feeds")
} }
ZStack(alignment: .bottom) { List(selection: $sidebarModel.selectedFeedIdentifiers) {
NavigationLink(destination: TimelineContainerView(), isActive: $navigate) { rows
EmptyView()
}.hidden()
List(selection: $sidebarModel.selectedFeedIdentifiers) {
rows
}
if case .refreshProgress(let percent) = refreshProgress.state {
HStack(alignment: .center) {
Spacer()
ProgressView(value: percent).frame(width: 100)
Spacer()
}
.padding(8)
.background(Color(NSColor.windowBackgroundColor))
.frame(height: 30)
.animation(.easeInOut(duration: 0.5))
.transition(.move(edge: .bottom))
}
} }
.onChange(of: sidebarModel.selectedFeedIdentifiers) { value in if case .refreshProgress(let percent) = refreshProgress.state {
navigate = !sidebarModel.selectedFeedIdentifiers.isEmpty HStack(alignment: .center) {
Spacer()
ProgressView(value: percent).frame(width: 100)
Spacer()
}
.padding(8)
.background(Color(NSColor.windowBackgroundColor))
.frame(height: 30)
.animation(.easeInOut(duration: 0.5))
.transition(.move(edge: .bottom))
} }
} }
#else #else