Skip to content

Commit 0e997c6

Browse files
joenoonFacebook Github Bot 7
authored andcommitted
fixes a bug where NavigationPropTypes.SceneRenderer was a plain object
Summary: ... used as both a shape and plain object. this splits them out so both parts can be used as needed. NavigationPropTypes.SceneRenderer is a PropTypes shape NavigationPropTypes.SceneRendererProps is the plain object that makes up the shape. Closes #7518 Differential Revision: D3317322 Pulled By: ericvicenti fbshipit-source-id: e8a31e05130e6647b63f68dbef31bc874550948c
1 parent 6796f13 commit 0e997c6

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

Libraries/CustomComponents/NavigationExperimental/NavigationCard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class NavigationCard extends React.Component<any, Props, any> {
9292
props: Props;
9393

9494
static propTypes = {
95-
...NavigationPropTypes.SceneRenderer,
95+
...NavigationPropTypes.SceneRendererProps,
9696
onComponentRef: PropTypes.func.isRequired,
9797
panHandlers: NavigationPropTypes.panHandlers,
9898
pointerEvents: PropTypes.string.isRequired,

Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class NavigationCardStack extends React.Component<DefaultProps, Props, void> {
9090
static propTypes = {
9191
direction: PropTypes.oneOf([Directions.HORIZONTAL, Directions.VERTICAL]),
9292
navigationState: NavigationPropTypes.navigationParentState.isRequired,
93-
onNavigate: NavigationPropTypes.SceneRenderer.onNavigate,
93+
onNavigate: NavigationPropTypes.SceneRendererProps.onNavigate,
9494
renderOverlay: PropTypes.func,
9595
renderScene: PropTypes.func.isRequired,
9696
};

Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class NavigationHeader extends React.Component<DefaultProps, Props, any> {
103103
};
104104

105105
static propTypes = {
106-
...NavigationPropTypes.SceneRenderer,
106+
...NavigationPropTypes.SceneRendererProps,
107107
renderLeftComponent: PropTypes.func,
108108
renderRightComponent: PropTypes.func,
109109
renderTitleComponent: PropTypes.func,

Libraries/NavigationExperimental/NavigationPropTypes.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const scene = PropTypes.shape({
6565
});
6666

6767
/* NavigationSceneRendererProps */
68-
const SceneRenderer = {
68+
const SceneRendererProps = {
6969
layout: layout.isRequired,
7070
navigationState: navigationParentState.isRequired,
7171
onNavigate: PropTypes.func.isRequired,
@@ -74,6 +74,8 @@ const SceneRenderer = {
7474
scenes: PropTypes.arrayOf(scene).isRequired,
7575
};
7676

77+
const SceneRenderer = PropTypes.shape(SceneRendererProps);
78+
7779
/* NavigationPanPanHandlers */
7880
const panHandlers = PropTypes.shape({
7981
onMoveShouldSetResponder: PropTypes.func.isRequired,
@@ -111,11 +113,12 @@ module.exports = {
111113
extractSceneRendererProps,
112114

113115
// Bundled propTypes.
114-
SceneRenderer,
116+
SceneRendererProps,
115117

116118
// propTypes
117119
action,
118120
navigationParentState,
119121
navigationState,
120122
panHandlers,
123+
SceneRenderer,
121124
};

0 commit comments

Comments
 (0)