@webview-bridge/react-native 1.4.3 → 1.4.5

package/dist/packages/react-native/src/createWebView.js

@@ -38,14 +38,22 @@ const createWebView = ({ bridge, debug, responseTimeout = 2000, fallback, }) =>
             isReady: false,
         },
     };
-    const _webviewRef = (0, react_1.createRef)();
+    const _webviewRefStack = new util_1.Stack();
     const emitter = (0, util_1.createEvents)();
     bridge.subscribe((state) => {
-        _webviewRef.current?.injectJavaScript((0, integrations_1.SAFE_NATIVE_EMITTER_EMIT)("bridgeStateChange", state));
+        _webviewRefStack
+            .top()
+            ?.current?.injectJavaScript((0, integrations_1.SAFE_NATIVE_EMITTER_EMIT)("bridgeStateChange", state));
     });
     return {
         WebView: (0, react_1.forwardRef)((props, ref) => {
             const webviewRef = (0, react_1.useRef)(null);
+            (0, react_1.useLayoutEffect)(() => {
+                _webviewRefStack.push(webviewRef);
+                return () => {
+                    _webviewRefStack.pop();
+                };
+            }, []);
             const bridgeNames = (0, react_1.useMemo)(() => Object.entries(bridge.getState() ?? {})
                 .filter(([_, bridge]) => typeof bridge === "function")
                 .map(([name]) => {
@@ -53,9 +61,6 @@ const createWebView = ({ bridge, debug, responseTimeout = 2000, fallback, }) =>
             }), []);
             const initialState = (0, react_1.useMemo)(() => Object.fromEntries(Object.entries(bridge.getState() ?? {}).filter(([_, value]) => typeof value !== "function")), []);
             (0, react_1.useImperativeHandle)(ref, () => webviewRef.current, []);
-            (0, react_1.useImperativeHandle)(_webviewRef, () => {
-                return webviewRef.current;
-            }, []);
             const handleMessage = async (event) => {
                 props.onMessage?.(event);
                 if (!webviewRef.current) {
@@ -80,7 +85,9 @@ const createWebView = ({ bridge, debug, responseTimeout = 2000, fallback, }) =>
                         return;
                     }
                     case "getBridgeState": {
-                        _webviewRef.current?.injectJavaScript((0, integrations_1.SAFE_NATIVE_EMITTER_EMIT)("bridgeStateChange", bridge.getState()));
+                        _webviewRefStack
+                            .top()
+                            ?.current?.injectJavaScript((0, integrations_1.SAFE_NATIVE_EMITTER_EMIT)("bridgeStateChange", bridge.getState()));
                         return;
                     }
                     case "registerWebMethod": {

package/dist/shared/util/src/index.d.ts

@@ -3,4 +3,5 @@ export * from "./createRandomId";
 export * from "./equals";
 export * from "./noop";
 export * from "./removeUndefinedKeys";
+export * from "./stack";
 export * from "./timeout";

package/dist/shared/util/src/index.js

@@ -19,4 +19,5 @@ __exportStar(require("./createRandomId"), exports);
 __exportStar(require("./equals"), exports);
 __exportStar(require("./noop"), exports);
 __exportStar(require("./removeUndefinedKeys"), exports);
+__exportStar(require("./stack"), exports);
 __exportStar(require("./timeout"), exports);

package/dist/shared/util/src/stack.d.ts

@@ -0,0 +1,9 @@
+export declare class Stack<T> {
+    private items;
+    push(element: T): void;
+    pop(): T | undefined;
+    top(): T | undefined;
+    isEmpty(): boolean;
+    size(): number;
+    clear(): void;
+}

package/dist/shared/util/src/stack.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Stack = void 0;
+class Stack {
+    items = [];
+    push(element) {
+        this.items.push(element);
+    }
+    pop() {
+        return this.items.pop();
+    }
+    top() {
+        return this.items[this.items.length - 1];
+    }
+    isEmpty() {
+        return this.items.length === 0;
+    }
+    size() {
+        return this.items.length;
+    }
+    clear() {
+        this.items = [];
+    }
+}
+exports.Stack = Stack;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webview-bridge/react-native",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "type": "module",
   "description": "Fully Type-Safe Integration for React Native WebView and Web",
   "main": "dist/packages/react-native/src/index.js",