✨ Adds parent ServerDrivenNode to the render tree (#12)

ZupIT · May 31, 2022 · 27a4f64 · 27a4f64
1 parent 0494492
commit 27a4f64
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/compose-sample/src/main/java/br/com/zup/nimbus/compose/sample/components/ComponentMap.kt b/compose-sample/src/main/java/br/com/zup/nimbus/compose/sample/components/ComponentMap.kt
@@ -7,15 +7,15 @@ import br.zup.com.nimbus.compose.ComponentHandler
 import com.fasterxml.jackson.core.type.TypeReference
 
 val customComponents: Map<String, @Composable ComponentHandler> = mapOf(
-    "custom:text" to @Composable { element, _ ->
+    "custom:text" to @Composable { element, _ , _->
         CustomText(element.parse(object : TypeReference<NimbusTextModel>() {})) },
-    "custom:personCard" to @Composable { element, _ ->
+    "custom:personCard" to @Composable { element, _ , _->
         PersonCardComponent(element.parse(object : TypeReference<PersonCardModel>() {})) },
-    "material:text" to @Composable { element, _ ->
+    "material:text" to @Composable { element, _ , _->
         NimbusText(element.parse(object : TypeReference<NimbusTextModel>() {}))
     },
-    "layout:container" to @Composable { _, children -> NimbusContainer(children) },
-    "material:button" to @Composable { element, _ ->
+    "layout:container" to @Composable { _, children, _ -> NimbusContainer(children) },
+    "material:button" to @Composable { element, _ , _->
         // can't use jackson to deserialize this, it has a function.
         NimbusButton(
             text = element.properties?.get("text") as String,

diff --git a/compose/src/main/java/br/zup/com/nimbus/compose/NimbusConfig.kt b/compose/src/main/java/br/zup/com/nimbus/compose/NimbusConfig.kt
@@ -18,7 +18,11 @@ import com.zup.nimbus.core.network.ViewClient
 import com.zup.nimbus.core.tree.IdManager
 import com.zup.nimbus.core.tree.ServerDrivenNode
 
-typealias ComponentHandler = (element: ServerDrivenNode, children: @Composable () -> Unit) -> Unit
+typealias ComponentHandler = (
+    element: ServerDrivenNode,
+    children: @Composable () -> Unit,
+    parentElement: ServerDrivenNode?,
+) -> Unit
 typealias LoadingHandler = @Composable() () -> Unit
 typealias ErrorHandler = @Composable() (throwable: Throwable, retry:() -> Unit) -> Unit
 const val PLATFORM_NAME = "android"

diff --git a/compose/src/main/java/br/zup/com/nimbus/compose/core/ui/internal/NimbusServerDrivenView.kt b/compose/src/main/java/br/zup/com/nimbus/compose/core/ui/internal/NimbusServerDrivenView.kt
@@ -8,6 +8,7 @@ import com.zup.nimbus.core.tree.ServerDrivenNode
 @Composable
 internal fun NimbusServerDrivenView(
     viewTree: ServerDrivenNode,
+    parentViewTree: ServerDrivenNode? = null
 ) {
 
     if (!NimbusTheme.nimbusAppState.config.components.containsKey(viewTree.component)) {
@@ -18,9 +19,9 @@ internal fun NimbusServerDrivenView(
             element = viewTree,
             children = {
                 viewTree.children?.forEach {
-                    NimbusServerDrivenView(it)
+                    NimbusServerDrivenView(it, parentViewTree = viewTree)
                 }
-            })
+            }, parentElement = parentViewTree)
     }
 }