Popup: Fixes TextPopupElement composable shifting in size when coming back into visibility (#461)

eri9000 · web-flow · commit 2223e8e1e0a2 · 2024-06-14T10:11:06.000-07:00
diff --git a/toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/Popup.kt b/toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/Popup.kt
@@ -150,35 +150,43 @@ private fun PopupBody(popupState: PopupState, onFileClicked: (ViewableFile?) ->
     ) {
         states.forEach { entry ->
             val element = entry.popupElement
-            item {
-                when (element) {
-                    is TextPopupElement -> {
+            when (element) {
+                is TextPopupElement -> {
+                    // a contentType is needed to reuse the TextPopupElement composable inside a LazyColumn
+                    item(contentType = TextPopupElement::class.java) {
                         TextPopupElement(
                             entry.state as TextElementState
                         )
                     }
+                }
 
-                    is AttachmentsPopupElement -> {
+                is AttachmentsPopupElement -> {
+                    item(contentType = AttachmentsPopupElement::class.java) {
                         AttachmentsPopupElement(
                             state = entry.state as AttachmentsElementState,
-                            onFileClicked)
+                            onFileClicked
+                        )
                     }
+                }
 
-                    is FieldsPopupElement -> {
+                is FieldsPopupElement -> {
+                    item(contentType = FieldsPopupElement::class.java) {
                         FieldsPopupElement(
                             entry.state as FieldsElementState,
                         )
                     }
+                }
 
-                    is MediaPopupElement -> {
+                is MediaPopupElement -> {
+                    item(contentType = MediaPopupElement::class.java) {
                         MediaPopupElement(
                             entry.state as MediaElementState
                         )
                     }
+                }
 
-                    else -> {
-                        // other popup elements are not created
-                    }
+                else -> {
+                    // other popup elements are not created
                 }
             }
         }
diff --git a/toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/internal/element/textelement/TextPopupElement.kt b/toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/internal/element/textelement/TextPopupElement.kt
@@ -81,7 +81,12 @@ private fun HTML(content: String) {
             val completeHtml = "$header$headStyle<html>${content.trim()}</html>"
             loadDataWithBaseURL(null, completeHtml, "text/html", "UTF-8", null)
         }
-    })
+    },
+        // By default, AndroidViews aren't reused in a lazy list. This means that the `HTML` composable instance will
+        // get discarded and recreated every time. By defining an `onReset` lambda, we can ensure tha the AndroidView will
+        // be reused when the composition hierarchy changes.
+        onReset = {}
+    )
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -150,35 +150,43 @@ private fun PopupBody(popupState: PopupState, onFileClicked: (ViewableFile?) ->`
`150`	`150`	`) {`
`151`	`151`	`states.forEach { entry ->`
`152`	`152`	`val element = entry.popupElement`
`153`		`- item {`
`154`		`- when (element) {`
`155`		`- is TextPopupElement -> {`
	`153`	`+ when (element) {`
	`154`	`+ is TextPopupElement -> {`
	`155`	`+ // a contentType is needed to reuse the TextPopupElement composable inside a LazyColumn`
	`156`	`+ item(contentType = TextPopupElement::class.java) {`
`156`	`157`	`TextPopupElement(`
`157`	`158`	`entry.state as TextElementState`
`158`	`159`	`)`
`159`	`160`	`}`
	`161`	`+ }`
`160`	`162`
`161`		`- is AttachmentsPopupElement -> {`
	`163`	`+ is AttachmentsPopupElement -> {`
	`164`	`+ item(contentType = AttachmentsPopupElement::class.java) {`
`162`	`165`	`AttachmentsPopupElement(`
`163`	`166`	`state = entry.state as AttachmentsElementState,`
`164`		`- onFileClicked)`
	`167`	`+ onFileClicked`
	`168`	`+ )`
`165`	`169`	`}`
	`170`	`+ }`
`166`	`171`
`167`		`- is FieldsPopupElement -> {`
	`172`	`+ is FieldsPopupElement -> {`
	`173`	`+ item(contentType = FieldsPopupElement::class.java) {`
`168`	`174`	`FieldsPopupElement(`
`169`	`175`	`entry.state as FieldsElementState,`
`170`	`176`	`)`
`171`	`177`	`}`
	`178`	`+ }`
`172`	`179`
`173`		`- is MediaPopupElement -> {`
	`180`	`+ is MediaPopupElement -> {`
	`181`	`+ item(contentType = MediaPopupElement::class.java) {`
`174`	`182`	`MediaPopupElement(`
`175`	`183`	`entry.state as MediaElementState`
`176`	`184`	`)`
`177`	`185`	`}`
	`186`	`+ }`
`178`	`187`
`179`		`- else -> {`
`180`		`- // other popup elements are not created`
`181`		`- }`
	`188`	`+ else -> {`
	`189`	`+ // other popup elements are not created`
`182`	`190`	`}`
`183`	`191`	`}`
`184`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,12 @@ private fun HTML(content: String) {`
`81`	`81`	`val completeHtml = "$header$headStyle<html>${content.trim()}</html>"`
`82`	`82`	`loadDataWithBaseURL(null, completeHtml, "text/html", "UTF-8", null)`
`83`	`83`	`}`
`84`		`- })`
	`84`	`+ },`
	`85`	+ // By default, AndroidViews aren't reused in a lazy list. This means that the `HTML` composable instance will
	`86`	+ // get discarded and recreated every time. By defining an `onReset` lambda, we can ensure tha the AndroidView will
	`87`	`+ // be reused when the composition hierarchy changes.`
	`88`	`+ onReset = {}`
	`89`	`+ )`
`85`	`90`	`}`
`86`	`91`
`87`	`92`	`/**`