Merge pull request #361 from keta1/fix/handle-element

Remove nested handling of elements in `Markdown` and `LazyMarkdown`

Author: mikepenz

multiplatform-markdown-renderer-m2/src/commonMain/kotlin/com/mikepenz/markdown/m2/Markdown.kt

@@ -69,11 +69,11 @@ fun Markdown(
     components: MarkdownComponents = markdownComponents(checkbox = { MarkdownCheckBox(it.content, it.node, it.typography.text) }),
     animations: MarkdownAnimations = markdownAnimations(),
     referenceLinkHandler: ReferenceLinkHandler = ReferenceLinkHandlerImpl(),
-    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
     success: @Composable (state: State.Success, components: MarkdownComponents, modifier: Modifier) -> Unit = { state, components, modifier ->
         MarkdownSuccess(state = state, components = components, modifier = modifier)
     },
-    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
 ) = com.mikepenz.markdown.compose.Markdown(
     content = content,
     colors = colors,
@@ -125,11 +125,11 @@ fun Markdown(
     extendedSpans: MarkdownExtendedSpans = markdownExtendedSpans(),
     components: MarkdownComponents = markdownComponents(checkbox = { MarkdownCheckBox(it.content, it.node, it.typography.text) }),
     animations: MarkdownAnimations = markdownAnimations(),
-    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
     success: @Composable (state: State.Success, components: MarkdownComponents, modifier: Modifier) -> Unit = { state, components, modifier ->
         MarkdownSuccess(state = state, components = components, modifier = modifier)
     },
-    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
 ) = com.mikepenz.markdown.compose.Markdown(
     state = state,
     colors = colors,

multiplatform-markdown-renderer-m3/src/commonMain/kotlin/com/mikepenz/markdown/m3/Markdown.kt

@@ -69,11 +69,11 @@ fun Markdown(
     components: MarkdownComponents = markdownComponents(checkbox = { MarkdownCheckBox(it.content, it.node, it.typography.text) }),
     animations: MarkdownAnimations = markdownAnimations(),
     referenceLinkHandler: ReferenceLinkHandler = ReferenceLinkHandlerImpl(),
-    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
     success: @Composable (state: State.Success, components: MarkdownComponents, modifier: Modifier) -> Unit = { state, components, modifier ->
         MarkdownSuccess(state = state, components = components, modifier = modifier)
     },
-    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
 ) = com.mikepenz.markdown.compose.Markdown(
     content = content,
     colors = colors,
@@ -125,11 +125,11 @@ fun Markdown(
     extendedSpans: MarkdownExtendedSpans = markdownExtendedSpans(),
     components: MarkdownComponents = markdownComponents(checkbox = { MarkdownCheckBox(it.content, it.node, it.typography.text) }),
     animations: MarkdownAnimations = markdownAnimations(),
-    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
     success: @Composable (state: State.Success, components: MarkdownComponents, modifier: Modifier) -> Unit = { state, components, modifier ->
         MarkdownSuccess(state = state, components = components, modifier = modifier)
     },
-    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
 ) = com.mikepenz.markdown.compose.Markdown(
     state = state,
     colors = colors,

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/LazyMarkdown.kt

@@ -29,11 +29,7 @@ fun LazyMarkdownSuccess(
         contentPadding = contentPadding,
     ) {
         items(state.node.children) { node ->
-            if (!handleElement(node, components, state.content, skipLinkDefinition = state.linksLookedUp)) {
-                node.children.forEach { child ->
-                    handleElement(child, components, state.content, skipLinkDefinition = state.linksLookedUp)
-                }
-            }
+            handleElement(node, components, state.content, skipLinkDefinition = state.linksLookedUp)
         }
     }
 }

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/Markdown.kt

@@ -71,11 +71,11 @@ fun Markdown(
     components: MarkdownComponents = markdownComponents(),
     animations: MarkdownAnimations = markdownAnimations(),
     referenceLinkHandler: ReferenceLinkHandler = ReferenceLinkHandlerImpl(),
-    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
     success: @Composable (state: State.Success, components: MarkdownComponents, modifier: Modifier) -> Unit = { state, components, modifier ->
         MarkdownSuccess(state = state, components = components, modifier = modifier)
     },
-    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
 ) {
     val state = rememberMarkdownState(
         content = content,
@@ -133,11 +133,11 @@ fun Markdown(
     extendedSpans: MarkdownExtendedSpans = markdownExtendedSpans(),
     components: MarkdownComponents = markdownComponents(),
     animations: MarkdownAnimations = markdownAnimations(),
-    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    loading: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
     success: @Composable (state: State.Success, components: MarkdownComponents, modifier: Modifier) -> Unit = { state, components, modifier ->
         MarkdownSuccess(state = state, components = components, modifier = modifier)
     },
-    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) {} },
+    error: @Composable (modifier: Modifier) -> Unit = { Box(modifier) },
 ) {
     val markdownState by state.state.collectAsState()
     CompositionLocalProvider(
@@ -175,11 +175,7 @@ fun MarkdownSuccess(
 ) {
     Column(modifier) {
         state.node.children.forEach { node ->
-            if (!handleElement(node, components, state.content, skipLinkDefinition = state.linksLookedUp)) {
-                node.children.forEach { child ->
-                    handleElement(child, components, state.content, skipLinkDefinition = state.linksLookedUp)
-                }
-            }
+            handleElement(node, components, state.content, skipLinkDefinition = state.linksLookedUp)
         }
     }
 }