Fix highlighting issue in workflow list

- Defer navigation destinations with the use of new `DeferView` to fix the highlighting issue that appears if you have nested navigation links
zenangst · Dec 20, 2020 · ea29a05 · ea29a05
1 parent 3148d4e
commit ea29a05
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/ViewKit/Sources/Views/GroupList/GroupList.swift b/ViewKit/Sources/Views/GroupList/GroupList.swift
@@ -27,12 +27,15 @@ public struct GroupList: View {
     List {
       ForEach(store.groups) { group in
         NavigationLink(
-          destination: WorkflowList(
-            store: store,
-            title: group.name,
-            subtitle: "Workflows: \(group.workflows.count)",
-            workflows: group.workflows,
-            selection: $workflowSelection)
+          destination: DeferView({
+            WorkflowList(
+              store: store,
+              title: group.name,
+              subtitle: "Workflows: \(group.workflows.count)",
+              workflows: group.workflows,
+              selection: $workflowSelection)
+
+          })
             .frame(minWidth: 250, idealWidth: 250),
           tag: group.id,
           selection: Binding<String?>(

diff --git a/ViewKit/Sources/Views/Shared/DeferedView.swift b/ViewKit/Sources/Views/Shared/DeferedView.swift
@@ -0,0 +1,12 @@
+import SwiftUI
+
+struct DeferView<Content: View>: View {
+    let content: () -> Content
+
+    init(@ViewBuilder _ content: @escaping () -> Content) {
+        self.content = content
+    }
+    var body: some View {
+        content()
+    }
+}
diff --git a/ViewKit/Sources/Views/WorkflowList/WorkflowList.swift b/ViewKit/Sources/Views/WorkflowList/WorkflowList.swift
@@ -25,8 +25,11 @@ public struct WorkflowList: View {
     List {
       ForEach(workflows, id: \.id) { workflow in
         NavigationLink(
-          destination: DetailView(context: store.context,
-                                  workflowController: store.context.workflow),
+          destination: DeferView({
+            DetailView(context: store.context,
+                       workflowController: store.context.workflow)
+
+          }),
           tag: workflow.id,
           selection: $selection,
           label: {

diff --git a/project.yml b/project.yml
@@ -37,9 +37,9 @@ targets:
       base:
         ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon"
         CODE_SIGN_IDENTITY: "-"
-        CURRENT_PROJECT_VERSION: 17
+        CURRENT_PROJECT_VERSION: 18
         INFOPLIST_FILE: "App/Resources/Info.plist"
-        MARKETING_VERSION: 0.4.0
+        MARKETING_VERSION: 0.4.1
         PRODUCT_BUNDLE_IDENTIFIER: "com.zenangst.Keyboard-Cowboy"
         PRODUCT_NAME: "Keyboard Cowboy"
         ENABLE_HARDENED_RUNTIME: true