Add inlineContentOverride #5
Conversation
| } | ||
| ) { | ||
| if (contentOverride?.invoke(this@computeRichTextString, currentNode) {} != true) { | ||
| val parentDestination = currentNode.links.firstParentOrNull<AstLink>()?.destination |
There was a problem hiding this comment.
I removed the one-off parent link handling for RemoteImage. It was actually fixed by the offset bug below.
| @@ -50,10 +50,10 @@ public fun RichTextScope.Text( | |||
| overflow = overflow, | |||
| maxLines = maxLines, | |||
| isOffsetClickable = { offset -> | |||
| annotated.getConsumableAnnotations(text.formatObjects, offset).any() | |||
| annotated.getConsumableAnnotations(text.formatObjects, offset.coerceIn(0, annotated.length - 1)).any() | |||
There was a problem hiding this comment.
offset was 1 when clicking the right half of the image. By coercing offset into the string length, the entire child content of a link becomes clickable. @halilozercan is going to do a sanity check but I couldn't find any new issues that this caused.
There was a problem hiding this comment.
This looks ok. The problem stems from getOffsetForPosition call which can return the length of the text to signify where the caret should be placed. Coercing the offset into actual character indices range should be ok in Image scenario. The only issue I can see with this approach is links that are placed at the very end of a paragraph. In that case, clicking end padding (the place where the text ends but text layout rectangle still occupies the screen) can trigger a link click. That may not be ideal.
| @@ -28,7 +28,6 @@ private val DEFAULT_IMAGE_SIZE = 64.dp | |||
| internal actual fun RemoteImage( | |||
| url: String, | |||
| contentDescription: String?, | |||
| onClick: (() -> Unit)?, | |||
There was a problem hiding this comment.
See below for why this was removed.
I split out content override and inline content override for overriding inline and block content independently because they have slightly different rendering paths.
I also change the way images with links works. Check my PR comments for more info.