Skip to content

Bugfix/fix wasmjs custom jsbridge name #348

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
KevinnZou merged 5 commits into from
Aug 11, 2025
Merged

Bugfix/fix wasmjs custom jsbridge name #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a60c554
Merge pull request #1 from amirghm/feature/add-wasmjs-support
amirghm May 27, 2025
5fb7fb0
Merge pull request #2 from amirghm/feature/add-wasmjs-support
amirghm May 27, 2025
8c08543
Merge pull request #3 from amirghm/feature/improve-zoom-support-and-a…
amirghm Jun 11, 2025
0dbf061
Merge pull request #4 from amirghm/bugfix/fix-load-file-in-ios-real-d…
amirghm Jul 12, 2025
b429cd2
Fix: Use configurable jsBridgeName in WasmJs and update version
amirghm Aug 10, 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 gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android.minSdk=21
#Versions
GROUP=io.github.kevinnzou
POM_ARTIFACT_ID=compose-webview-multiplatform
VERSION_NAME=2.0.2
VERSION_NAME=2.0.3
POM_NAME=Compose WebView Multiplatform
POM_INCEPTION_YEAR=2023
POM_DESCRIPTION=WebView for JetBrains Compose Multiplatform
Expand Down
2 changes: 1 addition & 1 deletion webview/src/wasmJsMain/kotlin/com/multiplatform/webview/web/WasmJsWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class WasmJsWebView(
try {
val dataString = messageEvent.data.toString()

if (dataString.contains("kmpJsBridge")) {
if (dataString.contains(webViewJsBridge.jsBridgeName)) {
val actionPattern = """action[=:][\s]*['"](.*?)['"]""".toRegex()
val paramsPattern = """params[=:][\s]*['"](.*?)['"]""".toRegex()
val callbackPattern = """callbackId[=:][\s]*(\d+)""".toRegex()
Expand Down
2 changes: 1 addition & 1 deletion webview/src/wasmJsMain/kotlin/com/multiplatform/webview/web/WebView.wasmJs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private fun setupJsBridgeForWasm(
try {
val dataString = messageEvent.data.toString()

if (dataString.contains("kmpJsBridge") && dataString.startsWith("{")) {
if (dataString.contains(webViewJsBridge.jsBridgeName) && dataString.startsWith("{")) {
val actionPattern = """"action"\s*:\s*"([^"]*)"""".toRegex()
val paramsPattern = """"params"\s*:\s*"((?:[^"\\]|\\.)*)"""".toRegex()
val callbackPattern = """"callbackId"\s*:\s*(\d+)""".toRegex()
Expand Down
4 changes: 2 additions & 2 deletions webview/src/wasmJsMain/kotlin/com/multiplatform/webview/web/WebViewJsBridge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ internal fun createJsBridgeScript(
postMessage: function(methodName, params, callbackId) {
// Send as JSON string instead of object to ensure proper parsing
var messageData = JSON.stringify({
type: 'kmpJsBridge',
type: '$jsBridgeName',
action: methodName,
params: params,
callbackId: callbackId || 0
Expand Down Expand Up @@ -55,7 +55,7 @@ internal fun createJsBridgeScript(
window.addEventListener('message', function(event) {
try {
var data = typeof event.data === 'string' ? JSON.parse(event.data) : event.data;
if (data && data.type === 'kmpJsBridgeCallback') {
if (data && data.type === '$jsBridgeName') {
window.$jsBridgeName.onCallback(data.callbackId, data.message);
}
} catch (e) {
Expand Down