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.

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

Jump to bottom

[actions]: add support when dealing Scenes defined using array map #793

Merged
merged 2 commits into from
Jun 9, 2016
Merged

[actions]: add support when dealing Scenes defined using array map #793

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d0c37d
[actions]: add support when dealing with array upon Scenes defined in…
alextkd Jun 7, 2016
a6d2174
[eslint]: fix eslint and space indentation errors
alextkd Jun 8, 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
14 changes: 13 additions & 1 deletion src/Actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class Actions {
assert(key, 'unique key should be defined ');
assert(
reservedKeys.indexOf(key) === -1,
`'${key}' is not allowed as key name. Reserved keys: [${reservedKeys.join(', ')}]`,
`'${key}' is not allowed as key name. Reserved keys: [${reservedKeys.join(', ')}]`
);
const { children, component, ...staticProps } = root.props;
let type = root.props.type || (parentProps.tabs ? JUMP_ACTION : PUSH_ACTION);
Expand Down Expand Up @@ -97,9 +97,21 @@ class Actions {
...componentProps,
};
let list = children || [];
const normalized = [];
if (!(list instanceof Array)) {
list = [list];
}
list.forEach(item => {
if (item instanceof Array) {
item.forEach(it => {
normalized.push(it);
});
} else {
normalized.push(item);
}
});
list = normalized; // normalize the list of scenes

const condition = el => (!el.props.component && !el.props.children &&
(!el.props.type || el.props.type === REFRESH_ACTION));
// determine sub-states
Expand Down