@portal-hq/webview 4.2.13 → 4.3.1

package/lib/commonjs/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -44,7 +54,7 @@ const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const react_native_webview_1 = __importDefault(require("react-native-webview"));
 const loading_1 = __importDefault(require("./loading"));
-const Webview = (0, react_1.memo)((0, react_1.forwardRef)(({ onNavigationStateChange, onSigningRequested, url }, webViewRef) => {
+const WebviewComponent = (0, react_1.forwardRef)(({ onNavigationStateChange, onSigningRequested, url }, webViewRef) => {
     const Webview = () => {
         var _a;
         // Derive context.
@@ -52,7 +62,7 @@ const Webview = (0, react_1.memo)((0, react_1.forwardRef)(({ onNavigationStateCh
         // Derive refs.
         const canGoBack = (0, react_1.useRef)(false);
         const initialized = (0, react_1.useRef)(false);
-        const webView = (0, react_1.useRef)();
+        const webView = (0, react_1.useRef)(null);
         // Derive state.
         const [currentUrl, setCurrentUrl] = (0, react_1.useState)(url);
         const [walletAddress, setWalletAddress] = (0, react_1.useState)();
@@ -157,10 +167,8 @@ const Webview = (0, react_1.memo)((0, react_1.forwardRef)(({ onNavigationStateCh
           </react_native_1.View>);
     };
     return <Webview />;
-}), (prevProps, nextProps) => {
-    console.log(`prevProps:`, prevProps);
-    console.log(`nextProps:`, nextProps);
-    // return true
+});
+const Webview = (0, react_1.memo)(WebviewComponent, (prevProps, nextProps) => {
     return prevProps.url === nextProps.url;
 });
 const styles = react_native_1.StyleSheet.create({

package/lib/esm/index.js

@@ -16,7 +16,7 @@ import React, { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useRe
 import { BackHandler, Platform, StyleSheet, View } from 'react-native';
 import WebView from 'react-native-webview';
 import Loading from './loading';
-const Webview = memo(forwardRef(({ onNavigationStateChange, onSigningRequested, url }, webViewRef) => {
+const WebviewComponent = forwardRef(({ onNavigationStateChange, onSigningRequested, url }, webViewRef) => {
     const Webview = () => {
         var _a;
         // Derive context.
@@ -24,7 +24,7 @@ const Webview = memo(forwardRef(({ onNavigationStateChange, onSigningRequested,
         // Derive refs.
         const canGoBack = useRef(false);
         const initialized = useRef(false);
-        const webView = useRef();
+        const webView = useRef(null);
         // Derive state.
         const [currentUrl, setCurrentUrl] = useState(url);
         const [walletAddress, setWalletAddress] = useState();
@@ -129,10 +129,8 @@ const Webview = memo(forwardRef(({ onNavigationStateChange, onSigningRequested,
           </View>);
     };
     return <Webview />;
-}), (prevProps, nextProps) => {
-    console.log(`prevProps:`, prevProps);
-    console.log(`nextProps:`, nextProps);
-    // return true
+});
+const Webview = memo(WebviewComponent, (prevProps, nextProps) => {
     return prevProps.url === nextProps.url;
 });
 const styles = StyleSheet.create({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/webview",
-  "version": "4.2.13",
+  "version": "4.3.1",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -18,14 +18,13 @@
     "test": "jest --passWithNoTests"
   },
   "dependencies": {
-    "@portal-hq/core": "^4.2.13",
-    "@portal-hq/injected-provider": "^4.2.13",
-    "@portal-hq/utils": "^4.2.13"
+    "@portal-hq/core": "^4.3.1",
+    "@portal-hq/injected-provider": "^4.3.1",
+    "@portal-hq/utils": "^4.3.1"
   },
   "devDependencies": {
     "@types/jest": "^29.2.0",
     "@types/react": "*",
-    "@types/react-native": "*",
     "jest": "^29.2.1",
     "jest-environment-jsdom": "^29.2.2",
     "ts-jest": "^29.0.3",
@@ -36,5 +35,5 @@
     "react-native": "*",
     "react-native-webview": "*"
   },
-  "gitHead": "cd2865d204185bcfedd02b94487afc46f4922780"
+  "gitHead": "0cfb3fc21c050a54e73044a87b92ac22f9e2edb7"
 }

package/src/index.tsx

@@ -8,7 +8,6 @@ import {
 import { CHAIN_NAMESPACES, DEFAULT_CHAIN_ID_NUMERIC } from '@portal-hq/utils'
 import React, {
   FC,
-  MutableRefObject,
   forwardRef,
   memo,
   useEffect,
@@ -32,7 +31,7 @@ interface WebviewProps {
   url: string
 }
 
-const Webview = memo(
+const WebviewComponent =
   forwardRef<WebView, WebviewProps>(
     ({ onNavigationStateChange, onSigningRequested, url }, webViewRef) => {
       const Webview: FC = () => {
@@ -41,7 +40,7 @@ const Webview = memo(
         // Derive refs.
         const canGoBack = useRef<boolean>(false)
         const initialized = useRef<boolean>(false)
-        const webView = useRef<WebView>()
+        const webView = useRef<WebView | null>(null)
 
         // Derive state.
         const [currentUrl, setCurrentUrl] = useState<string>(url)
@@ -99,7 +98,7 @@ const Webview = memo(
         const handlePostMessage = async (event: WebViewMessageEvent) => {
           const { type, data } = JSON.parse(event.nativeEvent.data)
           const { method, params, options } = data as RequestArguments
-        
+
           switch (type) {
             case 'portal_sign':
               await portal.request(
@@ -111,7 +110,7 @@ const Webview = memo(
               break
           }
         }
-        
+
         // Initialize Portal Bindings and set the wallet address
         useEffect(() => {
           if (portal && !initialized.current) {
@@ -177,7 +176,7 @@ const Webview = memo(
         }, [])
 
         // Ensure that the webView ref gets forwarded to the parent component
-        useImperativeHandle(webViewRef, () => webView.current as WebView)
+        useImperativeHandle(webViewRef, () => webView.current!)
 
         return (
           <View style={styles.container}>
@@ -192,7 +191,7 @@ const Webview = memo(
                 mediaPlaybackRequiresUserAction={true}
                 onMessage={handlePostMessage}
                 onNavigationStateChange={handleNavigationStateChange}
-                ref={webView as MutableRefObject<WebView>}
+                ref={webView}
                 renderLoading={() => <Loading />}
                 source={source}
                 startInLoadingState={true}
@@ -205,14 +204,16 @@ const Webview = memo(
 
       return <Webview />
     },
-  ),
-  (prevProps, nextProps) => {
-    console.log(`prevProps:`, prevProps)
-    console.log(`nextProps:`, nextProps)
-    // return true
-    return prevProps.url === nextProps.url
-  },
-)
+  )
+
+
+const Webview =
+  memo(WebviewComponent,
+    (prevProps, nextProps) => {
+      return prevProps.url === nextProps.url
+    }
+  )
+
 
 const styles = StyleSheet.create({
   container: {