mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
cherry-pick 0e997c6eab: (#7665)
fixes a bug where NavigationPropTypes.SceneRenderer was a plain object
This commit is contained in:
@@ -92,7 +92,7 @@ class NavigationCard extends React.Component<any, Props, any> {
|
||||
props: Props;
|
||||
|
||||
static propTypes = {
|
||||
...NavigationPropTypes.SceneRenderer,
|
||||
...NavigationPropTypes.SceneRendererProps,
|
||||
onComponentRef: PropTypes.func.isRequired,
|
||||
panHandlers: NavigationPropTypes.panHandlers,
|
||||
pointerEvents: PropTypes.string.isRequired,
|
||||
|
||||
@@ -95,7 +95,7 @@ class NavigationHeader extends React.Component<DefaultProps, Props, any> {
|
||||
};
|
||||
|
||||
static propTypes = {
|
||||
...NavigationPropTypes.SceneRenderer,
|
||||
...NavigationPropTypes.SceneRendererProps,
|
||||
renderLeftComponent: PropTypes.func,
|
||||
renderRightComponent: PropTypes.func,
|
||||
renderTitleComponent: PropTypes.func,
|
||||
|
||||
@@ -65,7 +65,7 @@ const scene = PropTypes.shape({
|
||||
});
|
||||
|
||||
/* NavigationSceneRendererProps */
|
||||
const SceneRenderer = {
|
||||
const SceneRendererProps = {
|
||||
layout: layout.isRequired,
|
||||
navigationState: navigationParentState.isRequired,
|
||||
onNavigate: PropTypes.func.isRequired,
|
||||
@@ -74,6 +74,8 @@ const SceneRenderer = {
|
||||
scenes: PropTypes.arrayOf(scene).isRequired,
|
||||
};
|
||||
|
||||
const SceneRenderer = PropTypes.shape(SceneRendererProps);
|
||||
|
||||
/* NavigationPanPanHandlers */
|
||||
const panHandlers = PropTypes.shape({
|
||||
onMoveShouldSetResponder: PropTypes.func.isRequired,
|
||||
@@ -111,11 +113,12 @@ module.exports = {
|
||||
extractSceneRendererProps,
|
||||
|
||||
// Bundled propTypes.
|
||||
SceneRenderer,
|
||||
SceneRendererProps,
|
||||
|
||||
// propTypes
|
||||
action,
|
||||
navigationParentState,
|
||||
navigationState,
|
||||
panHandlers,
|
||||
SceneRenderer,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user