Automated cherry pick of #4305 (#4309)

* Fixes Android Share Extension

* Revert changes to share extension navigation

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Mattermost Build 2020-05-20 14:05:29 +02:00 committed by GitHub
parent 6b7cffd6af
commit 7cf4084fe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 5 deletions

View file

@ -328,6 +328,8 @@ PODS:
- React
- RNReactNativeHapticFeedback (1.10.0):
- React
- RNReanimated (1.8.0):
- React
- RNRudderSdk (1.0.0):
- React
- Rudder (= 1.0.3-beta-4)
@ -416,6 +418,7 @@ DEPENDENCIES:
- RNLocalize (from `../node_modules/react-native-localize`)
- RNPermissions (from `../node_modules/react-native-permissions`)
- RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
- RNReanimated (from `../node_modules/react-native-reanimated`)
- "RNRudderSdk (from `../node_modules/@rudderstack/rudder-sdk-react-native/ios`)"
- RNScreens (from `../node_modules/react-native-screens`)
- "RNSentry (from `../node_modules/@sentry/react-native`)"
@ -554,6 +557,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-permissions"
RNReactNativeHapticFeedback:
:path: "../node_modules/react-native-haptic-feedback"
RNReanimated:
:path: "../node_modules/react-native-reanimated"
RNRudderSdk:
:path: "../node_modules/@rudderstack/rudder-sdk-react-native/ios"
RNScreens:
@ -629,6 +634,7 @@ SPEC CHECKSUMS:
RNLocalize: fc27ee5878ce5a3af73873fb2d8e866e0d1e6d84
RNPermissions: 8ca17fd6c822eea589fe84709d9426e05cc39c39
RNReactNativeHapticFeedback: 22c5ecf474428766c6b148f96f2ff6155cd7225e
RNReanimated: 955cf4068714003d2f1a6e2bae3fb1118f359aff
RNRudderSdk: 3abdcc4b145b3db6571827b0fc7af4e75a96af13
RNScreens: cf198f915f8a2bf163de94ca9f5bfc8d326c3706
RNSentry: 9c9783b13fb5cba387fff55f085cc1da3854ce71

8
package-lock.json generated
View file

@ -19433,6 +19433,14 @@
"prop-types": "^15.5.10"
}
},
"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==",
"requires": {
"fbjs": "^1.0.0"
}
},
"react-native-safe-area": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/react-native-safe-area/-/react-native-safe-area-0.5.1.tgz",

View file

@ -61,6 +61,7 @@
"react-native-notifications": "2.1.7",
"react-native-passcode-status": "1.1.2",
"react-native-permissions": "2.1.4",
"react-native-reanimated": "1.8.0",
"react-native-safe-area": "0.5.1",
"react-native-safe-area-context": "1.0.0",
"react-native-screens": "2.7.0",

View file

@ -3,7 +3,6 @@
import React, {PureComponent} from 'react';
import {CommonActions as NavigationActions} from '@react-navigation/native';
import TouchableItem from '@react-navigation/stack/lib/module/views/TouchableItem';
import PropTypes from 'prop-types';
import {intlShape} from 'react-intl';
@ -14,6 +13,7 @@ import {
ScrollView,
Text,
TextInput,
TouchableOpacity,
View,
} from 'react-native';
import FastImage from 'react-native-fast-image';
@ -302,7 +302,7 @@ export default class ExtensionPost extends PureComponent {
};
leftHeader = () => (
<TouchableItem
<TouchableOpacity
accessibilityComponentType='button'
accessibilityTraits='button'
borderless={true}
@ -316,7 +316,7 @@ export default class ExtensionPost extends PureComponent {
style={styles.closeButton}
/>
</View>
</TouchableItem>
</TouchableOpacity>
);
loadData = async (items) => {
@ -549,7 +549,7 @@ export default class ExtensionPost extends PureComponent {
};
rightHeader = () => (
<TouchableItem
<TouchableOpacity
accessibilityComponentType='button'
accessibilityTraits='button'
borderless={true}
@ -564,7 +564,7 @@ export default class ExtensionPost extends PureComponent {
width={20}
/>
</View>
</TouchableItem>
</TouchableOpacity>
);
renderTeamButton = () => {