From da71eb5bccbdbd22da7cd74b6ddcec031f069482 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Thu, 28 May 2026 15:59:53 +0800
Subject: [PATCH] Stabilize empty-drop tag removal confirmation
---
Apptag/AppGridItem.swift | 288 ++++++++++++++++++++-------------------------------------
1 files changed, 100 insertions(+), 188 deletions(-)
diff --git a/Apptag/AppGridItem.swift b/Apptag/AppGridItem.swift
index 3b4cc5a..5b39626 100644
--- a/Apptag/AppGridItem.swift
+++ b/Apptag/AppGridItem.swift
@@ -1,20 +1,9 @@
import SwiftUI
import AppKit
-// MARK: - App Grid Item (icon + name card, with Dock-like hover)
+// MARK: - App Grid Shared Types
-struct AppGridItem: View {
- let app: AppInfo
- let iconSize: CGFloat
- var showName: Bool = true
- var sourceTag: String? = nil
- var dragModeActive: Bool = false
- var onDragModeChange: ((Bool) -> Void)? = nil
- let onSelect: () -> Void
-
- @State private var isHovered = false
- @State private var wiggle = false
-
+enum AppGridItemMetrics {
static let hoverScale: CGFloat = 1.22
static let labelHeight: CGFloat = 14
@@ -25,193 +14,116 @@
static func stableHeight(iconSize: CGFloat) -> CGFloat {
iconSize * hoverScale + labelHeight + 22
}
+}
- private var iconSlotSize: CGFloat { iconSize * Self.hoverScale }
- private var labelWidth: CGFloat { iconSize + 20 }
- private var labelHeight: CGFloat { Self.labelHeight }
+enum AppBubbleHoverEvent {
+ case entered(canShowBubble: Bool)
+ case exited
+}
+
+enum BubblePlacement {
+ case above
+ case below
+}
+
+struct AppNameBubble: View {
+ let appName: String
+ let note: String?
+ let isEditing: Bool
+ let placement: BubblePlacement
+ let arrowOffset: CGFloat
+ @Binding var draftNote: String
+ var noteFocused: FocusState<Bool>.Binding
+ let onCommit: () -> Void
+ let onCancel: () -> Void
+
+ private var displayNote: String {
+ note?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+ }
var body: some View {
- VStack(spacing: 6) {
- ZStack {
- DraggableAppIconView(
- icon: app.icon,
- iconSize: iconSize,
- payload: "\(app.path.path)\n\(sourceTag ?? "")",
- onLongPress: { onDragModeChange?(true) },
- onDragEnd: { onDragModeChange?(false) },
- onClick: onSelect
- )
- .frame(width: iconSize, height: iconSize)
- .scaleEffect(isHovered ? Self.hoverScale : 1.0)
- .shadow(
- color: .black.opacity(isHovered ? 0.35 : 0),
- radius: isHovered ? 14 : 0,
- y: isHovered ? 8 : 0
- )
- .animation(.spring(response: 0.3, dampingFraction: 0.7), value: isHovered)
- }
- .frame(width: iconSlotSize, height: iconSlotSize)
+ content
+ .onExitCommand(perform: onCancel)
+ }
- Text(app.name)
- .font(.system(size: 11, weight: .medium))
+ private var content: some View {
+ VStack(spacing: isEditing || !displayNote.isEmpty ? 8 : 0) {
+ Text(appName)
+ .font(.system(size: isEditing ? 22 : 24, weight: .bold))
+ .foregroundStyle(.white)
.lineLimit(1)
- .truncationMode(.tail)
- .frame(width: labelWidth, height: labelHeight)
- .opacity(showName ? 1 : (isHovered ? 0.85 : 0))
+ .truncationMode(.middle)
+ .frame(maxWidth: .infinity)
+
+ if isEditing {
+ VStack(alignment: .trailing, spacing: 4) {
+ TextField(tr("appNote.placeholder"), text: limitedDraft)
+ .textFieldStyle(.plain)
+ .font(.system(size: 15, weight: .medium))
+ .foregroundStyle(.white)
+ .padding(.horizontal, 12)
+ .frame(height: 36)
+ .background(
+ RoundedRectangle(cornerRadius: 9)
+ .fill(Color.white.opacity(0.12))
+ )
+ .focused(noteFocused)
+ .onSubmit(onCommit)
+ Text("\(draftNote.count) / \(TagDatabase.maxAppNoteLength)")
+ .font(.system(size: 10, weight: .medium))
+ .foregroundStyle(.white.opacity(0.35))
+ }
+ } else if !displayNote.isEmpty {
+ Text(displayNote)
+ .font(.system(size: 14, weight: .medium))
+ .lineSpacing(2)
+ .foregroundStyle(.white.opacity(0.78))
+ .lineLimit(4)
+ .multilineTextAlignment(.center)
+ .fixedSize(horizontal: false, vertical: true)
+ .frame(maxWidth: .infinity)
+ }
}
- .padding(.vertical, 8)
- .padding(.horizontal, 4)
- .frame(width: Self.stableWidth(iconSize: iconSize), height: Self.stableHeight(iconSize: iconSize))
- .contentShape(Rectangle())
- .onHover { hovering in
- isHovered = hovering
- }
- .rotationEffect(.degrees(dragModeActive ? (wiggle ? 2.0 : -2.0) : 0))
- .animation(
- dragModeActive
- ? .easeInOut(duration: 0.12).repeatForever(autoreverses: true)
- : .default,
- value: wiggle
+ .padding(.horizontal, isEditing ? 22 : 24)
+ .padding(.vertical, isEditing ? 18 : 16)
+ .background(
+ RoundedRectangle(cornerRadius: 18, style: .continuous)
+ .fill(Color.black.opacity(0.92))
+ .shadow(color: .black.opacity(0.34), radius: 24, y: 16)
+ .shadow(color: .black.opacity(0.18), radius: 8, y: 3)
)
- .onChange(of: dragModeActive) { _, active in
- wiggle = active
+ .overlay(alignment: placement == .above ? .bottom : .top) {
+ BubbleArrow(placement: placement)
+ .fill(Color.black.opacity(0.92))
+ .frame(width: 18, height: 9)
+ .offset(x: arrowOffset, y: placement == .above ? 8 : -8)
}
+ }
+
+ private var limitedDraft: Binding<String> {
+ Binding(
+ get: { draftNote },
+ set: { draftNote = String($0.prefix(TagDatabase.maxAppNoteLength)) }
+ )
}
}
-private struct DraggableAppIconView: NSViewRepresentable {
- let icon: NSImage
- let iconSize: CGFloat
- let payload: String
- let onLongPress: () -> Void
- let onDragEnd: () -> Void
- let onClick: () -> Void
+private struct BubbleArrow: Shape {
+ let placement: BubblePlacement
- func makeNSView(context: Context) -> DragIconNSView {
- let view = DragIconNSView()
- view.image = icon
- view.iconSize = iconSize
- view.payload = payload
- view.onLongPress = onLongPress
- view.onDragEnd = onDragEnd
- view.onClick = onClick
- return view
- }
-
- func updateNSView(_ view: DragIconNSView, context: Context) {
- view.image = icon
- view.iconSize = iconSize
- view.payload = payload
- view.onLongPress = onLongPress
- view.onDragEnd = onDragEnd
- view.onClick = onClick
- view.needsDisplay = true
- }
-}
-
-private final class DragIconNSView: NSView {
- var image: NSImage = NSImage()
- var iconSize: CGFloat = 56
- var payload: String = ""
- var onLongPress: (() -> Void)?
- var onDragEnd: (() -> Void)?
- var onClick: (() -> Void)?
-
- private var mouseDownEvent: NSEvent?
- private var didStartDrag = false
- private var isLongPressActive = false
- private var longPressWorkItem: DispatchWorkItem?
- override var isFlipped: Bool { true }
-
- override func draw(_ dirtyRect: NSRect) {
- super.draw(dirtyRect)
- let rect = NSRect(
- x: (bounds.width - iconSize) / 2,
- y: (bounds.height - iconSize) / 2,
- width: iconSize,
- height: iconSize
- )
- image.draw(in: rect)
- }
-
- override func mouseDown(with event: NSEvent) {
- mouseDownEvent = event
- didStartDrag = false
- isLongPressActive = false
- let workItem = DispatchWorkItem { [weak self] in
- guard let self, self.mouseDownEvent != nil else { return }
- self.isLongPressActive = true
- self.onLongPress?()
+ func path(in rect: CGRect) -> Path {
+ var path = Path()
+ switch placement {
+ case .above:
+ path.move(to: CGPoint(x: rect.minX, y: rect.minY))
+ path.addLine(to: CGPoint(x: rect.maxX, y: rect.minY))
+ path.addLine(to: CGPoint(x: rect.midX, y: rect.maxY))
+ case .below:
+ path.move(to: CGPoint(x: rect.minX, y: rect.maxY))
+ path.addLine(to: CGPoint(x: rect.maxX, y: rect.maxY))
+ path.addLine(to: CGPoint(x: rect.midX, y: rect.minY))
}
- longPressWorkItem = workItem
- DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: workItem)
- }
-
- override func mouseDragged(with event: NSEvent) {
- if didStartDrag {
- AppDragCoordinator.shared.updateDragLocation(
- screenPoint(for: event),
- copy: event.modifierFlags.contains(.option)
- )
- return
- }
-
- guard let mouseDownEvent, isLongPressActive else { return }
- let dx = event.locationInWindow.x - mouseDownEvent.locationInWindow.x
- let dy = event.locationInWindow.y - mouseDownEvent.locationInWindow.y
- guard hypot(dx, dy) > 3 else { return }
-
- didStartDrag = true
- longPressWorkItem?.cancel()
- AppDragCoordinator.shared.beginDrag(
- image: makeDragImage(),
- payload: payload,
- at: screenPoint(for: event),
- copy: event.modifierFlags.contains(.option),
- in: window
- )
- }
-
- override func mouseUp(with event: NSEvent) {
- longPressWorkItem?.cancel()
- if didStartDrag {
- AppDragCoordinator.shared.finishDrag(
- at: screenPoint(for: event),
- copy: event.modifierFlags.contains(.option)
- )
- onDragEnd?()
- } else if !isLongPressActive {
- onClick?()
- } else {
- onDragEnd?()
- }
- didStartDrag = false
- isLongPressActive = false
- mouseDownEvent = nil
- }
-
- private func makeDragImage() -> NSImage {
- let scale: CGFloat = 1.22 * 1.5
- let imageSize = iconSize * scale
- let padding = iconSize * 0.45
- let canvasSize = NSSize(width: imageSize + padding * 2, height: imageSize + padding * 2)
- let dragImage = NSImage(size: canvasSize)
-
- dragImage.lockFocus()
- NSGraphicsContext.current?.imageInterpolation = .high
-
- let shadow = NSShadow()
- shadow.shadowColor = NSColor.black.withAlphaComponent(0.48)
- shadow.shadowBlurRadius = 24
- shadow.shadowOffset = NSSize(width: 0, height: -14)
- shadow.set()
-
- image.draw(in: NSRect(x: padding, y: padding, width: imageSize, height: imageSize))
- dragImage.unlockFocus()
- return dragImage
- }
-
- private func screenPoint(for event: NSEvent) -> NSPoint {
- window?.convertPoint(toScreen: event.locationInWindow) ?? NSEvent.mouseLocation
+ path.closeSubpath()
+ return path
}
}
--
Gitblit v1.9.3