Bridge: Fix nested objects.

e3ndr · e3ndr · commit d11a62478408 · 2024-01-17T16:45:32.000-06:00
diff --git a/bridge/src/main/resources/dev/webview/webview_java/bridge/BridgeScript.js b/bridge/src/main/resources/dev/webview/webview_java/bridge/BridgeScript.js
@@ -106,7 +106,11 @@ const Bridge = {
                 root = root[part];
             }
 
-            root[propertyName] = proxy;
+            Object.defineProperty(root, propertyName, {
+                value: proxy,
+                writable: true,
+                configurable: true
+            });
         },
 
         get(id, property) {
diff --git a/bridge/src/test/java/com/example/webview_java/BridgeExample.java b/bridge/src/test/java/com/example/webview_java/BridgeExample.java
@@ -51,6 +51,8 @@ public static void main(String[] args) {
 
     public static class TestObject extends JavascriptObject {
 
+        public final NestedTestObject nested = new NestedTestObject();
+
         @JavascriptValue(allowSet = false, watchForMutate = true)
         public long nanoTime = -1;
         {
@@ -71,4 +73,13 @@ public void ringBell() {
 
     }
 
+    public static class NestedTestObject extends JavascriptObject {
+
+        @JavascriptFunction
+        public void test() {
+            System.out.println("Test");
+        }
+
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ public static void main(String[] args) {`
`51`	`51`
`52`	`52`	`public static class TestObject extends JavascriptObject {`
`53`	`53`
	`54`	`+ public final NestedTestObject nested = new NestedTestObject();`
	`55`	`+`
`54`	`56`	`@JavascriptValue(allowSet = false, watchForMutate = true)`
`55`	`57`	`public long nanoTime = -1;`
`56`	`58`	`{`
`@@ -71,4 +73,13 @@ public void ringBell() {`
`71`	`73`
`72`	`74`	`}`
`73`	`75`
	`76`	`+ public static class NestedTestObject extends JavascriptObject {`
	`77`	`+`
	`78`	`+ @JavascriptFunction`
	`79`	`+ public void test() {`
	`80`	`+ System.out.println("Test");`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ }`
	`84`	`+`
`74`	`85`	`}`