Ensure backstack is set correctly for exiting and lastInstruction as …

…well as the main backstack
isaac-udy · Oct 18, 2022 · 77a4513 · 77a4513
1 parent 575751b
commit 77a4513
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/enro-core/src/main/java/dev/enro/core/container/NavigationBackstack.kt b/enro-core/src/main/java/dev/enro/core/container/NavigationBackstack.kt
@@ -114,6 +114,25 @@ internal fun NavigationBackstack.ensureOpeningTypeIsSet(
         backstack = backstack.map {
             if (it.internal.openingType != Any::class.java) return@map it
 
+            InstructionOpenedByInterceptor.intercept(
+                it,
+                parentContext,
+                requireNotNull(parentContext.controller.bindingForKeyType(it.navigationKey::class)),
+            )
+        },
+        lastInstruction = lastInstruction.let {
+            if (it !is AnyOpenInstruction) return@let it
+            if (it.internal.openingType != Any::class.java) return@let it
+
+            InstructionOpenedByInterceptor.intercept(
+                it,
+                parentContext,
+                requireNotNull(parentContext.controller.bindingForKeyType(it.navigationKey::class)),
+            )
+        },
+        exiting = exiting?.let {
+            if (it.internal.openingType != Any::class.java) return@let it
+
             InstructionOpenedByInterceptor.intercept(
                 it,
                 parentContext,