status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ReactNative] Navigator use flattenStyle 

Summary:
A hack was implemented in Navigator to do this manually, but there is a proper function to get these styles for setting native props

@public

Test Plan: Testing Navigator behavior on iOS and Android
This commit is contained in:
Eric Vicenti 2015-05-04 14:33:05 -07:00
parent 132a9170f1
commit 50de4a67b0
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Libraries/CustomComponents/Navigator/Navigator.js
View File

@ -40,13 +40,13 @@ var Platform = require('Platform');
var React = require('React');
var StaticContainer = require('StaticContainer.react');
var StyleSheet = require('StyleSheet');
var StyleSheetRegistry = require('StyleSheetRegistry');
var Subscribable = require('Subscribable');
var TimerMixin = require('react-timer-mixin');
var View = require('View');
var getNavigatorContext = require('getNavigatorContext');
var clamp = require('clamp');
var flattenStyle = require('flattenStyle');
var getNavigatorContext = require('getNavigatorContext');
var invariant = require('invariant');
var keyMirror = require('keyMirror');
var merge = require('merge');
@ -67,24 +67,6 @@ function getuid() {
return __uid++;
}
function resolveStyle(styles) {
// The styles for a scene are a prop in the style format, which can be an object,
// a number (which refers to the StyleSheetRegistry), or an arry of objects/numbers.
// This function resolves the actual style values so we can call setNativeProps with
// matching styles.
var resolvedStyle = {};
if (!Array.isArray(styles)) {
styles = [styles];
}
styles.forEach((style) => {
if (typeof style === 'number') {
style = StyleSheetRegistry.getStyleByID(style);
}
resolvedStyle = merge(resolvedStyle, style);
});
return resolvedStyle;
}
// styles moved to the top of the file so getDefaultProps can refer to it
var styles = StyleSheet.create({
container: {
@ -698,7 +680,7 @@ var Navigator = React.createClass({
*/
_enableScene: function(sceneIndex) {
// First, determine what the defined styles are for scenes in this navigator
var sceneStyle = resolveStyle(this.props.sceneStyle);
var sceneStyle = flattenStyle(this.props.sceneStyle);
// Then restore the left value for this scene
var enabledSceneNativeProps = {
left: sceneStyle.left,