@@ -106,12 +106,12 @@ class NavigationHierarchyController {
106
106
if let visitable = controller as? Visitable {
107
107
delegate. visit ( visitable, on: . main, with: proposal. options)
108
108
}
109
- let willContextSwitch = isInModalContext
109
+ let willReplaceModalContext = isInModalContext
110
110
navigationController. dismiss ( animated: proposal. animated)
111
111
pushOrReplace ( on: navigationController,
112
112
with: controller,
113
113
via: proposal,
114
- didSwitchToDefaultContext : willContextSwitch )
114
+ didReplaceModalContext : willReplaceModalContext )
115
115
case . modal:
116
116
if let visitable = controller as? Visitable {
117
117
delegate. visit ( visitable, on: . modal, with: proposal. options)
@@ -131,13 +131,13 @@ class NavigationHierarchyController {
131
131
private func pushOrReplace( on navigationController: UINavigationController ,
132
132
with controller: UIViewController ,
133
133
via proposal: VisitProposal ,
134
- didSwitchToDefaultContext : Bool = false ) {
134
+ didReplaceModalContext : Bool = false ) {
135
135
136
136
if visitingSamePage ( on: navigationController, with: controller, via: proposal. url) {
137
137
navigationController. replaceLastViewController ( with: controller)
138
138
} else if visitingPreviousPage ( on: navigationController, with: controller, via: proposal. url) {
139
139
navigationController. popViewController ( animated: proposal. animated)
140
- } else if proposal. options. action == . advance || didSwitchToDefaultContext {
140
+ } else if proposal. options. action == . advance || didReplaceModalContext {
141
141
navigationController. pushViewController ( controller, animated: proposal. animated)
142
142
} else {
143
143
navigationController. replaceLastViewController ( with: controller)
0 commit comments