Fix quick search early mouse dismiss

Ariver

2026-06-04 be83948fab7b643634ede2403abdca27e6b45f29

 Apptag/ContentView.swift

@@ -313,10 +313,12 @@
    var editingBubble: AppBubbleContext? = nil
    var pendingUncategorizedDrop: PendingUncategorizedDrop? = nil
    var pendingTagRemovalDrop: PendingTagRemovalDrop? = nil
    var uncategorizedDropSuppressFuturePrompt = false
    var tagRemovalDropSuppressFuturePrompt = false
    var appDragResetToken = 0
    var bubbleDraftNote = ""
    var tagNavigationHoveredGroupName: String? = nil
    var tagNavigationAppDropTargetName: String? = nil
    var tagNavigationLastHoverScrollID: String? = nil
    var tagNavigationLastHoverScrollAt: Date? = nil
}
@@ -338,20 +340,6 @@
    let id = UUID()
    let app: AppInfo
    let tagName: String
}

private enum SmartStartNoticeMode {
    case autoApplied
    case suggestionOnly
    case manuallyApplied
}

private struct SmartStartNotice: Identifiable {
    let id = UUID()
    let mode: SmartStartNoticeMode
    let title: String
    let message: String
    let summary: SmartStartSummary
}

struct ContentView: View {
@@ -400,6 +388,8 @@
    @State private var quickSearchFocusToken = 0
    @State private var quickSearchSelectionScrollToken = 0
    @State private var quickSearchCloseHidesOverlay = false
    @State private var quickSearchOnlySession = false
    @State private var quickSearchOpenedAt: Date? = nil
    @State private var quickSearchErrorMessage: String? = nil
    @State private var initialQuickSearchConsumed = false

@@ -407,8 +397,10 @@
        self.hideOverlay = hideOverlay
        self.initialQuickSearchSource = initialQuickSearchSource
        let startsInQuickSearch = initialQuickSearchSource != nil
        let startsInQuickSearchOnlySession = initialQuickSearchSource == QuickSearchOpenSource.globalHidden
        _quickSearchVisible = State(initialValue: startsInQuickSearch)
        _quickSearchCloseHidesOverlay = State(initialValue: initialQuickSearchSource == QuickSearchOpenSource.globalHidden)
        _quickSearchCloseHidesOverlay = State(initialValue: startsInQuickSearchOnlySession)
        _quickSearchOnlySession = State(initialValue: startsInQuickSearchOnlySession)
        _quickSearchFocusToken = State(initialValue: startsInQuickSearch ? 1 : 0)
    }

@@ -423,6 +415,7 @@
    @AppStorage("showUncommonAppBubbles") private var showUncommonAppBubbles = AppDefaults.showUncommonAppBubbles
    @AppStorage("useAppKitTagNavigation") private var useAppKitTagNavigation = AppDefaults.useAppKitTagNavigation
    @AppStorage("skipTagRemovalDropConfirm") private var skipTagRemovalDropConfirm = false
    @AppStorage("skipUncategorizedDropConfirm") private var skipUncategorizedDropConfirm = false

    private let editSidebarWidth: CGFloat = 188
    private let editSidebarHorizontalInset: CGFloat = 12
@@ -459,7 +452,10 @@
    }

    private var shouldRenderAppGridBehindQuickSearch: Bool {
        !quickSearchVisible || !quickSearchCloseHidesOverlay
        if quickSearchOnlySession {
            return false
        }
        return !quickSearchVisible || !quickSearchCloseHidesOverlay
    }

    var body: some View {
@@ -539,16 +535,23 @@
            refreshAppsIfNeeded()
            if let initialQuickSearchSource, !initialQuickSearchConsumed {
                initialQuickSearchConsumed = true
                quickSearchCloseHidesOverlay = initialQuickSearchSource == QuickSearchOpenSource.globalHidden
                if initialQuickSearchSource == QuickSearchOpenSource.globalHidden {
                    quickSearchCloseHidesOverlay = true
                    quickSearchOnlySession = true
                }
                if !quickSearchVisible {
                    quickSearchVisible = true
                    quickSearchFocusToken &+= 1
                }
                quickSearchOpenedAt = Date()
                refreshQuickSearchResults()
                NotificationCenter.default.post(
                    name: .tagLauncherQuickSearchVisibilityChanged,
                    object: nil,
                    userInfo: ["active": true]
                    userInfo: [
                        "active": true,
                        "hideOverlayOnClose": quickSearchCloseHidesOverlay
                    ]
                )
            }
        }
@@ -560,13 +563,16 @@
        .onReceive(NotificationCenter.default.publisher(for: .tagLauncherOverlayDidHide)) { _ in
            resetTransientDragState()
            closeQuickSearch(notify: true, hideOverlayIfNeeded: false)
            quickSearchOnlySession = false
            quickSearchCloseHidesOverlay = false
        }
        .onReceive(NotificationCenter.default.publisher(for: .tagLauncherQuickSearchRequested)) { notification in
            let source = notification.userInfo?["source"] as? String ?? QuickSearchOpenSource.mainOverlay
            openQuickSearch(source: source)
        }
        .onReceive(NotificationCenter.default.publisher(for: .tagLauncherQuickSearchDismissRequested)) { _ in
            closeQuickSearch()
        .onReceive(NotificationCenter.default.publisher(for: .tagLauncherQuickSearchDismissRequested)) { notification in
            let source = notification.userInfo?["source"] as? String
            closeQuickSearch(dismissalSource: source)
        }
        .onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ in
            guard allApps.isEmpty, !refreshInProgress else { return }
@@ -660,7 +666,7 @@
                    .ignoresSafeArea()
                    .contentShape(Rectangle())
                    .onTapGesture {
                        closeQuickSearch()
                        closeQuickSearch(dismissalSource: QuickSearchDismissSource.backdrop)
                    }
                    .zIndex(899)

@@ -717,17 +723,26 @@
    private func openQuickSearch(source: String) {
        guard canOpenQuickSearch else { return }
        dismissAppBubble()
        quickSearchCloseHidesOverlay = source == QuickSearchOpenSource.globalHidden
        if source == QuickSearchOpenSource.globalHidden {
            quickSearchOnlySession = true
        }
        quickSearchCloseHidesOverlay = quickSearchCloseHidesOverlay
            || source == QuickSearchOpenSource.globalHidden
        quickSearchVisible = true
        quickSearchOpenedAt = Date()
        quickSearchQuery = ""
        quickSearchManualSelection = false
        quickSearchErrorMessage = nil
        quickSearchFocusToken &+= 1
        refreshQuickSearchResults()
        refreshApps()
        NotificationCenter.default.post(
            name: .tagLauncherQuickSearchVisibilityChanged,
            object: nil,
            userInfo: ["active": true]
            userInfo: [
                "active": true,
                "hideOverlayOnClose": quickSearchCloseHidesOverlay
            ]
        )
    }

@@ -739,31 +754,71 @@
            && !quickSearchVisible
    }

    private func closeQuickSearch(notify: Bool = true, hideOverlayIfNeeded: Bool = true) {
    private func closeQuickSearch(
        notify: Bool = true,
        hideOverlayIfNeeded: Bool = true,
        dismissalSource: String? = nil
    ) {
        Diagnostics.log("content.quickSearch.closeRequest", [
            "source": dismissalSource,
            "notify": notify,
            "hideOverlayIfNeeded": hideOverlayIfNeeded,
            "quickSearchVisible": quickSearchVisible,
            "quickSearchCloseHidesOverlay": quickSearchCloseHidesOverlay,
            "quickSearchOnlySession": quickSearchOnlySession
        ])
        if shouldIgnoreEarlyQuickSearchDismiss(from: dismissalSource) {
            return
        }
        let shouldHideOverlay = quickSearchVisible && quickSearchCloseHidesOverlay && hideOverlayIfNeeded
        guard quickSearchVisible else { return }
        quickSearchVisible = false
        quickSearchOpenedAt = nil
        quickSearchQuery = ""
        quickSearchResults = []
        quickSearchSelectedID = nil
        quickSearchManualSelection = false
        quickSearchErrorMessage = nil
        quickSearchCloseHidesOverlay = false
        if notify {
            NotificationCenter.default.post(
                name: .tagLauncherQuickSearchVisibilityChanged,
                object: nil,
                userInfo: ["active": false]
                userInfo: [
                    "active": false,
                    "hideOverlayOnClose": shouldHideOverlay
                ]
            )
        }
        if shouldHideOverlay {
            hideOverlay()
        } else {
            quickSearchCloseHidesOverlay = false
        }
    }

    private func shouldIgnoreEarlyQuickSearchDismiss(from source: String?) -> Bool {
        guard quickSearchVisible,
              let quickSearchOpenedAt,
              source == QuickSearchDismissSource.mouse || source == QuickSearchDismissSource.backdrop
        else { return false }

        let age = Date().timeIntervalSince(quickSearchOpenedAt)
        let gracePeriod: TimeInterval = quickSearchOnlySession ? 1.25 : 0.30
        guard age < gracePeriod else { return false }
        Diagnostics.log("content.quickSearch.ignoredEarlyDismiss", [
            "source": source,
            "age": String(format: "%.3f", age),
            "gracePeriod": String(format: "%.2f", gracePeriod)
        ])
        return true
    }

    private func refreshQuickSearchResults() {
        let previousSelection = quickSearchSelectedID
        quickSearchResults = QuickSearchEngine.search(quickSearchQuery, documents: quickSearchDocuments)
        quickSearchResults = QuickSearchEngine.search(
            quickSearchQuery,
            documents: quickSearchDocuments.filter { FileManager.default.fileExists(atPath: $0.app.path.path) }
        )

        if quickSearchResults.isEmpty {
            quickSearchSelectedID = nil
@@ -782,6 +837,11 @@
    }

    private func handleQuickSearchCommand(_ command: QuickSearchCommand) {
        Diagnostics.log("content.quickSearch.command", [
            "command": String(describing: command),
            "quickSearchCloseHidesOverlay": quickSearchCloseHidesOverlay,
            "quickSearchOnlySession": quickSearchOnlySession
        ])
        switch command {
        case .moveUp:
            moveQuickSearchSelection(by: -1)
@@ -935,6 +995,7 @@

    private func appKitTagNavigation(orientation: TagNavigationView.Orientation) -> some View {
        let isHorizontal = orientation == .horizontal
        let appDropTargetID = appGridInteraction.tagNavigationAppDropTargetName
        return TagNavigationView(
            items: tagLabels,
            orientation: orientation,
@@ -943,6 +1004,8 @@
                : NSEdgeInsets(top: 12, left: 12, bottom: 12, right: 12),
            dragModeActive: tagNavDragModeActive,
            draggingItemID: tagNavDragItem,
            appDragModeActive: appGridInteraction.appDragModeActive,
            appDropTargetID: appDropTargetID,
            onActivate: { tagID in
                activateTagNavigation(tagID)
            },
@@ -952,6 +1015,9 @@
            canReorder: { tagID in
                canReorderTag(tagID)
            },
            canAcceptAppDrop: { tagID in
                canAssignDroppedAppToTag(tagID)
            },
            onReorderBegan: { tagID in
                beginTagNavReorder(tagID)
            },
@@ -960,6 +1026,12 @@
            },
            onReorderEnded: {
                endTagNavReorder()
            },
            onAppDropHoverChange: { tagID, active in
                handleTagNavigationAppDropHover(tagID, active: active)
            },
            onAppDrop: { path, source, targetTag, copy in
                dropAppOnTagNavigation(path: path, sourceTag: source, targetTag: targetTag, copy: copy)
            }
        )
    }
@@ -1100,88 +1172,12 @@
    }

    private var smartStartNoticeOverlay: some View {
        GeometryReader { proxy in
            if let notice = smartStartNotice {
                let panelWidth = min(560, max(320, proxy.size.width - 64))

                ZStack {
                    Color.black.opacity(0.10)
                        .ignoresSafeArea()

                    VStack(spacing: 18) {
                        Image(systemName: notice.mode == .suggestionOnly ? "sparkles" : "checkmark.seal.fill")
                            .font(.system(size: 30, weight: .semibold))
                            .foregroundStyle(Color.accentColor)
                            .frame(width: 58, height: 58)
                            .background(
                                Circle()
                                    .fill(Color.accentColor.opacity(0.12))
                            )

                        VStack(spacing: 8) {
                            Text(notice.title)
                                .font(.system(size: 21, weight: .semibold))
                                .foregroundStyle(.primary)
                                .multilineTextAlignment(.center)

                            Text(notice.message)
                                .font(.system(size: 15, weight: .regular))
                                .foregroundStyle(.secondary)
                                .multilineTextAlignment(.center)
                                .lineLimit(4)
                                .fixedSize(horizontal: false, vertical: true)
                        }

                        HStack(spacing: 12) {
                            switch notice.mode {
                            case .suggestionOnly:
                                Button(tr("smartstart.later")) {
                                    dismissSmartStartNotice()
                                }
                                .buttonStyle(.bordered)
                                .controlSize(.large)

                                Button(tr("smartstart.apply")) {
                                    applySmartStartSuggestion()
                                }
                                .buttonStyle(.borderedProminent)
                                .controlSize(.large)
                            case .autoApplied, .manuallyApplied:
                                if notice.summary.backupPath != nil {
                                    Button(tr("smartstart.undo")) {
                                        undoSmartStart()
                                    }
                                    .buttonStyle(.bordered)
                                    .controlSize(.large)
                                }
                                Button(tr("smartstart.ok")) {
                                    dismissSmartStartNotice()
                                }
                                .buttonStyle(.borderedProminent)
                                .controlSize(.large)
                            }
                        }
                    }
                    .padding(.horizontal, 30)
                    .padding(.vertical, 26)
                    .frame(width: panelWidth)
                    .background(
                        RoundedRectangle(cornerRadius: 16)
                            .fill(.ultraThickMaterial)
                            .shadow(color: .black.opacity(0.26), radius: 28, y: 16)
                    )
                    .overlay(
                        RoundedRectangle(cornerRadius: 16)
                            .stroke(.white.opacity(0.16), lineWidth: 1)
                    )
                }
                .frame(width: proxy.size.width, height: proxy.size.height)
                .transition(.scale(scale: 0.96).combined(with: .opacity))
                .zIndex(650)
            }
        }
        .ignoresSafeArea()
        .allowsHitTesting(smartStartNotice != nil)
        SmartStartNoticeOverlay(
            notice: smartStartNotice,
            onDismiss: dismissSmartStartNotice,
            onApply: applySmartStartSuggestion,
            onUndo: undoSmartStart
        )
    }
    // MARK: - Edit Tags View

@@ -1510,6 +1506,8 @@
                    UncategorizedDropConfirmBubble(
                        title: tr("drop.uncategorizedConfirmTitle"),
                        message: uncategorizedConfirmMessage(for: pendingDrop),
                        doNotRemindTitle: tr("drop.removeTagDoNotAskAgain"),
                        doNotRemind: $appGridInteraction.uncategorizedDropSuppressFuturePrompt,
                        cancelTitle: tr("tag.cancel"),
                        confirmTitle: tr("edit.confirm"),
                        onCancel: dismissUncategorizedDropConfirm,
@@ -1818,7 +1816,9 @@
    }

    private func handleAppGridScrollActivity() {
        appGridInteraction.hoveredBubble = nil
        if appGridInteraction.hoveredBubble != nil {
            appGridInteraction.hoveredBubble = nil
        }
    }

    private func handleBubbleHover(app: AppInfo, frame: CGRect, event: AppBubbleHoverEvent) {
@@ -1962,6 +1962,13 @@
    }

    private func handleTagNavigationHover(_ id: String, active: Bool) {
        if appGridInteraction.appDragModeActive {
            if !active, appGridInteraction.tagNavigationHoveredGroupName == id {
                appGridInteraction.tagNavigationHoveredGroupName = nil
            }
            return
        }

        guard active else {
            if appGridInteraction.tagNavigationHoveredGroupName == id {
                appGridInteraction.tagNavigationHoveredGroupName = nil
@@ -1972,6 +1979,24 @@
        appGridInteraction.tagNavigationHoveredGroupName = id
        fillColorlessContainer(id)
        scrollToTagFromHover(id)
    }

    private func handleTagNavigationAppDropHover(_ id: String, active: Bool) {
        guard appGridInteraction.appDragModeActive else {
            if appGridInteraction.tagNavigationAppDropTargetName == id {
                appGridInteraction.tagNavigationAppDropTargetName = nil
            }
            return
        }

        guard active, canAssignDroppedAppToTag(id) else {
            if appGridInteraction.tagNavigationAppDropTargetName == id {
                appGridInteraction.tagNavigationAppDropTargetName = nil
            }
            return
        }

        appGridInteraction.tagNavigationAppDropTargetName = id
    }

    private func scrollToTagFromHover(_ id: String) {
@@ -2111,6 +2136,22 @@
        refreshApps(forceLayoutRefresh: true)
    }

    private func dropAppOnTagNavigation(path: String, sourceTag: String, targetTag: String, copy: Bool) {
        resetTransientDragState()
        guard canAssignDroppedAppToTag(targetTag) else { return }
        guard let app = allApps.first(where: { $0.path.path == path }) else { return }
        guard !appHasTag(app, tagName: targetTag) else { return }
        TagEditor.appendTags([targetTag], to: [path])
        showDropRefresh()
        refreshApps(forceLayoutRefresh: true)
    }

    private func canAssignDroppedAppToTag(_ tagName: String) -> Bool {
        tagColors[tagName] != nil
            && !isAppleBuiltInDropTarget(tagName)
            && !isUncategorizedDropTarget(tagName)
    }

    private func dropAppOutsideGroup(path: String, sourceTag: String, copy: Bool) {
        resetTransientDragState(keepingPendingTagRemovalDrop: true)
        guard isRemovableRegularTag(sourceTag) else { return }
@@ -2136,7 +2177,13 @@
        guard !removableTags.isEmpty else { return }
        let assignedTags = assignedRegularDisplayTags(for: removableTags)

        if skipUncategorizedDropConfirm {
            moveDroppedAppToUncategorized(path: app.path.path, tags: removableTags)
            return
        }

        clearAppBubbleState()
        appGridInteraction.uncategorizedDropSuppressFuturePrompt = false
        withAnimation(.spring(response: 0.24, dampingFraction: 0.84)) {
            appGridInteraction.pendingUncategorizedDrop = PendingUncategorizedDrop(
                app: app,
@@ -2190,6 +2237,7 @@
    }

    private func dismissUncategorizedDropConfirm() {
        appGridInteraction.uncategorizedDropSuppressFuturePrompt = false
        resetTransientDragState(keepingPendingUncategorizedDrop: true)
        withAnimation(.easeOut(duration: 0.18)) {
            appGridInteraction.pendingUncategorizedDrop = nil
@@ -2200,10 +2248,19 @@
        guard let pendingDrop = appGridInteraction.pendingUncategorizedDrop else { return }
        let path = pendingDrop.app.path.path
        let tags = pendingDrop.removableTags
        let shouldSuppressFuturePrompt = appGridInteraction.uncategorizedDropSuppressFuturePrompt
        if shouldSuppressFuturePrompt {
            skipUncategorizedDropConfirm = true
        }
        appGridInteraction.uncategorizedDropSuppressFuturePrompt = false
        resetTransientDragState(keepingPendingUncategorizedDrop: true)
        withAnimation(.easeOut(duration: 0.16)) {
            appGridInteraction.pendingUncategorizedDrop = nil
        }
        moveDroppedAppToUncategorized(path: path, tags: tags)
    }

    private func moveDroppedAppToUncategorized(path: String, tags: [String]) {
        guard !tags.isEmpty else { return }
        TagEditor.removeTags(tags, from: [path])
        showDropRefresh()
@@ -2306,12 +2363,17 @@
        if active {
            endTagNavReorder()
            clearAppBubbleState()
            appGridInteraction.tagNavigationAppDropTargetName = nil
        }
        appGridInteraction.appDragModeActive = active
        if !active {
            appGridInteraction.tagNavigationAppDropTargetName = nil
        }
        if active {
            DispatchQueue.main.asyncAfter(deadline: .now() + 8) {
                if appGridInteraction.appDragModeActive && !AppDragCoordinator.shared.hasActiveDrag {
                    appGridInteraction.appDragModeActive = false
                    appGridInteraction.tagNavigationAppDropTargetName = nil
                }
            }
        }
@@ -2325,6 +2387,9 @@
        AppDragCoordinator.shared.cancelDrag()
        if appGridInteraction.appDragModeActive {
            appGridInteraction.appDragModeActive = false
        }
        if appGridInteraction.tagNavigationAppDropTargetName != nil {
            appGridInteraction.tagNavigationAppDropTargetName = nil
        }
        if hadAppDragState {
            appGridInteraction.appDragResetToken &+= 1
@@ -2350,7 +2415,7 @@
        }
    }

    func refreshApps(forceLayoutRefresh: Bool = false) {
    func refreshApps(forceLayoutRefresh: Bool = false, useCache: Bool = true) {
        guard !refreshInProgress else {
            if forceLayoutRefresh {
                refreshAgainAfterCurrent = true
@@ -2361,7 +2426,7 @@

        refreshInProgress = true
        DispatchQueue.global(qos: .userInitiated).async {
            let result = AppLibraryController.refresh()
            let result = AppLibraryController.refresh(useCache: useCache)
            DispatchQueue.main.async {
                applyAppLibrarySnapshot(result.snapshot)
                handleSmartStartRunResult(result.smartStartResult)
@@ -2398,6 +2463,20 @@
    ) {
        appGridInteraction.appDragModeActive = false
        endTagNavReorder()
        guard FileManager.default.fileExists(atPath: app.path.path) else {
            AppIndexer.invalidateScanCache()
            refreshApps()
            onFailure?()
            return
        }

        let closeQuickSearchAndOverlayBeforeOpening = closeQuickSearchOnSuccess
            && closeOverlayOnSuccess
            && (quickSearchCloseHidesOverlay || quickSearchOnlySession)
        if closeQuickSearchAndOverlayBeforeOpening {
            closeQuickSearch(hideOverlayIfNeeded: true)
            hideOverlay()
        }
        let configuration = NSWorkspace.OpenConfiguration()
        NSWorkspace.shared.openApplication(at: app.path, configuration: configuration) { _, error in
            DispatchQueue.main.async {
@@ -2409,10 +2488,10 @@
                DispatchQueue.global(qos: .utility).async {
                    TagEditor.recordLauncherOpen(for: app.path.path)
                }
                if closeQuickSearchOnSuccess {
                    closeQuickSearch(hideOverlayIfNeeded: false)
                if closeQuickSearchOnSuccess && !closeQuickSearchAndOverlayBeforeOpening {
                    closeQuickSearch(hideOverlayIfNeeded: closeOverlayOnSuccess)
                }
                if closeOverlayOnSuccess {
                if closeOverlayOnSuccess && !closeQuickSearchAndOverlayBeforeOpening {
                    hideOverlay()
                }
            }