Improve consumeHandler

Author: skydoves

Diff for: core/designsystem/src/main/kotlin/io/getstream/server/driven/core/designsystem/consumer/ConsumeHandler.kt

@@ -23,20 +23,23 @@ import io.getstream.server.driven.core.model.HandlerAction
 import io.getstream.server.driven.core.model.HandlerType
 
 @Composable
-fun Handler?.consumeHandler(
+fun Modifier.consumeHandler(
+  handler: Handler?,
   navigator: () -> Unit
 ): Modifier {
-  if (this == null) return Modifier
+  if (handler == null) return this
 
-  val action = if (this.actions[HandlerAction.NAVIGATION.value] == "to") {
+  val action = if (handler.actions[HandlerAction.NAVIGATION.value] == "to") {
     { navigator }
   } else {
     {}
   }
 
-  return if (this.type == HandlerType.CLICK.value) {
-    Modifier.clickable { action.invoke() }
-  } else {
-    Modifier
-  }
+  return then(
+    if (handler.type == HandlerType.CLICK.value) {
+      Modifier.clickable { action.invoke() }
+    } else {
+      Modifier
+    }
+  )
 }

Diff for: core/designsystem/src/main/kotlin/io/getstream/server/driven/core/designsystem/consumer/ConsumeImageUi.kt

@@ -40,18 +40,20 @@ fun ConsumeImageUi(
   navigator: (UiComponent) -> Unit = {},
   imageOptions: ImageOptions? = null
 ) {
-  val actionModifier = imageUi.handler.consumeHandler(
-    navigator = { navigator.invoke(imageUi) }
-  )
-
   val newModifier = if (version == 1) {
     modifier
-      .then(actionModifier)
+      .consumeHandler(
+        handler = imageUi.handler,
+        navigator = { navigator.invoke(imageUi) }
+      )
       .size(imageUi.size)
       .clip(RoundedCornerShape(8.dp))
   } else {
     modifier
-      .then(actionModifier)
+      .consumeHandler(
+        handler = imageUi.handler,
+        navigator = { navigator.invoke(imageUi) }
+      )
       .size(imageUi.size)
       .clip(RoundedCornerShape(16.dp))
       .border(