From 71bfdd4087d0b4d94bd5345cb45bb335617d737c Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Thu, 28 May 2026 15:27:05 +0800
Subject: [PATCH] Confirm single-tag removal on empty grid drop
---
Apptag/AppGridCollectionView.swift | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/Apptag/AppGridCollectionView.swift b/Apptag/AppGridCollectionView.swift
index 9fdd8af..b2884d7 100644
--- a/Apptag/AppGridCollectionView.swift
+++ b/Apptag/AppGridCollectionView.swift
@@ -45,6 +45,7 @@
let onBubbleHover: (AppInfo, CGRect, AppBubbleHoverEvent) -> Void
let onEditNote: (AppInfo, CGRect) -> Void
let onDropApp: (String, String, String, Bool) -> Void
+ let onDropOutsideGroup: (String, String, Bool) -> Void
let onGroupActivate: (String) -> Void
let onScrollActivity: () -> Void
let onDragModeChange: (Bool) -> Void
@@ -76,6 +77,7 @@
onBubbleHover: onBubbleHover,
onEditNote: onEditNote,
onDropApp: onDropApp,
+ onDropOutsideGroup: onDropOutsideGroup,
onGroupActivate: onGroupActivate,
onScrollActivity: onScrollActivity,
onDragModeChange: onDragModeChange
@@ -104,6 +106,7 @@
var onBubbleHover: (AppInfo, CGRect, AppBubbleHoverEvent) -> Void = { _, _, _ in }
var onEditNote: (AppInfo, CGRect) -> Void = { _, _ in }
var onDropApp: (String, String, String, Bool) -> Void = { _, _, _, _ in }
+ var onDropOutsideGroup: (String, String, Bool) -> Void = { _, _, _ in }
var onGroupActivate: (String) -> Void = { _ in }
var onScrollActivity: () -> Void = {}
var onDragModeChange: (Bool) -> Void = { _ in }
@@ -124,6 +127,7 @@
onBubbleHover: @escaping (AppInfo, CGRect, AppBubbleHoverEvent) -> Void,
onEditNote: @escaping (AppInfo, CGRect) -> Void,
onDropApp: @escaping (String, String, String, Bool) -> Void,
+ onDropOutsideGroup: @escaping (String, String, Bool) -> Void,
onGroupActivate: @escaping (String) -> Void,
onScrollActivity: @escaping () -> Void,
onDragModeChange: @escaping (Bool) -> Void
@@ -143,6 +147,7 @@
self.onBubbleHover = onBubbleHover
self.onEditNote = onEditNote
self.onDropApp = onDropApp
+ self.onDropOutsideGroup = onDropOutsideGroup
self.onGroupActivate = onGroupActivate
self.onScrollActivity = onScrollActivity
self.onDragModeChange = onDragModeChange
@@ -250,7 +255,8 @@
}
}
-final class AppGridCollectionHostView: NSView {
+final class AppGridCollectionHostView: NSView, AppEmptyDropReceivingView {
+ private let emptyDropTargetID = UUID()
private let scrollView = NSScrollView()
private let collectionView = NSCollectionView()
private let gridLayout = AppGridContainerCollectionLayout()
@@ -277,6 +283,7 @@
NotificationCenter.default.removeObserver(scrollObserver)
}
scrollUnfreezeWorkItem?.cancel()
+ AppDragCoordinator.shared.unregisterEmptyDropTarget(id: emptyDropTargetID)
}
func configure(coordinator: AppGridCollectionView.Coordinator) {
@@ -319,6 +326,22 @@
}
}
+ override func viewDidMoveToWindow() {
+ super.viewDidMoveToWindow()
+ if window == nil {
+ AppDragCoordinator.shared.unregisterEmptyDropTarget(id: emptyDropTargetID)
+ } else {
+ AppDragCoordinator.shared.registerEmptyDropTarget(id: emptyDropTargetID, view: self)
+ }
+ }
+
+ func performEmptyDrop(path: String, source: String, screenPoint: NSPoint, copy: Bool) {
+ guard let coordinator,
+ coordinator.displayStyle != .flat
+ else { return }
+ coordinator.onDropOutsideGroup(path, source, copy)
+ }
+
private func setup() {
wantsLayer = true
layer?.backgroundColor = NSColor.clear.cgColor
--
Gitblit v1.9.3