Merge pull request #176 from mikepenz/develop

dev -> main

Author: mikepenz

build.gradle.kts

@@ -21,7 +21,6 @@ allprojects {
         google()
         maven { setUrl("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
         maven { setUrl("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental") }
-        maven("https://oss.sonatype.org/content/repositories/snapshots")
     }
 }
 

gradle.properties

@@ -1,7 +1,7 @@
 # Maven stuff
 GROUP=com.mikepenz
-VERSION_NAME=0.22.0
-VERSION_CODE=2200
+VERSION_NAME=0.23.0
+VERSION_CODE=2300
 
 POM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
 

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ compose = "1.6.8"
 compose-plugin = "1.6.11"
 kotlin = "2.0.0"
 dokka = "1.9.20"
-coil = "3.0.0-SNAPSHOT"
+coil = "3.0.0-alpha07"
 coil2 = "2.6.0"
 aboutlib = "11.2.1"
 markdown = "0.7.3"

multiplatform-markdown-renderer-coil3/src/commonMain/kotlin/com/mikepenz/markdown/coil3/Coil3ImageTransformerImpl.kt

@@ -2,6 +2,7 @@ package com.mikepenz.markdown.coil3
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -30,10 +31,10 @@ object Coil3ImageTransformerImpl : ImageTransformer {
     @Composable
     override fun intrinsicSize(painter: Painter): Size {
         var size by remember(painter) { mutableStateOf(painter.intrinsicSize) }
-
         if (painter is AsyncImagePainter) {
-            LaunchedEffect(painter.state) {
-                painter.state.painter?.let {
+            val painterState = painter.state.collectAsState()
+            LaunchedEffect(painterState) {
+                painterState.value.painter?.let {
                     size = it.intrinsicSize
                 }
             }

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

@@ -27,8 +27,8 @@ import com.mikepenz.markdown.compose.elements.material.MarkdownBasicText
 import com.mikepenz.markdown.compose.extendedspans.ExtendedSpans
 import com.mikepenz.markdown.compose.extendedspans.drawBehind
 import com.mikepenz.markdown.model.rememberMarkdownImageState
-import com.mikepenz.markdown.utils.TAG_IMAGE_URL
-import com.mikepenz.markdown.utils.TAG_URL
+import com.mikepenz.markdown.utils.MARKDOWN_TAG_IMAGE_URL
+import com.mikepenz.markdown.utils.MARKDOWN_TAG_URL
 
 
 @Composable
@@ -86,12 +86,12 @@ fun MarkdownText(
     val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
     val imageState = rememberMarkdownImageState()
 
-    val hasUrl = content.getStringAnnotations(TAG_URL, 0, content.length).any()
+    val hasUrl = content.getStringAnnotations(MARKDOWN_TAG_URL, 0, content.length).any()
     val textModifier = if (hasUrl) modifier.pointerInput(Unit) {
         detectTapGestures { pos ->
             layoutResult.value?.let { layoutResult ->
                 val position = layoutResult.getOffsetForPosition(pos)
-                content.getStringAnnotations(TAG_URL, position, position).reversed().firstOrNull()
+                content.getStringAnnotations(MARKDOWN_TAG_URL, position, position).reversed().firstOrNull()
                     ?.let {
                         val foundReference = referenceLinkHandler.find(it.item)
                         try {
@@ -115,7 +115,7 @@ fun MarkdownText(
             .animateContentSize(),
         style = style,
         color = LocalMarkdownColors.current.text,
-        inlineContent = mapOf(TAG_IMAGE_URL to InlineTextContent(
+        inlineContent = mapOf(MARKDOWN_TAG_IMAGE_URL to InlineTextContent(
             Placeholder(
                 width = imageState.imageSize.width.sp,
                 height = imageState.imageSize.height.sp,

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/utils/AnnotatedStringKtx.kt

@@ -12,7 +12,6 @@ import com.mikepenz.markdown.compose.LocalMarkdownAnnotator
 import com.mikepenz.markdown.compose.LocalMarkdownColors
 import org.intellij.markdown.MarkdownElementTypes
 import org.intellij.markdown.MarkdownTokenTypes
-import org.intellij.markdown.MarkdownTokenTypes.Companion.TEXT
 import org.intellij.markdown.ast.ASTNode
 import org.intellij.markdown.ast.findChildOfType
 import org.intellij.markdown.ast.getTextInNode
@@ -26,10 +25,13 @@ internal fun AnnotatedString.Builder.appendMarkdownLink(content: String, node: A
         append(node.getTextInNode(content).toString())
         return
     }
-    val destination = node.findChildOfType(MarkdownElementTypes.LINK_DESTINATION)?.getTextInNode(content)?.toString()
-    val linkLabel = node.findChildOfType(MarkdownElementTypes.LINK_LABEL)?.getTextInNode(content)?.toString()
+    val destination = node.findChildOfType(MarkdownElementTypes.LINK_DESTINATION)
+        ?.getTextInNode(content)
+        ?.toString()
+    val linkLabel = node.findChildOfType(MarkdownElementTypes.LINK_LABEL)
+        ?.getTextInNode(content)?.toString()
     val annotation = destination ?: linkLabel
-    if (annotation != null) pushStringAnnotation(TAG_URL, annotation)
+    if (annotation != null) pushStringAnnotation(MARKDOWN_TAG_URL, annotation)
     pushStyle(
         SpanStyle(
             color = LocalMarkdownColors.current.linkText,
@@ -48,7 +50,7 @@ internal fun AnnotatedString.Builder.appendAutoLink(content: String, node: ASTNo
         it.type.name == MarkdownElementTypes.AUTOLINK.name
     } ?: node
     val destination = targetNode.getTextInNode(content).toString()
-    pushStringAnnotation(TAG_URL, (destination))
+    pushStringAnnotation(MARKDOWN_TAG_URL, (destination))
     pushStyle(
         SpanStyle(
             color = LocalMarkdownColors.current.linkText,
@@ -95,10 +97,9 @@ fun AnnotatedString.Builder.buildMarkdownAnnotatedString(content: String, childr
                     MarkdownElementTypes.PARAGRAPH -> buildMarkdownAnnotatedString(content, child)
                     MarkdownElementTypes.IMAGE -> child.findChildOfTypeRecursive(
                         MarkdownElementTypes.LINK_DESTINATION
-                    )
-                        ?.let {
-                            appendInlineContent(TAG_IMAGE_URL, it.getTextInNode(content).toString())
-                        }
+                    )?.let {
+                        appendInlineContent(MARKDOWN_TAG_IMAGE_URL, it.getTextInNode(content).toString())
+                    }
 
                     MarkdownElementTypes.EMPH -> {
                         pushStyle(SpanStyle(fontStyle = FontStyle.Italic))
@@ -136,7 +137,7 @@ fun AnnotatedString.Builder.buildMarkdownAnnotatedString(content: String, childr
                     MarkdownElementTypes.INLINE_LINK -> appendMarkdownLink(content, child)
                     MarkdownElementTypes.SHORT_REFERENCE_LINK -> appendMarkdownLink(content, child)
                     MarkdownElementTypes.FULL_REFERENCE_LINK -> appendMarkdownLink(content, child)
-                    TEXT -> append(child.getTextInNode(content).toString())
+                    MarkdownTokenTypes.TEXT -> append(child.getTextInNode(content).toString())
                     GFMTokenTypes.GFM_AUTOLINK -> if (child.parent == MarkdownElementTypes.LINK_TEXT) {
                         append(child.getTextInNode(content).toString())
                     } else appendAutoLink(content, child)

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/utils/Extensions.kt

@@ -6,12 +6,12 @@ import org.intellij.markdown.ast.ASTNode
 /**
  * Tag used to indicate an url for inline content. Required for click handling.
  */
-internal const val TAG_URL = "MARKDOWN_URL"
+const val MARKDOWN_TAG_URL = "MARKDOWN_URL"
 
 /**
  * Tag used to indicate an image url for inline content. Required for rendering.
  */
-internal const val TAG_IMAGE_URL = "MARKDOWN_IMAGE_URL"
+const val MARKDOWN_TAG_IMAGE_URL = "MARKDOWN_IMAGE_URL"
 
 /**
  * Find a child node recursive