feat: journal dropdown (#5)

Author: tmm

Horizon.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		E276483825C50824007ECF9B /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = E276483725C50824007ECF9B /* Store.swift */; };
 		E276484125C5CB74007ECF9B /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = E276484025C5CB74007ECF9B /* KeychainAccess */; };
 		E283259825C109980021BD90 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = E283259725C109980021BD90 /* Constants.swift */; };
+		E2943D1725DB2EFE0012CDCB /* Dropdown.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2943D1625DB2EFE0012CDCB /* Dropdown.swift */; };
 		E2AEB10B25BDF413003BD251 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2AEB10A25BDF413003BD251 /* AppDelegate.swift */; };
 		E2AEB10F25BDF413003BD251 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2AEB10E25BDF413003BD251 /* Assets.xcassets */; };
 		E2AEB11225BDF413003BD251 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2AEB11125BDF413003BD251 /* Preview Assets.xcassets */; };
@@ -60,6 +61,7 @@
 		E275D2B225BFA63E00320CA5 /* TextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextView.swift; sourceTree = "<group>"; };
 		E276483725C50824007ECF9B /* Store.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = "<group>"; };
 		E283259725C109980021BD90 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
+		E2943D1625DB2EFE0012CDCB /* Dropdown.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dropdown.swift; sourceTree = "<group>"; };
 		E2AEB10725BDF413003BD251 /* Horizon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Horizon.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E2AEB10A25BDF413003BD251 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		E2AEB10E25BDF413003BD251 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -242,6 +244,7 @@
 			isa = PBXGroup;
 			children = (
 				E275D2B225BFA63E00320CA5 /* TextView.swift */,
+				E2943D1625DB2EFE0012CDCB /* Dropdown.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -449,6 +452,7 @@
 				E2AEB10B25BDF413003BD251 /* AppDelegate.swift in Sources */,
 				E2AEB15B25BDF4A7003BD251 /* Journal.swift in Sources */,
 				E2AEB17F25BDF537003BD251 /* StatusBarMenuItem.swift in Sources */,
+				E2943D1725DB2EFE0012CDCB /* Dropdown.swift in Sources */,
 				E283259825C109980021BD90 /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -620,7 +624,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 111;
+				CURRENT_PROJECT_VERSION = 112;
 				DEVELOPMENT_ASSET_PATHS = "\"Horizon/Preview Content\"";
 				DEVELOPMENT_TEAM = LCFAPK739L;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -631,7 +635,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = co.meagher.Horizon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -647,7 +651,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 111;
+				CURRENT_PROJECT_VERSION = 112;
 				DEVELOPMENT_ASSET_PATHS = "\"Horizon/Preview Content\"";
 				DEVELOPMENT_TEAM = LCFAPK739L;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -658,7 +662,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = co.meagher.Horizon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

Horizon/AppDelegate.swift

@@ -11,7 +11,7 @@ import UserNotifications
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDelegate, SUUpdaterDelegate {
     var store = Store()
-
+    
     lazy var panel = PublishPanel(
         store: store,
         onClose: closePanel

Horizon/Components/Dropdown.swift

@@ -0,0 +1,88 @@
+// By Tom Meagher on 2/15/21 at 17:36
+
+import Foundation
+import SwiftUI
+
+struct Dropdown<T: Hashable>: NSViewRepresentable {
+    @Binding
+    var selectedValue: T?
+    
+    @Binding
+    var items: [T]
+    
+    private var disabled: Bool
+        
+    private let getItemTitle: ((T) -> String)
+    private let onChange: ((T) -> Void)?
+        
+    init(
+        selectedValue: Binding<T?>,
+        items: Binding<[T]>,
+        disabled: Bool,
+        getItemTitle: @escaping ((T) -> String),
+        onChange: ((T) -> Void)? = nil
+    ) {
+        self._selectedValue = selectedValue
+        self._items = items
+        self.disabled = disabled
+        self.getItemTitle = getItemTitle
+        self.onChange = onChange
+    }
+    
+    func makeCoordinator() -> Coordinator {
+        return Coordinator(self)
+    }
+    
+    func makeNSView(context: Context) -> NSPopUpButton {
+        let button = NSPopUpButton(frame: .zero, pullsDown: false)
+        
+        // Add local shortcut `⌘ j` for opening dropdown
+        NSEvent.addLocalMonitorForEvents(matching: [.keyDown]) { event in
+            if event.keyCode == 38 && event.modifierFlags.contains(.command) {
+                button.performClick(nil)
+            }
+            return event
+        }
+        
+        return button
+    }
+
+    func updateNSView(_ view: NSPopUpButton, context: Context) {
+        view.removeAllItems()
+        
+        for (index, element) in items.enumerated() {
+            let menuItem = NSMenuItem(
+                title: self.getItemTitle(element),
+                action: #selector(Coordinator.valueChanged(_:)),
+                keyEquivalent: "\(index + 1)"
+            )
+            menuItem.target = context.coordinator
+            view.menu?.insertItem(menuItem, at: index)
+        }
+        
+        if let selectedValue = self.selectedValue {
+            let index = self.items.firstIndex(of: selectedValue) ?? 0
+            view.selectItem(at: index)
+        }
+        
+        view.isEnabled = !disabled
+    }
+}
+
+extension Dropdown {
+    final class Coordinator: NSObject {
+        var parent: Dropdown<T>
+    
+        init(_ parent: Dropdown<T>) {
+            self.parent = parent
+        }
+
+        @objc
+        func valueChanged(_ sender: NSMenuItem) {
+            guard let index = sender.menu?.index(of: sender) else { return }
+            let item = self.parent.items[index]
+            self.parent._selectedValue.wrappedValue = item
+            self.parent.onChange?(item)
+        }
+    }
+}

Horizon/Components/TextView.swift

@@ -75,6 +75,7 @@ struct TextView: NSViewRepresentable {
     }
 
     func updateNSView(_ view: CustomTextView, context: Context) {
+        // TODO: Check out https://www.markusbodner.com/til/2021/02/08/multi-line-text-field-with-swiftui-on-macos/
         view.text = text
 
         view.isEditable = isEditable

Horizon/Models/Journal.swift

@@ -2,14 +2,18 @@
 
 import Foundation
 
-struct Journal: Codable, Identifiable, Equatable {
+struct Journal: Codable, Equatable, Hashable, Identifiable {
     var id: Int
     var entryTemplate: String?
     var entryTemplateActive: Bool
     var isPrivate: Bool
     var lastEntryAt: Date?
     var slug: String
     var title: String
+    
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+    }
 
     enum CodingKeys: String, CodingKey {
         case id

Horizon/Publish/PublishPanel.swift

@@ -14,30 +14,45 @@ class PublishPanel: NSPanel {
     ) {
         super.init(
             contentRect: NSRect(x: 0, y: 0, width: 440, height: 300),
-            styleMask: [.nonactivatingPanel],
+            styleMask: [.nonactivatingPanel, .titled, .fullSizeContentView],
             backing: .buffered,
             defer: false
         )
 
-        backgroundColor = .clear
         center()
+        isMovableByWindowBackground = true
+        hasShadow = true
+        setFrameAutosaveName("main")
+        
         collectionBehavior = [
             .canJoinAllSpaces,
             .fullScreenAuxiliary
         ]
-        hasShadow = true
         hidesOnDeactivate = false
-        isMovableByWindowBackground = true
         isExcludedFromWindowsMenu = false
+        
         isFloatingPanel = true
-        level = .popUpMenu
+        level = .floating
+        
+        titleVisibility = .hidden
+        titlebarAppearsTransparent = true
 
         let rootView = PublishView(
             viewModel: PublishViewModel(
                 store: store,
                 onClose: onClose
-            )
-        ).environmentObject(store)
-        contentView = NSHostingView(rootView: rootView)
+            ),
+            parent: self
+        )
+        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
+        .edgesIgnoringSafeArea(.all)
+        .environmentObject(store)
+        
+        contentView = NSHostingView(rootView: rootView)        
+        resize()
+    }
+    
+    func resize() {
+        setContentSize(contentView!.fittingSize)
     }
 }