Feature(map): add expand/collapse all button/logic
This commit is contained in:
@ -3,13 +3,26 @@ import { connect } from 'react-redux';
|
|||||||
import PureComponent from 'react-pure-render/component';
|
import PureComponent from 'react-pure-render/component';
|
||||||
import { InputGroup, FormControl, Button, Row } from 'react-bootstrap';
|
import { InputGroup, FormControl, Button, Row } from 'react-bootstrap';
|
||||||
import classnames from 'classnames';
|
import classnames from 'classnames';
|
||||||
import { clearFilter, updateFilter } from '../../redux/actions';
|
import {
|
||||||
|
clearFilter,
|
||||||
|
updateFilter,
|
||||||
|
collapseAll,
|
||||||
|
expandAll
|
||||||
|
} from '../../redux/actions';
|
||||||
|
|
||||||
const ESC = 27;
|
const ESC = 27;
|
||||||
const clearIcon = <i className='fa fa-times' />;
|
const clearIcon = <i className='fa fa-times' />;
|
||||||
const searchIcon = <i className='fa fa-search' />;
|
const searchIcon = <i className='fa fa-search' />;
|
||||||
const bindableActions = { clearFilter, updateFilter };
|
const bindableActions = {
|
||||||
const mapStateToProps = state => ({ filter: state.challengesApp.filter });
|
clearFilter,
|
||||||
|
updateFilter,
|
||||||
|
collapseAll,
|
||||||
|
expandAll
|
||||||
|
};
|
||||||
|
const mapStateToProps = state => ({
|
||||||
|
isAllCollapsed: state.challengesApp.mapUi.isAllCollapsed,
|
||||||
|
filter: state.challengesApp.filter
|
||||||
|
});
|
||||||
export class Header extends PureComponent {
|
export class Header extends PureComponent {
|
||||||
constructor(...props) {
|
constructor(...props) {
|
||||||
super(...props);
|
super(...props);
|
||||||
@ -17,9 +30,12 @@ export class Header extends PureComponent {
|
|||||||
}
|
}
|
||||||
static displayName = 'MapHeader';
|
static displayName = 'MapHeader';
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
clearFilter: PropTypes.func,
|
isAllCollapsed: PropTypes.bool,
|
||||||
filter: PropTypes.string,
|
filter: PropTypes.string,
|
||||||
updateFilter: PropTypes.func
|
clearFilter: PropTypes.func,
|
||||||
|
updateFilter: PropTypes.func,
|
||||||
|
collapseAll: PropTypes.func,
|
||||||
|
expandAll: PropTypes.func
|
||||||
};
|
};
|
||||||
|
|
||||||
handleKeyDown(e) {
|
handleKeyDown(e) {
|
||||||
@ -37,14 +53,24 @@ export class Header extends PureComponent {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
|
filter,
|
||||||
updateFilter,
|
updateFilter,
|
||||||
clearFilter,
|
clearFilter,
|
||||||
filter
|
collapseAll,
|
||||||
|
expandAll,
|
||||||
|
isAllCollapsed
|
||||||
} = this.props;
|
} = this.props;
|
||||||
const inputClass = classnames({
|
const inputClass = classnames({
|
||||||
'map-filter': true,
|
'map-filter': true,
|
||||||
filled: !!filter
|
filled: !!filter
|
||||||
});
|
});
|
||||||
|
const buttonClass = classnames({
|
||||||
|
'center-block': true,
|
||||||
|
active: isAllCollapsed
|
||||||
|
});
|
||||||
|
const buttonCopy = isAllCollapsed ?
|
||||||
|
'Expand all challenges' :
|
||||||
|
'Collapse all challenges';
|
||||||
return (
|
return (
|
||||||
<div className='map-wrapper'>
|
<div className='map-wrapper'>
|
||||||
<div
|
<div
|
||||||
@ -56,9 +82,10 @@ export class Header extends PureComponent {
|
|||||||
<Button
|
<Button
|
||||||
block={ true }
|
block={ true }
|
||||||
bsStyle='primary'
|
bsStyle='primary'
|
||||||
className='center-block'
|
className={ buttonClass }
|
||||||
|
onClick={ isAllCollapsed ? expandAll : collapseAll }
|
||||||
>
|
>
|
||||||
Collapse all challenges
|
{ buttonCopy }
|
||||||
</Button>
|
</Button>
|
||||||
</Row>
|
</Row>
|
||||||
<Row className='map-buttons'>
|
<Row className='map-buttons'>
|
||||||
|
@ -64,6 +64,8 @@ export const initMap = createAction(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
export const toggleThisPanel = createAction(types.toggleThisPanel);
|
export const toggleThisPanel = createAction(types.toggleThisPanel);
|
||||||
|
export const collapseAll = createAction(types.collapseAll);
|
||||||
|
export const expandAll = createAction(types.expandAll);
|
||||||
|
|
||||||
export const clearFilter = createAction(types.clearFilter);
|
export const clearFilter = createAction(types.clearFilter);
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ const initialState = {
|
|||||||
legacyKey: '',
|
legacyKey: '',
|
||||||
files: {},
|
files: {},
|
||||||
// map
|
// map
|
||||||
mapUi: {},
|
mapUi: { isAllCollapsed: false },
|
||||||
filter: '',
|
filter: '',
|
||||||
superBlocks: [],
|
superBlocks: [],
|
||||||
// misc
|
// misc
|
||||||
@ -246,6 +246,20 @@ const mapReducer = handleActions(
|
|||||||
[types.toggleThisPanel]: (state, { payload }) => ({
|
[types.toggleThisPanel]: (state, { payload }) => ({
|
||||||
...state,
|
...state,
|
||||||
[payload]: !state[payload]
|
[payload]: !state[payload]
|
||||||
|
}),
|
||||||
|
[types.collapseAll]: state => ({
|
||||||
|
...Object.keys(state).reduce((newState, key) => {
|
||||||
|
newState[key] = false;
|
||||||
|
return newState;
|
||||||
|
}, {}),
|
||||||
|
isAllCollapsed: true
|
||||||
|
}),
|
||||||
|
[types.expandAll]: state => ({
|
||||||
|
...Object.keys(state).reduce((newState, key) => {
|
||||||
|
newState[key] = true;
|
||||||
|
return newState;
|
||||||
|
}, {}),
|
||||||
|
isAllCollapsed: false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
initialState.mapUi
|
initialState.mapUi
|
||||||
|
@ -22,6 +22,8 @@ export default createTypes([
|
|||||||
'clearFilter',
|
'clearFilter',
|
||||||
'initMap',
|
'initMap',
|
||||||
'toggleThisPanel',
|
'toggleThisPanel',
|
||||||
|
'collapseAll',
|
||||||
|
'expandAll',
|
||||||
|
|
||||||
// files
|
// files
|
||||||
'updateFile',
|
'updateFile',
|
||||||
|
Reference in New Issue
Block a user