From b4a1ba5df0f073bf346c3f4407b613bf08d29f08 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Thu, 28 May 2026 19:34:57 +0800
Subject: [PATCH] Add AppKit tag navigation
---
Apptag/ContentView.swift | 280 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 166 insertions(+), 114 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index d6ca151..382f6b8 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -304,6 +304,20 @@
let arrowOffset: CGFloat
}
+private struct AppGridInteractionState {
+ var appDragModeActive = false
+ var dropWarningToast: String? = nil
+ var dropRefreshVisible = false
+ var dropRefreshStartedAt: Date? = nil
+ var hoveredBubble: AppBubbleContext? = nil
+ var editingBubble: AppBubbleContext? = nil
+ var pendingUncategorizedDrop: PendingUncategorizedDrop? = nil
+ var pendingTagRemovalDrop: PendingTagRemovalDrop? = nil
+ var tagRemovalDropSuppressFuturePrompt = false
+ var appDragResetToken = 0
+ var bubbleDraftNote = ""
+}
+
private struct EditActionFeedback: Identifiable {
let id = UUID()
let title: String
@@ -365,22 +379,12 @@
@State private var tagNavReorderDidMove = false
// Fixed interaction for "Colorless Container": hover fills persistently; click clears.
@State private var filledColorlessContainer: String? = nil
- @State private var appDragModeActive = false
- @State private var dropWarningToast: String? = nil
+ @State private var appGridInteraction = AppGridInteractionState()
@State private var smartStartNotice: SmartStartNotice? = nil
@State private var pendingSmartStartDraft: SmartCategorizationDraft? = nil
- @State private var dropRefreshVisible = false
- @State private var dropRefreshStartedAt: Date? = nil
@State private var refreshInProgress = false
@State private var refreshAgainAfterCurrent = false
@State private var refreshAgainForceLayout = false
- @State private var hoveredBubble: AppBubbleContext? = nil
- @State private var editingBubble: AppBubbleContext? = nil
- @State private var pendingUncategorizedDrop: PendingUncategorizedDrop? = nil
- @State private var pendingTagRemovalDrop: PendingTagRemovalDrop? = nil
- @State private var tagRemovalDropSuppressFuturePrompt = false
- @State private var appDragResetToken = 0
- @State private var bubbleDraftNote = ""
@FocusState private var bubbleNoteFocused: Bool
// Quick Search
@@ -414,6 +418,7 @@
@AppStorage("displayMode") private var displayMode = AppDefaults.displayMode
@AppStorage("hideAppNames") private var hideAppNames = AppDefaults.hideAppNames
@AppStorage("showUncommonAppBubbles") private var showUncommonAppBubbles = AppDefaults.showUncommonAppBubbles
+ @AppStorage("useAppKitTagNavigation") private var useAppKitTagNavigation = AppDefaults.useAppKitTagNavigation
@AppStorage("skipTagRemovalDropConfirm") private var skipTagRemovalDropConfirm = false
private let editSidebarWidth: CGFloat = 188
@@ -421,7 +426,9 @@
private let floatingControlsTrailingInset: CGFloat = 20
private let floatingControlsReservedWidth: CGFloat = 120
private var appBubbleDisabled: Bool {
- appDragModeActive || pendingUncategorizedDrop != nil || pendingTagRemovalDrop != nil
+ appGridInteraction.appDragModeActive
+ || appGridInteraction.pendingUncategorizedDrop != nil
+ || appGridInteraction.pendingTagRemovalDrop != nil
}
private let rightSidebarFloatingClearance: CGFloat = 44
@@ -484,7 +491,7 @@
quickSearchOverlay
- if shouldRenderAppGridBehindQuickSearch, let message = dropWarningToast {
+ if shouldRenderAppGridBehindQuickSearch, let message = appGridInteraction.dropWarningToast {
Text(message)
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.primary)
@@ -499,7 +506,7 @@
.allowsHitTesting(false)
}
- if shouldRenderAppGridBehindQuickSearch && dropRefreshVisible {
+ if shouldRenderAppGridBehindQuickSearch && appGridInteraction.dropRefreshVisible {
Color.black.opacity(0.08)
.ignoresSafeArea()
.transition(.opacity)
@@ -579,7 +586,7 @@
)
}
.onChange(of: bubbleNoteFocused) { _, focused in
- if editingBubble != nil && !focused {
+ if appGridInteraction.editingBubble != nil && !focused {
commitBubbleNote()
}
}
@@ -593,12 +600,11 @@
quickSearchErrorMessage = nil
refreshQuickSearchResults()
}
- .onChange(of: pendingUncategorizedDrop != nil) { _, active in
- NotificationCenter.default.post(
- name: .tagLauncherModalInteractionChanged,
- object: nil,
- userInfo: ["active": active]
- )
+ .onChange(of: appGridInteraction.pendingUncategorizedDrop != nil) { _, _ in
+ publishModalInteractionState()
+ }
+ .onChange(of: appGridInteraction.pendingTagRemovalDrop != nil) { _, _ in
+ publishModalInteractionState()
}
.onDisappear {
NotificationCenter.default.post(
@@ -607,6 +613,14 @@
userInfo: ["active": false]
)
}
+ }
+
+ private func publishModalInteractionState() {
+ NotificationCenter.default.post(
+ name: .tagLauncherModalInteractionChanged,
+ object: nil,
+ userInfo: ["active": appGridInteraction.pendingUncategorizedDrop != nil || appGridInteraction.pendingTagRemovalDrop != nil]
+ )
}
/// Set edit phase with synchronous notification BEFORE state change.
@@ -704,9 +718,9 @@
private var canOpenQuickSearch: Bool {
editPhase == .none
- && pendingUncategorizedDrop == nil
+ && appGridInteraction.pendingUncategorizedDrop == nil
&& smartStartNotice == nil
- && !dropRefreshVisible
+ && !appGridInteraction.dropRefreshVisible
&& !quickSearchVisible
}
@@ -852,7 +866,7 @@
private var topLayout: some View {
VStack(spacing: 0) {
Spacer().frame(height: notchHeight > 0 ? notchHeight + 14 : 28)
- if !tagLabels.isEmpty { tagBar.padding(.bottom, 8) }
+ if !tagLabels.isEmpty { topTagNavigation.padding(.bottom, 8) }
Divider().opacity(0.3)
appGridContent
}
@@ -863,14 +877,65 @@
Spacer().frame(height: notchHeight > 0 ? notchHeight + 14 : 28)
Divider().opacity(0.3)
HStack(spacing: 0) {
- if tagPosition == "left" { tagSidebar; sideDivider }
+ if tagPosition == "left" { leftTagSidebar; sideDivider }
appGridContent
if tagPosition == "right" { sideDivider; rightTagSidebar }
}
}
}
- private var tagBar: some View {
+ private var topTagNavigation: some View {
+ Group {
+ if useAppKitTagNavigation {
+ appKitTagNavigation(orientation: .horizontal)
+ .frame(height: 34)
+ } else {
+ swiftUITopTagBar
+ }
+ }
+ }
+
+ private var leftTagSidebar: some View {
+ Group {
+ if useAppKitTagNavigation {
+ appKitTagNavigation(orientation: .vertical)
+ } else {
+ swiftUITagSidebarList
+ }
+ }
+ .frame(width: 135)
+ }
+
+ private var rightTagSidebar: some View {
+ Group {
+ if useAppKitTagNavigation {
+ appKitTagNavigation(orientation: .vertical)
+ } else {
+ swiftUITagSidebarList
+ }
+ }
+ .padding(.top, rightSidebarFloatingClearance)
+ .frame(width: 135)
+ }
+
+ private func appKitTagNavigation(orientation: TagNavigationView.Orientation) -> some View {
+ let isHorizontal = orientation == .horizontal
+ return TagNavigationView(
+ items: tagLabels,
+ orientation: orientation,
+ contentInsets: isHorizontal
+ ? NSEdgeInsets(top: 3, left: 24, bottom: 3, right: tagPosition == "top" ? floatingControlsReservedWidth : 24)
+ : NSEdgeInsets(top: 12, left: 12, bottom: 12, right: 12),
+ onActivate: { tagID in
+ activateTagNavigation(tagID)
+ },
+ onHover: { tagID in
+ handleTagNavigationHover(tagID)
+ }
+ )
+ }
+
+ private var swiftUITopTagBar: some View {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 8) {
ForEach(tagLabels) { tag in
@@ -885,8 +950,7 @@
.highPriorityGesture(tagNavReorderGesture(for: tag.name))
.onHover { hovering in
if hovering {
- fillColorlessContainer(tag.id)
- scrollTo(tag.id)
+ handleTagNavigationHover(tag.id)
}
}
}
@@ -900,18 +964,7 @@
}
}
- private var tagSidebar: some View {
- tagSidebarList
- .frame(width: 135)
- }
-
- private var rightTagSidebar: some View {
- tagSidebarList
- .padding(.top, rightSidebarFloatingClearance)
- .frame(width: 135)
- }
-
- private var tagSidebarList: some View {
+ private var swiftUITagSidebarList: some View {
ScrollView(.vertical, showsIndicators: false) {
VStack(spacing: 6) {
ForEach(tagLabels) { tag in
@@ -926,8 +979,7 @@
.highPriorityGesture(tagNavReorderGesture(for: tag.name))
.onHover { hovering in
if hovering {
- fillColorlessContainer(tag.id)
- scrollTo(tag.id)
+ handleTagNavigationHover(tag.id)
}
}
}
@@ -986,9 +1038,9 @@
private var uncommonAppBubbleOverlay: some View {
GeometryReader { proxy in
- if let context = editingBubble ?? hoveredBubble {
+ if let context = appGridInteraction.editingBubble ?? appGridInteraction.hoveredBubble {
let rootFrame = proxy.frame(in: .global)
- let editing = editingBubble != nil
+ let editing = appGridInteraction.editingBubble != nil
let width = min(editing ? 440 : 520, max(260, proxy.size.width - 48))
let placement = bubblePlacement(for: context.frame, rootFrame: rootFrame)
let metrics = bubbleMetrics(
@@ -1006,7 +1058,7 @@
isEditing: editing,
placement: placement,
arrowOffset: metrics.arrowOffset,
- draftNote: $bubbleDraftNote,
+ draftNote: $appGridInteraction.bubbleDraftNote,
noteFocused: $bubbleNoteFocused,
onCommit: commitBubbleNote,
onCancel: dismissAppBubble
@@ -1019,7 +1071,7 @@
}
}
.ignoresSafeArea()
- .allowsHitTesting(editingBubble != nil)
+ .allowsHitTesting(appGridInteraction.editingBubble != nil)
}
private var smartStartNoticeOverlay: some View {
@@ -1425,7 +1477,7 @@
private var uncategorizedDropConfirmOverlay: some View {
GeometryReader { proxy in
- if let pendingDrop = pendingUncategorizedDrop {
+ if let pendingDrop = appGridInteraction.pendingUncategorizedDrop {
ZStack {
Color.black.opacity(0.14)
.ignoresSafeArea()
@@ -1446,12 +1498,12 @@
}
}
.ignoresSafeArea()
- .allowsHitTesting(pendingUncategorizedDrop != nil)
+ .allowsHitTesting(appGridInteraction.pendingUncategorizedDrop != nil)
}
private var tagRemovalDropConfirmOverlay: some View {
GeometryReader { proxy in
- if let pendingDrop = pendingTagRemovalDrop {
+ if let pendingDrop = appGridInteraction.pendingTagRemovalDrop {
ZStack {
Color.black.opacity(0.14)
.ignoresSafeArea()
@@ -1460,7 +1512,7 @@
title: tr("drop.removeTagConfirmTitle"),
message: tagRemovalConfirmMessage(for: pendingDrop),
doNotRemindTitle: tr("drop.removeTagDoNotAskAgain"),
- doNotRemind: $tagRemovalDropSuppressFuturePrompt,
+ doNotRemind: $appGridInteraction.tagRemovalDropSuppressFuturePrompt,
cancelTitle: tr("drop.removeTagConfirmNo"),
confirmTitle: tr("drop.removeTagConfirmYes"),
onCancel: dismissTagRemovalDropConfirm,
@@ -1474,7 +1526,7 @@
}
}
.ignoresSafeArea()
- .allowsHitTesting(pendingTagRemovalDrop != nil)
+ .allowsHitTesting(appGridInteraction.pendingTagRemovalDrop != nil)
}
private func buildEditActionFeedback(for selectedApps: [AppInfo], tags: [String]) -> EditActionFeedback {
@@ -1719,8 +1771,8 @@
groupLayoutVersion &+= 1
}
- private var tagLabels: [TagLabel] {
- displayGroups.map { TagLabel(name: $0.name, colorIndex: tagColors[$0.name] ?? 0) }
+ private var tagLabels: [TagNavigationItem] {
+ displayGroups.map { TagNavigationItem(name: $0.name, colorIndex: tagColors[$0.name] ?? 0) }
}
private var editGroups: [TagGroup] {
@@ -1750,7 +1802,7 @@
}
private func handleAppGridScrollActivity() {
- hoveredBubble = nil
+ appGridInteraction.hoveredBubble = nil
}
private func handleBubbleHover(app: AppInfo, frame: CGRect, event: AppBubbleHoverEvent) {
@@ -1758,17 +1810,17 @@
clearAppBubbleState()
return
}
- guard editingBubble == nil else { return }
+ guard appGridInteraction.editingBubble == nil else { return }
switch event {
case .entered(let canShowBubble):
if canShowBubble {
- hoveredBubble = AppBubbleContext(app: app, frame: frame)
+ appGridInteraction.hoveredBubble = AppBubbleContext(app: app, frame: frame)
} else {
- hoveredBubble = nil
+ appGridInteraction.hoveredBubble = nil
}
case .exited:
- guard hoveredBubble?.app.path == app.path else { return }
- hoveredBubble = nil
+ guard appGridInteraction.hoveredBubble?.app.path == app.path else { return }
+ appGridInteraction.hoveredBubble = nil
}
}
@@ -1777,9 +1829,9 @@
clearAppBubbleState()
return
}
- bubbleDraftNote = currentNote(for: app)
- hoveredBubble = nil
- editingBubble = AppBubbleContext(app: app, frame: frame)
+ appGridInteraction.bubbleDraftNote = currentNote(for: app)
+ appGridInteraction.hoveredBubble = nil
+ appGridInteraction.editingBubble = AppBubbleContext(app: app, frame: frame)
notifyAppNoteEditing(active: true)
DispatchQueue.main.async {
bubbleNoteFocused = true
@@ -1787,33 +1839,33 @@
}
private func commitBubbleNote() {
- guard let context = editingBubble else { return }
- let limited = String(bubbleDraftNote.prefix(TagDatabase.maxAppNoteLength))
+ guard let context = appGridInteraction.editingBubble else { return }
+ let limited = String(appGridInteraction.bubbleDraftNote.prefix(TagDatabase.maxAppNoteLength))
.trimmingCharacters(in: .whitespacesAndNewlines)
TagEditor.setAppNote(limited, for: context.app.path.path)
- bubbleDraftNote = limited
- editingBubble = nil
+ appGridInteraction.bubbleDraftNote = limited
+ appGridInteraction.editingBubble = nil
bubbleNoteFocused = false
notifyAppNoteEditing(active: false)
refreshApps()
}
private func dismissAppBubble() {
- hoveredBubble = nil
- if editingBubble != nil {
+ appGridInteraction.hoveredBubble = nil
+ if appGridInteraction.editingBubble != nil {
notifyAppNoteEditing(active: false)
}
- editingBubble = nil
+ appGridInteraction.editingBubble = nil
bubbleNoteFocused = false
}
private func clearAppBubbleState() {
- if hoveredBubble != nil {
- hoveredBubble = nil
+ if appGridInteraction.hoveredBubble != nil {
+ appGridInteraction.hoveredBubble = nil
}
- if editingBubble != nil {
+ if appGridInteraction.editingBubble != nil {
notifyAppNoteEditing(active: false)
- editingBubble = nil
+ appGridInteraction.editingBubble = nil
}
if bubbleNoteFocused {
bubbleNoteFocused = false
@@ -1890,6 +1942,11 @@
if isColorlessContainerMode {
toggleColorlessFill(id)
}
+ scrollTo(id)
+ }
+
+ private func handleTagNavigationHover(_ id: String) {
+ fillColorlessContainer(id)
scrollTo(id)
}
@@ -2024,9 +2081,9 @@
}
clearAppBubbleState()
- tagRemovalDropSuppressFuturePrompt = false
+ appGridInteraction.tagRemovalDropSuppressFuturePrompt = false
withAnimation(.spring(response: 0.24, dampingFraction: 0.84)) {
- pendingTagRemovalDrop = PendingTagRemovalDrop(app: app, tagName: sourceTag)
+ appGridInteraction.pendingTagRemovalDrop = PendingTagRemovalDrop(app: app, tagName: sourceTag)
}
}
@@ -2038,7 +2095,7 @@
clearAppBubbleState()
withAnimation(.spring(response: 0.24, dampingFraction: 0.84)) {
- pendingUncategorizedDrop = PendingUncategorizedDrop(
+ appGridInteraction.pendingUncategorizedDrop = PendingUncategorizedDrop(
app: app,
assignedTags: assignedTags,
removableTags: removableTags
@@ -2092,17 +2149,17 @@
private func dismissUncategorizedDropConfirm() {
resetTransientDragState(keepingPendingUncategorizedDrop: true)
withAnimation(.easeOut(duration: 0.18)) {
- pendingUncategorizedDrop = nil
+ appGridInteraction.pendingUncategorizedDrop = nil
}
}
private func confirmPendingUncategorizedDrop() {
- guard let pendingDrop = pendingUncategorizedDrop else { return }
+ guard let pendingDrop = appGridInteraction.pendingUncategorizedDrop else { return }
let path = pendingDrop.app.path.path
let tags = pendingDrop.removableTags
resetTransientDragState(keepingPendingUncategorizedDrop: true)
withAnimation(.easeOut(duration: 0.16)) {
- pendingUncategorizedDrop = nil
+ appGridInteraction.pendingUncategorizedDrop = nil
}
guard !tags.isEmpty else { return }
TagEditor.removeTags(tags, from: [path])
@@ -2111,26 +2168,27 @@
}
private func dismissTagRemovalDropConfirm() {
- resetTransientDragState(keepingPendingTagRemovalDrop: true)
- tagRemovalDropSuppressFuturePrompt = false
+ appGridInteraction.tagRemovalDropSuppressFuturePrompt = false
withAnimation(.easeOut(duration: 0.18)) {
- pendingTagRemovalDrop = nil
+ appGridInteraction.pendingTagRemovalDrop = nil
}
}
private func confirmPendingTagRemovalDrop() {
- guard let pendingDrop = pendingTagRemovalDrop else { return }
+ guard let pendingDrop = appGridInteraction.pendingTagRemovalDrop else { return }
let app = pendingDrop.app
let tagName = pendingDrop.tagName
- if tagRemovalDropSuppressFuturePrompt {
+ let shouldSuppressFuturePrompt = appGridInteraction.tagRemovalDropSuppressFuturePrompt
+ if shouldSuppressFuturePrompt {
skipTagRemovalDropConfirm = true
}
- resetTransientDragState(keepingPendingTagRemovalDrop: true)
- tagRemovalDropSuppressFuturePrompt = false
+ appGridInteraction.tagRemovalDropSuppressFuturePrompt = false
withAnimation(.easeOut(duration: 0.16)) {
- pendingTagRemovalDrop = nil
+ appGridInteraction.pendingTagRemovalDrop = nil
}
- removeTagFromDroppedApp(app: app, tagName: tagName)
+ DispatchQueue.main.async {
+ removeTagFromDroppedApp(app: app, tagName: tagName)
+ }
}
private func removeTagFromDroppedApp(app: AppInfo, tagName: String) {
@@ -2172,45 +2230,45 @@
private func showDropWarning() {
withAnimation(.spring(response: 0.24, dampingFraction: 0.82)) {
- dropWarningToast = tr("drop.systemDefaultWarning")
+ appGridInteraction.dropWarningToast = tr("drop.systemDefaultWarning")
}
DispatchQueue.main.asyncAfter(deadline: .now() + 1.6) {
withAnimation(.easeOut(duration: 0.18)) {
- dropWarningToast = nil
+ appGridInteraction.dropWarningToast = nil
}
}
}
private func showDropRefresh() {
- dropRefreshStartedAt = Date()
+ appGridInteraction.dropRefreshStartedAt = Date()
withAnimation(.spring(response: 0.22, dampingFraction: 0.82)) {
- dropRefreshVisible = true
+ appGridInteraction.dropRefreshVisible = true
}
}
private func finishDropRefreshAfterMinimumDuration() {
let minimumDuration: TimeInterval = 0.85
- let elapsed = dropRefreshStartedAt.map { Date().timeIntervalSince($0) } ?? minimumDuration
+ let elapsed = appGridInteraction.dropRefreshStartedAt.map { Date().timeIntervalSince($0) } ?? minimumDuration
let delay = max(0, minimumDuration - elapsed)
DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
withAnimation(.easeOut(duration: 0.18)) {
- dropRefreshVisible = false
+ appGridInteraction.dropRefreshVisible = false
}
- dropRefreshStartedAt = nil
+ appGridInteraction.dropRefreshStartedAt = nil
}
}
private func setAppDragMode(_ active: Bool) {
- guard appDragModeActive != active else { return }
+ guard appGridInteraction.appDragModeActive != active else { return }
if active {
endTagNavReorder()
clearAppBubbleState()
}
- appDragModeActive = active
+ appGridInteraction.appDragModeActive = active
if active {
DispatchQueue.main.asyncAfter(deadline: .now() + 8) {
- if appDragModeActive && !AppDragCoordinator.shared.hasActiveDrag {
- appDragModeActive = false
+ if appGridInteraction.appDragModeActive && !AppDragCoordinator.shared.hasActiveDrag {
+ appGridInteraction.appDragModeActive = false
}
}
}
@@ -2220,13 +2278,13 @@
keepingPendingUncategorizedDrop: Bool = false,
keepingPendingTagRemovalDrop: Bool = false
) {
- let hadAppDragState = appDragModeActive
+ let hadAppDragState = appGridInteraction.appDragModeActive
AppDragCoordinator.shared.cancelDrag()
- if appDragModeActive {
- appDragModeActive = false
+ if appGridInteraction.appDragModeActive {
+ appGridInteraction.appDragModeActive = false
}
if hadAppDragState {
- appDragResetToken &+= 1
+ appGridInteraction.appDragResetToken &+= 1
}
if tagNavDragModeActive {
tagNavDragModeActive = false
@@ -2241,11 +2299,11 @@
dragItem = nil
}
clearAppBubbleState()
- if !keepingPendingUncategorizedDrop, pendingUncategorizedDrop != nil {
- pendingUncategorizedDrop = nil
+ if !keepingPendingUncategorizedDrop, appGridInteraction.pendingUncategorizedDrop != nil {
+ appGridInteraction.pendingUncategorizedDrop = nil
}
- if !keepingPendingTagRemovalDrop, pendingTagRemovalDrop != nil {
- pendingTagRemovalDrop = nil
+ if !keepingPendingTagRemovalDrop, appGridInteraction.pendingTagRemovalDrop != nil {
+ appGridInteraction.pendingTagRemovalDrop = nil
}
}
@@ -2301,7 +2359,7 @@
closeOverlayOnSuccess: Bool = true,
onFailure: (() -> Void)? = nil
) {
- appDragModeActive = false
+ appGridInteraction.appDragModeActive = false
endTagNavReorder()
let configuration = NSWorkspace.OpenConfiguration()
NSWorkspace.shared.openApplication(at: app.path, configuration: configuration) { _, error in
@@ -2346,12 +2404,6 @@
static func reduce(value: inout [String: CGRect], nextValue: () -> [String: CGRect]) {
value.merge(nextValue(), uniquingKeysWith: { _, new in new })
}
-}
-
-private struct TagLabel: Identifiable {
- var id: String { name }
- let name: String
- let colorIndex: Int
}
// MARK: - NSVisualEffectView bridge
--
Gitblit v1.9.3