diff --git a/package-lock.json b/package-lock.json index 97b480338a9b..f7ad6a95f95a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -137,7 +137,7 @@ "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "4.0.0", "react-native-vision-camera": "^4.7.2", - "react-native-web": "0.20.0", + "react-native-web": "0.21.2", "react-native-webview": "13.13.1", "react-plaid-link": "3.3.2", "react-web-config": "^1.0.0", @@ -32564,7 +32564,9 @@ } }, "node_modules/react-native-web": { - "version": "0.20.0", + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.21.2.tgz", + "integrity": "sha512-SO2t9/17zM4iEnFvlu2DA9jqNbzNhoUP+AItkoCOyFmDMOhUnBBznBDCYN92fGdfAkfQlWzPoez6+zLxFNsZEg==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.6", diff --git a/package.json b/package.json index 8544222e793c..5dc641721e6b 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,7 @@ "react-native-url-polyfill": "^2.0.0", "react-native-view-shot": "4.0.0", "react-native-vision-camera": "^4.7.2", - "react-native-web": "0.20.0", + "react-native-web": "0.21.2", "react-native-webview": "13.13.1", "react-plaid-link": "3.3.2", "react-web-config": "^1.0.0", diff --git a/patches/react-native-web/details.md b/patches/react-native-web/details.md index 0afcae736c7d..8c7df48f3ea2 100644 --- a/patches/react-native-web/details.md +++ b/patches/react-native-web/details.md @@ -1,6 +1,6 @@ # `react-native-web` patches -### [react-native-web+0.20.0+001+initial.patch](react-native-web+0.20.0+001+initial.patch) +### [react-native-web+0.21.2+001+initial.patch](react-native-web+0.21.2+001+initial.patch) - Reason: @@ -12,7 +12,7 @@ - E/App issue: 🛑 - PR introducing patch: https://github.com/Expensify/App/pull/24482 -### [react-native-web+0.20.0+002+fixLastSpacer.patch](react-native-web+0.20.0+002+fixLastSpacer.patch) +### [react-native-web+0.21.2+002+fixLastSpacer.patch](react-native-web+0.21.2+002+fixLastSpacer.patch) - Reason: @@ -24,7 +24,7 @@ - E/App issue: 🛑 - PR introducing patch: https://github.com/Expensify/App/pull/32843 -### [react-native-web+0.20.0+003+image-header-support.patch](react-native-web+0.20.0+003+image-header-support.patch) +### [react-native-web+0.21.2+003+image-header-support.patch](react-native-web+0.21.2+003+image-header-support.patch) - Reason: @@ -36,7 +36,7 @@ - E/App issue: 🛑 - PR introducing patch: https://github.com/Expensify/App/pull/13036 -### [react-native-web+0.20.0+004+fixPointerEventDown.patch](react-native-web+0.20.0+004+fixPointerEventDown.patch) +### [react-native-web+0.21.2+004+fixPointerEventDown.patch](react-native-web+0.21.2+004+fixPointerEventDown.patch) - Reason: @@ -48,7 +48,7 @@ - E/App issue: 🛑 - PR introducing patch: https://github.com/Expensify/App/pull/38494 -### [react-native-web+0.20.0+005+osr-improvement.patch](react-native-web+0.20.0+005+osr-improvement.patch) +### [react-native-web+0.21.2+005+osr-improvement.patch](react-native-web+0.21.2+005+osr-improvement.patch) - Reason: @@ -60,7 +60,7 @@ - E/App issue: 🛑 - PR introducing patch: -### [react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch](react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch) +### [react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch](react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch) - Reason: @@ -72,7 +72,7 @@ - E/App issue: 🛑 - PR introducing patch: https://github.com/Expensify/App/pull/39520 -### [react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch](react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch) +### [react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch](react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch) - Reason: @@ -84,7 +84,7 @@ - E/App issue: 🛑 - PR introducing patch: https://github.com/Expensify/App/pull/47532 -### [react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch](react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch) +### [react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch](react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch) - Reason: @@ -96,7 +96,7 @@ - E/App issue: 🛑 - PR introducing patch: https://github.com/Expensify/App/pull/60174 -### [react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch](react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch) +### [react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch](react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch) - Reason: @@ -108,7 +108,7 @@ - E/App issue: 🛑 - PR introducing patch: https://github.com/Expensify/App/pull/60340 -### [react-native-web+0.20.0+010+fullstory-support.patch](react-native-web+0.20.0+010+fullstory-support.patch) +### [react-native-web+0.21.2+010+fullstory-support.patch](react-native-web+0.21.2+010+fullstory-support.patch) - Reason: @@ -120,18 +120,7 @@ - E/App issue: As explained above the current solution can't be applied to upstream because it's tailored to Fullstory needs. - PR introducing patch: https://github.com/Expensify/App/pull/67552 -### [react-native-web+0.20.0+011+fix-memory-leak.patch](react-native-web+0.20.0+011+fix-memory-leak.patch) -- Reason: - - ``` - Fixes memory leak on web caused by Animated API used in @react-navigation package - ``` - -- Upstream PR/issue: https://github.com/necolas/react-native-web/pull/2800 -- E/App issue: https://github.com/Expensify/App/issues/65820 -- PR introducing patch: https://github.com/Expensify/App/pull/68834 - -### [react-native-web+0.20.0+012+fix-overscroll-recoil.patch](react-native-web+0.20.0+012+fix-overscroll-recoil.patch) +### [react-native-web+0.21.2+011+fix-overscroll-recoil.patch](react-native-web+0.21.2+011+fix-overscroll-recoil.patch) - Reason: diff --git a/patches/react-native-web/react-native-web+0.20.0+011+fix-memory-leak.patch b/patches/react-native-web/react-native-web+0.20.0+011+fix-memory-leak.patch deleted file mode 100644 index bd749e123c7d..000000000000 --- a/patches/react-native-web/react-native-web+0.20.0+011+fix-memory-leak.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/react-native-web/dist/vendor/react-native/Animated/nodes/AnimatedProps.js b/node_modules/react-native-web/dist/vendor/react-native/Animated/nodes/AnimatedProps.js -index 9ba3336..2d67005 100644 ---- a/node_modules/react-native-web/dist/vendor/react-native/Animated/nodes/AnimatedProps.js -+++ b/node_modules/react-native-web/dist/vendor/react-native/Animated/nodes/AnimatedProps.js -@@ -68,6 +68,7 @@ class AnimatedProps extends AnimatedNode { - if (this.__isNative && this._animatedView) { - this.__disconnectAnimatedView(); - } -+ this._animatedView = null - for (var key in this._props) { - var value = this._props[key]; - if (value instanceof AnimatedNode) { diff --git a/patches/react-native-web/react-native-web+0.20.0+001+initial.patch b/patches/react-native-web/react-native-web+0.21.2+001+initial.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+001+initial.patch rename to patches/react-native-web/react-native-web+0.21.2+001+initial.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+002+fixLastSpacer.patch b/patches/react-native-web/react-native-web+0.21.2+002+fixLastSpacer.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+002+fixLastSpacer.patch rename to patches/react-native-web/react-native-web+0.21.2+002+fixLastSpacer.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+003+image-header-support.patch b/patches/react-native-web/react-native-web+0.21.2+003+image-header-support.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+003+image-header-support.patch rename to patches/react-native-web/react-native-web+0.21.2+003+image-header-support.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+004+fixPointerEventDown.patch b/patches/react-native-web/react-native-web+0.21.2+004+fixPointerEventDown.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+004+fixPointerEventDown.patch rename to patches/react-native-web/react-native-web+0.21.2+004+fixPointerEventDown.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+005+osr-improvement.patch b/patches/react-native-web/react-native-web+0.21.2+005+osr-improvement.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+005+osr-improvement.patch rename to patches/react-native-web/react-native-web+0.21.2+005+osr-improvement.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch b/patches/react-native-web/react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch rename to patches/react-native-web/react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch b/patches/react-native-web/react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch rename to patches/react-native-web/react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch b/patches/react-native-web/react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch rename to patches/react-native-web/react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch b/patches/react-native-web/react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch rename to patches/react-native-web/react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+010+fullstory-support.patch b/patches/react-native-web/react-native-web+0.21.2+010+fullstory-support.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+010+fullstory-support.patch rename to patches/react-native-web/react-native-web+0.21.2+010+fullstory-support.patch diff --git a/patches/react-native-web/react-native-web+0.20.0+012+fix-overscroll-recoil.patch b/patches/react-native-web/react-native-web+0.21.2+011+fix-overscroll-recoil.patch similarity index 100% rename from patches/react-native-web/react-native-web+0.20.0+012+fix-overscroll-recoil.patch rename to patches/react-native-web/react-native-web+0.21.2+011+fix-overscroll-recoil.patch