Skip to content

make refresh by key modify the child data and not scene data. #429

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 29, 2016
Merged

make refresh by key modify the child data and not scene data. #429

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e10bf8b
make refresh by key modify the child data and not scene data.
joenoon Mar 29, 2016
265654c
refactor findElement to handle types differently
joenoon Mar 29, 2016
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
53 changes: 23 additions & 30 deletions src/Reducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ function inject(state, action, props, scenes) {
case POP_ACTION:
return {...state, index:state.index-1, children:state.children.slice(0, -1) };
case REFRESH_ACTION:
// use key and parent from state to avoid loss during refresh
let {key, parent} = state;
return {...state, ...props, key, parent};
return {...state, ...props};
case PUSH_ACTION:
if (state.children[state.index].sceneKey == action.key && !props.clone){
return state;
Expand All @@ -63,24 +61,16 @@ function inject(state, action, props, scenes) {
}


function findElement(state, key) {
if (state.sceneKey != key){
if (state.children){
let result = undefined;
state.children.forEach(el=>{
let res = findElement(el, key);
if (res){
result = res;
return res;
}
});
return result;
} else {
return false;
}
} else {
function findElement(state, key, type) {
if (type === REFRESH_ACTION ? state.key === key : state.sceneKey === key) {
return state;
}
if (state.children) {
for (let child of state.children) {
let current = findElement(child, key, type);
if (current) return current;
}
}
}

function getCurrent(state){
Expand All @@ -99,8 +89,6 @@ function update(state,action){
return inject(state, action, props, state.scenes);
}

var _uniqPush = 0;

function reducer({initialState, scenes}){
assert(initialState, "initialState should not be null");
assert(initialState.key, "initialState.key should not be null");
Expand All @@ -112,14 +100,19 @@ function reducer({initialState, scenes}){
assert(state.scenes, "state.scenes is missed");

if (action.key){
let scene = state.scenes[action.key];
assert(scene, "missed route data for key="+action.key);

// clone scene
if (scene.clone) {
action.parent = getCurrent(state).parent;
if (action.type === REFRESH_ACTION) {
let key = action.key;
let child = findElement(state, key, action.type);
assert(child, "missed child data for key="+key);
action = {...child,...action};
} else {
let scene = state.scenes[action.key];
assert(scene, "missed route data for key="+action.key);
// clone scene
if (scene.clone) {
action.parent = getCurrent(state).parent;
}
}

} else {
// set current route for pop action or refresh action
if (action.type === POP_ACTION || action.type === POP_ACTION2 || action.type === REFRESH_ACTION){
Expand All @@ -130,9 +123,9 @@ function reducer({initialState, scenes}){
// recursive pop parent
if (action.type === POP_ACTION || action.type === POP_ACTION2) {
let parent = action.parent || state.scenes[action.key].parent;
let el = findElement(state, parent);
let el = findElement(state, parent, action.type);
while (el.parent && (el.children.length <= 1 || el.tabs)) {
el = findElement(state, el.parent);
el = findElement(state, el.parent, action.type);
assert(el, "Cannot find element for parent=" + el.parent + " within current state");
}
action.parent = el.sceneKey;
Expand Down