Compatibility with react-native 0.60.6 (#585)

* Platform configuration updated * minimist dependency * module optimist used * Fixed react-native.config.js * Adding babel.config.js along with desktop files * Updated ScrollView and babel.config.js * babel plugin updated * Fixed misprint * Fixes * more changes * More changes * desktop-qt name used as a Platform.OS name * Fix SafeAreaView * Preparing setup for local development * Fix local development of react-native-desktop-qt * Fix * Start script changed * Merged latest RNTester * Removed unnecessary files
status-im · May 13, 2020 · 6800d2b · 6800d2b
1 parent b7f2a61
commit 6800d2b
Show file tree

Hide file tree

Showing 313 changed files with 7,706 additions and 17,571 deletions.
diff --git a/Libraries/Alert/Alert.desktop-qt.js b/Libraries/Alert/Alert.desktop-qt.js
@@ -54,7 +54,7 @@ class Alert {
       AlertIOS.alert(title, message, buttons);
     } else if (Platform.OS === 'android') {
       AlertAndroid.alert(title, message, buttons, options);
-    } else if (Platform.OS === 'desktop') {
+    } else if (Platform.OS === 'desktop-qt') {
       AlertDesktop.alert(title, message, buttons, options);
     }
   }

diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.desktop-qt.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.desktop-qt.js
@@ -25,7 +25,7 @@ import type {ViewProps} from 'ViewPropTypes';
 const RCTActivityIndicator =
   Platform.OS === 'android'
     ? require('ProgressBarAndroid')
-    : Platform.OS === 'desktop'
+    : Platform.OS === 'desktop-qt'
       ? requireNativeComponent('RCTActivityIndicatorView', ActivityIndicator)
       : requireNativeComponent('RCTActivityIndicatorView');
 

diff --git a/Libraries/Components/Button.desktop-qt.js b/Libraries/Components/Button.desktop-qt.js
@@ -101,7 +101,7 @@ class Button extends React.Component<ButtonProps> {
     const buttonStyles = [styles.button];
     const textStyles = [styles.text];
     if (color) {
-      if (Platform.OS === 'ios' || Platform.OS === 'desktop') {
+      if (Platform.OS === 'ios' || Platform.OS === 'desktop-qt') {
         textStyles.push({color: color});
       } else {
         buttonStyles.push({backgroundColor: color});

diff --git a/Libraries/Components/Picker/Picker.desktop-qt.js b/Libraries/Components/Picker/Picker.desktop-qt.js
@@ -147,7 +147,7 @@ class Picker extends React.Component<PickerProps> {
         <PickerAndroid {...this.props}>{this.props.children}</PickerAndroid>
       );
       }
-      else if (Platform.OS === 'desktop') {
+      else if (Platform.OS === 'desktop-qt') {
         // $FlowFixMe found when converting React.createClass to ES6
         return <PickerDesktop {...this.props}>{this.props.children}</PickerDesktop>;
       }