fix: Bookmark menu items were always disabled (#465)

The way we were injecting the selection state meant that the bookmark menu items never updated and were always disabled. This change removes some misguided attempts at managing enable/disable for menu items and moves the ownership of the selection model.
inseven · May 26, 2023 · ff922ca · ff922ca
1 parent 929cc31
commit ff922ca
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 167 deletions.
diff --git a/macos/Bookmarks-macOS.xcodeproj/project.pbxproj b/macos/Bookmarks-macOS.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		D80710EB26C4847D007272C0 /* BookmarkDebugCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80710EA26C4847D007272C0 /* BookmarkDebugCommands.swift */; };
 		D80710F326C4B855007272C0 /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80710F226C4B855007272C0 /* MainWindow.swift */; };
 		D8164D6626C08DD500756D43 /* EditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8164D6526C08DD500756D43 /* EditView.swift */; };
 		D8164D6826C08EEC00756D43 /* BorderedSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8164D6726C08EEC00756D43 /* BorderedSelection.swift */; };
@@ -19,7 +18,6 @@
 		D861257526AA048E00EB5FEF /* RenameTagView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D861257426AA048E00EB5FEF /* RenameTagView.swift */; };
 		D879448F26CB4A5400D97155 /* MenuType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D879448E26CB4A5400D97155 /* MenuType.swift */; };
 		D879449126CB57BE00D97155 /* ContextAwareKeyboardShortcut.swift in Sources */ = {isa = PBXBuildFile; fileRef = D879449026CB57BE00D97155 /* ContextAwareKeyboardShortcut.swift */; };
-		D879449326CB5E1900D97155 /* MainMenuItemCondition.swift in Sources */ = {isa = PBXBuildFile; fileRef = D879449226CB5E1900D97155 /* MainMenuItemCondition.swift */; };
 		D879449526CB5E3D00D97155 /* Countable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D879449426CB5E3D00D97155 /* Countable.swift */; };
 		D891C454261E32F90024E1A6 /* BookmarksApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D891C453261E32F90024E1A6 /* BookmarksApp.swift */; };
 		D891C456261E32F90024E1A6 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D891C455261E32F90024E1A6 /* ContentView.swift */; };
@@ -68,7 +66,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		D80710EA26C4847D007272C0 /* BookmarkDebugCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkDebugCommands.swift; sourceTree = "<group>"; };
 		D80710F226C4B855007272C0 /* MainWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindow.swift; sourceTree = "<group>"; };
 		D8164D6526C08DD500756D43 /* EditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditView.swift; sourceTree = "<group>"; };
 		D8164D6726C08EEC00756D43 /* BorderedSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BorderedSelection.swift; sourceTree = "<group>"; };
@@ -80,7 +77,6 @@
 		D861257426AA048E00EB5FEF /* RenameTagView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RenameTagView.swift; sourceTree = "<group>"; };
 		D879448E26CB4A5400D97155 /* MenuType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuType.swift; sourceTree = "<group>"; };
 		D879449026CB57BE00D97155 /* ContextAwareKeyboardShortcut.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextAwareKeyboardShortcut.swift; sourceTree = "<group>"; };
-		D879449226CB5E1900D97155 /* MainMenuItemCondition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuItemCondition.swift; sourceTree = "<group>"; };
 		D879449426CB5E3D00D97155 /* Countable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Countable.swift; sourceTree = "<group>"; };
 		D891C450261E32F90024E1A6 /* Bookmarks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Bookmarks.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D891C453261E32F90024E1A6 /* BookmarksApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksApp.swift; sourceTree = "<group>"; };
@@ -237,7 +233,6 @@
 			isa = PBXGroup;
 			children = (
 				D879449026CB57BE00D97155 /* ContextAwareKeyboardShortcut.swift */,
-				D879449226CB5E1900D97155 /* MainMenuItemCondition.swift */,
 				D8931F6326C5E16200A8021E /* SelectionSheetHandler.swift */,
 			);
 			path = Modifiers;
@@ -256,7 +251,6 @@
 			isa = PBXGroup;
 			children = (
 				D8A06F2028A7E92F0002A56D /* AccountCommands.swift */,
-				D80710EA26C4847D007272C0 /* BookmarkDebugCommands.swift */,
 				D8A336FD26B56AF700436200 /* BookmarkDestructiveCommands.swift */,
 				D8A3370226B56C7400436200 /* BookmarkEditCommands.swift */,
 				D8A336FF26B56C1B00436200 /* BookmarkOpenCommands.swift */,
@@ -464,7 +458,6 @@
 				D891C456261E32F90024E1A6 /* ContentView.swift in Sources */,
 				D835072A294A0DB40044ADE0 /* TagEditorModel.swift in Sources */,
 				D861257526AA048E00EB5FEF /* RenameTagView.swift in Sources */,
-				D80710EB26C4847D007272C0 /* BookmarkDebugCommands.swift in Sources */,
 				D8A336FE26B56AF700436200 /* BookmarkDestructiveCommands.swift in Sources */,
 				D8931F6426C5E16200A8021E /* SelectionSheetHandler.swift in Sources */,
 				D8A336FA26B569C200436200 /* BookmarkTagCommands.swift in Sources */,
@@ -480,7 +473,6 @@
 				D8164D6626C08DD500756D43 /* EditView.swift in Sources */,
 				D8A8001D2A1F76200042C03B /* View.swift in Sources */,
 				D8F3F28F26EE776900BFA43B /* LogInView.swift in Sources */,
-				D879449326CB5E1900D97155 /* MainMenuItemCondition.swift in Sources */,
 				D879449126CB57BE00D97155 /* ContextAwareKeyboardShortcut.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/macos/Bookmarks/BookmarksApp.swift b/macos/Bookmarks/BookmarksApp.swift
@@ -29,13 +29,12 @@ struct BookmarksApp: App {
 
     @Environment(\.manager) var manager
 
-    @StateObject var selection = BookmarksSelection()
+    @FocusedObject var selection: BookmarksSelection?
 
     var body: some Scene {
 
         WindowGroup {
             MainWindow(manager: manager)
-                .environment(\.selection, selection)
         }
         .commands {
             SidebarCommands()
@@ -49,15 +48,15 @@ struct BookmarksApp: App {
                 .keyboardShortcut("r", modifiers: .command)
             }
             CommandMenu("Bookmark") {
-                BookmarkOpenCommands(selection: selection)
+                BookmarkOpenCommands(selection: selection ?? BookmarksSelection())
                     .trailingDivider()
-                BookmarkDesctructiveCommands(selection: selection)
+                BookmarkDesctructiveCommands(selection: selection ?? BookmarksSelection())
                     .trailingDivider()
-                BookmarkEditCommands(selection: selection)
+                BookmarkEditCommands(selection: selection ?? BookmarksSelection())
                     .trailingDivider()
-                BookmarkShareCommands(selection: selection)
+                BookmarkShareCommands(selection: selection ?? BookmarksSelection())
                     .trailingDivider()
-                BookmarkTagCommands(selection: selection)
+                BookmarkTagCommands(selection: selection ?? BookmarksSelection())
             }
             AccountCommands()
         }

diff --git a/macos/Bookmarks/Commands/BookmarkDebugCommands.swift b/macos/Bookmarks/Commands/BookmarkDebugCommands.swift
diff --git a/macos/Bookmarks/Commands/BookmarkDestructiveCommands.swift b/macos/Bookmarks/Commands/BookmarkDestructiveCommands.swift
@@ -25,6 +25,7 @@ import BookmarksCore
 struct BookmarkDesctructiveCommands: View {
 
     @Environment(\.manager) var manager: BookmarksManager
+    @Environment(\.menuType) var menuType
 
     @ObservedObject var selection: BookmarksSelection
 
@@ -33,7 +34,7 @@ struct BookmarkDesctructiveCommands: View {
             selection.delete(manager: manager)
         }
         .contextAwareKeyboardShortcut(.delete, modifiers: [.command])
-        .mainMenuItemCondition(.nonEmpty, selection)
+        .disabled(menuType == .main && selection.isEmpty)
     }
 
 }
diff --git a/macos/Bookmarks/Commands/BookmarkEditCommands.swift b/macos/Bookmarks/Commands/BookmarkEditCommands.swift
@@ -25,6 +25,7 @@ import BookmarksCore
 struct BookmarkEditCommands: View {
 
     @Environment(\.manager) var manager: BookmarksManager
+    @Environment(\.menuType) var menuType
 
     @ObservedObject var selection: BookmarksSelection
 
@@ -33,15 +34,15 @@ struct BookmarkEditCommands: View {
             selection.update(manager: manager, toRead: !selection.containsUnreadBookmark)
         }
         .contextAwareKeyboardShortcut("U", modifiers: [.command, .shift])
-        .mainMenuItemCondition(.nonEmpty, selection)
+        .disabled(menuType == .main && selection.isEmpty)
         Button(selection.containsPublicBookmark ? "Make Private" : "Make Public") {
             selection.update(manager: manager, shared: !selection.containsPublicBookmark)
         }
-        .mainMenuItemCondition(.nonEmpty, selection)
+        .disabled(menuType == .main && selection.isEmpty)
         Divider()
         Button("Edit on Pinboard") {
             selection.open(manager: manager, location: .pinboard)
         }
-        .mainMenuItemCondition(.nonEmpty, selection)
+        .disabled(menuType == .main && selection.isEmpty)
     }
 }
diff --git a/macos/Bookmarks/Commands/BookmarkOpenCommands.swift b/macos/Bookmarks/Commands/BookmarkOpenCommands.swift
@@ -34,12 +34,12 @@ struct BookmarkOpenCommands: View {
             selection.open(manager: manager)
         }
         .contextAwareKeyboardShortcut(.return, modifiers: [.command])
-        .mainMenuItemCondition(.nonEmpty, selection)
+        .disabled(menuType == .main && selection.isEmpty)
         Button("Open on Internet Archive") {
             selection.open(manager: manager, location: .internetArchive)
         }
         .contextAwareKeyboardShortcut(.return, modifiers: [.command, .shift])
-        .mainMenuItemCondition(.nonEmpty, selection)
+        .disabled(menuType == .main && selection.isEmpty)
     }
 
 }
diff --git a/macos/Bookmarks/Commands/BookmarkShareCommands.swift b/macos/Bookmarks/Commands/BookmarkShareCommands.swift
@@ -25,6 +25,7 @@ import BookmarksCore
 struct BookmarkShareCommands: View {
 
     @Environment(\.manager) var manager: BookmarksManager
+    @Environment(\.menuType) var menuType
 
     @ObservedObject var selection: BookmarksSelection
 
@@ -33,12 +34,12 @@ struct BookmarkShareCommands: View {
             selection.copy()
         }
         .contextAwareKeyboardShortcut("c", modifiers: [.command])
-        .mainMenuItemCondition(.nonEmpty, selection)
+        .disabled(menuType == .main && selection.isEmpty)
         Button("Copy Tags") {
             selection.copyTags()
         }
         .contextAwareKeyboardShortcut("c", modifiers: [.command, .shift])
-        .mainMenuItemCondition(.nonEmpty, selection)
+        .disabled(menuType == .main && selection.isEmpty)
     }
 
 }
diff --git a/macos/Bookmarks/Model/BookmarksSelection.swift b/macos/Bookmarks/Model/BookmarksSelection.swift
@@ -108,22 +108,3 @@ extension BookmarksSelection.SheetType: Identifiable {
     }
 
 }
-
-public struct SelectionEnvironmentKey: EnvironmentKey {
-
-    public static var defaultValue = BookmarksSelection()
-
-}
-
-public extension EnvironmentValues {
-
-    var selection: BookmarksSelection {
-        get { self[SelectionEnvironmentKey.self] }
-        set { self[SelectionEnvironmentKey.self] = newValue }
-    }
-
-}
-
-extension BookmarksSelection: Countable {
-
-}
diff --git a/macos/Bookmarks/Modifiers/MainMenuItemCondition.swift b/macos/Bookmarks/Modifiers/MainMenuItemCondition.swift
diff --git a/macos/Bookmarks/Views/ContentView.swift b/macos/Bookmarks/Views/ContentView.swift
@@ -28,9 +28,8 @@ struct ContentView: View {
 
     let manager: BookmarksManager
 
-    @ObservedObject var selection: BookmarksSelection
-
     @StateObject var bookmarksView: BookmarksView
+    @StateObject var selection = BookmarksSelection()
     @StateObject var selectionTracker: SelectionTracker<Bookmark>
     @State var firstResponder: Bool = false
 
@@ -39,11 +38,9 @@ struct ContentView: View {
 
     private var subscription: AnyCancellable?
 
-    init(selection: BookmarksSelection,
-         manager: BookmarksManager,
+    init(manager: BookmarksManager,
          section: BookmarksSection) {
         self.manager = manager
-        self.selection = selection
         let bookmarksView = Deferred(BookmarksView(manager: manager, section: section))
         let selectionTracker = Deferred(SelectionTracker(items: bookmarksView.get().$bookmarks))
         _bookmarksView = StateObject(wrappedValue: bookmarksView.get())
@@ -70,10 +67,6 @@ struct ContentView: View {
                                 BookmarkShareCommands(selection: selection)
                                     .trailingDivider()
                                 BookmarkTagCommands(selection: selection)
-                                #if DEBUG
-                                BookmarkDebugCommands()
-                                    .leadingDivider()
-                                #endif
                             } onContextMenuChange: { focused in
                                 guard focused == true else {
                                     return
@@ -127,5 +120,6 @@ struct ContentView: View {
         }
         .navigationTitle(bookmarksView.title)
         .navigationSubtitle(bookmarksView.subtitle)
+        .focusedSceneObject(selection)
     }
 }
diff --git a/macos/Bookmarks/Views/EditView.swift b/macos/Bookmarks/Views/EditView.swift
@@ -31,9 +31,10 @@ struct EditView: View {
     }
 
     @Environment(\.manager) var manager
-    @Environment(\.selection) var selection
     @Environment(\.presentationMode) var presentationMode
 
+    @FocusedObject var selection: BookmarksSelection?
+
     var bookmarks: [Bookmark]
     @State var isBusy = false
     @AppStorage(SettingsKey.addTagsMarkAsRead.rawValue) var markAsRead: Bool = false
@@ -89,6 +90,10 @@ struct EditView: View {
                         .frame(minWidth: LayoutMetrics.minimumButtonWidth, maxWidth: .infinity)
                         .keyboardShortcut(.cancelAction)
                         Button {
+                            guard let selection else {
+                                print("No selection!")
+                                return
+                            }
                             isBusy = true
                             let tags = tokens.compactMap { $0.associatedValue }
                             let updatedBookmarks = bookmarks.map { item in