Skip to content

Feature/multi select #8

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
rob-balfre merged 13 commits into from
Jan 22, 2019
Merged

Feature/multi select #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bb98e20
multi init
Jan 21, 2019
fe82c9e
multi selecting item
Jan 21, 2019
fc9316f
multi: selected items are filtered from list
Jan 21, 2019
3f874d1
getting selectedValue and filterText to play nicely together
Jan 21, 2019
89c9316
multi: removing items
Jan 21, 2019
30511e3
multi: clearing items
Jan 21, 2019
4a3d3f7
multi and group by test and select data clean up
Jan 21, 2019
47feb3c
multi: wrap selected items
Jan 21, 2019
c14e64a
multi: left/right arrow key logic
Jan 22, 2019
cd508bd
multi: first item hover fix
Jan 22, 2019
a4c9540
remove bug listing
Jan 22, 2019
c99436f
clean up old bug
Jan 22, 2019
15c2114
Merge remote-tracking branch 'origin/develop' into feature/multi_select
Jan 22, 2019
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
567 changes: 439 additions & 128 deletions index.js
View file
Open in desktop

Large diffs are not rendered by default.

567 changes: 439 additions & 128 deletions index.mjs
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions src/List.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{/if}

<div on:mouseover="handleHover(i)" on:click="handleClick(item, i, event)"
class="listItem {itemClasses(hoverItemIndex, item, i, items, selectedItem)}">
class="listItem {itemClasses(hoverItemIndex, item, i, items, selectedValue)}">
<svelte:component this="{Item}" {item} {getOptionLabel}/>
</div>
{:else}
Expand Down Expand Up @@ -82,7 +82,7 @@
hoverItemIndex: 0,
items: [],
Item,
selectedItem: undefined,
selectedValue: undefined,
getOptionLabel: (option) => option.label
}
},
Expand All @@ -101,19 +101,19 @@

this.scrollToActiveItem('active');
}
if (changed.selectedItem && current.selectedItem) {
if (changed.selectedValue && current.selectedValue) {
this.scrollToActiveItem('active');
if (current.items) {
const hoverItemIndex = current.items.findIndex((item) => item.value === current.selectedItem.value);
if (current.items && !current.isMulti) {
const hoverItemIndex = current.items.findIndex((item) => item.value === current.selectedValue.value);
if (hoverItemIndex) {
this.set({hoverItemIndex});
}
}
}
},
helpers: {
itemClasses(hoverItemIndex, item, itemIndex, items, selectedItem) {
return `${selectedItem && (selectedItem.value === item.value) ? 'active ' : ''}${hoverItemIndex === itemIndex || items.length === 1 ? 'hover' : ''}`;
itemClasses(hoverItemIndex, item, itemIndex, items, selectedValue) {
return `${selectedValue && (selectedValue.value === item.value) ? 'active ' : ''}${hoverItemIndex === itemIndex || items.length === 1 ? 'hover' : ''}`;
}
},
methods: {
Expand Down
86 changes: 86 additions & 0 deletions src/MultiSelection.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{#each selectedValue as value, i}
<div class="multiSelectItem {activeSelectedValue === i ? 'active' : ''}">
<div class="multiSelectItem_label">
{value.label}
</div>
<div class="multiSelectItem_clear" on:click="handleClear(i, event)">
<svg width="100%" height="100%" viewBox="-2 -2 50 50" focusable="false" role="presentation">
<path
d="M34.923,37.251L24,26.328L13.077,37.251L9.436,33.61l10.923-10.923L9.436,11.765l3.641-3.641L24,19.047L34.923,8.124 l3.641,3.641L27.641,22.688L38.564,33.61L34.923,37.251z"></path>
</svg>
</div>
</div>
{/each}

<script>
export default {
methods: {
handleClear(i, event) {
event.stopPropagation();
this.fire('multiItemClear', { i });
}
}
}
</script>

<style>
.multiSelectItem {
background: #EBEDEF;
margin-right: 5px;
border-radius: 16px;
line-height: 32px;
display: flex;
cursor: default;
height: 32px;
margin-top: 6px;
padding: 0 10px 0 15px;
}

.multiSelectItem_label {
margin-right: 5px;
}

.selectContainer.multiSelect input {
width: auto;
padding: 0;
flex-grow: 1;
}

.multiSelectItem_clear {
border-radius: 0 4px 4px 0;
width: 20px;
text-align: center;
}

.multiSelectItem:hover,
.multiSelectItem.active {
background-color: #006FFF;
color: #fff;
}

.multiSelectItem_clear {
border-radius: 50%;
background: #52616F;
width: 16px;
height: 16px;
position: relative;
top: 8px;
text-align: center;
padding: 1px;
}

.multiSelectItem_clear:hover,
.active .multiSelectItem_clear {
background: #fff;
}

.multiSelectItem_clear:hover svg,
.active .multiSelectItem_clear svg {
fill: #006FFF;
}

.multiSelectItem_clear svg {
fill: #EBEDEF;
vertical-align: top;
}
</style>
Loading