Implement HandlerNavigation

BKinya · Sep 5, 2024 · 13e4701 · 13e4701
1 parent 0dfe3a9
commit 13e4701
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/...m/src/main/kotlin/io/getstream/server/driven/core/designsystem/consumer/ConsumeHandler.kt b/...m/src/main/kotlin/io/getstream/server/driven/core/designsystem/consumer/ConsumeHandler.kt
@@ -20,6 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import io.getstream.server.driven.core.model.Handler
 import io.getstream.server.driven.core.model.HandlerAction
+import io.getstream.server.driven.core.model.HandlerNavigation
 import io.getstream.server.driven.core.model.HandlerType
 
 @Composable
@@ -29,17 +30,23 @@ fun Modifier.consumeHandler(
 ): Modifier {
   if (handler == null) return this
 
-  val action = if (handler.actions[HandlerAction.NAVIGATION.value] == "to") {
-    { navigator }
-  } else {
-    {}
-  }
+  handler.actions.forEach { element ->
+    val action =
+      if (element.key == HandlerAction.NAVIGATION.value &&
+        element.value == HandlerNavigation.TO.value
+      ) {
+        { navigator }
+      } else {
+        {}
+      }
 
-  return then(
-    if (handler.type == HandlerType.CLICK.value) {
+    val newModifier = if (handler.type == HandlerType.CLICK.value) {
       Modifier.clickable { action.invoke() }
     } else {
       Modifier
     }
-  )
+
+    then(newModifier)
+  }
+  return this
 }
diff --git a/core/model/src/main/kotlin/io/getstream/server/driven/core/model/Handler.kt b/core/model/src/main/kotlin/io/getstream/server/driven/core/model/Handler.kt
@@ -32,3 +32,7 @@ enum class HandlerType(val value: String) {
 enum class HandlerAction(val value: String) {
   NAVIGATION("navigation")
 }
+
+enum class HandlerNavigation(val value: String) {
+  TO("to")
+}