Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with react-native 0.60.6 #585

Merged
merged 19 commits into from
May 13, 2020
Merged

Compatibility with react-native 0.60.6 #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4d454cb
Platform configuration updated
vkjr Apr 30, 2020
cac5e43
minimist dependency
vkjr Apr 30, 2020
674b04b
module optimist used
vkjr Apr 30, 2020
e623bcd
Fixed react-native.config.js
vkjr Apr 30, 2020
06de255
Adding babel.config.js along with desktop files
vkjr May 6, 2020
c014fa2
Updated ScrollView and babel.config.js
vkjr May 6, 2020
64e6efc
babel plugin updated
vkjr May 6, 2020
c1660d8
Fixed misprint
vkjr May 6, 2020
d2c0d0c
Fixes
vkjr May 6, 2020
603a770
more changes
vkjr May 6, 2020
d7f58e3
More changes
vkjr May 7, 2020
e39cc94
desktop-qt name used as a Platform.OS name
vkjr May 7, 2020
139f027
Fix SafeAreaView
vkjr May 8, 2020
9221bb5
Preparing setup for local development
vkjr May 8, 2020
61dabc5
Fix local development of react-native-desktop-qt
vkjr May 8, 2020
b3499b2
Fix
vkjr May 8, 2020
e316556
Start script changed
vkjr May 12, 2020
87222ca
Merged latest RNTester
vkjr May 13, 2020
d75a05e
Removed unnecessary files
vkjr May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Libraries/Alert/Alert.desktop-qt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Components/ActivityIndicator/ActivityIndicator.desktop-qt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion Libraries/Components/Button.desktop-qt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Components/Picker/Picker.desktop-qt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
}
Expand Down
Loading