kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-28 20:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add subviewStyle prop to NavigationHeader"

Browse Source 
Summary:
This reverts commit 1dc82a9e5f.

Breaks OSS tests
Closes https://github.com/facebook/react-native/pull/7232

Differential Revision: D3223972

Pulled By: bestander

fb-gh-sync-id: fea7ec4a1c13d328a7bbda9fcd3f201a7007081e
fbshipit-source-id: fea7ec4a1c13d328a7bbda9fcd3f201a7007081e
This commit is contained in:
Konstantin Raev
2016-04-26 06:09:48 -07:00
committed by Facebook Github Bot 1
parent c1aff6b116
commit 2eef115161
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
View File

@@ -65,7 +65,6 @@ type Props = NavigationSceneRendererProps & {
renderRightComponent: NavigationSceneRenderer, renderRightComponent: NavigationSceneRenderer,
renderTitleComponent: NavigationSceneRenderer, renderTitleComponent: NavigationSceneRenderer,
style?: any; style?: any;
subviewStyle?: any;
viewProps?: any; viewProps?: any;
}; };
@@ -101,7 +100,6 @@ class NavigationHeader extends React.Component<DefaultProps, Props, any> {
renderRightComponent: PropTypes.func, renderRightComponent: PropTypes.func,
renderTitleComponent: PropTypes.func, renderTitleComponent: PropTypes.func,
style: View.propTypes.style, style: View.propTypes.style,
subviewStyle: View.propTypes.style,
viewProps: PropTypes.shape(View.propTypes), viewProps: PropTypes.shape(View.propTypes),
}; };
@@ -188,7 +186,6 @@ class NavigationHeader extends React.Component<DefaultProps, Props, any> {
return null; return null;
} }
const { subviewStyle } = this.props;
const pointerEvents = offset !== 0 || isStale ? 'none' : 'box-none'; const pointerEvents = offset !== 0 || isStale ? 'none' : 'box-none';
return ( return (
<Animated.View <Animated.View
@@ -197,7 +194,6 @@ class NavigationHeader extends React.Component<DefaultProps, Props, any> {
style={[ style={[
styles[name], styles[name],
styleInterpolator(props), styleInterpolator(props),
subviewStyle[name],
]}> ]}>
{subView} {subView}
</Animated.View> </Animated.View>