From 210744a301eda09df948270670b1c23f800cd572 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 9 Apr 2016 11:55:33 +0100 Subject: [PATCH] Test for removeItems options to enable/disable selecting items --- assets/scripts/dist/bundle.js | 2 +- assets/scripts/src/choices.js | 50 +++++++++++++++------------- assets/scripts/src/reducers/index.js | 29 +++++++++++++--- assets/styles/css/choices.css | 12 ++++--- assets/styles/css/choices.min.css | 2 +- assets/styles/scss/choices.scss | 7 ++-- 6 files changed, 62 insertions(+), 40 deletions(-) diff --git a/assets/scripts/dist/bundle.js b/assets/scripts/dist/bundle.js index 75b6aa1..bc3a252 100644 --- a/assets/scripts/dist/bundle.js +++ b/assets/scripts/dist/bundle.js @@ -1 +1 @@ -!function(e){function t(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return e[i].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="/assets/scripts/dist/",t(0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0}),t.Choices=void 0;var r=function(){function e(e,t){for(var n=0;n=0;n--){var i=this.list.children[n];if(i.innerHTML===e.toString()){t=i;break}}if(t){var o=t.getAttribute("data-choice-id"),r=t.innerHTML;this.options.callbackOnRemoveItem&&((0,l.isType)("Function",this.options.callbackOnRemoveItem)?this.options.callbackOnRemoveItem(r):console.error("callbackOnRemoveItem: Callback is not a function")),this.store.dispatch((0,u.removeItemFromStore)(o))}else console.error("Item not found")}},{key:"removeAll",value:function(e){for(var t=0;t'+e+"");this.dropdown.appendChild(t)}},{key:"renderTextInput",value:function(){var e=this,t=(0,l.strToEl)('
'),n=(0,l.strToEl)('
');this.passedInput.classList.add("choices__input","choices__input--hidden"),this.passedInput.tabIndex="-1",this.passedInput.setAttribute("style","display:none;"),this.passedInput.setAttribute("aria-hidden","true"),(0,l.wrap)(this.passedInput,n),(0,l.wrap)(n,t);var i=(0,l.strToEl)('
'),o=(0,l.strToEl)('');this.passedInput.placeholder&&(o.placeholder=this.passedInput.placeholder),this.options.addItems||(o.disabled=!0),t.appendChild(n),n.appendChild(i),n.appendChild(o),this.containerOuter=t,this.containerInner=n,this.input=o,this.list=i,this.presetItems.forEach(function(t){e.addItem(t)}),this.store.subscribe(this.render),this.render(),this.addEventListeners()}},{key:"renderMultipleSelectInput",value:function(){var e=this,t=(0,l.strToEl)('
'),n=(0,l.strToEl)('
');this.passedInput.classList.add("choices__input","choices__input--hidden"),this.passedInput.tabIndex="-1",this.passedInput.setAttribute("style","display:none;"),this.passedInput.setAttribute("aria-hidden","true"),(0,l.wrap)(this.passedInput,n),(0,l.wrap)(n,t);var i=(0,l.strToEl)('
'),o=(0,l.strToEl)(''),r=(0,l.strToEl)('
');o.placeholder&&(o.placeholder=this.passedInput.placeholder),this.options.addItems||(o.disabled=!0),t.appendChild(n),t.appendChild(r),n.appendChild(i),n.appendChild(o),this.containerOuter=t,this.containerInner=n,this.input=o,this.list=i,this.dropdown=r,this.presetItems.forEach(function(t){e.addItem(t)});for(var s=this.passedInput.options,a=0;a'+t.value+"");e.list.appendChild(n)}}),console.log(t)}},{key:"renderInput",value:function(e){switch(this.options.debug&&console.debug("Render"),e.type){case"text":this.renderTextInput();break;case"select-one":break;case"select-multiple":this.renderMultipleSelectInput();break;default:this.renderTextInput()}}},{key:"init",value:function(){this.supports||console.error("init: Your browser doesn'nt support shit"),this.initialised=!0,this.renderInput(this.passedInput)}},{key:"destroy",value:function(){this.options=null,this.passedInput=null,this.initialised=null}}]),e}();document.addEventListener("DOMContentLoaded",function(){var e=document.getElementById(1),t=document.getElementById(2),n=document.getElementById(3),i=document.getElementById(4),o=document.getElementById(5),r=document.getElementById(6),s=document.getElementById(7),a=(new d({element:e,delimiter:" ",editItems:!0,maxItems:5,callbackOnRemoveItem:function(e){console.log(e)},callbackOnAddItem:function(e,t){console.log(e,t)}}),new d({element:t,allowDuplicates:!1,editItems:!0}),new d({element:n,allowDuplicates:!1,editItems:!0,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,}))$/}),new d({element:i,addItems:!1}),new d({element:o,prependValue:"item-",appendValue:"-"+Date.now()}),new d({element:r,items:["josh@joshuajohnson.co.uk","joe@bloggs.co.uk"]}));new d({element:s});a.addItem("josh2@joshuajohnson.co.uk"),a.removeItem("josh@joshuajohnson.co.uk"),console.log(a.getItemByValue("josh2@joshuajohnson.co.uk"))})},function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}t.__esModule=!0,t.compose=t.applyMiddleware=t.bindActionCreators=t.combineReducers=t.createStore=void 0;var o=n(3),r=i(o),s=n(8),a=i(s),c=n(10),u=i(c),l=n(11),d=i(l),p=n(12),h=i(p),f=n(9);i(f);t.createStore=r.default,t.combineReducers=a.default,t.bindActionCreators=u.default,t.applyMiddleware=d.default,t.compose=h.default},function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}function o(e,t,n){function i(){f===h&&(f=h.slice())}function r(){return p}function c(e){if("function"!=typeof e)throw new Error("Expected listener to be a function.");var t=!0;return i(),f.push(e),function(){if(t){t=!1,i();var n=f.indexOf(e);f.splice(n,1)}}}function u(e){if(!(0,s.default)(e))throw new Error("Actions must be plain objects. Use custom middleware for async actions.");if("undefined"==typeof e.type)throw new Error('Actions may not have an undefined "type" property. Have you misspelled a constant?');if(v)throw new Error("Reducers may not dispatch actions.");try{v=!0,p=d(p,e)}finally{v=!1}for(var t=h=f,n=0;nn;n++)t[n]=arguments[n];return function(e){return function(n,i,o){var s=e(n,i,o),c=s.dispatch,u=[],l={getState:s.getState,dispatch:function(e){return c(e)}};return u=t.map(function(e){return e(l)}),c=a.default.apply(void 0,u)(s.dispatch),r({},s,{dispatch:c})}}}var r=Object.assign||function(e){for(var t=1;tn;n++)t[n]=arguments[n];return function(){if(0===t.length)return arguments.length<=0?void 0:arguments[0];var e=t[t.length-1],n=t.slice(0,-1);return n.reduceRight(function(e,t){return t(e)},e.apply(void 0,arguments))}}t.__esModule=!0,t.default=n},function(e,t){"use strict";function n(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);to;o++){var r=arguments[o];n("Object",r)?i(r):console.error("Custom options must be an object")}return e},t.whichTransitionEvent=function(){var e,t=document.createElement("fakeelement"),n={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(e in n)if(void 0!==t.style[e])return n[e]},t.whichAnimationEvent=function(){var e,t=document.createElement("fakeelement"),n={animation:"animationend",OAnimation:"oAnimationEnd",MozAnimation:"animationend",WebkitAnimation:"webkitAnimationEnd"};for(e in n)if(void 0!==t.style[e])return n[e]});t.getParentsUntil=function(e,t,n){for(var i=[];e&&e!==document;e=e.parentNode){if(t){var o=t.charAt(0);if("."===o&&e.classList.contains(t.substr(1)))break;if("#"===o&&e.id===t.substr(1))break;if("["===o&&e.hasAttribute(t.substr(1,t.length-1)))break;if(e.tagName.toLowerCase()===t)break}if(n){var r=n.charAt(0);"."===r&&e.classList.contains(n.substr(1))&&i.push(e),"#"===r&&e.id===n.substr(1)&&i.push(e),"["===r&&e.hasAttribute(n.substr(1,n.length-1))&&i.push(e),e.tagName.toLowerCase()===n&&i.push(e)}else i.push(e)}return 0===i.length?null:i},t.wrap=function(e,t){return t=t||document.createElement("div"),e.nextSibling?e.parentNode.insertBefore(t,e.nextSibling):e.parentNode.appendChild(t),t.appendChild(e)},t.getSiblings=function(e){for(var t=[],n=e.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==e&&t.push(n);return t},t.findAncestor=function(e,t){for(;(e=e.parentElement)&&!e.classList.contains(t););return e},t.debounce=function(e,t,n){var i;return function(){var o=this,r=arguments,s=function(){i=null,n||e.apply(o,r)},a=n&&!i;clearTimeout(i),i=setTimeout(s,t),a&&e.apply(o,r)}},t.getElemDistance=function(e){var t=0;if(e.offsetParent)do t+=e.offsetTop,e=e.offsetParent;while(e);return t>=0?t:0},t.getElementOffset=function(e,t){var n=t;return n>1&&(n=1),n>0&&(n=0),Math.max(e.offsetHeight*n)},t.getScrollPosition=function(e){return"bottom"===e?Math.max((window.scrollY||window.pageYOffset)+(window.innerHeight||document.documentElement.clientHeight)):window.scrollY||window.pageYOffset},t.isInView=function(e,t,n){return this.getScrollPosition(t)>this.getElemDistance(e)+this.getElementOffset(e,n)},t.stripHTML=function(e){var t=document.createElement("DIV");return t.innerHTML=e,t.textContent||t.innerText||""},t.addAnimation=function(e,t){var n=i(),o=function r(){e.classList.remove(t),e.removeEventListener(n,r,!1)};e.classList.add(t),e.addEventListener(n,o,!1)},t.getRandomNumber=function(e,t){return Math.floor(Math.random()*(t-e)+e)},t.strToEl=function(){var e=document.createElement("div");return function(t){var n;for(e.innerHTML=t,n=e.children[0];e.firstChild;)e.removeChild(e.firstChild);return n}}(),t.getWidthOfInput=function(){var e=document.createElement("span");e.className="tmp-element",e.innerHTML=inputEl.value.replace(/&/g,"&").replace(//g,">"),document.body.appendChild(e);var t=e.getBoundingClientRect().width;return document.body.removeChild(e),t}}]); \ No newline at end of file +!function(e){function t(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return e[i].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="/assets/scripts/dist/",t(0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0}),t.Choices=void 0;var r=function(){function e(e,t){for(var n=0;n=0;n--){var i=this.list.children[n];if(i.innerHTML===e.toString()){t=i;break}}if(t){var o=t.getAttribute("data-choice-id"),r=t.innerHTML;this.options.callbackOnRemoveItem&&((0,l.isType)("Function",this.options.callbackOnRemoveItem)?this.options.callbackOnRemoveItem(r):console.error("callbackOnRemoveItem: Callback is not a function")),this.store.dispatch((0,u.removeItemFromStore)(o))}else console.error("Item not found")}},{key:"removeAll",value:function(e){for(var t=0;t'+e+"");this.dropdown.appendChild(t)}},{key:"renderTextInput",value:function(){var e=this,t=(0,l.strToEl)('
'),n=(0,l.strToEl)('
');this.passedInput.classList.add("choices__input","choices__input--hidden"),this.passedInput.tabIndex="-1",this.passedInput.setAttribute("style","display:none;"),this.passedInput.setAttribute("aria-hidden","true"),(0,l.wrap)(this.passedInput,n),(0,l.wrap)(n,t);var i=(0,l.strToEl)('
'),o=(0,l.strToEl)('');this.passedInput.placeholder&&(o.placeholder=this.passedInput.placeholder),this.options.addItems||(o.disabled=!0,t.classList.add("is-disabled")),t.appendChild(n),n.appendChild(i),n.appendChild(o),this.containerOuter=t,this.containerInner=n,this.input=o,this.list=i,this.presetItems.forEach(function(t){e.addItem(t)}),this.store.subscribe(this.render),this.render(),this.addEventListeners()}},{key:"renderMultipleSelectInput",value:function(){var e=this,t=(0,l.strToEl)('
'),n=(0,l.strToEl)('
');this.passedInput.classList.add("choices__input","choices__input--hidden"),this.passedInput.tabIndex="-1",this.passedInput.setAttribute("style","display:none;"),this.passedInput.setAttribute("aria-hidden","true"),(0,l.wrap)(this.passedInput,n),(0,l.wrap)(n,t);var i=(0,l.strToEl)('
'),o=(0,l.strToEl)(''),r=(0,l.strToEl)('
');o.placeholder&&(o.placeholder=this.passedInput.placeholder),this.options.addItems||(o.disabled=!0),t.appendChild(n),t.appendChild(r),n.appendChild(i),n.appendChild(o),this.containerOuter=t,this.containerInner=n,this.input=o,this.list=i,this.dropdown=r,this.presetItems.forEach(function(t){e.addItem(t)});for(var s=this.passedInput.options,a=0;a'+t.value+"");e.list.appendChild(n)}}),console.log(t)}},{key:"renderInput",value:function(e){switch(this.options.debug&&console.debug("Render"),e.type){case"text":this.renderTextInput();break;case"select-one":break;case"select-multiple":this.renderMultipleSelectInput();break;default:this.renderTextInput()}}},{key:"init",value:function(){this.supports||console.error("init: Your browser doesn'nt support shit"),this.initialised=!0,this.renderInput(this.passedInput)}},{key:"destroy",value:function(){this.options=null,this.passedInput=null,this.initialised=null}}]),e}();document.addEventListener("DOMContentLoaded",function(){var e=document.getElementById(1),t=document.getElementById(2),n=document.getElementById(3),i=document.getElementById(4),o=document.getElementById(5),r=document.getElementById(6),s=document.getElementById(7),a=(new d({element:e,delimiter:" ",editItems:!0,maxItems:5,callbackOnRemoveItem:function(e){console.log(e)},callbackOnAddItem:function(e,t){console.log(e,t)}}),new d({element:t,allowDuplicates:!1,editItems:!0}),new d({element:n,allowDuplicates:!1,editItems:!0,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,}))$/}),new d({element:i,addItems:!1,removeItems:!1}),new d({element:o,prependValue:"item-",appendValue:"-"+Date.now()}),new d({element:r,items:["josh@joshuajohnson.co.uk","joe@bloggs.co.uk"]}));new d({element:s});a.addItem("josh2@joshuajohnson.co.uk"),a.removeItem("josh@joshuajohnson.co.uk"),console.log(a.getItemByValue("josh2@joshuajohnson.co.uk"))})},function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}t.__esModule=!0,t.compose=t.applyMiddleware=t.bindActionCreators=t.combineReducers=t.createStore=void 0;var o=n(3),r=i(o),s=n(8),a=i(s),c=n(10),u=i(c),l=n(11),d=i(l),p=n(12),h=i(p),f=n(9);i(f);t.createStore=r.default,t.combineReducers=a.default,t.bindActionCreators=u.default,t.applyMiddleware=d.default,t.compose=h.default},function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}function o(e,t,n){function i(){f===h&&(f=h.slice())}function r(){return p}function c(e){if("function"!=typeof e)throw new Error("Expected listener to be a function.");var t=!0;return i(),f.push(e),function(){if(t){t=!1,i();var n=f.indexOf(e);f.splice(n,1)}}}function u(e){if(!(0,s.default)(e))throw new Error("Actions must be plain objects. Use custom middleware for async actions.");if("undefined"==typeof e.type)throw new Error('Actions may not have an undefined "type" property. Have you misspelled a constant?');if(v)throw new Error("Reducers may not dispatch actions.");try{v=!0,p=d(p,e)}finally{v=!1}for(var t=h=f,n=0;nn;n++)t[n]=arguments[n];return function(e){return function(n,i,o){var s=e(n,i,o),c=s.dispatch,u=[],l={getState:s.getState,dispatch:function(e){return c(e)}};return u=t.map(function(e){return e(l)}),c=a.default.apply(void 0,u)(s.dispatch),r({},s,{dispatch:c})}}}var r=Object.assign||function(e){for(var t=1;tn;n++)t[n]=arguments[n];return function(){if(0===t.length)return arguments.length<=0?void 0:arguments[0];var e=t[t.length-1],n=t.slice(0,-1);return n.reduceRight(function(e,t){return t(e)},e.apply(void 0,arguments))}}t.__esModule=!0,t.default=n},function(e,t){"use strict";function n(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);to;o++){var r=arguments[o];n("Object",r)?i(r):console.error("Custom options must be an object")}return e},t.whichTransitionEvent=function(){var e,t=document.createElement("fakeelement"),n={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(e in n)if(void 0!==t.style[e])return n[e]},t.whichAnimationEvent=function(){var e,t=document.createElement("fakeelement"),n={animation:"animationend",OAnimation:"oAnimationEnd",MozAnimation:"animationend",WebkitAnimation:"webkitAnimationEnd"};for(e in n)if(void 0!==t.style[e])return n[e]});t.getParentsUntil=function(e,t,n){for(var i=[];e&&e!==document;e=e.parentNode){if(t){var o=t.charAt(0);if("."===o&&e.classList.contains(t.substr(1)))break;if("#"===o&&e.id===t.substr(1))break;if("["===o&&e.hasAttribute(t.substr(1,t.length-1)))break;if(e.tagName.toLowerCase()===t)break}if(n){var r=n.charAt(0);"."===r&&e.classList.contains(n.substr(1))&&i.push(e),"#"===r&&e.id===n.substr(1)&&i.push(e),"["===r&&e.hasAttribute(n.substr(1,n.length-1))&&i.push(e),e.tagName.toLowerCase()===n&&i.push(e)}else i.push(e)}return 0===i.length?null:i},t.wrap=function(e,t){return t=t||document.createElement("div"),e.nextSibling?e.parentNode.insertBefore(t,e.nextSibling):e.parentNode.appendChild(t),t.appendChild(e)},t.getSiblings=function(e){for(var t=[],n=e.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==e&&t.push(n);return t},t.findAncestor=function(e,t){for(;(e=e.parentElement)&&!e.classList.contains(t););return e},t.debounce=function(e,t,n){var i;return function(){var o=this,r=arguments,s=function(){i=null,n||e.apply(o,r)},a=n&&!i;clearTimeout(i),i=setTimeout(s,t),a&&e.apply(o,r)}},t.getElemDistance=function(e){var t=0;if(e.offsetParent)do t+=e.offsetTop,e=e.offsetParent;while(e);return t>=0?t:0},t.getElementOffset=function(e,t){var n=t;return n>1&&(n=1),n>0&&(n=0),Math.max(e.offsetHeight*n)},t.getScrollPosition=function(e){return"bottom"===e?Math.max((window.scrollY||window.pageYOffset)+(window.innerHeight||document.documentElement.clientHeight)):window.scrollY||window.pageYOffset},t.isInView=function(e,t,n){return this.getScrollPosition(t)>this.getElemDistance(e)+this.getElementOffset(e,n)},t.stripHTML=function(e){var t=document.createElement("DIV");return t.innerHTML=e,t.textContent||t.innerText||""},t.addAnimation=function(e,t){var n=i(),o=function r(){e.classList.remove(t),e.removeEventListener(n,r,!1)};e.classList.add(t),e.addEventListener(n,o,!1)},t.getRandomNumber=function(e,t){return Math.floor(Math.random()*(t-e)+e)},t.strToEl=function(){var e=document.createElement("div");return function(t){var n;for(e.innerHTML=t,n=e.children[0];e.firstChild;)e.removeChild(e.firstChild);return n}}(),t.getWidthOfInput=function(){var e=document.createElement("span");e.className="tmp-element",e.innerHTML=inputEl.value.replace(/&/g,"&").replace(//g,">"),document.body.appendChild(e);var t=e.getBoundingClientRect().width;return document.body.removeChild(e),t}}]); \ No newline at end of file diff --git a/assets/scripts/src/choices.js b/assets/scripts/src/choices.js index e24f28e..f9279fc 100644 --- a/assets/scripts/src/choices.js +++ b/assets/scripts/src/choices.js @@ -1,7 +1,7 @@ 'use strict'; import { createStore } from 'redux'; -import choices from './reducers/index.js'; +import items from './reducers/index.js'; import { addItemToStore, removeItemFromStore, selectItemFromStore } from './actions/index'; import { hasClass, wrap, getSiblings, isType, strToEl, extend } from './lib/utils.js'; @@ -11,7 +11,6 @@ export class Choices { const userOptions = options || {}; const defaultOptions = { element: document.querySelector('[data-choice]'), - disabled: false, items: [], addItems: true, removeItems: true, @@ -38,7 +37,7 @@ export class Choices { this.options = extend(defaultOptions, userOptions || {}); // Create data store - this.store = createStore(choices); + this.store = createStore(items); // Cutting the mustard this.supports = 'querySelector' in document && 'addEventListener' in document && 'classList' in fakeEl; @@ -46,7 +45,7 @@ export class Choices { // Retrieve triggering element (i.e. element with 'data-choice' trigger) this.passedInput = this.options.element; - // Set preset items + // Set preset items - this looks out of place this.presetItems = []; if(this.options.items.length) { this.presetItems = this.options.items; @@ -135,7 +134,7 @@ export class Choices { } // All is good, update - if (canUpdate) { + if (canUpdate && this.options.addItems) { if(this.passedInput.type === 'text') { let canAddItem = true; @@ -169,15 +168,14 @@ export class Choices { let lastItem = currentListItems[currentListItems.length - 1]; let inputIsFocussed = this.input === document.activeElement; - if(lastItem && !this.options.editItems && inputIsFocussed) { + if(lastItem && !this.options.editItems && inputIsFocussed && this.options.removeItems) { this.selectItem(lastItem); } // If editing the last item is allowed and there is a last item and // there are not other selected items (minus the last item), we can edit // the item value. Otherwise if we can remove items, remove all items - - if(this.options.editItems && lastItem && selectedItems.length === 0 && inputIsFocussed) { + if(this.options.removeItems && this.options.editItems && lastItem && selectedItems.length === 0 && inputIsFocussed) { this.input.value = lastItem.innerHTML; this.removeItem(lastItem); } else { @@ -203,22 +201,24 @@ export class Choices { if(e.target.hasAttribute('data-choice-item')) { let item = e.target; - let handleClick = (item) => { - let passedId = item.getAttribute('data-choice-id'); - let items = this.list.children; + let handleClick = (item) => { + if(this.options.removeItems) { + let passedId = item.getAttribute('data-choice-id'); + let items = this.list.children; - // We only want to select one item with a click - // so we deselect any items that aren't the target - for (var i = 0; i < items.length; i++) { - let singleItem = items[i]; - let id = singleItem.getAttribute('data-choice-id');; + // We only want to select one item with a click + // so we deselect any items that aren't the target + for (var i = 0; i < items.length; i++) { + let singleItem = items[i]; + let id = singleItem.getAttribute('data-choice-id');; - if(id === passedId && !singleItem.classList.contains('is-selected')) { - this.selectItem(singleItem); - } else { - this.deselectItem(singleItem); - } - } + if(id === passedId && !singleItem.classList.contains('is-selected')) { + this.selectItem(singleItem); + } else { + this.deselectItem(singleItem); + } + } + } } handleClick(item); @@ -460,6 +460,7 @@ export class Choices { if(!this.options.addItems) { input.disabled = true; + containerOuter.classList.add('is-disabled'); } containerOuter.appendChild(containerInner); @@ -599,7 +600,7 @@ export class Choices { state.forEach((item) => { if(item.active) { // Create new list element - let listItem = strToEl(`
${ item.value }
`); + let listItem = strToEl(`
${ item.value }
`); // Append it to list this.list.appendChild(listItem); @@ -690,7 +691,8 @@ document.addEventListener('DOMContentLoaded', () => { let choices4 = new Choices({ element : input4, - addItems: false + addItems: false, + removeItems: false }); let choices5 = new Choices({ diff --git a/assets/scripts/src/reducers/index.js b/assets/scripts/src/reducers/index.js index db4b7a0..15fdf74 100644 --- a/assets/scripts/src/reducers/index.js +++ b/assets/scripts/src/reducers/index.js @@ -1,6 +1,4 @@ -const initialState = []; - -const choices = (state = initialState, action) => { +const items = (state = [], action) => { switch (action.type) { case 'ADD_ITEM': // Add object to items array @@ -16,7 +14,7 @@ const choices = (state = initialState, action) => { item.selected = false; } return item; - });; + }); case 'REMOVE_ITEM': // Set item to inactive @@ -41,4 +39,25 @@ const choices = (state = initialState, action) => { } } -export default choices \ No newline at end of file +const initialState = { + dropdownItems: [], + items: [] +} + +const choices = (state = initialState, action) => { + switch (action.type) { + case 'ADD_ITEM': + return state; + + case 'REMOVE_ITEM': + return state; + + case 'SELECT_ITEM': + return state; + + default: + return state; + } +} + +export default items; \ No newline at end of file diff --git a/assets/styles/css/choices.css b/assets/styles/css/choices.css index bc14a91..48328cb 100644 --- a/assets/styles/css/choices.css +++ b/assets/styles/css/choices.css @@ -56,9 +56,6 @@ h1, h2, h3, h4, h5, h6 { padding-left: 0; list-style-type: none; } -.choices__item--selectable { - cursor: pointer; } - .choices__list--items { display: inline; } .choices__list--items .choices__item { @@ -70,8 +67,7 @@ h1, h2, h3, h4, h5, h6 { margin-bottom: .375rem; background-color: #00BCD4; border: 1px solid #00b1c7; - color: #FFFFFF; - cursor: pointer; } + color: #FFFFFF; } .choices__list--items .choices__item.is-selected { background-color: #00a5bb; } @@ -92,6 +88,12 @@ h1, h2, h3, h4, h5, h6 { .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; diff --git a/assets/styles/css/choices.min.css b/assets/styles/css/choices.min.css index a674e68..e67f86e 100644 --- a/assets/styles/css/choices.min.css +++ b/assets/styles/css/choices.min.css @@ -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__item--selectable{cursor:pointer}.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;cursor:pointer}.choices__list--items .choices__item.is-selected{background-color:#00a5bb}.choices__list--dropdown{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__input,.choices__list--dropdown .choices__item:hover{background-color:#f9f9f9}.choices__list--dropdown.is-active{display:block}.choices__input{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} \ No newline at end of file +*,: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{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} \ No newline at end of file diff --git a/assets/styles/scss/choices.scss b/assets/styles/scss/choices.scss index 067abca..12714f5 100644 --- a/assets/styles/scss/choices.scss +++ b/assets/styles/scss/choices.scss @@ -70,9 +70,6 @@ h1, h2, h3, h4, h5, h6 { list-style-type: none; } -.choices__item {} -.choices__item--selectable { cursor: pointer; } - .choices__list--options {} .choices__list--items { @@ -87,7 +84,6 @@ h1, h2, h3, h4, h5, h6 { background-color: #00BCD4; border: 1px solid darken(#00BCD4, 2.5%); color: #FFFFFF; - cursor: pointer; &.is-selected { background-color: darken(#00BCD4, 5%); } } } @@ -111,6 +107,9 @@ h1, h2, h3, h4, h5, h6 { &.is-active { display: block; } } +.choices__item { cursor: default; } +.choices__item--selectable { cursor: pointer; } + .choices__input { background-color: mix(#000000, #FFFFFF, 2.5%); font-size: 1.4rem;