Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

A sheet in front turns off the commands that act on the page under it

Țugui Dragoș6ddcdbdfdf66
diff --git a/Packages/PeelCore/Sources/PeelCore/Support/SheetInFront.swift b/Packages/PeelCore/Sources/PeelCore/Support/SheetInFront.swift
new file mode 100644
index 00000000..612d6d41
--- /dev/null
+++ b/Packages/PeelCore/Sources/PeelCore/Support/SheetInFront.swift
@@ -0,0 +1,31 @@
+public import AppKit
+public import Observation
+
+/// Whether the key window is a sheet, such as a question or a sheet a page opened. The window under a sheet takes no
+/// command from the menus, so the commands that act on a page are turned off meanwhile and its keys reach the sheet.
+@MainActor
+@Observable
+public final class SheetInFront {
+ public private(set) var isShowing = false
+ @ObservationIgnored private let keyWindow: @MainActor () -> NSWindow?
+ @ObservationIgnored private var observers: [any NSObjectProtocol] = []
+
+ public init(keyWindow: @escaping @MainActor () -> NSWindow? = { NSApp.keyWindow }) {
+ self.keyWindow = keyWindow
+ }
+
+ /// Follows whichever window is key from now on.
+ public func start() {
+ guard observers.isEmpty else { return }
+ observers = [NSWindow.didBecomeKeyNotification, NSWindow.didResignKeyNotification].map { name in
+ NotificationCenter.default.addObserver(forName: name, object: nil, queue: .main) { [weak self] _ in
+ MainActor.assumeIsolated { self?.read() }
+ }
+ }
+ read()
+ }
+
+ private func read() {
+ isShowing = keyWindow()?.sheetParent != nil
+ }
+}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/KeyWindow.swift b/Packages/PeelCore/Tests/PeelCoreTests/KeyWindow.swift
new file mode 100644
index 00000000..43417577
--- /dev/null
+++ b/Packages/PeelCore/Tests/PeelCoreTests/KeyWindow.swift
@@ -0,0 +1,11 @@
+import AppKit
+
+/// The window a test says is key, read each time a window says it became key or stopped being key.
+@MainActor
+final class KeyWindow {
+ var window: NSWindow?
+
+ init(_ window: NSWindow?) {
+ self.window = window
+ }
+}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/SheetInFrontTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/SheetInFrontTests.swift
new file mode 100644
index 00000000..e7b2631c
--- /dev/null
+++ b/Packages/PeelCore/Tests/PeelCoreTests/SheetInFrontTests.swift
@@ -0,0 +1,29 @@
+import AppKit
+@testable import PeelCore
+import Testing
+
+@MainActor
+struct SheetInFrontTests {
+ @Test func isShowingWhileTheKeyWindowIsASheet() {
+ let window = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 300, height: 200), styleMask: [.titled], backing: .buffered, defer: true)
+ let sheet = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 200, height: 100), styleMask: [.titled], backing: .buffered, defer: true)
+ let key = KeyWindow(window)
+ let sheetInFront = SheetInFront(keyWindow: { key.window })
+ sheetInFront.start()
+ #expect(!sheetInFront.isShowing)
+
+ window.beginSheet(sheet)
+ key.window = sheet
+ NotificationCenter.default.post(name: NSWindow.didBecomeKeyNotification, object: sheet)
+ #expect(sheetInFront.isShowing)
+
+ window.endSheet(sheet)
+ key.window = window
+ NotificationCenter.default.post(name: NSWindow.didBecomeKeyNotification, object: window)
+ #expect(!sheetInFront.isShowing)
+
+ key.window = nil
+ NotificationCenter.default.post(name: NSWindow.didResignKeyNotification, object: window)
+ #expect(!sheetInFront.isShowing)
+ }
+}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/TextEditingTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TextEditingTests.swift
index a5057fa9..d82c76a6 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/TextEditingTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/TextEditingTests.swift
@@ -103,13 +103,3 @@ struct TextEditingTests {
#expect(!TextEditing.edits(nil))
}
}
-
-/// The window a test says is key, read by `TextEditing` each time a window says it became key.
-@MainActor
-private final class KeyWindow {
- var window: NSWindow?
-
- init(_ window: NSWindow?) {
- self.window = window
- }
-}
diff --git a/Peel/Navigation/PeelCommands.swift b/Peel/Navigation/PeelCommands.swift
index eedc15f2..ed109c62 100644
--- a/Peel/Navigation/PeelCommands.swift
+++ b/Peel/Navigation/PeelCommands.swift
@@ -49,6 +49,7 @@ struct PeelCommands: Commands {
let library: AppLibrary
let homebrew: HomebrewLibrary
let textEditing: TextEditing
+ let sheetInFront: SheetInFront
@Environment(\.openWindow) private var openWindow
@FocusedValue(\.removalHistory) private var history
@FocusedBinding(\.selectedTool) private var selectedTool
@@ -77,7 +78,7 @@ struct PeelCommands: Commands {
}
}
.keyboardShortcut("z", modifiers: .command)
- .disabled(history?.undoName == nil || history?.isRestoring == true)
+ .disabled(history?.undoName == nil || history?.isRestoring == true || sheetInFront.isShowing)
Button("Redo") {}
.keyboardShortcut("z", modifiers: [.command, .shift])
.disabled(true)
@@ -101,18 +102,18 @@ struct PeelCommands: Commands {
Divider()
Button(String(localized: moveToTrash?.title ?? "Move to Trash")) { moveToTrash?.perform() }
.keyboardShortcut(.delete, modifiers: .command)
- .disabled(moveToTrash?.isEnabled != true || textEditing.isEditing)
+ .disabled(moveToTrash?.isEnabled != true || textEditing.isEditing || sheetInFront.isShowing)
Divider()
Menu("Export List of Apps") {
ExportListMenuContent(library: library, homebrew: homebrew)
}
- .disabled(!InventoryExport.canExport(library: library, homebrew: homebrew))
+ .disabled(!InventoryExport.canExport(library: library, homebrew: homebrew) || sheetInFront.isShowing)
}
CommandGroup(before: .textEditing) {
Button("Find") { searchField = true }
.keyboardShortcut("f", modifiers: .command)
- .disabled(searchField == nil)
+ .disabled(searchField == nil || sheetInFront.isShowing)
Divider()
}
@@ -121,15 +122,15 @@ struct PeelCommands: Commands {
let rescan = PageCommands.shared.rescan
Button(String(localized: rescan?.title ?? "Rescan")) { rescan?.perform() }
.keyboardShortcut("r", modifiers: .command)
- .disabled(rescan?.isEnabled != true)
+ .disabled(rescan?.isEnabled != true || sheetInFront.isShowing)
let stop = PageCommands.shared.stop
Button(String(localized: stop?.title ?? "Stop")) { stop?.perform() }
.keyboardShortcut(".", modifiers: .command)
- .disabled(stop?.isEnabled != true)
+ .disabled(stop?.isEnabled != true || sheetInFront.isShowing)
Menu("Sort and Filter") {
AppListMenuContent(library: library)
}
- .disabled(selectedTool != .applications)
+ .disabled(selectedTool != .applications || sheetInFront.isShowing)
Divider()
let ordered = Tool.Group.allCases.flatMap(\.tools)
ForEach(Tool.Group.allCases, id: \.self) { group in
@@ -141,7 +142,7 @@ struct PeelCommands: Commands {
Text(tool.title)
}
.keyboardShortcut(index < 9 ? KeyboardShortcut(KeyEquivalent(Character(String(index + 1))), modifiers: .command) : nil)
- .disabled(selectedTool == nil)
+ .disabled(selectedTool == nil || sheetInFront.isShowing)
}
Divider()
}
diff --git a/Peel/PeelApp.swift b/Peel/PeelApp.swift
index b4cf7e81..6429e84d 100644
--- a/Peel/PeelApp.swift
+++ b/Peel/PeelApp.swift
@@ -55,6 +55,7 @@ struct PeelApp: App {
@State private var carrier: SelectionCarrier
@State private var background = StandingWork()
@State private var textEditing = TextEditing()
+ @State private var sheetInFront = SheetInFront()
@State private var hasLaunched = false
private let exclusions = ExclusionsStore.shared
@@ -243,6 +244,7 @@ struct PeelApp: App {
followFolders, followAppsForTheTrash, askWhenDue, followFindings, followActivations, watchFreeSpace,
])
textEditing.start()
+ sheetInFront.start()
// Work for Peel coming forward is in `followActivations`.
guard !hasLaunched else { return }
hasLaunched = true
@@ -352,7 +354,7 @@ struct PeelApp: App {
}
.defaultSize(width: 1120, height: 764)
.commands {
- PeelCommands(library: library, homebrew: homebrew, textEditing: textEditing)
+ PeelCommands(library: library, homebrew: homebrew, textEditing: textEditing, sheetInFront: sheetInFront)
}
.onChange(of: watchesTrash) { _, isWatching in
if isWatching {