Skip to content

Added multiselect to ListView (#32) #33

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added multiselect to ListView (#32) #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 62 additions & 21 deletions src/components/ListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@ const createView = props => {

const cols = (paneIndex) => (row, rowIndex) => {
const col = row.columns[paneIndex] || {};
const selected = props.selectedIndex === rowIndex;
const colIcon = col.icon ? h(Icon, col.icon) : null;
const children = [h('span', {}, [typeof col === 'object' ? col.label : col])];
const selected = props.multiselect
? props.selectedIndex.indexOf(rowIndex) !== -1
: props.selectedIndex === rowIndex;

if (colIcon) {
children.unshift(colIcon);
Expand All @@ -51,11 +53,11 @@ const createView = props => {
key: row.key,
'data-has-icon': col.icon ? true : undefined,
class: 'osjs-gui-list-view-cell' + (selected ? ' osjs__active' : ''),
ontouchstart: (ev) => tapper(ev, () => props.onactivate({data: row.data, index: rowIndex, ev})),
ondblclick: (ev) => props.onactivate({data: row.data, index: rowIndex, ev}),
onclick: (ev) => props.onselect({data: row.data, index: rowIndex, ev}),
oncontextmenu: (ev) => props.oncontextmenu({data: row.data, index: rowIndex, ev}),
oncreate: (el) => props.oncreate({data: row.data, index: rowIndex, el})
ontouchstart: (ev) => tapper(ev, () => props.onactivate({index: rowIndex, ev})),
ondblclick: (ev) => props.onactivate({index: rowIndex, ev}),
onclick: (ev) => props.onselect({index: rowIndex, ev}),
oncontextmenu: (ev) => props.oncontextmenu({index: rowIndex, ev}),
oncreate: (el) => props.oncreate({index: rowIndex, el})
}, children);
};

Expand All @@ -79,7 +81,11 @@ const createView = props => {
class: 'osjs-gui-list-view-wrapper',
oncreate: el => (el.scrollTop = props.scrollTop),
onupdate: el => {
if (props.selectedIndex < 0) {
const notSelected = props.multiselect
? props.selectedIndex.length === 0
: props.selectedIndex < 0;

if (notSelected) {
el.scrollTop = props.scrollTop;
}
}
Expand All @@ -92,33 +98,68 @@ export const ListView = props => h(Element, Object.assign({

export const listView = ({
component: (state, actions) => {

const createSelection = index => state.selectedIndex.indexOf(index) === -1
? [...state.selectedIndex, index]
: state.selectedIndex;

const getSelection = (index, ev) => {
const selected = state.multiselect
? (ev.shiftKey ? createSelection(index) : [index])
: index;

const data = state.multiselect
? selected.map(i => state.rows[i].data)
: state.rows[selected].data;

return {selected, data};
};

const clearCurrentSelection = (index, ev) => {
const selected = state.multiselect
? []
: -1;

const data = state.multiselect
? state.selectedIndex.map(i => state.rows[i].data)
: state.rows[index].data;

return {selected, data};
};

const newProps = Object.assign({
multiselect: false,
zebra: true,
columns: [],
rows: [],
onselect: ({data, index, ev}) => {
actions.select({data, index, ev});
actions.setSelectedIndex(index);
onselect: ({index, ev}) => {
const {selected, data} = getSelection(index, ev);
actions.select({data, index, ev, selected});
actions.setSelectedIndex(selected);
},
onactivate: ({data, index, ev}) => {
actions.activate({data, index, ev});
actions.setSelectedIndex(-1);
onactivate: ({index, ev}) => {
const {selected, data} = clearCurrentSelection(index, ev);
actions.activate({data, index, ev, selected});
actions.setSelectedIndex(selected);
},
oncontextmenu: ({data, index, ev}) => {
oncontextmenu: ({index, ev}) => {
const {selected, data} = getSelection(index, ev);

actions.select({data, index, ev});
actions.contextmenu({data, index, ev});
actions.setSelectedIndex(index);
actions.contextmenu({data, index, ev, selected});
actions.setSelectedIndex(selected);
},
oncreate: (args) => {
actions.created(args);
oncreate: ({index, el}) => {
const data = state.rows[index].data;
actions.created({index, el, data});
}
}, state);

return (props = {}) => ListView(Object.assign(newProps, props));
},

state: state => Object.assign({
selectedIndex: -1,
selectedIndex: state.multiselect ? [] : -1,
scrollTop: 0
}, state),

Expand All @@ -129,7 +170,7 @@ export const listView = ({
created: () => () => ({}),
setRows: rows => ({rows}),
setColumns: columns => ({columns}),
setScrollTop: scrollTop => state => ({scrollTop}),
setSelectedIndex: selectedIndex => state => ({selectedIndex})
setScrollTop: scrollTop => ({scrollTop}),
setSelectedIndex: selectedIndex => ({selectedIndex})
}, actions || {})
});