From a47b2a38312fe77d0b9c184ea23eb0da06cd36bd Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Tue, 25 Aug 2020 17:41:54 -0400 Subject: [PATCH] Upgrade depdendencies (#4725) (#4727) * @react-navigation/* * react-native-navigation * react-native-calendars * react-native-gesture-handler * react-native-reanimated * react-native-safe-area-context * react-native-screens * react-native-video (cherry picked from commit 183eec0fadc634b781ab565cc9efe562f3a6b03b) Co-authored-by: Elias Nahum --- .../slide_up_panel/slide_up_panel.js | 2 +- .../reaction_header_item.test.js.snap | 12 +++ .../reaction_list/reaction_header_item.js | 5 ++ .../__snapshots__/reaction_row.test.js.snap | 6 ++ .../reaction_row/reaction_row.js | 5 ++ ios/Podfile.lock | 33 ++++---- package-lock.json | 83 ++++++++++--------- package.json | 18 ++-- ...h => react-native-navigation+6.12.1.patch} | 0 9 files changed, 99 insertions(+), 65 deletions(-) rename patches/{react-native-navigation+6.4.0.patch => react-native-navigation+6.12.1.patch} (100%) diff --git a/app/components/slide_up_panel/slide_up_panel.js b/app/components/slide_up_panel/slide_up_panel.js index 9a34e684a..610da04be 100644 --- a/app/components/slide_up_panel/slide_up_panel.js +++ b/app/components/slide_up_panel/slide_up_panel.js @@ -285,9 +285,9 @@ export default class SlideUpPanel extends PureComponent { > - {headerComponent} + {headerComponent} @@ -78,6 +79,10 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { allText: { marginLeft: 7, }, + emojiText: { + color: '#000', + fontWeight: 'bold', + }, text: { color: theme.buttonBg, marginLeft: 4, diff --git a/app/screens/reaction_list/reaction_row/__snapshots__/reaction_row.test.js.snap b/app/screens/reaction_list/reaction_row/__snapshots__/reaction_row.test.js.snap index 170d5dcb3..fb8cfa1e1 100644 --- a/app/screens/reaction_list/reaction_row/__snapshots__/reaction_row.test.js.snap +++ b/app/screens/reaction_list/reaction_row/__snapshots__/reaction_row.test.js.snap @@ -88,6 +88,12 @@ exports[`ReactionRow should match snapshot, renderContent 1`] = ` diff --git a/app/screens/reaction_list/reaction_row/reaction_row.js b/app/screens/reaction_list/reaction_row/reaction_row.js index 72be6f270..78937505e 100644 --- a/app/screens/reaction_list/reaction_row/reaction_row.js +++ b/app/screens/reaction_list/reaction_row/reaction_row.js @@ -113,6 +113,7 @@ export default class ReactionRow extends React.PureComponent { @@ -155,5 +156,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { width: '13%', justifyContent: 'center', }, + emojiText: { + color: '#000', + fontWeight: 'bold', + }, }; }); diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 825762b4b..167b06b1e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -231,12 +231,12 @@ PODS: - React - react-native-safe-area (0.5.1): - React - - react-native-safe-area-context (1.0.0): + - react-native-safe-area-context (3.1.7): - React - - react-native-video (5.1.0-alpha7): + - react-native-video (5.1.0-alpha8): - React - - react-native-video/Video (= 5.1.0-alpha7) - - react-native-video/Video (5.1.0-alpha7): + - react-native-video/Video (= 5.1.0-alpha8) + - react-native-video/Video (5.1.0-alpha8): - React - react-native-webview (7.0.1): - React @@ -304,7 +304,12 @@ PODS: - React - ReactNativeKeyboardTrackingView (5.7.0): - React - - ReactNativeNavigation (6.4.0): + - ReactNativeNavigation (6.12.1): + - React + - React-RCTImage + - React-RCTText + - ReactNativeNavigation/Core (= 6.12.1) + - ReactNativeNavigation/Core (6.12.1): - React - React-RCTImage - React-RCTText @@ -324,7 +329,7 @@ PODS: - SDWebImageWebPCoder (~> 0.6.1) - RNFileViewer (2.1.1): - React - - RNGestureHandler (1.6.1): + - RNGestureHandler (1.7.0): - React - RNKeychain (4.0.5): - React @@ -334,12 +339,12 @@ PODS: - React - RNReactNativeHapticFeedback (1.10.0): - React - - RNReanimated (1.8.0): + - RNReanimated (1.13.0): - React - RNRudderSdk (1.0.0): - React - Rudder (= 1.0.3-beta-4) - - RNScreens (2.7.0): + - RNScreens (2.10.1): - React - RNSentry (1.7.1): - React @@ -619,8 +624,8 @@ SPEC CHECKSUMS: react-native-notifications: 24706907104a0f00c35c4bde7e0ca76a50f730e1 react-native-passcode-status: 88c4f6e074328bc278bd127646b6c694ad5a530a react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3 - react-native-safe-area-context: 5f3e081f937ab7c44c179d551f332fa494cfcf8f - react-native-video: 184f7d5107582e7def6dafdd3ddc0f795dc33f6a + react-native-safe-area-context: fcece23844742b6f7f0627c3715b806a7deff946 + react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444 react-native-webview: 0d1c2b4e7ffb0543a74fa0512f2f8dc5fb0e49e2 React-RCTActionSheet: 910163b6b09685a35c4ebbc52b66d1bfbbe39fc5 React-RCTAnimation: 9a883bbe1e9d2e158d4fb53765ed64c8dc2200c6 @@ -634,7 +639,7 @@ SPEC CHECKSUMS: ReactCommon: a0a1edbebcac5e91338371b72ffc66aa822792ce ReactNativeExceptionHandler: 8025d98049c25f186835a3af732dd7c9974d6dce ReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306 - ReactNativeNavigation: 667586f6924fbd09512e2933fe70497db914b758 + ReactNativeNavigation: 67d1f3d7f335f39873a5cf26058f03d0511dd0de rn-fetch-blob: 17961aec08caae68bb8fc0e5b40f93b3acfa6932 RNCAsyncStorage: 3eea36d9460c5159b592f9ecbe5a77f8aca98006 RNCClipboard: 5f3218dcdc28405aa2ae72b78e388f150b826dd3 @@ -642,14 +647,14 @@ SPEC CHECKSUMS: RNDeviceInfo: e841619c3dac5495a095c5455473579ff04908d4 RNFastImage: e19ba191922e7dab9d932a4d59d62d76660aa222 RNFileViewer: db62d60dd19007c54b2c959b5e675a46d59f8a43 - RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38 + RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08 RNKeychain: 840f8e6f13be0576202aefcdffd26a4f54bfe7b5 RNLocalize: c388679af021ddd6069c215f7fdd2acf4e77ede5 RNPermissions: 1888705aebcc81714efa5dbff94351e4388ae012 RNReactNativeHapticFeedback: 22c5ecf474428766c6b148f96f2ff6155cd7225e - RNReanimated: 955cf4068714003d2f1a6e2bae3fb1118f359aff + RNReanimated: 89f5e0a04d1dd52fbf27e7e7030d8f80a646a3fc RNRudderSdk: 3abdcc4b145b3db6571827b0fc7af4e75a96af13 - RNScreens: cf198f915f8a2bf163de94ca9f5bfc8d326c3706 + RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2 RNSentry: 2bae4ffee2e66376ef42cb845a494c3bde17bc56 RNSVG: ce9d996113475209013317e48b05c21ee988d42e RNVectorIcons: da6fe858f5a65d7bbc3379540a889b0b12aa5976 diff --git a/package-lock.json b/package-lock.json index 4b98ff80b..0063cc754 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5526,38 +5526,39 @@ "integrity": "sha512-cEkA1Apg8+VjnDdeDZRHI+2RqouiPKgYnewouRkvF4ettH9ZS4Cmi/nANQKIpIu2L+czboxM3fCZ44nc7IM9VQ==" }, "@react-navigation/core": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.10.0.tgz", - "integrity": "sha512-cVQTj5FtZHWuymjZMP50RVXYpkQUbo1zQPjxJl+UfBUh7u9nKexknajBhjYbZq61uDE4MmPE8qAqIEJHKeR4Hg==", + "version": "5.12.3", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.12.3.tgz", + "integrity": "sha512-aEOTAw4FRRNsNu6F9ibLk3SVSs4Res8BI832NEZN6qUto5ZgtuYnQHWeWV2cZ43Nc9KvUyQC/vXvO2RScwgFwA==", "requires": { - "@react-navigation/routers": "^5.4.7", + "@react-navigation/routers": "^5.4.11", "escape-string-regexp": "^4.0.0", - "nanoid": "^3.1.5", - "query-string": "^6.12.1", + "nanoid": "^3.1.12", + "query-string": "^6.13.1", "react-is": "^16.13.0", "use-subscription": "^1.4.0" } }, "@react-navigation/native": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.3.2.tgz", - "integrity": "sha512-F9UzCHNjBQSQLv2RNc4q+Uo/3hRx00CIrP6CPBcrDxLe318frN/LHWqh7Dd6rRm7OAvDFYKsniEluLqTPK3Y0w==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.7.3.tgz", + "integrity": "sha512-bXb1g/cLpGF2DW1Vxk90Ch5vbaZTk5b/4Fn5xjQlueQODgc9ca+GPEssKZ84hCrNmS+Xg+iK1m/ArawLF5gMlw==", "requires": { - "@react-navigation/core": "^5.6.1" + "@react-navigation/core": "^5.12.3", + "nanoid": "^3.1.12" } }, "@react-navigation/routers": { - "version": "5.4.7", - "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.4.7.tgz", - "integrity": "sha512-J+lQYDbEsyhAjcPpWY6ZJYEkGiZcPX62hNtySruShjbIEnI9gm3rC+BHdcrP/lufeWxWGFhI8CN7NSJGgP/Nmg==", + "version": "5.4.11", + "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.4.11.tgz", + "integrity": "sha512-J/CsHdIjYBRe81UUiLOoz9NSrQ91uP23Oe21QPCALInRHx+rfwo2oPl6Fn8xAa7n8Dtt2oQUGyF+g5d05cB74w==", "requires": { - "nanoid": "^3.1.5" + "nanoid": "^3.1.12" } }, "@react-navigation/stack": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-5.3.6.tgz", - "integrity": "sha512-6uE9pWMa9tdvDSbMV9o6/1cFrT60c2S3CTKIR5mZWJbyanIGFdu/ScbjIvplnG5kLG24rIpc3rtC0FgqTsBVXQ==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-5.9.0.tgz", + "integrity": "sha512-kt6M0ZLMyNKXfKi50n01bHg4/d8zp0Yh5QaQG4d1roWOqdV9ou1nFEK4l2yQ6XKH2lLSYswHElPDZUuWd+6XzA==", "requires": { "color": "^3.1.2", "react-native-iphone-x-helper": "^1.2.1" @@ -16530,9 +16531,9 @@ "optional": true }, "nanoid": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.10.tgz", - "integrity": "sha512-iZFMXKeXWkxzlfmMfM91gw7YhN2sdJtixY+eZh9V6QWJWTOiurhpKhBMgr82pfzgSqglQgqYSCowEYsz8D++6w==" + "version": "3.1.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", + "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" }, "nanomatch": { "version": "1.2.13", @@ -18212,9 +18213,9 @@ } }, "react-native-calendars": { - "version": "1.303.0", - "resolved": "https://registry.npmjs.org/react-native-calendars/-/react-native-calendars-1.303.0.tgz", - "integrity": "sha512-J0mdZ/4FEaHfxD0Jaqqt/OGHlnW68kNnlU9efy45KFUx8uabkwlCg8EfW3H0gvgnQFbXgEiIzkgmzc+AIDk1Pw==", + "version": "1.315.0", + "resolved": "https://registry.npmjs.org/react-native-calendars/-/react-native-calendars-1.315.0.tgz", + "integrity": "sha512-W3h0RKJLZn5R2ri7laDtEtlkdYp3xLWjB2hLyK8DOc8efp/7NpppZATfDCi9/12YvGIXpLhyoHtL7eBu+Q5F8w==", "requires": { "hoist-non-react-statics": "^3.3.1", "immutable": "^4.0.0-rc.12", @@ -18307,9 +18308,9 @@ "integrity": "sha512-Q5OtfA+VlprLaXmKk1tH/IFzMHwa2B5YnR4xfoEKOJ53UI5BKvYc67Y/ammUUog7bUwPkUBWenwd4MxBTi1R+g==" }, "react-native-gesture-handler": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.6.1.tgz", - "integrity": "sha512-gQgIKhDiYf754yzhhliagLuLupvGb6ZyBdzYzr7aus3Fyi87TLOw63ers+r4kGw0h26oAWTAdHd34JnF4NeL6Q==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.7.0.tgz", + "integrity": "sha512-1CrjJf8Z6Iz2XWzfZknYtsm2sud5Lu/pLhhokkgBIKttxqGDtetDEVFDJOTJWJyKCrUPk0X5tnWi/diSF4q++w==", "requires": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^2.3.1", @@ -18382,9 +18383,9 @@ "integrity": "sha512-XD26iejqNhwScrV/cm4eqTKz51k9fHmR95e7xrTPVGRMzoffscu4LIitLcx1h4ed1uEr3IXs6rPd/p2ikJI7MA==" }, "react-native-navigation": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/react-native-navigation/-/react-native-navigation-6.4.0.tgz", - "integrity": "sha512-VOtmr5FDVWo0YzR+yV3M0BPe0YhJdIYiUBPrHzhKyV5vASb0hbMA32H8wsbX5NYgGjr4vhXcpPYdpXIAa9A9eA==", + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/react-native-navigation/-/react-native-navigation-6.12.1.tgz", + "integrity": "sha512-z/ukaRFzMqQx0MXaaMUI3VcGuKDIFLNDNmYfjGI6Q/7WJ/389KUb3vGIXu7oHA3i2mmyenQ68f6DU8Zy6dM4Fg==", "requires": { "hoist-non-react-statics": "3.x.x", "lodash": "4.17.x", @@ -18449,9 +18450,9 @@ } }, "react-native-reanimated": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-1.8.0.tgz", - "integrity": "sha512-vGTt94lE5fsZmfMwERWFIsCr5LHsyllOESeNvlKryLgAg7h4cnJ5XSmVSy4L3qogdgFYCL6HEgY+s7tQmKXiiQ==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-1.13.0.tgz", + "integrity": "sha512-uadP/0QO+4TCsyPSvzRdl+76NPM7Bp8M25KQLB4Hg3tWBMjhrMrETnzNi33L/OPfmhU+7rceyi0QPe/DxKT5bQ==", "requires": { "fbjs": "^1.0.0" } @@ -18476,14 +18477,14 @@ } }, "react-native-safe-area-context": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-1.0.0.tgz", - "integrity": "sha512-8Poo0FHSS/KE0fP6JUH9Mnjg2KQ5MfZAJN3G8/gW2HoFSypWSfFmDp5msETU0Ix3OnRsmBZTJpmgHFEl9OfNAg==" + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-3.1.7.tgz", + "integrity": "sha512-qSyg/pVMwVPgAy8yCvw349Q+uEUhtRBV33eVXHHkfoou1vCChJxI7SmNR47/6M3BLdjWcyc4lcd018Kx+jhQCw==" }, "react-native-screens": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.7.0.tgz", - "integrity": "sha512-n/23IBOkrTKCfuUd6tFeRkn3lB2QZ3cmvoubRscR0JU/Zl4/ZyKmwnFmUv1/Fr+2GH/H8UTX59kEKDYYg3dMgA==" + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.10.1.tgz", + "integrity": "sha512-Z2kKSk4AwWRQNCBmTjViuBQK0/Lx0jc25TZptn/2gKYUCOuVRvCekoA26u0Tsb3BIQ8tWDsZW14OwDlFUXW1aw==" }, "react-native-section-list-get-item-layout": { "version": "2.2.3", @@ -18677,9 +18678,9 @@ } }, "react-native-video": { - "version": "5.1.0-alpha7", - "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-5.1.0-alpha7.tgz", - "integrity": "sha512-mJs0reEGWbtNn2Fybhz1u2K3HgdqfnMWLvfsyfjJbz66XXNobjWTAujcgTcPTHePLlpYwnXiVNMHyHNS4i0JyQ==", + "version": "5.1.0-alpha8", + "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-5.1.0-alpha8.tgz", + "integrity": "sha512-RRDSxqKe2F4OtiDWKCQlwVzvcsZ/TcWQdRxeAE3wsGBmFpAYFyhCz52QkFXgQQgYUuIK6Wd+j2lVxUoLp4+R2w==", "requires": { "keymirror": "^0.1.1", "prop-types": "^15.7.2", diff --git a/package.json b/package.json index 9fb983ff2..424cbfa5c 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "@react-native-community/clipboard": "1.2.3", "@react-native-community/masked-view": "0.1.10", "@react-native-community/netinfo": "5.9.6", - "@react-navigation/native": "5.3.2", - "@react-navigation/stack": "5.3.6", + "@react-navigation/native": "5.7.3", + "@react-navigation/stack": "5.9.0", "@rudderstack/rudder-sdk-react-native": "0.1.2", "@sentry/react-native": "1.7.1", "analytics-react-native": "1.2.0", @@ -37,7 +37,7 @@ "react-native-android-open-settings": "1.3.0", "react-native-animatable": "1.3.3", "react-native-button": "3.0.1", - "react-native-calendars": "1.303.0", + "react-native-calendars": "1.315.0", "react-native-circular-progress": "1.3.6", "react-native-cookies": "github:mattermost/react-native-cookies#b35bafc388ae09c83bd875e887daf6a0755e0b40", "react-native-device-info": "5.6.5", @@ -46,7 +46,7 @@ "react-native-exception-handler": "2.10.8", "react-native-fast-image": "8.3.2", "react-native-file-viewer": "2.1.1", - "react-native-gesture-handler": "1.6.1", + "react-native-gesture-handler": "1.7.0", "react-native-haptic-feedback": "1.10.0", "react-native-hw-keyboard-event": "0.0.4", "react-native-image-gallery": "github:mattermost/react-native-image-gallery#c1a9f7118e90cc87d47620bc0584c9cac4b0cf38", @@ -58,20 +58,20 @@ "react-native-local-auth": "1.6.0", "react-native-localize": "1.4.1", "react-native-mmkv-storage": "0.3.7", - "react-native-navigation": "6.4.0", + "react-native-navigation": "6.12.1", "react-native-notifications": "2.1.7", "react-native-passcode-status": "1.1.2", "react-native-permissions": "2.1.5", - "react-native-reanimated": "1.8.0", + "react-native-reanimated": "1.13.0", "react-native-safe-area": "0.5.1", - "react-native-safe-area-context": "1.0.0", - "react-native-screens": "2.7.0", + "react-native-safe-area-context": "3.1.7", + "react-native-screens": "2.10.1", "react-native-section-list-get-item-layout": "2.2.3", "react-native-slider": "0.11.0", "react-native-status-bar-size": "0.3.3", "react-native-svg": "12.1.0", "react-native-vector-icons": "7.0.0", - "react-native-video": "5.1.0-alpha7", + "react-native-video": "5.1.0-alpha8", "react-native-webview": "github:mattermost/react-native-webview#b5e22940a613869d3999feac9451ee65352f4fbe", "react-native-youtube": "2.0.1", "react-redux": "7.2.1", diff --git a/patches/react-native-navigation+6.4.0.patch b/patches/react-native-navigation+6.12.1.patch similarity index 100% rename from patches/react-native-navigation+6.4.0.patch rename to patches/react-native-navigation+6.12.1.patch