Skip to content

Commit 6800d2b

Browse files
authored
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
1 parent b7f2a61 commit 6800d2b

File tree

313 files changed

+7706
-17571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+7706
-17571
lines changed

Diff for: Libraries/Alert/Alert.desktop-qt.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Alert {
5454
AlertIOS.alert(title, message, buttons);
5555
} else if (Platform.OS === 'android') {
5656
AlertAndroid.alert(title, message, buttons, options);
57-
} else if (Platform.OS === 'desktop') {
57+
} else if (Platform.OS === 'desktop-qt') {
5858
AlertDesktop.alert(title, message, buttons, options);
5959
}
6060
}

Diff for: Libraries/Components/ActivityIndicator/ActivityIndicator.desktop-qt.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import type {ViewProps} from 'ViewPropTypes';
2525
const RCTActivityIndicator =
2626
Platform.OS === 'android'
2727
? require('ProgressBarAndroid')
28-
: Platform.OS === 'desktop'
28+
: Platform.OS === 'desktop-qt'
2929
? requireNativeComponent('RCTActivityIndicatorView', ActivityIndicator)
3030
: requireNativeComponent('RCTActivityIndicatorView');
3131

Diff for: Libraries/Components/Button.desktop-qt.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class Button extends React.Component<ButtonProps> {
101101
const buttonStyles = [styles.button];
102102
const textStyles = [styles.text];
103103
if (color) {
104-
if (Platform.OS === 'ios' || Platform.OS === 'desktop') {
104+
if (Platform.OS === 'ios' || Platform.OS === 'desktop-qt') {
105105
textStyles.push({color: color});
106106
} else {
107107
buttonStyles.push({backgroundColor: color});

Diff for: Libraries/Components/Picker/Picker.desktop-qt.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class Picker extends React.Component<PickerProps> {
147147
<PickerAndroid {...this.props}>{this.props.children}</PickerAndroid>
148148
);
149149
}
150-
else if (Platform.OS === 'desktop') {
150+
else if (Platform.OS === 'desktop-qt') {
151151
// $FlowFixMe found when converting React.createClass to ES6
152152
return <PickerDesktop {...this.props}>{this.props.children}</PickerDesktop>;
153153
}

0 commit comments

Comments
 (0)