From 561541e7b46a6aa52ca8570b2cc32db19b0d64e6 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Thu, 28 May 2026 18:48:35 +0800
Subject: [PATCH] Consolidate app grid interaction state
---
Apptag/ContentView.swift | 262 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 192 insertions(+), 70 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index c163918..f94de57 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
@@ -315,6 +329,12 @@
let app: AppInfo
let assignedTags: [String]
let removableTags: [String]
+}
+
+private struct PendingTagRemovalDrop: Identifiable {
+ let id = UUID()
+ let app: AppInfo
+ let tagName: String
}
private enum SmartStartNoticeMode {
@@ -359,20 +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 appDragResetToken = 0
- @State private var bubbleDraftNote = ""
@FocusState private var bubbleNoteFocused: Bool
// Quick Search
@@ -406,13 +418,16 @@
@AppStorage("displayMode") private var displayMode = AppDefaults.displayMode
@AppStorage("hideAppNames") private var hideAppNames = AppDefaults.hideAppNames
@AppStorage("showUncommonAppBubbles") private var showUncommonAppBubbles = AppDefaults.showUncommonAppBubbles
+ @AppStorage("skipTagRemovalDropConfirm") private var skipTagRemovalDropConfirm = false
private let editSidebarWidth: CGFloat = 188
private let editSidebarHorizontalInset: CGFloat = 12
private let floatingControlsTrailingInset: CGFloat = 20
private let floatingControlsReservedWidth: CGFloat = 120
private var appBubbleDisabled: Bool {
- appDragModeActive || pendingUncategorizedDrop != nil
+ appGridInteraction.appDragModeActive
+ || appGridInteraction.pendingUncategorizedDrop != nil
+ || appGridInteraction.pendingTagRemovalDrop != nil
}
private let rightSidebarFloatingClearance: CGFloat = 44
@@ -470,11 +485,12 @@
smartStartNoticeOverlay
editActionFeedbackOverlay
uncategorizedDropConfirmOverlay
+ tagRemovalDropConfirmOverlay
}
quickSearchOverlay
- if shouldRenderAppGridBehindQuickSearch, let message = dropWarningToast {
+ if shouldRenderAppGridBehindQuickSearch, let message = appGridInteraction.dropWarningToast {
Text(message)
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.primary)
@@ -489,7 +505,7 @@
.allowsHitTesting(false)
}
- if shouldRenderAppGridBehindQuickSearch && dropRefreshVisible {
+ if shouldRenderAppGridBehindQuickSearch && appGridInteraction.dropRefreshVisible {
Color.black.opacity(0.08)
.ignoresSafeArea()
.transition(.opacity)
@@ -569,7 +585,7 @@
)
}
.onChange(of: bubbleNoteFocused) { _, focused in
- if editingBubble != nil && !focused {
+ if appGridInteraction.editingBubble != nil && !focused {
commitBubbleNote()
}
}
@@ -583,12 +599,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(
@@ -597,6 +612,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.
@@ -694,9 +717,9 @@
private var canOpenQuickSearch: Bool {
editPhase == .none
- && pendingUncategorizedDrop == nil
+ && appGridInteraction.pendingUncategorizedDrop == nil
&& smartStartNotice == nil
- && !dropRefreshVisible
+ && !appGridInteraction.dropRefreshVisible
&& !quickSearchVisible
}
@@ -959,6 +982,9 @@
onDropApp: { path, source, target, copy in
dropApp(path: path, sourceTag: source, targetTag: target, copy: copy)
},
+ onDropOutsideGroup: { path, source, copy in
+ dropAppOutsideGroup(path: path, sourceTag: source, copy: copy)
+ },
onGroupActivate: { groupName in
if isColorlessContainerMode {
toggleColorlessFill(groupName)
@@ -973,9 +999,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(
@@ -993,7 +1019,7 @@
isEditing: editing,
placement: placement,
arrowOffset: metrics.arrowOffset,
- draftNote: $bubbleDraftNote,
+ draftNote: $appGridInteraction.bubbleDraftNote,
noteFocused: $bubbleNoteFocused,
onCommit: commitBubbleNote,
onCancel: dismissAppBubble
@@ -1006,7 +1032,7 @@
}
}
.ignoresSafeArea()
- .allowsHitTesting(editingBubble != nil)
+ .allowsHitTesting(appGridInteraction.editingBubble != nil)
}
private var smartStartNoticeOverlay: some View {
@@ -1412,7 +1438,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()
@@ -1433,7 +1459,35 @@
}
}
.ignoresSafeArea()
- .allowsHitTesting(pendingUncategorizedDrop != nil)
+ .allowsHitTesting(appGridInteraction.pendingUncategorizedDrop != nil)
+ }
+
+ private var tagRemovalDropConfirmOverlay: some View {
+ GeometryReader { proxy in
+ if let pendingDrop = appGridInteraction.pendingTagRemovalDrop {
+ ZStack {
+ Color.black.opacity(0.14)
+ .ignoresSafeArea()
+
+ TagRemovalDropConfirmBubble(
+ title: tr("drop.removeTagConfirmTitle"),
+ message: tagRemovalConfirmMessage(for: pendingDrop),
+ doNotRemindTitle: tr("drop.removeTagDoNotAskAgain"),
+ doNotRemind: $appGridInteraction.tagRemovalDropSuppressFuturePrompt,
+ cancelTitle: tr("drop.removeTagConfirmNo"),
+ confirmTitle: tr("drop.removeTagConfirmYes"),
+ onCancel: dismissTagRemovalDropConfirm,
+ onConfirm: confirmPendingTagRemovalDrop
+ )
+ .frame(width: min(560, max(350, proxy.size.width - 120)))
+ .position(x: proxy.size.width / 2, y: proxy.size.height / 2)
+ .transition(.scale(scale: 0.94).combined(with: .opacity))
+ }
+ .zIndex(711)
+ }
+ }
+ .ignoresSafeArea()
+ .allowsHitTesting(appGridInteraction.pendingTagRemovalDrop != nil)
}
private func buildEditActionFeedback(for selectedApps: [AppInfo], tags: [String]) -> EditActionFeedback {
@@ -1709,7 +1763,7 @@
}
private func handleAppGridScrollActivity() {
- hoveredBubble = nil
+ appGridInteraction.hoveredBubble = nil
}
private func handleBubbleHover(app: AppInfo, frame: CGRect, event: AppBubbleHoverEvent) {
@@ -1717,17 +1771,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
}
}
@@ -1736,9 +1790,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
@@ -1746,33 +1800,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
@@ -1970,6 +2024,25 @@
refreshApps(forceLayoutRefresh: true)
}
+ private func dropAppOutsideGroup(path: String, sourceTag: String, copy: Bool) {
+ resetTransientDragState(keepingPendingTagRemovalDrop: true)
+ guard isRemovableRegularTag(sourceTag) else { return }
+ guard let app = allApps.first(where: { $0.path.path == path }),
+ appHasTag(app, tagName: sourceTag)
+ else { return }
+
+ if skipTagRemovalDropConfirm {
+ removeTagFromDroppedApp(app: app, tagName: sourceTag)
+ return
+ }
+
+ clearAppBubbleState()
+ appGridInteraction.tagRemovalDropSuppressFuturePrompt = false
+ withAnimation(.spring(response: 0.24, dampingFraction: 0.84)) {
+ appGridInteraction.pendingTagRemovalDrop = PendingTagRemovalDrop(app: app, tagName: sourceTag)
+ }
+ }
+
private func confirmAndMoveAppToUncategorized(path: String) {
guard let app = allApps.first(where: { $0.path.path == path }) else { return }
let removableTags = removableRegularTags(for: app)
@@ -1978,7 +2051,7 @@
clearAppBubbleState()
withAnimation(.spring(response: 0.24, dampingFraction: 0.84)) {
- pendingUncategorizedDrop = PendingUncategorizedDrop(
+ appGridInteraction.pendingUncategorizedDrop = PendingUncategorizedDrop(
app: app,
assignedTags: assignedTags,
removableTags: removableTags
@@ -2019,23 +2092,66 @@
)
}
+ private func tagRemovalConfirmMessage(for pendingDrop: PendingTagRemovalDrop) -> String {
+ formattedFeedbackMessage(
+ forKey: "drop.removeTagConfirmMessage",
+ replacements: [
+ "%appName%": pendingDrop.app.displayName,
+ "%tagName%": displayTagName(pendingDrop.tagName)
+ ]
+ )
+ }
+
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])
+ showDropRefresh()
+ refreshApps(forceLayoutRefresh: true)
+ }
+
+ private func dismissTagRemovalDropConfirm() {
+ appGridInteraction.tagRemovalDropSuppressFuturePrompt = false
+ withAnimation(.easeOut(duration: 0.18)) {
+ appGridInteraction.pendingTagRemovalDrop = nil
+ }
+ }
+
+ private func confirmPendingTagRemovalDrop() {
+ guard let pendingDrop = appGridInteraction.pendingTagRemovalDrop else { return }
+ let app = pendingDrop.app
+ let tagName = pendingDrop.tagName
+ let shouldSuppressFuturePrompt = appGridInteraction.tagRemovalDropSuppressFuturePrompt
+ if shouldSuppressFuturePrompt {
+ skipTagRemovalDropConfirm = true
+ }
+ appGridInteraction.tagRemovalDropSuppressFuturePrompt = false
+ withAnimation(.easeOut(duration: 0.16)) {
+ appGridInteraction.pendingTagRemovalDrop = nil
+ }
+ DispatchQueue.main.async {
+ removeTagFromDroppedApp(app: app, tagName: tagName)
+ }
+ }
+
+ private func removeTagFromDroppedApp(app: AppInfo, tagName: String) {
+ guard isRemovableRegularTag(tagName),
+ appHasTag(app, tagName: tagName)
+ else { return }
+ TagEditor.removeTags([tagName], from: [app.path.path])
showDropRefresh()
refreshApps(forceLayoutRefresh: true)
}
@@ -2070,58 +2186,61 @@
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
}
}
}
}
- private func resetTransientDragState(keepingPendingUncategorizedDrop: Bool = false) {
- let hadAppDragState = appDragModeActive
+ private func resetTransientDragState(
+ keepingPendingUncategorizedDrop: Bool = false,
+ keepingPendingTagRemovalDrop: Bool = false
+ ) {
+ 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
@@ -2136,8 +2255,11 @@
dragItem = nil
}
clearAppBubbleState()
- if !keepingPendingUncategorizedDrop, pendingUncategorizedDrop != nil {
- pendingUncategorizedDrop = nil
+ if !keepingPendingUncategorizedDrop, appGridInteraction.pendingUncategorizedDrop != nil {
+ appGridInteraction.pendingUncategorizedDrop = nil
+ }
+ if !keepingPendingTagRemovalDrop, appGridInteraction.pendingTagRemovalDrop != nil {
+ appGridInteraction.pendingTagRemovalDrop = nil
}
}
@@ -2193,7 +2315,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
--
Gitblit v1.9.3