Skip to content

onLoadEnd duplicate fix for #352 #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2025
Merged

onLoadEnd duplicate fix for #352 #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14c3748
onLoadEnd duplicate fix for #352
DrUlysses Aug 14, 2025
c0d7bf6
Currently possible fix for #354
DrUlysses Aug 14, 2025
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
2 changes: 1 addition & 1 deletion webview/src/desktopMain/kotlin/com/multiplatform/webview/web/WebEngineExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ internal fun CefBrowser.addLoadListener(
KLogger.d { "Load End ${browser?.url}" }
state.loadingState = LoadingState.Finished
navigator.canGoBack = canGoBack()
navigator.canGoBack = canGoForward()
navigator.canGoForward = canGoForward()
state.lastLoadedUrl = getCurrentUrl()
}

Expand Down
43 changes: 24 additions & 19 deletions webview/src/desktopMain/kotlin/com/multiplatform/webview/web/WebView.desktop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,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.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.awt.SwingPanel
import com.multiplatform.webview.jsbridge.WebViewJsBridge
Expand All @@ -15,6 +9,7 @@ import dev.datlag.kcef.KCEFBrowser
import dev.datlag.kcef.KCEFClient
import org.cef.browser.CefRendering
import org.cef.browser.CefRequestContext
import java.util.concurrent.TimeUnit

/**
* Desktop WebView implementation.
Expand Down Expand Up @@ -142,18 +137,28 @@ fun DesktopWebView(
}

browser?.let {
SwingPanel(
factory = {
onCreated(it)
browser.apply {
addDisplayHandler(state)
addLoadListener(state, navigator)
addRequestHandler(state, navigator)
}
browser.uiComponent
},
modifier = modifier,
)
if (runCatching { browser.windowlessFrameRate.get(100L, TimeUnit.MILLISECONDS) }.getOrNull() == null) {
SwingPanel(
factory = {
onCreated(browser)
browser.apply {
addDisplayHandler(state)
addLoadListener(state, navigator)
addRequestHandler(state, navigator)
}
browser.uiComponent
},
modifier = modifier,
)
} else {
onCreated(browser)
browser.apply {
addDisplayHandler(state)
addLoadListener(state, navigator)
addRequestHandler(state, navigator)
}
browser.uiComponent.size = java.awt.Dimension(1280, 720)
}
}

DisposableEffect(Unit) {
Expand Down