-
-
Notifications
You must be signed in to change notification settings - Fork 64
Add initial support for closing windows with dismiss / dismissWindow
#282
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ffd29a8
initial attempt at closing windows using `DismissAction` (not success…
d93856b
"fix" `DismissAction` for windows (it already worked, I just wasn't u…
kaascevich 82f863d
add dedicated `dismissWindow` action
kaascevich 0cb2f33
Merge branch 'stackotter:main' into window-dismissal
kaascevich 4d242cc
use default padding in WindowingExample
kaascevich f66eb01
documentation fixups
kaascevich 28a45b4
Merge branch 'stackotter:main' into window-dismissal
kaascevich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
Sources/SwiftCrossUI/Environment/Actions/DismissWindowAction.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /// An action that closes the current window. | ||
kaascevich marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| /// | ||
| /// Use the `dismissWindow` environment value to get an instance of this action, | ||
| /// then call it to close the current window . | ||
kaascevich marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| /// | ||
| /// Example usage: | ||
| /// ```swift | ||
| /// struct ContentView: View { | ||
| /// @Environment(\.dismissWindow) var dismissWindow | ||
| /// | ||
| /// var body: some View { | ||
| /// VStack { | ||
| /// Text("Window Content") | ||
| /// Button("Close") { | ||
| /// dismissWindow() | ||
| /// } | ||
| /// } | ||
| /// } | ||
| /// } | ||
| /// ``` | ||
| @MainActor | ||
| public struct DismissWindowAction { | ||
| let backend: any AppBackend | ||
| let window: MainActorBox<Any?> | ||
|
|
||
| /// Dismisses the current presentation context. | ||
kaascevich marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| public func callAsFunction() { | ||
| func closeWindow<Backend: AppBackend>(backend: Backend) { | ||
| guard let window = window.value else { | ||
| print("warning: dismissWindow() called outside of a window") | ||
kaascevich marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return | ||
| } | ||
| backend.close(window: window as! Backend.Window) | ||
| } | ||
|
|
||
| closeWindow(backend: backend) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.