If we are increasing the number of scenes, remove any scene from the list that

is no longer in the navigation state
This commit is contained in:
Brent Vatne 2018-10-26 09:19:03 -07:00
parent b79aaefcfc
commit 77cdfabe8c
1 changed files with 40 additions and 0 deletions

View File

@ -11,6 +11,8 @@ const DefaultTransitionSpec = {
timing: Animated.timing, timing: Animated.timing,
}; };
const DEBUG = false;
class Transitioner extends React.Component { class Transitioner extends React.Component {
constructor(props, context) { constructor(props, context) {
super(props, context); super(props, context);
@ -72,6 +74,16 @@ class Transitioner extends React.Component {
this.props.navigation.state, this.props.navigation.state,
nextProps.descriptors nextProps.descriptors
); );
// We are adding one or more scene! We can't handle a case where the number
// of scenes increases and one or more of the new scenes is not in the
// current navigation state, so we filter anything that's not in the
// navigation state right now out and assume it has been transitioned out
// properly beforehand.
if (nextScenes.length > this.state.scenes.length) {
nextScenes = filterNotInState(nextScenes, nextProps.navigation.state);
}
if (!nextProps.navigation.state.isTransitioning) { if (!nextProps.navigation.state.isTransitioning) {
nextScenes = filterStale(nextScenes); nextScenes = filterStale(nextScenes);
} }
@ -86,6 +98,10 @@ class Transitioner extends React.Component {
return; return;
} }
if (__DEV__ && DEBUG) {
console.log({ nextScenes: nextScenes.map(s => s.descriptor.key )})
}
const indexHasChanged = const indexHasChanged =
nextProps.navigation.state.index !== this.props.navigation.state.index; nextProps.navigation.state.index !== this.props.navigation.state.index;
if (this._isTransitionRunning) { if (this._isTransitionRunning) {
@ -180,6 +196,12 @@ class Transitioner extends React.Component {
} }
render() { render() {
if (__DEV__ && DEBUG) {
let key = this.props.navigation.state.key;
let routeName = this.props.navigation.state.routeName;
console.log({ [key]: this.state.scenes.map(d => d.key), route: routeName });
}
return ( return (
<View onLayout={this._onLayout} style={styles.main}> <View onLayout={this._onLayout} style={styles.main}>
{this.props.render(this._transitionProps, this._prevTransitionProps)} {this.props.render(this._transitionProps, this._prevTransitionProps)}
@ -288,6 +310,24 @@ function filterStale(scenes) {
return filtered; return filtered;
} }
function filterNotInState(scenes, state) {
let activeKeys = state.routes.map(r => r.key);
let filtered = scenes.filter(scene => activeKeys.includes(scene.descriptor.key));
if (__DEV__ && DEBUG) {
console.log({
activeKeys,
filtered: filtered.map(s => s.descriptor.key),
scenes: scenes.map(s => s.descriptor.key),
});
}
if (filtered.length === scenes.length) {
return scenes;
}
return filtered;
}
function isSceneActive(scene) { function isSceneActive(scene) {
return scene.isActive; return scene.isActive;
} }