Use const instead of let where possible + selecting options

This commit is contained in:
Josh Johnson 2016-04-12 22:42:56 +01:00
parent cd43799258
commit 6ac55c9e37
7 changed files with 108 additions and 94 deletions

File diff suppressed because one or more lines are too long

View file

@ -13,7 +13,7 @@ export class Choices {
// If there are multiple elements, create a new instance
// for each element besides the first one (as that already has an instance)
if(isType('String', element)) {
let elements = document.querySelectorAll(element);
const elements = document.querySelectorAll(element);
if(elements.length > 1) {
for (let i = 1; i < elements.length; i++) {
let el = elements[i];
@ -46,6 +46,8 @@ export class Choices {
listDropdown: 'choices__list--dropdown',
item: 'choices__item',
itemSelectable: 'choices__item--selectable',
itemDisabled: 'choices__item--disabled',
itemOption: 'choices__item--option',
activeState: 'is-active',
disabledState: 'is-disabled',
hiddenState: 'is-hidden',
@ -86,7 +88,6 @@ export class Choices {
this.destroy = this.destroy.bind(this);
this.onKeyDown = this.onKeyDown.bind(this);
this.onClick = this.onClick.bind(this);
this.onFocus = this.onFocus.bind(this);
// Let's have it large
this.init();
@ -107,7 +108,7 @@ export class Choices {
* @return {Boolean}
*/
isEmpty() {
return (this.store.getState().length === 0) ? true : false;
return (this.store.getState().items.length === 0) ? true : false;
}
/* Event handling */
@ -130,7 +131,7 @@ export class Choices {
// If CTRL + A or CMD + A have been pressed and there are items to select
if (ctrlDownKey && e.keyCode === aKey && this.list && this.list.children) {
let handleSelectAll = () => {
const handleSelectAll = () => {
if(this.options.removeItems && !this.input.value && this.options.selectAll && this.input === document.activeElement) {
this.selectAll(this.list.children);
}
@ -143,7 +144,7 @@ export class Choices {
if (e.keyCode === enterKey && e.target.value) {
let value = this.input.value;
let handleEnter = () => {
const handleEnter = () => {
let canUpdate = true;
// If there is a max entry limit and we have reached that limit
@ -188,7 +189,7 @@ export class Choices {
// If backspace or delete key is pressed and the input has no value
if (e.keyCode === deleteKey && !e.target.value) {
let handleBackspaceKey = () => {
const handleBackspaceKey = () => {
if(this.options.removeItems) {
let inputIsFocussed = this.input === document.activeElement;
@ -226,12 +227,18 @@ export class Choices {
* @return
*/
onClick(e) {
if(this.dropdown) {
this.toggleDropdown();
}
// If click is affecting a child node of our element
if(this.containerOuter.contains(e.target)) {
const state = this.store.getState();
const items = state.items;
const options = state.options;
if(this.input !== document.activeElement) {
this.input.focus();
}
@ -239,7 +246,7 @@ export class Choices {
if(e.target.hasAttribute('data-choice-item')) {
let item = e.target;
let handleClick = (item) => {
const handleClick = (item) => {
if(this.options.removeItems) {
let passedId = item.getAttribute('data-choice-id');
@ -256,17 +263,16 @@ export class Choices {
}
handleClick(item);
}
if(e.target.hasAttribute('data-choice-selectable')) {
} else if(e.target.hasAttribute('data-choice-selectable')) {
let id = e.target.getAttribute('data-choice-id');
let option = options.find((option) => {
return option.id === parseInt(id);
});
if(option) {
this.selectOption(id);
if(!option.selected) {
this.selectOption(id, true);
this.addItem(option.value);
}
}
@ -281,12 +287,6 @@ export class Choices {
}
onFocus(e) {
if(this.dropdown) {
this.toggleDropdown();
}
}
/* Methods */
/**
@ -303,8 +303,8 @@ export class Choices {
* @return {Boolean} Whether test passed/failed
*/
regexFilter(value) {
let expression = new RegExp(this.options.regexFilter, 'i');
let passesTest = expression.test(value);
const expression = new RegExp(this.options.regexFilter, 'i');
const passesTest = expression.test(value);
return passesTest;
}
@ -320,14 +320,14 @@ export class Choices {
return;
}
let state = this.store.getState();
let items = state.items;
const state = this.store.getState();
const items = state.items;
let itemObject = items.find((item) => {
const itemObject = items.find((item) => {
return item.id === parseInt(id);
});
let item = this.list.querySelector(`[data-choice-id='${ itemObject.id }']`);
const item = this.list.querySelector(`[data-choice-id='${ itemObject.id }']`);
return item;
}
@ -339,7 +339,7 @@ export class Choices {
*/
selectItem(item) {
if(!item) return;
let id = item.id;
const id = item.id;
this.store.dispatch(selectItem(id, true));
}
@ -350,7 +350,7 @@ export class Choices {
*/
deselectItem(item) {
if(!item) return;
let id = item.id;
const id = item.id;
this.store.dispatch(selectItem(id, false));
}
@ -375,9 +375,9 @@ export class Choices {
});
}
selectOption(id) {
selectOption(id, value) {
if(!id) return;
this.store.dispatch(selectOption(id));
this.store.dispatch(selectOption(id, value));
}
/**
@ -480,7 +480,8 @@ export class Choices {
addOptionToDropdown(value) {
// Generate unique id
let id = this.store.getState().items.length + 1;
let state = this.store.getState();
let id = state.options.length + 1;
this.store.dispatch(addOption(value, id));
}
@ -559,20 +560,8 @@ export class Choices {
* @return
*/
renderMultipleSelectInput() {
/*
Template:
<div class="choices choices--active">
<div class="choices__inner">
<input id="1" type="text" data-choice="" class="choices__input choices__input--hidden" tabindex="-1" style="display:none;" aria-hidden="true">
<ul class="choices__list choices__list--items"></ul>
<input type="text" class="choices__input choices__input--cloned">
</div>
</div>
*/
let containerOuter = strToEl(`<div class="${ this.options.classNames.containerOuter }"></div>`);
let containerInner = strToEl(`<div class="${ this.options.classNames.containerInner }"></div>`);
const containerOuter = strToEl(`<div class="${ this.options.classNames.containerOuter }"></div>`);
const containerInner = strToEl(`<div class="${ this.options.classNames.containerInner }"></div>`);
// Hide passed input
this.passedElement.classList.add(this.options.classNames.input, this.options.classNames.hiddenState);
@ -586,9 +575,9 @@ export class Choices {
// Wrapper inner container with outer container
wrap(containerInner, containerOuter);
let list = strToEl(`<ul class="${ this.options.classNames.list } ${ this.options.classNames.listItems }"></ul>`);
let input = strToEl(`<input type="text" class="${ this.options.classNames.input } ${ this.options.classNames.inputCloned }">`);
let dropdown = strToEl(`<div class="${ this.options.classNames.list } ${ this.options.classNames.listDropdown }"></div>`);
const list = strToEl(`<ul class="${ this.options.classNames.list } ${ this.options.classNames.listItems }"></ul>`);
const input = strToEl(`<input type="text" class="${ this.options.classNames.input } ${ this.options.classNames.inputCloned }">`);
const dropdown = strToEl(`<div class="${ this.options.classNames.list } ${ this.options.classNames.listDropdown }"></div>`);
if (input.placeholder) {
input.placeholder = this.passedElement.placeholder;
@ -613,12 +602,11 @@ export class Choices {
this.presetItems.forEach((value) => {
this.addItem(value);
});
const unselectedOptions = this.passedElement.options;
for (var i = 0; i < unselectedOptions.length; i++) {
let option = unselectedOptions[i];
const passedOptions = Array.prototype.slice.call(this.passedElement.options);
passedOptions.forEach((option) => {
this.addOptionToDropdown(option.value);
}
});
// Subscribe to store
this.store.subscribe(this.render);
@ -633,13 +621,11 @@ export class Choices {
addEventListeners() {
document.addEventListener('keydown', this.onKeyDown);
document.addEventListener('click', this.onClick);
this.input.addEventListener('focus', this.onFocus);
}
removeEventListeners() {
document.removeEventListener('keydown', this.onKeyDown);
document.removeEventListener('click', this.onClick);
this.input.removeEventListener('focus', this.onFocus);
}
/**
@ -647,9 +633,10 @@ export class Choices {
* @return
*/
render(callback = this.options.callbackOnRender) {
let state = this.store.getState();
let items = state.items;
let options = state.options;
const classNames = this.options.classNames;
const state = this.store.getState();
const items = state.items;
const options = state.options;
// OPTIONS
if(this.dropdown) {
@ -657,16 +644,22 @@ export class Choices {
this.dropdown.innerHTML = '';
// Add each option to dropdown
options.forEach((option) => {
const dropdownItem = strToEl(`<li class="${ this.options.classNames.item } ${ this.options.classNames.itemSelectable }" data-choice-selectable data-choice-id="${ option.id }" data-choice-value="${ option.value }">${ option.value }</li>`);
if(options) {
options.forEach((option) => {
const dropdownItem = strToEl(`<li class="${ classNames.item } ${ classNames.itemOption } ${ option.selected ? classNames.selectedState + ' ' + classNames.itemDisabled : classNames.itemSelectable }" data-choice-selectable data-choice-id="${ option.id }" data-choice-value="${ option.value }">${ option.value }</li>`);
this.dropdown.appendChild(dropdownItem);
});
} else {
const dropdownItem = strToEl(`<li class="${ classNames.item }">No options to select</li>`);
this.dropdown.appendChild(dropdownItem);
});
}
}
// ITEMS
// Simplify store data to just values
let valueArray = items.reduce((prev, current) => {
const valueArray = items.reduce((prev, current) => {
prev.push(current.value);
return prev;
}, []);
@ -681,7 +674,7 @@ export class Choices {
items.forEach((item) => {
if(item.active) {
// Create new list element
const listItem = strToEl(`<li class="choices__item ${ this.options.removeItems ? 'choices__item--selectable' : '' } ${ item.selected ? 'is-selected' : '' }" data-choice-item data-choice-id="${ item.id }" data-choice-selected="${ item.selected }">${ item.value }</li>`);
const listItem = strToEl(`<li class="${ classNames.item } ${ this.options.removeItems ? classNames.itemSelectable : '' } ${ item.selected ? classNames.selectedState : '' }" data-choice-item data-choice-id="${ item.id }" data-choice-selected="${ item.selected }">${ item.value }</li>`);
// Append it to list
this.list.appendChild(listItem);
@ -751,7 +744,7 @@ export class Choices {
};
document.addEventListener('DOMContentLoaded', () => {
let choices1 = new Choices('#choices-1', {
const choices1 = new Choices('#choices-1', {
delimiter: ' ',
editItems: true,
maxItems: 5,
@ -766,7 +759,7 @@ document.addEventListener('DOMContentLoaded', () => {
// }
});
let choices2 = new Choices('#choices-2', {
const choices2 = new Choices('#choices-2', {
allowDuplicates: false,
editItems: true,
callbackOnRender: function(items) {
@ -774,7 +767,7 @@ document.addEventListener('DOMContentLoaded', () => {
}
});
let choices3 = new Choices('#choices-3', {
const choices3 = new Choices('#choices-3', {
allowDuplicates: false,
editItems: true,
regexFilter: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
@ -783,7 +776,7 @@ document.addEventListener('DOMContentLoaded', () => {
}
});
let choices4 = new Choices('#choices-4', {
const choices4 = new Choices('#choices-4', {
addItems: false,
removeItems: false,
callbackOnRender: function(items) {
@ -791,7 +784,7 @@ document.addEventListener('DOMContentLoaded', () => {
}
});
let choices5 = new Choices('#choices-5', {
const choices5 = new Choices('#choices-5', {
prependValue: 'item-',
appendValue: `-${Date.now()}`,
callbackOnRender: function(items) {
@ -801,20 +794,20 @@ document.addEventListener('DOMContentLoaded', () => {
choices5.removeAllItems();
let choices6 = new Choices('#choices-6', {
const choices6 = new Choices('#choices-6', {
items: ['josh@joshuajohnson.co.uk', 'joe@bloggs.co.uk'],
callbackOnRender: function(items) {
console.log(items);
}
});
let choices7 = new Choices('#choices-7', {
const choices7 = new Choices('#choices-7', {
callbackOnRender: function(items, options) {
console.log(options);
console.log(items);
}
});
let choicesMultiple = new Choices();
const choicesMultiple = new Choices();
choices6.addItem('josh2@joshuajohnson.co.uk', () => { console.log('Custom add item callback')});
choices6.removeItem('josh@joshuajohnson.co.uk');

View file

@ -14,7 +14,7 @@ const options = (state = [], action) => {
case 'SELECT_OPTION':
return state.map((option) => {
if(option.id === parseInt(action.id)) {
option.selected = action.value;
option.selected = action.selected;
}
return option;

View file

@ -77,6 +77,7 @@ h1, h2, h3, h4, h5, h6 {
width: 100%;
background-color: #FFFFFF;
border: 1px solid #DDDDDD;
top: 100%;
margin-top: -1px;
display: none;
border-bottom-left-radius: .25rem;
@ -86,8 +87,21 @@ h1, h2, h3, h4, h5, h6 {
font-size: 1.4rem; }
.choices__list--dropdown .choices__item:hover {
background-color: #f9f9f9; }
.choices__list--dropdown .choices__item.is-selected {
opacity: .5; }
.choices__list--dropdown .choices__item.is-selected:hover {
background-color: #FFFFFF; }
.choices__list--dropdown.is-active {
display: block; }
.choices__list--dropdown.is-flipped {
top: auto;
bottom: 100%;
margin-top: 0;
margin-bottom: -1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: .25rem;
border-top-right-radius: .25rem; }
.choices__item {
cursor: default; }
@ -95,6 +109,13 @@ h1, h2, h3, h4, h5, h6 {
.choices__item--selectable {
cursor: pointer; }
.choices__item--disabled {
cursor: not-allowed;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none; }
.choices__input {
background-color: #f9f9f9;
font-size: 1.4rem;

View file

@ -1 +1 @@
*,:after,:before{box-sizing:border-box}body,html{margin:0;height:100%;widows:100%}html{font-size:62.5%}body{background-color:#333;font-family:"Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:1.6rem;color:#fff}label{display:block;margin-bottom:.8rem;font-size:1.4rem;font-weight:500}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:1.2rem;font-weight:500}.container{display:block;margin:auto;max-width:35em;padding:2.4rem}.section{background-color:#fff;padding:2.4rem;color:#333}.choices{margin-bottom:2.4rem;position:relative}.choices__inner{background-color:#f9f9f9;padding:.75rem .75rem .375rem;border:1px solid #ddd;border-radius:.25rem;font-size:1.4rem}.choices__inner:focus{outline:1px solid #00bcd4;outline-offset:-1px}.choices__list{margin:0;padding-left:0;list-style-type:none}.choices__list--items{display:inline}.choices__list--items .choices__item{display:inline-block;border-radius:2rem;padding:.4rem 1rem;font-size:1.2rem;margin-right:.375rem;margin-bottom:.375rem;background-color:#00bcd4;border:1px solid #00b1c7;color:#fff}.choices__list--items .choices__item.is-selected{background-color:#00a5bb}.choices__list--dropdown{z-index:1;position:absolute;width:100%;background-color:#fff;border:1px solid #ddd;margin-top:-1px;display:none;border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem}.choices__list--dropdown .choices__item{padding:1rem;font-size:1.4rem}.choices__list--dropdown .choices__item:hover{background-color:#f9f9f9}.choices__list--dropdown.is-active{display:block}.choices__item{cursor:default}.choices__item--selectable{cursor:pointer}.choices__input{background-color:#f9f9f9;font-size:1.4rem;padding:0;margin-bottom:.5rem;display:inline-block;vertical-align:baseline;border:0;border-radius:0;max-width:100%;padding:.4rem 0 .4rem .2rem}.choices__input:focus{outline:0}
*,:after,:before{box-sizing:border-box}body,html{margin:0;height:100%;widows:100%}html{font-size:62.5%}body{background-color:#333;font-family:"Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:1.6rem;color:#fff}label{display:block;margin-bottom:.8rem;font-size:1.4rem;font-weight:500}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:1.2rem;font-weight:500}.container{display:block;margin:auto;max-width:35em;padding:2.4rem}.section{background-color:#fff;padding:2.4rem;color:#333}.choices{margin-bottom:2.4rem;position:relative}.choices__inner{background-color:#f9f9f9;padding:.75rem .75rem .375rem;border:1px solid #ddd;border-radius:.25rem;font-size:1.4rem}.choices__inner:focus{outline:1px solid #00bcd4;outline-offset:-1px}.choices__list{margin:0;padding-left:0;list-style-type:none}.choices__list--items{display:inline}.choices__list--items .choices__item{display:inline-block;border-radius:2rem;padding:.4rem 1rem;font-size:1.2rem;margin-right:.375rem;margin-bottom:.375rem;background-color:#00bcd4;border:1px solid #00b1c7;color:#fff}.choices__list--items .choices__item.is-selected{background-color:#00a5bb}.choices__list--dropdown{z-index:1;position:absolute;width:100%;background-color:#fff;border:1px solid #ddd;top:100%;margin-top:-1px;display:none;border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem}.choices__list--dropdown .choices__item{padding:1rem;font-size:1.4rem}.choices__list--dropdown .choices__item:hover{background-color:#f9f9f9}.choices__list--dropdown .choices__item.is-selected{opacity:.5}.choices__list--dropdown .choices__item.is-selected:hover{background-color:#fff}.choices__list--dropdown.is-active{display:block}.choices__list--dropdown.is-flipped{top:auto;bottom:100%;margin-top:0;margin-bottom:-1px;border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.choices__item{cursor:default}.choices__item--selectable{cursor:pointer}.choices__item--disabled{cursor:not-allowed;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.choices__input{background-color:#f9f9f9;font-size:1.4rem;padding:0;margin-bottom:.5rem;display:inline-block;vertical-align:baseline;border:0;border-radius:0;max-width:100%;padding:.4rem 0 .4rem .2rem}.choices__input:focus{outline:0}

View file

@ -94,6 +94,7 @@ h1, h2, h3, h4, h5, h6 {
width: 100%;
background-color: #FFFFFF;
border: 1px solid #DDDDDD;
top: 100%;
margin-top: -1px;
display: none;
border-bottom-left-radius: .25rem;
@ -101,15 +102,31 @@ h1, h2, h3, h4, h5, h6 {
.choices__item {
padding: 1rem;
font-size: 1.4rem;
&:hover {
background-color: mix(#000000, #FFFFFF, 2.5%);
&:hover { background-color: mix(#000000, #FFFFFF, 2.5%); }
&.is-selected {
opacity: .5;
&:hover { background-color: #FFFFFF; }
}
}
&.is-active { display: block; }
&.is-flipped {
top: auto;
bottom: 100%;
margin-top: 0;
margin-bottom: -1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: .25rem;
border-top-right-radius: .25rem;
}
}
.choices__item { cursor: default; }
.choices__item--selectable { cursor: pointer; }
.choices__item--disabled {
cursor: not-allowed;
user-select: none;
}
.choices__input {
background-color: mix(#000000, #FFFFFF, 2.5%);

View file

@ -31,14 +31,15 @@
<label for="choices-7">Select box</label>
<select name="choices-7" id="choices-7" placeholder="This is a placeholder" multiple>
<option value="Dropdown item 1">Dropdown item 1</option>
<option value="Dropdown item 2" selected>Dropdown item 2</option>
<option value="Dropdown item 2">Dropdown item 2</option>
<option value="Dropdown item 3">Dropdown item 3</option>
<option value="Dropdown item 4" disabled="disabled">Dropdown item 4</option>
</select>
<label for="choices-8">Select box</label>
<select id="choices-8" name="choices-8" data-choice placeholder="This is a placeholder" multiple>
<option value="Dropdown item 1">Dropdown item 1</option>
<option value="Dropdown item 2" selected>Dropdown item 2</option>
<option value="Dropdown item 2">Dropdown item 2</option>
<option value="Dropdown item 3">Dropdown item 3</option>
</select>
@ -48,24 +49,6 @@
<option value="Dropdown item 2" selected>Dropdown item 2</option>
<option value="Dropdown item 3">Dropdown item 3</option>
</select>
<!--
<div class="choices choices--active">
<div class="choices__inner">
<input id="choices-1" type="text" data-choice="" value="preset-1 preset-2" class="choices__input choices__input--hidden" tabindex="-1" style="display:none;" aria-hidden="true">
<div class="choices__list choices__list--items">
<div class="choices__item" data-choice-item data-choice-id="choices-1" data-choice-selected="false">preset-1</div>
<div class="choices__item" data-choice-item data-choice-id="choices-2" data-choice-selected="false">preset-2</div>
</div>
<input type="text" class="choices__input choices__input--cloned">
</div>
<ul class="choices__list choices__list--dropdown">
<li class="choices__item choices__item--selectable" data-choice-selectable data-choice-value="Dropdown item 1">Dropdown item 1</li>
<li class="choices__item choices__item--selectable" data-choice-selectable data-choice-value="Dropdown item 2">Dropdown item 2</li>
<li class="choices__item choices__item--selectable" data-choice-selectable data-choice-value="Dropdown item 3">Dropdown item 3</li>
</ul>
</div> -->
</div>
</div>
</body>