Merge pull request #13 from alphicc/bug_pass_argument

bug_pass_argument : fix duplicate pass argument
alphicc · Apr 16, 2023 · c862f6a · c862f6a
2 parents 52d71b6 + 988e9d8
commit c862f6a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![MAVEN](https://img.shields.io/badge/Maven-v2.1.1-blue) ![Platform](https://img.shields.io/badge/platform-android-green?color=lightgray) ![API](https://img.shields.io/badge/API-21-brightgreen?color=brightgreen) ![Platform](https://img.shields.io/badge/platform-desktop-green?color=lightgray)
+![MAVEN](https://img.shields.io/badge/Maven-v2.1.2-blue) ![Platform](https://img.shields.io/badge/platform-android-green?color=lightgray) ![API](https://img.shields.io/badge/API-21-brightgreen?color=brightgreen) ![Platform](https://img.shields.io/badge/platform-desktop-green?color=lightgray)
 <h1 align="center">
     <img height="300" src="https://raw.githubusercontent.com/alphicc/Brick/main/media/logo.png"/>
     <br>

diff --git a/brick/src/commonMain/kotlin/com/alphicc/brick/ArgumentTranslator.kt b/brick/src/commonMain/kotlin/com/alphicc/brick/ArgumentTranslator.kt
@@ -1,5 +1,5 @@
 package com.alphicc.brick
 
 interface ArgumentTranslator {
-     suspend fun <A> redirectArgument(from: ArgumentTranslator, componentKey: String, argument: A)
+     suspend fun <A> redirectArgument(from: ArgumentTranslator, componentKey: String, argument: A): Boolean
 }
diff --git a/brick/src/commonMain/kotlin/com/alphicc/brick/TreeRouterImpl.kt b/brick/src/commonMain/kotlin/com/alphicc/brick/TreeRouterImpl.kt
@@ -2,7 +2,9 @@ package com.alphicc.brick
 
 import kotlinx.atomicfu.AtomicRef
 import kotlinx.atomicfu.atomic
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 
 internal class TreeRouterImpl(
     override val initialComponent: Component<*>? = null,
@@ -208,19 +210,26 @@ internal class TreeRouterImpl(
         from: ArgumentTranslator,
         componentKey: String,
         argument: A
-    ) {
+    ): Boolean {
+        val isEmitted = emitArguments(componentKey, argument)
+        if (isEmitted) return true
+        childRouters.value.forEach {
+            val isEmittedChildRouter = it.second.redirectArgument(this, componentKey, argument)
+            if (isEmittedChildRouter) return true
+        }
         if (parentRouter !== from) {
-            parentRouter?.redirectArgument(this, componentKey, argument)
+            val isEmittedParentRouter = parentRouter?.redirectArgument(this, componentKey, argument)
+            if (isEmittedParentRouter == true) return true
         }
-        childRouters.value.forEach { it.second.redirectArgument(this, componentKey, argument) }
-        emitArguments(componentKey, argument)
+        return false
     }
 
-    private suspend fun <A> emitArguments(componentKey: String, argument: A) {
+    private suspend fun <A> emitArguments(componentKey: String, argument: A): Boolean {
         _currentOverlayFlow.value?.let { overlayComponent ->
             if (overlayComponent.key == componentKey) {
                 val dataContainer = DataContainer(argument)
                 overlayComponent.channel.emit(dataContainer)
+                return true
             }
         }
 
@@ -229,21 +238,25 @@ internal class TreeRouterImpl(
                 if (it.key == componentKey) {
                     val dataContainer = DataContainer(argument)
                     it.channel.emit(dataContainer)
+                    return true
                 }
             }
 
             node.compositions().forEach { entry ->
                 if (entry.key == componentKey) {
                     val dataContainer = DataContainer(argument)
                     entry.value.channel.emit(dataContainer)
+                    return true
                 }
             }
 
             if (node.rootComponent.key == componentKey) {
                 val dataContainer = DataContainer(argument)
                 node.rootComponent.channel.emit(dataContainer)
+                return true
             }
         }
+        return false
     }
 
     private fun <A> addChildNode(component: Component<*>, argument: A?) {

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "io.github.alphicc"
-version = "1.0.0"
+version = "2.1.2"
 
 kotlin {
     jvm {

diff --git a/gradle.properties b/gradle.properties
@@ -13,11 +13,11 @@ gradle_tools_version=7.0.4
 publish_plugin_version=0.18.0
 
 GROUP=io.github.alphicc
-VERSION_NAME=2.1.1
+VERSION_NAME=2.1.2
 
 POM_NAME=Brick
 POM_DESCRIPTION=Brick - Navigation library for Jetpack Compose.
-POM_INCEPTION_YEAR=2022
+POM_INCEPTION_YEAR=2023
 POM_URL=https://github.com/alphicc/Brick
 
 POM_LICENCE_NAME=The MIT License