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

Jump to bottom

Adds support for platform specific styles in StyleSheet #7033

Closed
wants to merge 1 commit into from
Closed

Adds support for platform specific styles in StyleSheet #7033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions Libraries/StyleSheet/StyleSheet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
var PixelRatio = require('PixelRatio');
var StyleSheetRegistry = require('StyleSheetRegistry');
var StyleSheetValidation = require('StyleSheetValidation');
var Platform = require('Platform');

var flatten = require('flattenStyle');

Expand Down Expand Up @@ -93,9 +94,19 @@ module.exports = {
*/
create(obj: {[key: string]: any}): {[key: string]: number} {
var result = {};

for (var key in obj) {
StyleSheetValidation.validateStyle(key, obj);
result[key] = StyleSheetRegistry.registerStyle(obj[key]);

let {ios, android, ...style} = obj[key];
if (ios && Platform.OS === 'ios') {
style = {...style, ...ios};
}
if (android && Platform.OS === 'android') {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

semi: Missing semicolon.

style = {...style, ...android};
}

StyleSheetValidation.validateStyle(key, style);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is correct? This looks different from the previous code, where validateStyle took the whole object and registerStyle took a property of the object.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm... You're right. I'll take a look at this again. Thanks for pointing it out.

result[key] = StyleSheetRegistry.registerStyle(style);
}
return result;
}
Expand Down