99import UIKit
1010import RxSwift
1111
12-
12+ /// WidgetNavigator provides access to the current UINavgiationController and navigation stack.
1313public struct WidgetNavigator {
1414
1515 var context : WidgetContext
@@ -18,54 +18,88 @@ public struct WidgetNavigator {
1818 self . context = context
1919 }
2020
21+ /// Returns the current UINavigation controller for the current context.
2122 public var navigationController : UINavigationController ? {
2223 context. viewController? . navigationController
2324 }
2425
2526 // dismissible functionality
2627
28+ /// Pushes the widget onto the navigation stack in a new UIWidgetHostController.
2729 public func push( widget: Widget , animated: Bool = true ) {
30+ let context = self . context. set ( presentation: . pushed)
2831 let viewController = UIWidgetHostController ( widget, with: context)
2932 navigationController? . pushViewController ( viewController, animated: animated)
3033 }
3134
35+ /// Pushes the widget onto the navigation stack in a new UIWidgetHostController with a return value handler.
3236 public func push< ReturnType> ( widget: Widget , animated: Bool = true , onDismiss handler: @escaping WidgetDismissibleReturnHandler < ReturnType > ) {
37+ let context = self . context. set ( presentation: . pushed)
3338 let dismissible = WidgetDismissibleReturn < ReturnType > ( handler)
3439 let viewController = UIWidgetHostController ( widget, with: context, dismissible: dismissible)
3540 navigationController? . pushViewController ( viewController, animated: animated)
3641 }
3742
43+ /// Presents a widget on the navigation stack in a new UIWidgetHostController.
44+ public func present( widget: Widget , animated: Bool = true ) {
45+ let context = self . context. set ( presentation: . presented)
46+ let viewController = UIWidgetHostController ( widget, with: context)
47+ navigationController? . present ( viewController, animated: animated, completion: nil )
48+ }
49+
50+ /// Presents a widget on the navigation stack in a new UIWidgetHostController with a return value handler.
51+ public func present< ReturnType> ( widget: Widget , animated: Bool = true , onDismiss handler: @escaping WidgetDismissibleReturnHandler < ReturnType > ) {
52+ let context = self . context. set ( presentation: . presented)
53+ let dismissible = WidgetDismissibleReturn < ReturnType > ( handler)
54+ let viewController = UIWidgetHostController ( widget, with: context, dismissible: dismissible)
55+ navigationController? . present ( viewController, animated: animated, completion: nil )
56+ }
57+
58+ /// Pops or dismisses the current view controller, returning a value that will be passed to the onDismiss handler.
3859 public func dismiss< Value> ( returning value: Value , animated: Bool = true ) {
3960 if let dimissible = context. dismissible as? WidgetDismissibleReturn < Value > {
4061 dimissible. handler ( value)
4162 }
4263 dismiss ( animated: animated)
4364 }
4465
66+ /// Pops or dismisses the current view controller, dependent upon the presentation state.
4567 public func dismiss( animated: Bool = true ) {
46- guard let viewController = context. viewController else { return }
47- viewController. navigationController? . popToViewController ( viewController, animated: false )
48- viewController. navigationController? . popViewController ( animated: animated)
68+ guard let viewController = context. viewController else {
69+ return
70+ }
71+ switch self . context. presentation {
72+ case . presented:
73+ viewController. dismiss ( animated: animated, completion: nil )
74+ case . pushed:
75+ viewController. navigationController? . popToViewController ( viewController, animated: false )
76+ viewController. navigationController? . popViewController ( animated: animated)
77+ }
4978 }
5079
5180 // standard functionality
5281
82+ /// Pushes a non-widget baseed view controller onto the current navigation stack.
5383 public func pushViewController( _ viewController: UIViewController , animated: Bool = true ) {
5484 navigationController? . pushViewController ( viewController, animated: animated)
5585 }
5686
87+ /// Pops a view controller from the current navigation stack.
5788 public func popViewController( animated: Bool = true ) {
5889 navigationController? . popViewController ( animated: animated)
5990 }
6091
92+ /// Pops to the root view controller on the current navigation stack.
6193 public func popToRootViewController( animated: Bool = true ) {
6294 navigationController? . popToRootViewController ( animated: animated)
6395 }
6496
97+ /// Presents a view controller using the current navigation stack.
6598 public func presentViewController( _ viewController: UIViewController , animated: Bool = true ) {
6699 context. viewController? . present ( viewController, animated: animated, completion: nil )
67100 }
68101
102+ /// Dismisses a view controller from the current navigation stack.
69103 public func dismissViewController( animated: Bool = true ) {
70104 context. viewController? . dismiss ( animated: animated, completion: nil )
71105 }
@@ -75,36 +109,51 @@ public struct WidgetNavigator {
75109
76110extension WidgetContext {
77111
112+ /// Returns the Navigator for the current context.
78113 public var navigator : WidgetNavigator ? {
79114 if viewController != nil {
80115 return WidgetNavigator ( self )
81116 }
82117 return nil
83118 }
84119
120+ /// Returns the current context with a new RxSwift DisposeBag for subscriptions.
85121 public func new( ) -> WidgetContext {
86122 var context = self
87123 context. disposeBag = DisposeBag ( )
88124 return context
89125 }
90126
127+ /// Sets the current view controller to be the passed view controller.
91128 public func set( viewController: UIViewController ) -> WidgetContext {
92129 var context = self
93130 context. viewController = viewController
94131 return context
95132 }
96133
134+ /// Returns the current navigation dismissible, if any.
97135 public var dismissible : WidgetDismissibleType ? {
98136 return get ( WidgetDismissibleType . self)
99137 }
100138
139+ /// Sets the current navigation dismissible.
101140 public func set( dismissible: WidgetDismissibleType ? ) -> WidgetContext {
102141 if let dismissible = dismissible {
103142 return put ( dismissible)
104143 }
105144 return self
106145 }
107146
147+ /// Returns the current navigation presentation type for the current view controller.
148+ public var presentation : WidgetDismissiblePresentationType {
149+ return find ( WidgetDismissiblePresentationType . self) ?? . pushed
150+ }
151+
152+ /// Sets the current navigation presentation type for the current view controller.
153+ public func set( presentation: WidgetDismissiblePresentationType ) -> WidgetContext {
154+ return put ( presentation)
155+ }
156+
108157}
109158
110159fileprivate struct UIViewControllerBox {
0 commit comments