Merge pull request #84 from KevinnZou/bugfix/desktop_flickering_effect

Bugfix/desktop flickering effect

Author: KevinnZou

webview/src/commonMain/kotlin/com/multiplatform/webview/web/WebView.kt

@@ -53,37 +53,40 @@ fun WebView(
             }
         }
 
-        LaunchedEffect(wv, state) {
-            snapshotFlow { state.content }.collect { content ->
-                when (content) {
-                    is WebContent.Url -> {
-                        state.lastLoadedUrl = content.url
-                        wv.loadUrl(content.url, content.additionalHttpHeaders)
-                    }
+        // Desktop will handle the first load by itself
+        if (!getPlatform().isDesktop()) {
+            LaunchedEffect(wv, state) {
+                snapshotFlow { state.content }.collect { content ->
+                    when (content) {
+                        is WebContent.Url -> {
+                            state.lastLoadedUrl = content.url
+                            wv.loadUrl(content.url, content.additionalHttpHeaders)
+                        }
 
-                    is WebContent.Data -> {
-                        wv.loadHtml(
-                            content.data,
-                            content.baseUrl,
-                            content.mimeType,
-                            content.encoding,
-                            content.historyUrl,
-                        )
-                    }
+                        is WebContent.Data -> {
+                            wv.loadHtml(
+                                content.data,
+                                content.baseUrl,
+                                content.mimeType,
+                                content.encoding,
+                                content.historyUrl,
+                            )
+                        }
 
-                    is WebContent.File -> {
-                        wv.loadHtmlFile(content.fileName)
-                    }
+                        is WebContent.File -> {
+                            wv.loadHtmlFile(content.fileName)
+                        }
 
-                    is WebContent.Post -> {
-                        wv.postUrl(
-                            content.url,
-                            content.postData,
-                        )
-                    }
+                        is WebContent.Post -> {
+                            wv.postUrl(
+                                content.url,
+                                content.postData,
+                            )
+                        }
 
-                    is WebContent.NavigatorOnly -> {
-                        // NO-OP
+                        is WebContent.NavigatorOnly -> {
+                            // NO-OP
+                        }
                     }
                 }
             }

webview/src/desktopMain/kotlin/com/multiplatform/webview/web/DesktopWebView.kt

@@ -124,7 +124,7 @@ class DesktopWebView(
 
     override fun initJsBridge(webViewJsBridge: WebViewJsBridge) {
         KLogger.d {
-            "DesktopWebView injectJsBridge"
+            "DesktopWebView initJsBridge"
         }
         val router = CefMessageRouter.create()
         val handler =

webview/src/desktopMain/kotlin/com/multiplatform/webview/web/WebEngineExt.kt

@@ -86,7 +86,7 @@ internal fun CefBrowser.addLoadListener(
 ) {
     this.client.addLoadHandler(
         object : CefLoadHandler {
-            private var lastLoadedUrl = ""
+            private var lastLoadedUrl = "null"
 
             override fun onLoadingStateChange(
                 browser: CefBrowser?,
@@ -116,7 +116,7 @@ internal fun CefBrowser.addLoadListener(
                 transitionType: CefRequest.TransitionType?,
             ) {
                 KLogger.d { "Load Start ${browser?.url}" }
-                lastLoadedUrl = "" // clean last loaded url for reload to work
+                lastLoadedUrl = "null" // clean last loaded url for reload to work
                 state.loadingState = LoadingState.Loading(0F)
                 state.errorsForCurrentRequest.clear()
             }

webview/src/desktopMain/kotlin/com/multiplatform/webview/web/WebView.desktop.kt

@@ -2,7 +2,6 @@ package com.multiplatform.webview.web
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
@@ -126,15 +125,21 @@ fun DesktopWebView(
                     )
                 }
             }
-        }?.also {
-            val desktopWebView = DesktopWebView(it, scope, webViewJsBridge)
-            state.webView = desktopWebView
-            webViewJsBridge?.webView = desktopWebView
+        }
+    val desktopWebView =
+        remember(browser) {
+            if (browser != null) {
+                DesktopWebView(browser, scope, webViewJsBridge)
+            } else {
+                null
+            }
         }
 
     browser?.let {
         SwingPanel(
             factory = {
+                state.webView = desktopWebView
+                webViewJsBridge?.webView = desktopWebView
                 browser.apply {
                     addDisplayHandler(state)
                     addLoadListener(state, navigator)
@@ -146,15 +151,6 @@ fun DesktopWebView(
         )
     }
 
-    // Handle navigation events. Workaround for navigator not working issue.
-    LaunchedEffect(state.webView, navigator) {
-        state.webView?.let { wv ->
-            with(navigator) {
-                wv.handleNavigationEvents()
-            }
-        }
-    }
-
     DisposableEffect(Unit) {
         onDispose {
             client?.dispose()