From 673e9373279893e9276e1d54efcdc0531c076613 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 12 Apr 2016 14:31:07 +0100 Subject: [PATCH] Render dropdown from store --- assets/scripts/dist/bundle.js | 2 +- assets/scripts/src/actions/index.js | 14 ++- assets/scripts/src/choices.js | 113 +++++++++++++++---------- assets/scripts/src/reducers/index.js | 2 +- assets/scripts/src/reducers/options.js | 10 +++ 5 files changed, 92 insertions(+), 49 deletions(-) diff --git a/assets/scripts/dist/bundle.js b/assets/scripts/dist/bundle.js index 50fdb0cc..834f3c00 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 s=function(){function e(e,t){for(var n=0;n1)for(var l=1;l=0;i--){var o=this.list.children[i];if(o.innerHTML===e.toString()){n=o;break}}if(n){var s=n.getAttribute("data-choice-id"),r=n.innerHTML;t&&((0,u.isType)("Function",t)?t(r):console.error("callbackOnRemoveItem: Callback is not a function")),this.store.dispatch((0,l.removeItemFromStore)(s))}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,u.strToEl)('
'),n=(0,u.strToEl)('
');this.passedElement.classList.add(this.options.classNames.input,this.options.classNames.hiddenState),this.passedElement.tabIndex="-1",this.passedElement.setAttribute("style","display:none;"),this.passedElement.setAttribute("aria-hidden","true"),(0,u.wrap)(this.passedElement,n),(0,u.wrap)(n,t);var i=(0,u.strToEl)('
    '),o=(0,u.strToEl)('');this.passedElement.placeholder&&(o.placeholder=this.passedElement.placeholder),this.options.addItems||(o.disabled=!0,t.classList.add(this.options.classNames.disabledState)),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,u.strToEl)('
    '),n=(0,u.strToEl)('
    ');this.passedElement.classList.add(this.options.classNames.input,this.options.classNames.hiddenState),this.passedElement.tabIndex="-1",this.passedElement.setAttribute("style","display:none;"),this.passedElement.setAttribute("aria-hidden","true"),(0,u.wrap)(this.passedElement,n),(0,u.wrap)(n,t);var i=(0,u.strToEl)('
      '),o=(0,u.strToEl)(''),s=(0,u.strToEl)('
      ');o.placeholder&&(o.placeholder=this.passedElement.placeholder),this.options.addItems||(o.disabled=!0),t.appendChild(n),t.appendChild(s),n.appendChild(i),n.appendChild(o),this.containerOuter=t,this.containerInner=n,this.input=o,this.list=i,this.dropdown=s,this.presetItems.forEach(function(t){e.addItem(t)});for(var r=this.passedElement.options,a=0;a'+t.value+"");e.list.appendChild(n)}}),t&&((0,u.isType)("Function",t)?t(i):console.error("callbackOnRender: Callback is not a function"))}},{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.passedElement)}},{key:"destroy",value:function(){this.options=null,this.passedElement=null,this.initialised=null}}]),e}();document.addEventListener("DOMContentLoaded",function(){var e=(new d("#choices-1",{delimiter:" ",editItems:!0,maxItems:5,callbackOnRemoveItem:function(e){console.log(e)},callbackOnAddItem:function(e,t){console.log(e,t)},callbackOnRender:function(e){console.log(e)}}),new d("#choices-2",{allowDuplicates:!1,editItems:!0,callbackOnRender:function(e){console.log(e)}}),new d("#choices-3",{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,}))$/,callbackOnRender:function(e){console.log(e)}}),new d("#choices-4",{addItems:!1,removeItems:!1,callbackOnRender:function(e){console.log(e)}}),new d("#choices-5",{prependValue:"item-",appendValue:"-"+Date.now(),callbackOnRender:function(e){console.log(e)}}),new d("#choices-6",{items:["josh@joshuajohnson.co.uk","joe@bloggs.co.uk"],callbackOnRender:function(e){console.log(e)}}));new d("#choices-7"),new d;e.addItem("josh2@joshuajohnson.co.uk",function(){console.log("Custom add item callback")}),e.removeItem("josh@joshuajohnson.co.uk"),console.log(e.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),s=i(o),r=n(7),a=i(r),c=n(9),l=i(c),u=n(10),d=i(u),p=n(11),h=i(p),f=n(8);i(f);t.createStore=s.default,t.combineReducers=a.default,t.bindActionCreators=l.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 s(){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 l(e){if(!(0,r.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(m)throw new Error("Reducers may not dispatch actions.");try{m=!0,p=d(p,e)}finally{m=!1}for(var t=h=f,n=0;nn;n++)t[n]=arguments[n];return function(e){return function(n,i,o){var r=e(n,i,o),c=r.dispatch,l=[],u={getState:r.getState,dispatch:function(e){return c(e)}};return l=t.map(function(e){return e(u)}),c=a.default.apply(void 0,l)(r.dispatch),s({},r,{dispatch:c})}}}var s=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,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=n(2),s=n(13),r=i(s),a=n(14),c=(i(a),(0,o.combineReducers)({items:r.default}));t.default=c},function(e,t){"use strict";function n(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);tr;r++){var a=arguments[r];n("Object",a)?s(a):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 s=n.charAt(0);"."===s&&e.classList.contains(n.substr(1))&&i.push(e),"#"===s&&e.id===n.substr(1)&&i.push(e),"["===s&&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,s=arguments,r=function(){i=null,n||e.apply(o,s)},a=n&&!i;clearTimeout(i),i=setTimeout(r,t),a&&e.apply(o,s)}},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 s(){e.classList.remove(t),e.removeEventListener(n,s,!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 s=function(){function e(e,t){for(var n=0;n1)for(var l=1;l=0;i--){var o=this.list.children[i];if(o.innerHTML===e.toString()){n=o;break}}if(n){var s=n.getAttribute("data-choice-id"),r=n.innerHTML;t&&((0,u.isType)("Function",t)?t(r):console.error("callbackOnRemoveItem: Callback is not a function")),this.store.dispatch((0,l.removeItem)(s))}else console.error("Item not found")}},{key:"removeAllItems",value:function(){var e=this.store.getState().items;console.log(e);for(var t=0;t'),n=(0,u.strToEl)('
      ');this.passedElement.classList.add(this.options.classNames.input,this.options.classNames.hiddenState),this.passedElement.tabIndex="-1",this.passedElement.setAttribute("style","display:none;"),this.passedElement.setAttribute("aria-hidden","true"),(0,u.wrap)(this.passedElement,n),(0,u.wrap)(n,t);var i=(0,u.strToEl)('
        '),o=(0,u.strToEl)('');this.passedElement.placeholder&&(o.placeholder=this.passedElement.placeholder),this.options.addItems||(o.disabled=!0,t.classList.add(this.options.classNames.disabledState)),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,u.strToEl)('
        '),n=(0,u.strToEl)('
        ');this.passedElement.classList.add(this.options.classNames.input,this.options.classNames.hiddenState),this.passedElement.tabIndex="-1",this.passedElement.setAttribute("style","display:none;"),this.passedElement.setAttribute("aria-hidden","true"),(0,u.wrap)(this.passedElement,n),(0,u.wrap)(n,t);var i=(0,u.strToEl)('
          '),o=(0,u.strToEl)(''),s=(0,u.strToEl)('
          ');o.placeholder&&(o.placeholder=this.passedElement.placeholder),this.options.addItems||(o.disabled=!0),t.appendChild(n),t.appendChild(s),n.appendChild(i),n.appendChild(o),this.containerOuter=t,this.containerInner=n,this.input=o,this.list=i,this.dropdown=s,this.presetItems.forEach(function(t){e.addItem(t)});for(var r=this.passedElement.options,a=0;a'+t.value+"");e.dropdown.appendChild(n)}));var s=i.reduce(function(e,t){return e.push(t.value),e},[]);this.passedElement.value=s.join(this.options.delimiter),this.list.innerHTML="",i.forEach(function(t){if(t.active){var n=(0,u.strToEl)('
        • '+t.value+"
          • ");e.list.appendChild(n)}}),t&&((0,u.isType)("Function",t)?t(i,o):console.error("callbackOnRender: Callback is not a function"))}},{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(){var e=arguments.length<=0||void 0===arguments[0]?this.options.callbackOnInit:arguments[0];this.supports||console.error("init: Your browser doesn'nt support shit"),this.initialised=!0,this.renderInput(this.passedElement),e&&((0,u.isType)("Function",e)?e():console.error("callbackOnInit: Callback is not a function"))}},{key:"destroy",value:function(){this.options=null,this.passedElement=null,this.initialised=null}}]),e}();document.addEventListener("DOMContentLoaded",function(){var e=(new d("#choices-1",{delimiter:" ",editItems:!0,maxItems:5}),new d("#choices-2",{allowDuplicates:!1,editItems:!0}),new d("#choices-3",{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("#choices-4",{addItems:!1,removeItems:!1}),new d("#choices-5",{prependValue:"item-",appendValue:"-"+Date.now()}));e.removeAllItems();var t=new d("#choices-6",{items:["josh@joshuajohnson.co.uk","joe@bloggs.co.uk"]});new d("#choices-7",{callbackOnRender:function(e,t){console.log(t)}}),new d;t.addItem("josh2@joshuajohnson.co.uk",function(){console.log("Custom add item callback")}),t.removeItem("josh@joshuajohnson.co.uk"),console.log(t.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),s=i(o),r=n(7),a=i(r),c=n(9),l=i(c),u=n(10),d=i(u),p=n(11),h=i(p),f=n(8);i(f);t.createStore=s.default,t.combineReducers=a.default,t.bindActionCreators=l.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 s(){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 l(e){if(!(0,r.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(m)throw new Error("Reducers may not dispatch actions.");try{m=!0,p=d(p,e)}finally{m=!1}for(var t=h=f,n=0;nn;n++)t[n]=arguments[n];return function(e){return function(n,i,o){var r=e(n,i,o),c=r.dispatch,l=[],u={getState:r.getState,dispatch:function(e){return c(e)}};return l=t.map(function(e){return e(u)}),c=a.default.apply(void 0,l)(r.dispatch),s({},r,{dispatch:c})}}}var s=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,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=n(2),s=n(13),r=i(s),a=n(14),c=i(a),l=(0,o.combineReducers)({items:r.default,options:c.default});t.default=l},function(e,t){"use strict";function n(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);tr;r++){var a=arguments[r];n("Object",a)?s(a):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 s=n.charAt(0);"."===s&&e.classList.contains(n.substr(1))&&i.push(e),"#"===s&&e.id===n.substr(1)&&i.push(e),"["===s&&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,s=arguments,r=function(){i=null,n||e.apply(o,s)},a=n&&!i;clearTimeout(i),i=setTimeout(r,t),a&&e.apply(o,s)}},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 s(){e.classList.remove(t),e.removeEventListener(n,s,!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/actions/index.js b/assets/scripts/src/actions/index.js index 54b1dc50..8ffdb8d4 100644 --- a/assets/scripts/src/actions/index.js +++ b/assets/scripts/src/actions/index.js @@ -1,4 +1,4 @@ -export const addItemToStore = (value, id) => { +export const addItem = (value, id) => { return { type: 'ADD_ITEM', value: value, @@ -6,17 +6,25 @@ export const addItemToStore = (value, id) => { } }; -export const removeItemFromStore = (id) => { +export const removeItem = (id) => { return { type: 'REMOVE_ITEM', id: id } }; -export const selectItemFromStore = (id, value) => { +export const selectItem = (id, value) => { return { type: 'SELECT_ITEM', id: id, value: value } +}; + +export const addOption = (value, id) => { + return { + type: 'ADD_OPTION', + value: value, + id: id + } }; \ No newline at end of file diff --git a/assets/scripts/src/choices.js b/assets/scripts/src/choices.js index 8d184da1..417252c6 100644 --- a/assets/scripts/src/choices.js +++ b/assets/scripts/src/choices.js @@ -2,7 +2,7 @@ import { createStore } from 'redux'; import rootReducer from './reducers/index.js'; -import { addItemToStore, removeItemFromStore, selectItemFromStore } from './actions/index'; +import { addItem, removeItem, selectItem, addOption } from './actions/index'; import { hasClass, wrap, getSiblings, isType, strToEl, extend } from './lib/utils.js'; export class Choices { @@ -205,7 +205,7 @@ export class Choices { this.input.value = lastItem.innerHTML; this.removeItem(lastItem); } else { - this.removeAll(currentListItems); + this.removeAllItems(); } } }; @@ -251,12 +251,12 @@ export class Choices { handleClick(item); } - if(e.target.hasAttribute('data-choice-selectable')) { let item = e.target; let value = e.target.getAttribute('data-choice-value'); this.addItem(value); } + } else if(this.dropdown && this.dropdown.classList.contains(this.options.classNames.activeState)) { this.toggleDropdown(); } @@ -316,7 +316,7 @@ export class Choices { */ selectItem(item) { let id = item.getAttribute('data-choice-id'); - this.store.dispatch(selectItemFromStore(id, true)); + this.store.dispatch(selectItem(id, true)); } /** @@ -326,7 +326,7 @@ export class Choices { */ deselectItem(item) { let id = item.getAttribute('data-choice-id'); - this.store.dispatch(selectItemFromStore(id, false)); + this.store.dispatch(selectItem(id, false)); } /** @@ -377,7 +377,7 @@ export class Choices { } } - this.store.dispatch(addItemToStore(passedValue, id)); + this.store.dispatch(addItem(passedValue, id)); } /** @@ -418,11 +418,10 @@ export class Choices { } } - this.store.dispatch(removeItemFromStore(id)); + this.store.dispatch(removeItem(id)); } else { console.error('Item not found'); } - } /** @@ -430,12 +429,16 @@ export class Choices { * @param {Array} items Items to remove from store * @return */ - removeAll(items) { - for (let i = 0; i < items.length; i++) { - let item = items[i]; + removeAllItems() { + const items = this.store.getState().items; - if (item.classList.contains('is-selected')) { - this.removeItem(item); + console.log(items); + + for (let i = 0; i < items.length; i++) { + const item = items[i]; + + if (item.selected) { + this.removeItem(item.value); } }; } @@ -451,9 +454,10 @@ export class Choices { this.dropdown.classList[isActive ? 'remove' : 'add']('is-active'); } - addItemToDropdown(value) { - const dropdownItem = strToEl(`
        • ${value}
          • `); - this.dropdown.appendChild(dropdownItem); + addOptionToDropdown(value) { + // Generate unique id + let id = this.store.getState().items.length + 1; + this.store.dispatch(addOption(value, id)); } /* Rendering */ @@ -589,7 +593,7 @@ export class Choices { const unselectedOptions = this.passedElement.options; for (var i = 0; i < unselectedOptions.length; i++) { let option = unselectedOptions[i]; - this.addItemToDropdown(option.value); + this.addOptionToDropdown(option.value); } // Subscribe to store @@ -621,7 +625,22 @@ export class Choices { render(callback = this.options.callbackOnRender) { let state = this.store.getState(); let items = state.items; + let options = state.options; + // OPTIONS + if(this.dropdown) { + // Clear options + this.dropdown.innerHTML = ''; + + // Add each option to dropdown + options.forEach((option) => { + const dropdownItem = strToEl(`
        • ${ option.value }
          • `); + this.dropdown.appendChild(dropdownItem); + }); + } + + + // ITEMS // Simplify store data to just values let valueArray = items.reduce((prev, current) => { prev.push(current.value); @@ -638,7 +657,7 @@ export class Choices { items.forEach((item) => { if(item.active) { // Create new list element - let listItem = strToEl(`
        • ${ item.value }
          • `); + const listItem = strToEl(`
        • ${ item.value }
          • `); // Append it to list this.list.appendChild(listItem); @@ -648,7 +667,7 @@ export class Choices { // Run callback if it is a function if(callback){ if(isType('Function', callback)) { - callback(items); + callback(items, options); } else { console.error('callbackOnRender: Callback is not a function'); } @@ -712,58 +731,64 @@ document.addEventListener('DOMContentLoaded', () => { delimiter: ' ', editItems: true, maxItems: 5, - callbackOnRemoveItem: function(value) { - console.log(value); - }, - callbackOnAddItem: function(item, value) { - console.log(item, value); - }, - callbackOnRender: function(items) { - console.log(items); - } + // callbackOnRemoveItem: function(value) { + // console.log(value); + // }, + // callbackOnAddItem: function(item, value) { + // console.log(item, value); + // }, + // callbackOnRender: function(items) { + // console.log(items); + // } }); let choices2 = new Choices('#choices-2', { allowDuplicates: false, editItems: true, - callbackOnRender: function(items) { - console.log(items); - } + // callbackOnRender: function(items) { + // console.log(items); + // } }); let 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,}))$/, - callbackOnRender: function(items) { - console.log(items); - } + // callbackOnRender: function(items) { + // console.log(items); + // } }); let choices4 = new Choices('#choices-4', { addItems: false, removeItems: false, - callbackOnRender: function(items) { - console.log(items); - } + // callbackOnRender: function(items) { + // console.log(items); + // } }); let choices5 = new Choices('#choices-5', { prependValue: 'item-', appendValue: `-${Date.now()}`, - callbackOnRender: function(items) { - console.log(items); - } + // callbackOnRender: function(items) { + // console.log(items); + // } }); + choices5.removeAllItems(); + let choices6 = new Choices('#choices-6', { items: ['josh@joshuajohnson.co.uk', 'joe@bloggs.co.uk'], - callbackOnRender: function(items) { - console.log(items); - } + // callbackOnRender: function(items) { + // console.log(items); + // } }); - let choices7 = new Choices('#choices-7'); + let choices7 = new Choices('#choices-7', { + callbackOnRender: function(items, options) { + console.log(options); + } + }); let choicesMultiple = new Choices(); diff --git a/assets/scripts/src/reducers/index.js b/assets/scripts/src/reducers/index.js index 648dbe8d..b4aeec92 100644 --- a/assets/scripts/src/reducers/index.js +++ b/assets/scripts/src/reducers/index.js @@ -4,7 +4,7 @@ import options from './options'; const rootReducer = combineReducers({ items, - // options + options }) export default rootReducer; \ No newline at end of file diff --git a/assets/scripts/src/reducers/options.js b/assets/scripts/src/reducers/options.js index 4a02232b..4622cc58 100644 --- a/assets/scripts/src/reducers/options.js +++ b/assets/scripts/src/reducers/options.js @@ -1,5 +1,15 @@ const options = (state = [], action) => { switch (action.type) { + case 'ADD_OPTION': + // Add object to items array + let newState = [...state, { + id: parseInt(action.id), + value: action.value, + disabled: false, + selected: false + }]; + + return newState; default: return state; }