Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3204 onEnter/onExit for Drawer #3254

Merged
merged 2 commits into from
Sep 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Example/Example.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const Example = () => (
<Scene key="home" component={Home} title="Replace" type={ActionConst.REPLACE} />
</Stack>

<Drawer hideNavBar key="drawer" contentComponent={DrawerContent} drawerImage={MenuIcon} drawerWidth={300}>
<Drawer hideNavBar key="drawer" onExit={() => { console.log('Drawer closed') }} onEnter={() => { console.log('Drawer opened') }} contentComponent={DrawerContent} drawerImage={MenuIcon} drawerWidth={300}>
{/*
Wrapper Scene needed to fix a bug where the tabs would
reload as a modal ontop of itself
Expand Down
13 changes: 13 additions & 0 deletions src/State.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ export function isActiveRoute(state, routeName) {
return isActiveRoute(state.routes[state.index], routeName);
}

export function getRouteNameByKey(state, key) {
if (state.key === key) {
return state.routeName;
}
if (!state.routes) {
return state.routeName;
}
if (state.routes[state.index].key === key) {
return state.routes[state.index].routeName;
}
return getRouteNameByKey(state.routes[state.index], key);
}

export function getActiveState(param, parent) {
const state = param;
if (!state.routes) {
Expand Down
76 changes: 45 additions & 31 deletions src/navigationStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { LeftButton, RightButton, BackButton } from './NavBar';
import LightboxRenderer from './LightboxRenderer';
import _drawerImage from '../images/menu_burger.png';
import Scene from './Scene';
import { getActiveState, getParent } from './State';
import { getActiveState, getParent, getRouteNameByKey } from './State';
import Modal from './Modal';
import Lightbox from './Lightbox';
import Drawer from './Drawer';
Expand Down Expand Up @@ -512,6 +512,42 @@ class NavigationStore {
Navigator.router.getStateForAction = (cmd, state) => (this.reducer ? this.reducer(state, cmd) : reducer(state, cmd));
};

onEnterHandler = async (currentScene) => {
if (this.states[currentScene]) {
const handler = this[currentScene + OnEnter];
const success = this.states[currentScene].success || defaultSuccess;
const failure = this.states[currentScene].failure || defaultFailure;
if (handler) {
try {
const res = await handler(this.currentParams, this.state);
if (res) {
success(res);
} else {
failure();
}
} catch (e) {
failure({ error: e.message });
}
}
}
};

onExitHandler = (prevScene) => {
if (prevScene) {
const exitHandler = this[prevScene + OnExit];
if (exitHandler) {
try {
const res = exitHandler(this.state);
if (res instanceof Promise) {
res.then(defaultSuccess, defaultFailure);
}
} catch (e) {
console.error('Error during onExit handler:', e);
}
}
}
};

onNavigationStateChange = async (prevState, currentState, action) => {
this.state = currentState;
this.prevState = prevState;
Expand All @@ -522,41 +558,19 @@ class NavigationStore {
this.prevScene = this.prevState ? getActiveState(this.prevState).routeName : null;
if (this.currentScene !== this.prevScene) {
// run onExit for old scene
if (this.prevScene) {
const exitHandler = this[this.prevScene + OnExit];
if (exitHandler) {
try {
const res = exitHandler(this.state);
if (res instanceof Promise) {
res.then(defaultSuccess, defaultFailure);
}
} catch (e) {
console.error('Error during onExit handler:', e);
}
}
}
this.onExitHandler(this.prevScene);
setTimeout(() => this.dispatch({
type: ActionConst.FOCUS,
routeName: this.currentScene,
params: this.currentParams,
}));
if (this.states[currentScene]) {
const handler = this[currentScene + OnEnter];
const success = this.states[currentScene].success || defaultSuccess;
const failure = this.states[currentScene].failure || defaultFailure;
// call onEnter handler
if (handler) {
try {
const res = await handler(this.currentParams, this.state);
if (res) {
success(res);
} else {
failure();
}
} catch (e) {
failure({ error: e.message });
}
}
this.onEnterHandler(currentScene);
} else {
const routeName = getRouteNameByKey(this.state, action.key);
if (action.type === 'Navigation/DRAWER_OPENED') {
this.onEnterHandler(routeName);
} else if (action.type === 'Navigation/DRAWER_CLOSED') {
this.onExitHandler(routeName);
}
}
if (this.onStateChange) {
Expand Down