Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
Expand Down Expand Up @@ -110,6 +111,21 @@ fun ViewDescriptionScreen(readmeUrl: String) =
exit = fadeOut(),
) {
this@Scaffold.ResponsiveContent {
var webViewRef by remember { mutableStateOf<WebUIView?>(null) }
var hasLoadedUrl by remember { mutableStateOf(false) }

DisposableEffect(Unit) {
onDispose {
// Properly clean up the WebView when leaving composition
webViewRef?.let { webView ->
webView.removeJavascriptInterface(MarkdownInterface.INTERFACE_NAME)
webView.stopLoading()
webView.loadUrl("about:blank")
webView.destroy()
}
}
}

AndroidView(
factory = { context ->
val options =
Expand Down Expand Up @@ -149,19 +165,23 @@ fun ViewDescriptionScreen(readmeUrl: String) =

WebUIView(options).apply {
webViewClient = WXClient(options, assetsLoader)
webViewRef = this
}
},
update = { webView ->
// Remove the interface if it already exists to prevent crashes
// when the screen is reopened (e.g., after navigating back)
webView.removeJavascriptInterface(MarkdownInterface.INTERFACE_NAME)

webView.addJavascriptInterface<MarkdownInterface>(
arrayOf(readme),
arrayOf(String::class.java),
)
if (!hasLoadedUrl) {
// Remove the interface if it already exists to prevent crashes
// when the screen is reopened (e.g., after navigating back)
webView.removeJavascriptInterface(MarkdownInterface.INTERFACE_NAME)

webView.addJavascriptInterface<MarkdownInterface>(
arrayOf(readme),
arrayOf(String::class.java),
)

webView.loadUrl(launchUrl)
webView.loadUrl(launchUrl)
hasLoadedUrl = true
}
},
)
}
Expand Down