-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #51 from SwiftfulThinking/master
Master
- Loading branch information
Showing
16 changed files
with
957 additions
and
129 deletions.
There are no files selected for viewing
This file contains 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,16 @@ | ||
| { | ||
| "object": { | ||
| "pins": [ | ||
| { | ||
| "package": "SwiftfulRecursiveUI", | ||
| "repositoryURL": "https://github.com/SwiftfulThinking/SwiftfulRecursiveUI.git", | ||
| "state": { | ||
| "branch": null, | ||
| "revision": "d8de572e731d2f45a7abf05642893cb848bfec8c", | ||
| "version": "1.0.1" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "version": 1 | ||
| } |
This file contains 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 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
193 changes: 193 additions & 0 deletions
193
Sources/SwiftfulRouting/Components/ModalSupportView.swift
This file contains 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,193 @@ | ||
| // | ||
| // File.swift | ||
| // | ||
| // | ||
| // Created by Nick Sarno on 1/19/24. | ||
| // | ||
|
|
||
| import Foundation | ||
| import SwiftUI | ||
| import SwiftfulRecursiveUI | ||
|
|
||
| struct AnyModalWithDestination: Identifiable, Equatable { | ||
| let id: String | ||
| let configuration: ModalConfiguration | ||
| let destination: AnyDestination | ||
| private(set) var didDismiss: Bool = false | ||
|
|
||
| static func == (lhs: AnyModalWithDestination, rhs: AnyModalWithDestination) -> Bool { | ||
| lhs.id == rhs.id && lhs.didDismiss == rhs.didDismiss | ||
| } | ||
|
|
||
| mutating func dismiss() { | ||
| didDismiss = true | ||
| } | ||
|
|
||
| static var origin: AnyModalWithDestination { | ||
| AnyModalWithDestination( | ||
| id: "origin", | ||
| configuration: ModalConfiguration( | ||
| transition: .identity, | ||
| animation: .default, | ||
| alignment: .center, | ||
| backgroundColor: nil, | ||
| ignoreSafeArea: true | ||
| ), | ||
| destination: AnyDestination(EmptyView()) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| struct ModalSupportView: View { | ||
|
|
||
| @State private var selection: AnyModalWithDestination? = nil | ||
|
|
||
| let transitions: [AnyModalWithDestination] | ||
| let onDismissModal: (AnyModalWithDestination) -> Void | ||
|
|
||
| var body: some View { | ||
| ZStack { | ||
| LazyZStack(allowSimultaneous: true, selection: selection, items: transitions) { data in | ||
| LazyZStack(allowSimultaneous: true, selection: true) { showView1 in | ||
| if showView1 { | ||
| data.destination.destination | ||
| .frame(configuration: data.configuration) | ||
| .transition(data.configuration.transition) | ||
| .zIndex(2) | ||
| } else { | ||
| if let backgroundColor = data.configuration.backgroundColor { | ||
| backgroundColor | ||
| .frame(maxWidth: .infinity, maxHeight: .infinity) | ||
| .edgesIgnoringSafeArea(.all) | ||
| .transition(AnyTransition.opacity.animation(.easeInOut)) | ||
| .onTapGesture { | ||
| onDismissModal(data) | ||
| } | ||
| .zIndex(1) | ||
| } else { | ||
| EmptyView() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| .animation(transitions.last?.configuration.animation ?? .default, value: (selection?.id ?? "") + "\(transitions.count)") | ||
| } | ||
| .onFirstAppear { | ||
| selection = transitions.last | ||
| } | ||
| .onChange(of: transitions, perform: { newValue in | ||
| Task { @MainActor in | ||
| try? await Task.sleep(nanoseconds: 0) | ||
| if let new = newValue.last(where: { !$0.didDismiss }), self.selection?.id != new.id { | ||
| self.selection = new | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| public enum TransitionOption: String, CaseIterable { | ||
| case trailing, trailingCover, leading, leadingCover, top, topCover, bottom, bottomCover // identity //, scale, opacity, slide, slideCover | ||
|
|
||
| var insertion: AnyTransition { | ||
| switch self { | ||
| case .trailing, .trailingCover: | ||
| return .move(edge: .trailing) | ||
| case .leading, .leadingCover: | ||
| return .move(edge: .leading) | ||
| case .top, .topCover: | ||
| return .move(edge: .top) | ||
| case .bottom, .bottomCover: | ||
| return .move(edge: .bottom) | ||
| // case .scale: | ||
| // return .scale.animation(.default) | ||
| // case .opacity: | ||
| // return .opacity.animation(.default) | ||
| // case .slide, .slideCover: | ||
| // return .slide.animation(.default) | ||
| // case .identity: | ||
| // return .identity | ||
| } | ||
| } | ||
| // | ||
| // var removal: AnyTransition { | ||
| // switch self { | ||
| // case .trailingCover, .leadingCover, .topCover, .bottomCover: | ||
| // return AnyTransition.opacity.animation(.easeInOut.delay(1)) | ||
| // case .trailing: | ||
| // return .move(edge: .leading) | ||
| // case .leading: | ||
| // return .move(edge: .trailing) | ||
| // case .top: | ||
| // return .move(edge: .bottom) | ||
| // case .bottom: | ||
| // return .move(edge: .top) | ||
| //// case .scale: | ||
| //// return .scale.animation(.easeInOut) | ||
| //// case .opacity: | ||
| //// return .opacity.animation(.easeInOut) | ||
| //// case .slide: | ||
| //// return .slide.animation(.easeInOut) | ||
| //// case .identity: | ||
| //// return .identity | ||
| // | ||
| // } | ||
| // } | ||
|
|
||
| var reversed: TransitionOption { | ||
| switch self { | ||
| case .trailing: return .leading | ||
| case .trailingCover: return .leading | ||
| case .leading: return .trailing | ||
| case .leadingCover: return .trailing | ||
| case .top: return .bottom | ||
| case .topCover: return .bottom | ||
| case .bottom: return .top | ||
| case .bottomCover: return .top | ||
| // case .identity: return .identity | ||
| } | ||
| } | ||
|
|
||
| var asAlignment: Alignment { | ||
| switch self { | ||
| case .trailing: | ||
| return .trailing | ||
| case .trailingCover: | ||
| return .trailing | ||
| case .leading: | ||
| return .leading | ||
| case .leadingCover: | ||
| return .leading | ||
| case .top: | ||
| return .top | ||
| case .topCover: | ||
| return .top | ||
| case .bottom: | ||
| return .bottom | ||
| case .bottomCover: | ||
| return .bottom | ||
| } | ||
| } | ||
|
|
||
| var asAxis: Axis.Set { | ||
| switch self { | ||
| case .trailing: | ||
| return .horizontal | ||
| case .trailingCover: | ||
| return .horizontal | ||
| case .leading: | ||
| return .horizontal | ||
| case .leadingCover: | ||
| return .horizontal | ||
| case .top: | ||
| return .vertical | ||
| case .topCover: | ||
| return .vertical | ||
| case .bottom: | ||
| return .vertical | ||
| case .bottomCover: | ||
| return .vertical | ||
| } | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.