kylefang/react-native-web
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-web.git synced 2026-01-12 17:43:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] i18n of styles when using 'setNativeProps'

Browse Source 
Close #732
This commit is contained in:
Liron Yahdav
2017-12-30 14:18:55 -08:00
committed by Nicolas Gallagher
parent b85a7062be
commit 85aaa39206
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/react-native-web/src/components/View/index.js vendored
View File

@@ -65,7 +65,7 @@ class View extends Component<ViewProps> {
if (hitSlop) {
const hitSlopStyle = calculateHitSlopStyle(hitSlop);
const hitSlopChild = createElement('span', { style: [styles.hitSlop, hitSlopStyle] });
otherProps.children = React.Children.toArray([ hitSlopChild, otherProps.children ]);
otherProps.children = React.Children.toArray([hitSlopChild, otherProps.children]);
}
return createElement('div', otherProps);

12
packages/react-native-web/src/modules/NativeMethodsMixin/index.js vendored
View File

@@ -102,6 +102,10 @@ const NativeMethodsMixin = {
* the initial styles from the DOM node and merge them with incoming props.
*/
setNativeProps(nativeProps: Object) {
if (!nativeProps) {
return;
}
// Copy of existing DOM state
const node = findNodeHandle(this);
const nodeStyle = node.style;
@@ -117,10 +121,14 @@ const NativeMethodsMixin = {
style[toCamelCase(property)] = nodeStyle.getPropertyValue(property);
}
}
const domStyleProps = { classList, style };
const domStyleProps = { classList, style };
const props = {
...nativeProps,
style: i18nStyle(nativeProps.style)
};
// Next DOM state
const domProps = createDOMProps(null, i18nStyle(nativeProps), style =>
const domProps = createDOMProps(null, props, style =>
StyleRegistry.resolveStateful(style, domStyleProps, { i18n: false })
);
UIManager.updateView(node, domProps, this);