self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-23 18:53:36 +02:00
Code Issues Releases Activity

Mobile: Upgrade react-native-webview to v12

Browse Source
This commit is contained in:
Laurent Cozic 2023-06-10 17:58:55 +01:00
parent 6dc8ad2ba6
commit 9ceb7b9c88
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/app-mobile/components/ExtendedWebView.tsx
View File

@ -122,6 +122,11 @@ const ExtendedWebView = (props: Props, ref: Ref<WebViewControl>) => {
// - `setSupportMultipleWindows` must be `true` for security reasons: // - `setSupportMultipleWindows` must be `true` for security reasons:
// https://github.com/react-native-webview/react-native-webview/releases/tag/v11.0.0 // https://github.com/react-native-webview/react-native-webview/releases/tag/v11.0.0
// 2023-06-10: When the source is falsy, we set it to `{ uri: undefined }`
// to avoid various crashes and errors:
// https://github.com/react-native-webview/react-native-webview/issues/2920
// https://github.com/react-native-webview/react-native-webview/issues/2995
return ( return (
<WebView <WebView
style={{ style={{
@ -131,7 +136,7 @@ const ExtendedWebView = (props: Props, ref: Ref<WebViewControl>) => {
ref={webviewRef} ref={webviewRef}
scrollEnabled={props.scrollEnabled} scrollEnabled={props.scrollEnabled}
useWebKit={true} useWebKit={true}
source={source} source={source ? source : { uri: undefined }}
setSupportMultipleWindows={true} setSupportMultipleWindows={true}
hideKeyboardAccessoryView={true} hideKeyboardAccessoryView={true}
allowingReadAccessToURL={`file://${Setting.value('resourceDir')}`} allowingReadAccessToURL={`file://${Setting.value('resourceDir')}`}

8
packages/app-mobile/ios/Podfile.lock
View File

@ -373,7 +373,7 @@ PODS:
- React-Core - React-Core
- react-native-version-info (1.1.1): - react-native-version-info (1.1.1):
- React-Core - React-Core
- react-native-webview (11.26.1): - react-native-webview (12.4.0):
- React-Core - React-Core
- React-perflogger (0.71.10) - React-perflogger (0.71.10)
- React-RCTActionSheet (0.71.10): - React-RCTActionSheet (0.71.10):
@ -465,7 +465,7 @@ PODS:
- React-Core - React-Core
- RNCPushNotificationIOS (1.11.0): - RNCPushNotificationIOS (1.11.0):
- React-Core - React-Core
- RNDateTimePicker (7.0.0): - RNDateTimePicker (7.0.1):
- React-Core - React-Core
- RNExitApp (1.1.0): - RNExitApp (1.1.0):
- React - React
@ -778,7 +778,7 @@ SPEC CHECKSUMS:
react-native-slider: 33b8d190b59d4f67a541061bb91775d53d617d9d react-native-slider: 33b8d190b59d4f67a541061bb91775d53d617d9d
react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261 react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9 react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9
react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1 react-native-webview: 65f1143983cfeaedf02fd25b2621d3f4a37075de
React-perflogger: 217095464d5c4bb70df0742fa86bf2a363693468 React-perflogger: 217095464d5c4bb70df0742fa86bf2a363693468
React-RCTActionSheet: 8deae9b85a4cbc6a2243618ea62a374880a2c614 React-RCTActionSheet: 8deae9b85a4cbc6a2243618ea62a374880a2c614
React-RCTAnimation: 59c62353a8b59ce206044786c5d30e4754bffa64 React-RCTAnimation: 59c62353a8b59ce206044786c5d30e4754bffa64
@ -795,7 +795,7 @@ SPEC CHECKSUMS:
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8 RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
RNDateTimePicker: 66cb21772d462d02efc6826adac37f1fd40984cf RNDateTimePicker: e073697ac3e8a378968d68ab0581fef542b8af8a
RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3 RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3
RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592 RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNFS: 4ac0f0ea233904cb798630b3c077808c06931688

2
packages/app-mobile/package.json
View File

@ -68,7 +68,7 @@
"react-native-vector-icons": "9.2.0", "react-native-vector-icons": "9.2.0",
"react-native-version-info": "1.1.1", "react-native-version-info": "1.1.1",
"react-native-vosk": "0.1.12", "react-native-vosk": "0.1.12",
"react-native-webview": "11.26.1", "react-native-webview": "12.4.0",
"react-redux": "7.2.9", "react-redux": "7.2.9",
"redux": "4.2.1", "redux": "4.2.1",
"rn-fetch-blob": "0.12.0", "rn-fetch-blob": "0.12.0",

10
yarn.lock
View File

@ -4424,7 +4424,7 @@ __metadata:
react-native-vector-icons: 9.2.0 react-native-vector-icons: 9.2.0
react-native-version-info: 1.1.1 react-native-version-info: 1.1.1
react-native-vosk: 0.1.12 react-native-vosk: 0.1.12
react-native-webview: 11.26.1 react-native-webview: 12.4.0
react-redux: 7.2.9 react-redux: 7.2.9
redux: 4.2.1 redux: 4.2.1
rn-fetch-blob: 0.12.0 rn-fetch-blob: 0.12.0
@ -27388,16 +27388,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"react-native-webview@npm:11.26.1": "react-native-webview@npm:12.4.0":
version: 11.26.1 version: 12.4.0
resolution: "react-native-webview@npm:11.26.1" resolution: "react-native-webview@npm:12.4.0"
dependencies: dependencies:
escape-string-regexp: 2.0.0 escape-string-regexp: 2.0.0
invariant: 2.2.4 invariant: 2.2.4
peerDependencies: peerDependencies:
react: "*" react: "*"
react-native: "*" react-native: "*"
checksum: d2f95a89e944a2f1e8cf402e4e274f3568edae42e7ef190915e9fba8004a01d699c962459bdc9688c159060538e90aea3017cab24e6f4112021cbbc10ef57104 checksum: f7bd69b71af6bd2f62ae290aa40d8d7e7191dd7fd451327b2b6fcde7f8035e85de89d9f8f9e6c8ca913850e0efc91e195181f41c17df68516a47ff50977a49a1
languageName: node languageName: node
linkType: hard linkType: hard