SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Dependencies (#5578) (#5582)

Browse Source 
* Dependency updates

* Ensure post list starts at the beginning on channel switch

* add missing prop to settings_sidebar test

* Update detox deps

(cherry picked from commit 29fd07ede6)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Mattermost Build
2021-07-30 01:17:04 +02:00
committed by GitHub
parent 2b1a30d757
commit 43689751dc
20 changed files with 1604 additions and 11452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/post_draft/quick_actions/camera_quick_action/index.tsx
View File

@@ -39,7 +39,9 @@ const CameraQuickAction = ({disabled, fileCount, intl, maxFileCount, onUploadFil
return;
}
onUploadFiles(response.assets);
if (response.assets) {
onUploadFiles(response.assets);
}
});
}
};

2
app/components/post_draft/quick_actions/image_quick_action/index.tsx
View File

@@ -42,7 +42,7 @@ const ImageQuickAction = ({disabled, fileCount = 0, intl, maxFileCount = MAX_FIL
if (hasPermission) {
launchImageLibrary(options, async (response) => {
StatusBar.setHidden(false);
if (response.errorCode || response.didCancel) {
if (response.errorCode || response.didCancel || !response.assets) {
return;
}

2
app/components/post_list/post/body/files/image_file.tsx
View File

@@ -123,7 +123,6 @@ const ImageFile = ({
id={file.id}
style={{height: file.height, width: file.width}}
tintDefaultSource={!file.localPath && !failed}
filename={file.name}
onError={handleError}
resizeMode={'contain'}
resizeMethod={resizeMethod}
@@ -167,7 +166,6 @@ const ImageFile = ({
id={file.id}
style={[isSingleImage ? null : style.imagePreview, imageDimensions]}
tintDefaultSource={!file.localPath && !failed}
filename={file.name}
onError={handleError}
resizeMode={resizeMode}
resizeMethod={resizeMethod}

10
app/components/post_list/post_list.tsx
View File

@@ -311,10 +311,20 @@ const PostList = ({
}, [deepLinkURL]);
useLayoutEffect(() => {
let scrollFrame: number;
if (postIds.length && channelId !== prevChannelId.current) {
telemetry.end([PERF_MARKERS.CHANNEL_RENDER]);
prevChannelId.current = channelId;
scrollFrame = requestAnimationFrame(() => {
flatListRef.current?.scrollToOffset({animated: true, offset: 0});
});
}
return () => {
if (scrollFrame) {
cancelAnimationFrame(scrollFrame);
}
};
}, [channelId, postIds]);
useLayoutEffect(() => {

1
app/components/sidebars/settings/settings_sidebar.test.js
View File

@@ -29,6 +29,7 @@ describe('SettingsSidebar', () => {
theme: Preferences.THEMES.default,
isCustomStatusEnabled: false,
isCustomStatusExpired: false,
isCustomStatusExpirySupported: false,
customStatus,
};

1
app/screens/apps_form/apps_form_field.tsx
View File

@@ -184,7 +184,6 @@ export default class AppsFormField extends React.PureComponent<Props, State> {
return (
<AutocompleteSelector
id={name}
label={displayName}
dataSource={dataSource}
options={options}

1
app/screens/channel_info/__snapshots__/channel_info.test.js.snap
View File

@@ -35,6 +35,7 @@ exports[`channelInfo should match snapshot 1`] = `
isArchived={false}
isCustomStatusEnabled={false}
isCustomStatusExpired={false}
isCustomStatusExpirySupported={false}
isGroupConstrained={false}
isTeammateGuest={false}
memberCount={2}

1
app/screens/channel_info/channel_info.test.js
View File

@@ -51,6 +51,7 @@ describe('channelInfo', () => {
isLandscape: false,
isCustomStatusEnabled: false,
isCustomStatusExpired: false,
isCustomStatusExpirySupported: false,
actions: {
getChannelStats: jest.fn(),
getCustomEmojisInText: jest.fn(),

2
app/screens/slide_up/index.tsx
View File

@@ -50,8 +50,6 @@ const SlideUp = (props: Props) => {
<SlideUpPanel
{...otherProps}
onRequestClose={onClose}
// @ts-expect-error no ref typing for JS file
ref={slideUpPanel}
>
{children}

8
app/store/middlewares/middleware.test.js
View File

@@ -265,6 +265,9 @@ describe('cleanUpState', () => {
general: {
dataRetentionPolicy,
},
preferences: {
myPreferences: {},
},
},
};
@@ -341,6 +344,9 @@ describe('cleanUpState', () => {
postsInThread: {},
reactions: {},
},
preferences: {
myPreferences: {},
},
search: {
results: [],
flagged: [],
@@ -723,7 +729,7 @@ describe('cleanUpPostsInChannel', () => {
});
});
describe.only('cleanUpThreadsInTeam', () => {
describe('cleanUpThreadsInTeam', () => {
const threadsInTeam = {
team1: ['thread1', 'thread2', 'thread3'],
team2: ['thread3', 'thread4', 'thread5'],

11889
detox/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

20
detox/package.json
View File

@@ -4,22 +4,22 @@
"repository": "git@github.com:mattermost/mattermost-mobile.git",
"author": "Mattermost, Inc.",
"devDependencies": {
"@babel/plugin-proposal-class-properties": "7.13.0",
"@babel/plugin-transform-modules-commonjs": "7.14.0",
"@babel/plugin-transform-runtime": "7.14.3",
"@babel/preset-env": "7.14.5",
"@babel/plugin-proposal-class-properties": "7.14.5",
"@babel/plugin-transform-modules-commonjs": "7.14.5",
"@babel/plugin-transform-runtime": "7.14.5",
"@babel/preset-env": "7.14.8",
"axios": "0.21.1",
"babel-jest": "27.0.2",
"babel-jest": "27.0.6",
"babel-plugin-module-resolver": "4.1.0",
"client-oauth2": "github:larkox/js-client-oauth2#e24e2eb5dfcbbbb3a59d095e831dbe0012b0ac49",
"deepmerge": "4.2.2",
"detox": "18.18.1",
"detox": "18.20.0",
"form-data": "4.0.0",
"jest": "26.6.3",
"jest-circus": "26.6.3",
"jest-cli": "26.6.3",
"jest": "27.0.6",
"jest-circus": "27.0.6",
"jest-cli": "27.0.6",
"jest-html-reporters": "2.1.6",
"jest-junit": "12.1.0",
"jest-junit": "12.2.0",
"sanitize-filename": "1.6.3",
"uuid": "8.3.2"
},

54
ios/Podfile.lock
View File

@@ -12,7 +12,7 @@ PODS:
- React-jsi (= 0.64.2)
- ReactCommon/turbomodule/core (= 0.64.2)
- glog (0.3.5)
- jail-monkey (2.5.0):
- jail-monkey (2.6.0):
- React-Core
- libwebp (1.2.0):
- libwebp/demux (= 1.2.0)
@@ -242,7 +242,7 @@ PODS:
- React-Core
- react-native-hw-keyboard-event (0.0.4):
- React
- react-native-image-picker (4.0.4):
- react-native-image-picker (4.0.6):
- React-Core
- react-native-local-auth (1.6.0):
- React
@@ -251,7 +251,7 @@ PODS:
- React-Core
- react-native-netinfo (6.0.0):
- React-Core
- react-native-notifications (3.5.0):
- react-native-notifications (4.1.1):
- React-Core
- react-native-passcode-status (1.1.2):
- React
@@ -336,12 +336,12 @@ PODS:
- React-Core
- ReactNativeKeyboardTrackingView (5.7.0):
- React
- ReactNativeNavigation (7.17.1):
- ReactNativeNavigation (7.18.1):
- React-Core
- React-RCTImage
- React-RCTText
- ReactNativeNavigation/Core (= 7.17.1)
- ReactNativeNavigation/Core (7.17.1):
- ReactNativeNavigation/Core (= 7.18.1)
- ReactNativeNavigation/Core (7.18.1):
- React-Core
- React-RCTImage
- React-RCTText
@@ -353,13 +353,15 @@ PODS:
- React-Core
- RNCMaskedView (0.1.11):
- React
- RNDeviceInfo (8.1.3):
- RNDateTimePicker (3.5.2):
- React-Core
- RNDeviceInfo (8.1.4):
- React-Core
- RNDevMenu (4.0.2):
- React-Core
- React-Core/DevSupport
- React-RCTNetwork
- RNFastImage (8.3.5):
- RNFastImage (8.3.7):
- React-Core
- SDWebImage (~> 5.8)
- SDWebImageWebPCoder (~> 0.6.1)
@@ -410,10 +412,10 @@ PODS:
- RNScreens (3.4.0):
- React-Core
- React-RCTImage
- RNSentry (2.6.0):
- RNSentry (2.6.1):
- React-Core
- Sentry (= 7.0.0)
- RNShare (6.2.2):
- Sentry (= 7.1.4)
- RNShare (6.4.0):
- React-Core
- RNSVG (12.1.1):
- React
@@ -426,9 +428,9 @@ PODS:
- SDWebImageWebPCoder (0.6.1):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.7)
- Sentry (7.0.0):
- Sentry/Core (= 7.0.0)
- Sentry/Core (7.0.0)
- Sentry (7.1.4):
- Sentry/Core (= 7.1.4)
- Sentry/Core (7.1.4)
- Swime (3.0.6)
- XCDYouTubeKit (2.15.2)
- Yoga (1.14.0)
@@ -495,6 +497,7 @@ DEPENDENCIES:
- "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
- "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
- "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
- "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
- RNDevMenu (from `../node_modules/react-native-dev-menu`)
- RNFastImage (from `../node_modules/react-native-fast-image`)
@@ -645,6 +648,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/@react-native-community/clipboard"
RNCMaskedView:
:path: "../node_modules/@react-native-community/masked-view"
RNDateTimePicker:
:path: "../node_modules/@react-native-community/datetimepicker"
RNDeviceInfo:
:path: "../node_modules/react-native-device-info"
RNDevMenu:
@@ -695,7 +700,7 @@ SPEC CHECKSUMS:
FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
FBReactNativeSpec: cef0cc6d50abc92e8cf52f140aa22b5371cfec0b
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
jail-monkey: feb2bdedc4d67312cd41a455c22661d804bba985
jail-monkey: 07b83767601a373db876e939b8dbf3f5eb15f073
libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0
MMKV: 22e5136f7d00197bc0fc9694b7f71519f0d1ca12
MMKVCore: 27bf04f4376305c9c0187136a7b58a236ee83f9e
@@ -721,11 +726,11 @@ SPEC CHECKSUMS:
react-native-cookies: 2cb6ef472da68610dfcf0eaee68464c244943abd
react-native-document-picker: f1b5398801b332c77bc62ae0eae2116f49bdff26
react-native-hw-keyboard-event: b517cefb8d5c659a38049c582de85ff43337dc53
react-native-image-picker: c07b072faa83f3480b473a15ea3c19cc39b3d6fa
react-native-image-picker: a6e56460d34905c849ada551db30897dc7f3d535
react-native-local-auth: 49d336dcf0cb0268a930100013a6525844093844
react-native-mmkv-storage: 684f1adf671592c18fb023e0cf1305a84108b59d
react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
react-native-notifications: 89a73cd2cd2648e1734fa10e3507681c9e4f14de
react-native-notifications: b7391a61c9a3919a8cccf6e3a4c542b419cb5ee2
react-native-passcode-status: e78f76b3c8db613e6ced6bd40b54aa4f53374173
react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
@@ -746,14 +751,15 @@ SPEC CHECKSUMS:
ReactCommon: 149906e01aa51142707a10665185db879898e966
ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
ReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306
ReactNativeNavigation: 8ccac6aadb88ce59ff1594bfbe1f579b9bb5e81a
ReactNativeNavigation: 88128fa06b2c349b613e1e0fd3cdff2c58c01c55
rn-fetch-blob: 17961aec08caae68bb8fc0e5b40f93b3acfa6932
RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
RNDeviceInfo: 8d3a29207835f972bce883723882980143270d55
RNDateTimePicker: 7658208086d86d09e1627b5c34ba0cf237c60140
RNDeviceInfo: 0b3e0154c1c659ea9779cb3e883e66ece92326a9
RNDevMenu: fd325b5554b61fe7f48d9205a3877cf5ee88cd7c
RNFastImage: 811ade1ec186fa437ff92bd189dd6721c0ed11d9
RNFastImage: a7384db75df352500261e8e8f1ac2026def26102
RNFileViewer: 83cc066ad795b1f986791d03b56fe0ee14b6a69f
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNKeychain: f75b8c8b2f17d3b2aa1f25b4a0ac5b83d947ff8f
@@ -763,19 +769,19 @@ SPEC CHECKSUMS:
RNReanimated: 9c13c86454bfd54dab7505c1a054470bfecd2563
RNRudderSdk: 9aa881c2bf754dc3b05e392340a5e3663a970f0a
RNScreens: 21b73c94c9117e1110a79ee0ee80c93ccefed8ce
RNSentry: a2b02b326ae4fce91ce7c57d3f7dcf8df4f72269
RNShare: 1a049e096cc7239fb790892cd0bee1d31498269d
RNSentry: af7873b080a0beb74c020644644d247ef4771644
RNShare: 129b187a54301c9f32ec7249fb4431e30a8d6ab8
RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4
Rudder: 3eae52018e1a401d3610b3f16f6210026eb327c8
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
Sentry: 89d26e036063b9cb9caa59b6951dd2f8277aa13b
Sentry: 1d3eb1a25f8c5333c88dd5603904a6d461cd9fcf
Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
XCDYouTubeKit: b120aced3d8638ffb570c5450cddb5a1dac448c7
Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac
YoutubePlayer-in-WKWebView: cfbf46da51d7370662a695a8f351e5fa1d3e1008
PODFILE CHECKSUM: c3bbb0fd2d81abb15a1f699210f18b2577ec458f
PODFILE CHECKSUM: d4ec78ededdb9c6523425879185c23a32b4efd90
COCOAPODS: 1.10.1

942
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

50
package.json
View File

@@ -7,7 +7,7 @@
"license": "Apache 2.0",
"private": true,
"dependencies": {
"@babel/runtime": "7.14.6",
"@babel/runtime": "7.14.8",
"@react-native-community/async-storage": "1.12.1",
"@react-native-community/cameraroll": "4.0.4",
"@react-native-community/clipboard": "1.5.1",
@@ -18,7 +18,7 @@
"@react-navigation/native": "5.9.4",
"@react-navigation/stack": "5.14.5",
"@rudderstack/rudder-sdk-react-native": "1.0.12",
"@sentry/react-native": "2.6.0",
"@sentry/react-native": "2.6.1",
"@types/redux-mock-store": "1.0.3",
"analytics-react-native": "1.2.0",
"array.prototype.flat": "1.2.4",
@@ -31,8 +31,8 @@
"form-data": "4.0.0",
"fuse.js": "6.4.6",
"intl": "1.2.5",
"jail-monkey": "2.5.0",
"mime-db": "1.48.0",
"jail-monkey": "2.6.0",
"mime-db": "1.49.0",
"moment-timezone": "0.5.33",
"prop-types": "15.7.2",
"react": "17.0.2",
@@ -42,16 +42,16 @@
"react-native-animatable": "1.3.3",
"react-native-button": "3.0.1",
"react-native-calendars": "1.1264.0",
"react-native-device-info": "8.1.3",
"react-native-device-info": "8.1.4",
"react-native-document-picker": "5.2.0",
"react-native-elements": "3.4.2",
"react-native-exception-handler": "2.10.10",
"react-native-fast-image": "8.3.5",
"react-native-fast-image": "8.3.7",
"react-native-file-viewer": "2.1.4",
"react-native-gesture-handler": "1.10.3",
"react-native-haptic-feedback": "1.11.0",
"react-native-hw-keyboard-event": "0.0.4",
"react-native-image-picker": "4.0.4",
"react-native-image-picker": "4.0.6",
"react-native-keyboard-aware-scrollview": "2.1.0",
"react-native-keyboard-tracking-view": "5.7.0",
"react-native-keychain": "7.0.0",
@@ -59,8 +59,8 @@
"react-native-local-auth": "1.6.0",
"react-native-localize": "2.1.1",
"react-native-mmkv-storage": "0.6.0",
"react-native-navigation": "7.17.1",
"react-native-notifications": "3.5.0",
"react-native-navigation": "7.18.1",
"react-native-notifications": "4.1.1",
"react-native-passcode-status": "1.1.2",
"react-native-permissions": "3.0.5",
"react-native-reanimated": "2.2.0",
@@ -69,7 +69,7 @@
"react-native-safe-area-context": "3.2.0",
"react-native-screens": "3.4.0",
"react-native-section-list-get-item-layout": "2.2.3",
"react-native-share": "6.2.2",
"react-native-share": "6.4.0",
"react-native-slider": "0.11.0",
"react-native-startup-time": "2.0.0",
"react-native-svg": "12.1.1",
@@ -91,13 +91,13 @@
"serialize-error": "8.1.0",
"shallow-equals": "1.0.0",
"tinycolor2": "1.4.2",
"url-parse": "1.5.1"
"url-parse": "1.5.3"
},
"devDependencies": {
"@babel/cli": "7.14.5",
"@babel/core": "7.14.6",
"@babel/cli": "7.14.8",
"@babel/core": "7.14.8",
"@babel/plugin-transform-runtime": "7.14.5",
"@babel/preset-env": "7.14.7",
"@babel/preset-env": "7.14.8",
"@babel/register": "7.14.5",
"@react-native-community/eslint-config": "3.0.0",
"@storybook/addon-knobs": "6.2.9",
@@ -110,31 +110,31 @@
"@types/enzyme-adapter-react-16": "1.0.6",
"@types/jest": "26.0.24",
"@types/moment-timezone": "0.5.30",
"@types/react": "17.0.14",
"@types/react-native": "0.64.11",
"@types/react": "17.0.15",
"@types/react-native": "0.64.12",
"@types/react-native-share": "3.3.3",
"@types/react-native-video": "5.0.8",
"@types/react-redux": "7.1.17",
"@types/react-redux": "7.1.18",
"@types/react-test-renderer": "17.0.1",
"@types/shallow-equals": "1.0.0",
"@types/tinycolor2": "1.4.3",
"@types/url-parse": "1.4.3",
"@typescript-eslint/eslint-plugin": "4.28.2",
"@typescript-eslint/parser": "4.28.2",
"@typescript-eslint/eslint-plugin": "4.28.5",
"@typescript-eslint/parser": "4.28.5",
"babel-eslint": "10.1.0",
"babel-jest": "27.0.6",
"babel-loader": "8.2.2",
"babel-plugin-module-resolver": "4.1.0",
"babel-plugin-transform-remove-console": "6.9.4",
"deep-freeze": "0.0.1",
"detox": "18.18.1",
"detox": "18.20.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
"enzyme-to-json": "3.6.2",
"eslint": "7.30.0",
"eslint": "7.31.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-jest": "24.3.6",
"eslint-plugin-jest": "24.4.0",
"eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#070ce792d105482ffb2b27cfc0b7e78b3d20acee",
"eslint-plugin-react": "7.24.0",
"expect": "27.0.6",
@@ -146,7 +146,7 @@
"jest-enzyme": "7.1.2",
"jetifier": "2.0.0",
"jsdom-global": "3.0.2",
"metro-react-native-babel-preset": "0.66.1",
"metro-react-native-babel-preset": "0.66.2",
"mmjstool": "github:mattermost/mattermost-utilities#3faa6075089a541d8c90ed85114e644c7a23fedf",
"mock-async-storage": "2.2.0",
"mock-socket": "9.0.3",
@@ -155,13 +155,13 @@
"patch-package": "6.4.7",
"react-dom": "17.0.2",
"react-native-dev-menu": "4.0.2",
"react-native-dotenv": "3.0.0",
"react-native-dotenv": "3.1.1",
"react-native-storybook-loader": "2.0.4",
"react-test-renderer": "17.0.2",
"redux-mock-store": "1.5.4",
"redux-persist-node-storage": "2.0.0",
"socketcluster": "16.0.2",
"ts-jest": "27.0.3",
"ts-jest": "27.0.4",
"typescript": "4.3.5",
"underscore": "1.13.1",
"util": "0.12.4"

0
patches/jail-monkey+2.5.0.patch → patches/jail-monkey+2.6.0.patch
View File

0
patches/react-native-device-info+8.1.3.patch → patches/react-native-device-info+8.1.4.patch
View File

0
patches/react-native-fast-image+8.3.5.patch → patches/react-native-fast-image+8.3.7.patch
View File

27
patches/react-native-navigation+7.17.1.patch → patches/react-native-navigation+7.18.1.patch
View File

@@ -1,9 +1,9 @@
diff --git a/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java b/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
index 3b4e398..8e91f6b 100644
index 2b30edf..2063845 100644
--- a/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
+++ b/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
@@ -55,14 +55,18 @@ public class NavigationModule extends ReactContextBaseJavaModule {
reactContext.addLifecycleEventListener(new LifecycleEventListenerAdapter() {
@@ -61,15 +61,19 @@ public class NavigationModule extends ReactContextBaseJavaModule {
@Override
public void onHostResume() {
- eventEmitter = new EventEmitter(reactContext);
@@ -14,6 +14,7 @@ index 3b4e398..8e91f6b 100644
- navigator().getChildRegistry(),
- ((NavigationApplication) activity().getApplication()).getExternalComponents()
- );
- navigator().onHostResume();
+ try {
+ eventEmitter = new EventEmitter(reactContext);
+ navigator().setEventEmitter(eventEmitter);
@@ -23,13 +24,14 @@ index 3b4e398..8e91f6b 100644
+ navigator().getChildRegistry(),
+ ((NavigationApplication) activity().getApplication()).getExternalComponents()
+ );
+ navigator().onHostResume();
+ } catch (ClassCastException e) {
+ // The most current activity is not a NavigationActivity
+ }
}
});
}
@@ -210,8 +214,12 @@ public class NavigationModule extends ReactContextBaseJavaModule {
@@ -217,8 +221,12 @@ public class NavigationModule extends ReactContextBaseJavaModule {
protected void handle(Runnable task) {
UiThread.post(() -> {
@@ -40,7 +42,7 @@ index 3b4e398..8e91f6b 100644
+ task.run();
+ }
+ } catch (ClassCastException e) {
+ // The most current activity is not a NavigationActivity
+ // The most current activity is not a NavigationActivity)
}
});
}
@@ -71,28 +73,27 @@ index 1e5751e..f921605 100644
view.setOnHierarchyChangeListener(null);
if (view.getParent() instanceof ViewGroup) {
diff --git a/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m b/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
index 815e1c6..a35a087 100644
index 934e7e7..19169a3 100644
--- a/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
+++ b/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
@@ -1,5 +1,7 @@
@@ -1,6 +1,8 @@
#import "RNNOverlayWindow.h"
#import "RNNReactView.h"
#import <React/RCTModalHostView.h>
+#import <react-native-safe-area-context/RNCSafeAreaView.h>
+#import <react-native-safe-area-context/RNCSafeAreaProvider.h>
@implementation RNNOverlayWindow
@@ -7,7 +9,9 @@
UIView *hitTestResult = [super hitTest:point withEvent:event];
@@ -9,6 +11,8 @@
if ([hitTestResult isKindOfClass:[UIWindow class]] ||
- [hitTestResult.subviews.firstObject isKindOfClass:RNNReactView.class]) {
+ [hitTestResult.subviews.firstObject isKindOfClass:RNNReactView.class] ||
[hitTestResult.subviews.firstObject isKindOfClass:RNNReactView.class] ||
+ [hitTestResult isKindOfClass:[RNCSafeAreaView class]] ||
+ [hitTestResult isKindOfClass:[RNCSafeAreaProvider class]]) {
+ [hitTestResult isKindOfClass:[RNCSafeAreaProvider class]] ||
[hitTestResult isKindOfClass:[RCTModalHostView class]]) {
return nil;
}
diff --git a/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m b/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m
index 2e60123..56830c8 100644
--- a/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m

42
patches/react-native-notifications+3.5.0.patch → patches/react-native-notifications+4.1.1.patch
View File

@@ -173,7 +173,7 @@ index 0d70024..b9e6c88 100644
PushNotificationProps asProps();
}
diff --git a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
index f6ac8ec..5e68a08 100644
index fe1fb94..c9e0301 100644
--- a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
+++ b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
@@ -8,6 +8,10 @@ import android.content.Context;
@@ -206,7 +206,7 @@ index f6ac8ec..5e68a08 100644
final protected AppVisibilityListener mAppVisibilityListener = new AppVisibilityListener() {
@Override
public void onAppVisible() {
@@ -59,7 +65,7 @@ public class PushNotification implements IPushNotification {
@@ -62,7 +68,7 @@ public class PushNotification implements IPushNotification {
}
@Override
@@ -215,7 +215,7 @@ index f6ac8ec..5e68a08 100644
if (!mAppLifecycleFacade.isAppVisible()) {
postNotification(null);
notifyReceivedBackgroundToJS();
@@ -78,6 +84,42 @@ public class PushNotification implements IPushNotification {
@@ -81,6 +87,41 @@ public class PushNotification implements IPushNotification {
return postNotification(notificationId);
}
@@ -253,12 +253,11 @@ index f6ac8ec..5e68a08 100644
+
+ return postNotification(notificationId);
+ }
+
+
@Override
public PushNotificationProps asProps() {
return mNotificationProps.copy();
@@ -140,19 +182,20 @@ public class PushNotification implements IPushNotification {
@@ -143,15 +184,16 @@ public class PushNotification implements IPushNotification {
}
protected Notification buildNotification(PendingIntent intent) {
@@ -268,13 +267,9 @@ index f6ac8ec..5e68a08 100644
}
- protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
+ protected NotificationCompat.Builder getNotificationBuilder(PendingIntent intent) {
String CHANNEL_ID = "channel_01";
String CHANNEL_NAME = "Channel Name";
- final Notification.Builder notification = new Notification.Builder(mContext)
+ final NotificationCompat.Builder notification = new NotificationCompat.Builder(mContext, CHANNEL_ID)
+ protected NotificationCompat.Builder getNotificationBuilder(PendingIntent intent) {
+ final NotificationCompat.Builder notification = new NotificationCompat.Builder(mContext, DEFAULT_CHANNEL_ID)
.setContentTitle(mNotificationProps.getTitle())
.setContentText(mNotificationProps.getBody())
.setContentIntent(intent)
@@ -283,7 +278,7 @@ index f6ac8ec..5e68a08 100644
.setAutoCancel(true);
setUpIcon(notification);
@@ -169,7 +212,7 @@ public class PushNotification implements IPushNotification {
@@ -166,7 +208,7 @@ public class PushNotification implements IPushNotification {
return notification;
}
@@ -292,7 +287,7 @@ index f6ac8ec..5e68a08 100644
int iconResId = getAppResourceId("notification_icon", "drawable");
if (iconResId != 0) {
notification.setSmallIcon(iconResId);
@@ -180,7 +223,7 @@ public class PushNotification implements IPushNotification {
@@ -177,7 +219,7 @@ public class PushNotification implements IPushNotification {
setUpIconColor(notification);
}
@@ -301,7 +296,7 @@ index f6ac8ec..5e68a08 100644
int colorResID = getAppResourceId("colorAccent", "color");
if (colorResID != 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
int color = mContext.getResources().getColor(colorResID);
@@ -195,7 +238,7 @@ public class PushNotification implements IPushNotification {
@@ -192,7 +234,7 @@ public class PushNotification implements IPushNotification {
}
protected void postNotification(int id, Notification notification) {
@@ -312,7 +307,7 @@ index f6ac8ec..5e68a08 100644
diff --git a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationPublisher.java b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationPublisher.java
new file mode 100644
index 0000000..58ff887
index 0000000..5b64593
--- /dev/null
+++ b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationPublisher.java
@@ -0,0 +1,27 @@
@@ -343,6 +338,7 @@ index 0000000..58ff887
+ pushNotification.onPostScheduledRequest(notificationId);
+ }
+}
\ No newline at end of file
diff --git a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java
index e22cd62..48aa1cd 100644
--- a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java
@@ -434,13 +430,13 @@ index ad7fc1a..a04ec6b 100644
get title() {
return this.payload.title;
diff --git a/node_modules/react-native-notifications/lib/dist/Notifications.d.ts b/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
index b8da863..79dbb1f 100644
index 6e49fd4..1d94217 100644
--- a/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
+++ b/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
@@ -37,6 +37,10 @@ export declare class NotificationsRoot {
* cancelLocalNotification
*/
cancelLocalNotification(notificationId: string): void;
cancelLocalNotification(notificationId: number): void;
+ /**
+ * cancelAllLocalNotifications
+ */
@@ -477,10 +473,10 @@ index 0e78cb5..ae90bd1 100644
+ constructor(identifier: string, activationMode: 'background' | 'foreground' | 'authenticationRequired' | 'destructive', title: string, authenticationRequired: boolean, textInput?: NotificationTextInput);
}
diff --git a/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m b/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
index 8b68284..f2fd0ee 100644
index 7452523..a093262 100644
--- a/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
+++ b/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
@@ -73,7 +73,7 @@
@@ -83,7 +83,7 @@
for (UNNotification *notification in notifications) {
[formattedNotifications addObject:[RCTConvert UNNotificationPayload:notification]];
}
@@ -490,10 +486,10 @@ index 8b68284..f2fd0ee 100644
}
diff --git a/node_modules/react-native-notifications/lib/src/Notifications.ts b/node_modules/react-native-notifications/lib/src/Notifications.ts
index b107f09..ace3be2 100644
index 0848f6d..ceb271d 100644
--- a/node_modules/react-native-notifications/lib/src/Notifications.ts
+++ b/node_modules/react-native-notifications/lib/src/Notifications.ts
@@ -79,6 +79,13 @@ export class NotificationsRoot {
@@ -80,6 +80,13 @@ export class NotificationsRoot {
return this.commands.cancelLocalNotification(notificationId);
}
@@ -508,10 +504,10 @@ index b107f09..ace3be2 100644
* removeAllDeliveredNotifications
*/
diff --git a/node_modules/react-native-notifications/lib/src/NotificationsIOS.ts b/node_modules/react-native-notifications/lib/src/NotificationsIOS.ts
index 98e2293..10d6646 100644
index 98fc19d..0c8ea3d 100644
--- a/node_modules/react-native-notifications/lib/src/NotificationsIOS.ts
+++ b/node_modules/react-native-notifications/lib/src/NotificationsIOS.ts
@@ -53,13 +53,6 @@ export class NotificationsIOS {
@@ -52,13 +52,6 @@ export class NotificationsIOS {
return this.commands.setBadgeCount(count);
}