feat: compose can pop check variable

programadorthi · Jun 7, 2024 · 1d345c3 · 1d345c3
1 parent d62a16e
commit 1d345c3
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/integration/compose/common/src/dev/programadorthi/routing/compose/ComposeRoutingExt.kt b/integration/compose/common/src/dev/programadorthi/routing/compose/ComposeRoutingExt.kt
@@ -12,6 +12,8 @@ internal expect fun Routing.popOnPlatform(
     fallback: () -> Unit,
 )
 
+public expect val Routing.canPop: Boolean
+
 public fun Routing.pop(result: Any? = null) {
     popOnPlatform(result = result) {
         if (callStack.size < 2) return@popOnPlatform

diff --git a/integration/compose/common/test/dev/programadorthi/routing/compose/ComposeRoutingTest.kt b/integration/compose/common/test/dev/programadorthi/routing/compose/ComposeRoutingTest.kt
@@ -16,8 +16,10 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class ComposeRoutingTest {
@@ -46,6 +48,7 @@ class ComposeRoutingTest {
 
             // THEN
             assertEquals("I'm the initial content", fakeContent.result)
+            assertFalse(routing.canPop, "pop having one call only isn't valid")
         }
 
     @Test
@@ -83,6 +86,7 @@ class ComposeRoutingTest {
 
             // THEN
             assertEquals("I'm the path based content", fakeContent.result)
+            assertTrue(routing.canPop, "pop should be available having more than one call")
         }
 
     @Test
@@ -311,6 +315,7 @@ class ComposeRoutingTest {
             assertEquals("", "${result?.name}")
             assertEquals(RouteMethod.ReplaceAll, result?.routeMethod)
             assertEquals(Parameters.Empty, result?.parameters)
+            assertFalse(routing.canPop, "replace all should turn can pop false")
         }
 
     @Test

diff --git a/...ose/common/test/dev/programadorthi/routing/compose/history/ComposeHistoryAttributeTest.kt b/...ose/common/test/dev/programadorthi/routing/compose/history/ComposeHistoryAttributeTest.kt
@@ -21,10 +21,11 @@ class ComposeHistoryAttributeTest {
     fun shouldUseMemoryHistoryMode() =
         runComposeTest { coroutineContext, composition, clock ->
             // GIVEN
-            val routing = routing(parentCoroutineContext = coroutineContext) {
-                composable(path = "/initial") {
+            val routing =
+                routing(parentCoroutineContext = coroutineContext) {
+                    composable(path = "/initial") {
+                    }
                 }
-            }
 
             // WHEN
             composition.setContent {
@@ -43,10 +44,11 @@ class ComposeHistoryAttributeTest {
     fun shouldUseHtml5HistoryMode() =
         runComposeTest { coroutineContext, composition, clock ->
             // GIVEN
-            val routing = routing(parentCoroutineContext = coroutineContext) {
-                composable(path = "/initial") {
+            val routing =
+                routing(parentCoroutineContext = coroutineContext) {
+                    composable(path = "/initial") {
+                    }
                 }
-            }
 
             // WHEN
             composition.setContent {
@@ -66,10 +68,11 @@ class ComposeHistoryAttributeTest {
     fun shouldUseHashHistoryMode() =
         runComposeTest { coroutineContext, composition, clock ->
             // GIVEN
-            val routing = routing(parentCoroutineContext = coroutineContext) {
-                composable(path = "/initial") {
+            val routing =
+                routing(parentCoroutineContext = coroutineContext) {
+                    composable(path = "/initial") {
+                    }
                 }
-            }
 
             // WHEN
             composition.setContent {

diff --git a/integration/compose/js/src/dev/programadorthi/routing/compose/ComposeRoutingExt.js.kt b/integration/compose/js/src/dev/programadorthi/routing/compose/ComposeRoutingExt.js.kt
@@ -17,3 +17,6 @@ internal actual fun Routing.popOnPlatform(
         }
     }
 }
+
+public actual val Routing.canPop: Boolean
+    get() = historyMode != ComposeHistoryMode.Memory || callStack.size > 1
diff --git a/integration/compose/jvm/src/dev/programadorthi/routing/compose/ComposeRoutingExt.jvm.kt b/integration/compose/jvm/src/dev/programadorthi/routing/compose/ComposeRoutingExt.jvm.kt
@@ -8,3 +8,6 @@ internal actual fun Routing.popOnPlatform(
 ) {
     fallback()
 }
+
+public actual val Routing.canPop: Boolean
+    get() = callStack.size > 1
diff --git a/integration/compose/posix/src/dev/programadorthi/routing/compose/ComposeRoutingExt.posix.kt b/integration/compose/posix/src/dev/programadorthi/routing/compose/ComposeRoutingExt.posix.kt
@@ -8,3 +8,6 @@ internal actual fun Routing.popOnPlatform(
 ) {
     fallback()
 }
+
+public actual val Routing.canPop: Boolean
+    get() = callStack.size > 1
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,3 +17,6 @@ internal actual fun Routing.popOnPlatform( @@
             }
         }
     }
+    public actual val Routing.canPop: Boolean
+        get() = historyMode != ComposeHistoryMode.Memory || callStack.size > 1