@onekeyfe/onekey-cross-webview 1.1.36 → 1.1.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -247,4 +247,5 @@ const DesktopWebView = forwardRef((_a, ref) => {
247
247
  nodeintegration: "true", nodeintegrationinsubframes: "true", webpreferences: "contextIsolation=0, contextisolation=0, nativeWindowOpen=1" }, props)))));
248
248
  });
249
249
  DesktopWebView.displayName = 'DesktopWebView';
250
+ // TODO rename to DesktopWebViewLegacy
250
251
  export { DesktopWebView };
@@ -14,6 +14,7 @@ import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo
14
14
  import { WebView } from 'react-native-webview';
15
15
  import { appDebugLogger } from '@onekeyfe/cross-inpage-provider-core';
16
16
  import { JsBridgeNativeHost } from './JsBridgeNativeHost';
17
+ // TODO rename to NativeWebViewLegacy
17
18
  const NativeWebView = forwardRef((_a, ref) => {
18
19
  var { style, src, receiveHandler, onSrcChange, onLoadProgress, injectedJavaScriptBeforeContentLoaded, onMessage } = _a, props = __rest(_a, ["style", "src", "receiveHandler", "onSrcChange", "onLoadProgress", "injectedJavaScriptBeforeContentLoaded", "onMessage"]);
19
20
  const webviewRef = useRef(null);
@@ -23,8 +24,14 @@ const NativeWebView = forwardRef((_a, ref) => {
23
24
  }), [receiveHandler]);
24
25
  const webviewOnMessage = useCallback((event) => {
25
26
  const { data } = event.nativeEvent;
26
- const uri = new URL(event.nativeEvent.url);
27
- const origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
27
+ let origin = '';
28
+ try {
29
+ const uri = new URL(event.nativeEvent.url);
30
+ origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
31
+ }
32
+ catch (err) {
33
+ console.error(err);
34
+ }
28
35
  appDebugLogger.webview('onMessage', origin, data);
29
36
  // - receive
30
37
  jsBridge.receive(data, { origin });
@@ -36,6 +36,7 @@ const react_1 = __importStar(require("react"));
36
36
  const react_native_webview_1 = require("react-native-webview");
37
37
  const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
38
38
  const JsBridgeNativeHost_1 = require("./JsBridgeNativeHost");
39
+ // TODO rename to NativeWebViewLegacy
39
40
  const NativeWebView = (0, react_1.forwardRef)((_a, ref) => {
40
41
  var { style, src, receiveHandler, onSrcChange, onLoadProgress, injectedJavaScriptBeforeContentLoaded, onMessage } = _a, props = __rest(_a, ["style", "src", "receiveHandler", "onSrcChange", "onLoadProgress", "injectedJavaScriptBeforeContentLoaded", "onMessage"]);
41
42
  const webviewRef = (0, react_1.useRef)(null);
@@ -45,8 +46,14 @@ const NativeWebView = (0, react_1.forwardRef)((_a, ref) => {
45
46
  }), [receiveHandler]);
46
47
  const webviewOnMessage = (0, react_1.useCallback)((event) => {
47
48
  const { data } = event.nativeEvent;
48
- const uri = new URL(event.nativeEvent.url);
49
- const origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
49
+ let origin = '';
50
+ try {
51
+ const uri = new URL(event.nativeEvent.url);
52
+ origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
53
+ }
54
+ catch (err) {
55
+ console.error(err);
56
+ }
50
57
  cross_inpage_provider_core_1.appDebugLogger.webview('onMessage', origin, data);
51
58
  // - receive
52
59
  jsBridge.receive(data, { origin });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/onekey-cross-webview",
3
- "version": "1.1.36",
3
+ "version": "1.1.37",
4
4
  "keywords": [
5
5
  "cross-inpage-provider"
6
6
  ],
@@ -28,15 +28,16 @@
28
28
  "start": "tsc --watch"
29
29
  },
30
30
  "peerDependencies": {
31
- "electron": "*"
31
+ "electron": "*",
32
+ "react-native-webview": "*"
32
33
  },
33
34
  "devDependencies": {
34
- "electron": "^17.2.0"
35
+ "electron": "^17.2.0",
36
+ "react-native-webview": "^11.17.2"
35
37
  },
36
38
  "dependencies": {
37
- "@onekeyfe/cross-inpage-provider-core": "1.1.36",
38
- "@onekeyfe/cross-inpage-provider-types": "1.1.36",
39
- "react-native-webview": "^11.17.2"
39
+ "@onekeyfe/cross-inpage-provider-core": "1.1.37",
40
+ "@onekeyfe/cross-inpage-provider-types": "1.1.37"
40
41
  },
41
- "gitHead": "946a3e8dd1728c16f36623759e2f737adc7cc45f"
42
+ "gitHead": "1012c4a1ea9ff4b3edcdf8a50e05bd55791c2de3"
42
43
  }