forked from Ivasoft/mattermost-mobile
2013f39a61
* Update to RN 0.67 & dependencies * Update server displayName if already exists * Allow adding only one reaction * update to rn 0.67.1
105 lines
4.9 KiB
Diff
105 lines
4.9 KiB
Diff
diff --git a/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js b/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
|
|
index b121da3..82c1c24 100644
|
|
--- a/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
|
|
+++ b/node_modules/react-native/Libraries/Components/ScrollView/ScrollView.js
|
|
@@ -1777,9 +1777,15 @@ class ScrollView extends React.Component<Props, State> {
|
|
// Note: we should split props.style on the inner and outer props
|
|
// however, the ScrollView still needs the baseStyle to be scrollable
|
|
const {outer, inner} = splitLayoutProps(flattenStyle(props.style));
|
|
+ let inverted;
|
|
+ if (inner.scaleY) {
|
|
+ inverted = {scaleY: -1};
|
|
+ delete inner['scaleY']
|
|
+ }
|
|
+
|
|
return React.cloneElement(
|
|
refreshControl,
|
|
- {style: StyleSheet.compose(baseStyle, outer)},
|
|
+ {style: [baseStyle, outer, inverted]},
|
|
<NativeDirectionalScrollView
|
|
{...props}
|
|
style={StyleSheet.compose(baseStyle, inner)}
|
|
diff --git a/node_modules/react-native/Libraries/Lists/VirtualizedList.js b/node_modules/react-native/Libraries/Lists/VirtualizedList.js
|
|
index 2648cc3..e0c2c13 100644
|
|
--- a/node_modules/react-native/Libraries/Lists/VirtualizedList.js
|
|
+++ b/node_modules/react-native/Libraries/Lists/VirtualizedList.js
|
|
@@ -16,6 +16,7 @@ const ScrollView = require('../Components/ScrollView/ScrollView');
|
|
const StyleSheet = require('../StyleSheet/StyleSheet');
|
|
const View = require('../Components/View/View');
|
|
const ViewabilityHelper = require('./ViewabilityHelper');
|
|
+const Platform = require('../Utilities/Platform');
|
|
|
|
const flattenStyle = require('../StyleSheet/flattenStyle');
|
|
const infoLog = require('../Utilities/infoLog');
|
|
@@ -2119,7 +2120,14 @@ function describeNestedLists(childList: {
|
|
|
|
const styles = StyleSheet.create({
|
|
verticallyInverted: {
|
|
- transform: [{scaleY: -1}],
|
|
+ ...Platform.select({
|
|
+ android: {
|
|
+ scaleY: -1,
|
|
+ },
|
|
+ ios: {
|
|
+ transform: [{scaleY: -1}],
|
|
+ },
|
|
+ }),
|
|
},
|
|
horizontallyInverted: {
|
|
transform: [{scaleX: -1}],
|
|
diff --git a/node_modules/react-native/jest/setup.js b/node_modules/react-native/jest/setup.js
|
|
index 7787788..6c60f47 100644
|
|
--- a/node_modules/react-native/jest/setup.js
|
|
+++ b/node_modules/react-native/jest/setup.js
|
|
@@ -111,9 +111,7 @@ jest
|
|
}),
|
|
)
|
|
.mock('../Libraries/Modal/Modal', () => {
|
|
- const baseComponent = mockComponent('../Libraries/Modal/Modal');
|
|
- const mockModal = jest.requireActual('./mockModal');
|
|
- return mockModal(baseComponent);
|
|
+ mockComponent('../Libraries/Modal/Modal');
|
|
})
|
|
.mock('../Libraries/Components/View/View', () =>
|
|
mockComponent('../Libraries/Components/View/View', MockNativeMethods),
|
|
diff --git a/node_modules/react-native/react.gradle b/node_modules/react-native/react.gradle
|
|
index d9e2714..bed8756 100644
|
|
--- a/node_modules/react-native/react.gradle
|
|
+++ b/node_modules/react-native/react.gradle
|
|
@@ -88,7 +88,7 @@ def enableHermesForVariant = config.enableHermesForVariant ?: {
|
|
def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
|
|
def variant ->
|
|
def hermesFlags;
|
|
- if (variant.name.toLowerCase().contains("release")) {
|
|
+ if (variant.name.toLowerCase().contains("release") || variant.name..toLowerCase().contains("unsigned")) {
|
|
// Can't use ?: since that will also substitute valid empty lists
|
|
hermesFlags = config.hermesFlagsRelease
|
|
if (hermesFlags == null) hermesFlags = ["-O", "-output-source-map"]
|
|
@@ -102,7 +102,7 @@ def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
|
|
// Set deleteDebugFilesForVariant to a function to configure per variant,
|
|
// defaults to True for Release variants and False for debug variants
|
|
def deleteDebugFilesForVariant = config.deleteDebugFilesForVariant ?: {
|
|
- def variant -> variant.name.toLowerCase().contains("release")
|
|
+ def variant -> (variant.name.toLowerCase().contains("release") || variant.name.toLowerCase().contains("unsigned"))
|
|
}
|
|
|
|
android {
|
|
@@ -173,7 +173,7 @@ afterEvaluate {
|
|
|
|
// Set up dev mode
|
|
def devEnabled = !(config."devDisabledIn${targetName}"
|
|
- || targetName.toLowerCase().contains("release"))
|
|
+ || targetName.toLowerCase().contains("release") || targetName.toLowerCase().contains("unsigned"))
|
|
|
|
def extraArgs = []
|
|
|
|
@@ -237,7 +237,7 @@ afterEvaluate {
|
|
? config."bundleIn${targetName}"
|
|
: config."bundleIn${variant.buildType.name.capitalize()}" != null
|
|
? config."bundleIn${variant.buildType.name.capitalize()}"
|
|
- : targetName.toLowerCase().contains("release")
|
|
+ : (targetName.toLowerCase().contains("release") || targetName.toLowerCase().contains("unsigned"))
|
|
}
|
|
|
|
// Expose a minimal interface on the application variant and the task itself:
|