Close button styling

This commit is contained in:
Josh Johnson 2016-05-11 23:17:22 +01:00
parent 964a8e709b
commit d87a3f8171
7 changed files with 74 additions and 31 deletions

1
assets/icons/cross.svg Normal file
View file

@ -0,0 +1 @@
<svg width="21" height="21" viewBox="0 0 21 21" xmlns="http://www.w3.org/2000/svg"><title>Slice 1</title><g fill="#FFF" fill-rule="evenodd"><path d="M2.592.044l18.364 18.364-2.548 2.548L.044 2.592z"/><path d="M0 18.364L18.364 0l2.548 2.548L2.548 20.912z"/></g></svg>

After

Width:  |  Height:  |  Size: 266 B

File diff suppressed because one or more lines are too long

View file

@ -69,7 +69,7 @@ export class Choices {
highlightedState: 'is-highlighted',
hiddenState: 'is-hidden',
flippedState: 'is-flipped',
selectedState: 'is-selected'
selectedState: 'is-selected',
},
callbackOnInit: () => {},
callbackOnRemoveItem: () => {},
@ -972,7 +972,7 @@ export class Choices {
item: (data) => {
if(this.options.removeButton) {
return strToEl(`
<div class="${ classNames.item } ${ data.selected ? classNames.selectedState : classNames.itemSelectable }" data-item data-id="${ data.id }" data-value="${ data.value }">
<div class="${ classNames.item } ${ data.selected ? classNames.selectedState : classNames.itemSelectable }" data-item data-id="${ data.id }" data-value="${ data.value }" data-deletable>
${ data.label }
<button class="${ classNames.button }" data-button>Remove item</button>
</div>
@ -1110,7 +1110,7 @@ export class Choices {
if(this.passedElement.type === 'text') {
// Assign hidden input array of values
this.passedElement.value = itemsFiltered.join(this.options.delimiter);
this.passedElement.setAttribute('value', itemsFiltered.join(this.options.delimiter));
} else {
const selectedOptionsFragment = document.createDocumentFragment();
@ -1233,29 +1233,32 @@ export class Choices {
* Initialise Choices
* @return
*/
init(callback = this.options.callbackOnInit) {
this.initialised = true;
init(callback) {
if(this.initialised !== true) {
// Create required elements
this.createTemplates();
this.initialised = true;
// Generate input markup
this.generateInput();
// Create required elements
this.createTemplates();
this.store.subscribe(this.render);
// Generate input markup
this.generateInput();
// Render any items
this.render();
this.store.subscribe(this.render);
// Trigger event listeners
this.addEventListeners();
// Render any items
this.render();
// Run callback if it is a function
if(callback){
if(isType('Function', callback)) {
callback();
} else {
console.error('callbackOnInit: Callback is not a function');
// Trigger event listeners
this.addEventListeners();
// Run callback if it is a function
if(callback = this.options.callbackOnInit){
if(isType('Function', callback)) {
callback();
} else {
console.error('callbackOnInit: Callback is not a function');
}
}
}
}
@ -1269,14 +1272,12 @@ export class Choices {
this.passedElement.tabIndex = '';
this.passedElement.removeAttribute('style', 'display:none;');
this.passedElement.removeAttribute('aria-hidden');
this.passedElement.addAttribute('data-choice');
this.containerOuter.outerHTML = this.passedElement.outerHTML;
this.passedElement = null;
this.userOptions = null;
this.options = null;
this.initialised = null;
this.store = null;
this.removeEventListeners();

View file

@ -24,6 +24,13 @@ label {
font-size: 1.4rem;
font-weight: 500; }
hr {
display: block;
margin: 1.2rem 0;
border: 0;
border-bottom: 1px solid #eaeaea;
height: 1px; }
h1, h2, h3, h4, h5, h6 {
margin-top: 0;
margin-bottom: 1.2rem;
@ -111,6 +118,8 @@ h1, h2, h3, h4, h5, h6 {
border: 1px solid #00a5bb;
color: #FFFFFF;
word-break: break-all; }
.choices__list--multiple .choices__item[data-deletable] {
padding-right: .5rem; }
.choices__list--multiple .choices__item.is-selected {
background-color: #00a5bb; }
.is-disabled .choices__list--multiple .choices__item {
@ -181,11 +190,21 @@ h1, h2, h3, h4, h5, h6 {
.choices__button {
text-indent: -9999px;
background-color: white;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
border: 0; }
border: 0;
background-color: transparent;
background-image: url("../../icons/cross.svg");
background-repeat: no-repeat;
background-position: center;
background-size: 8px;
border-left: 1px solid #00a5bb;
margin-left: 4px;
padding-left: 6px;
padding-right: 6px;
line-height: 1;
cursor: pointer; }
.choices__input {
background-color: #f9f9f9;

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.is-disabled .choices__inner,.choices.is-disabled .choices__input{background-color:#eaeaea;cursor:not-allowed;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.choices.is-disabled .choices__item{cursor:not-allowed}.choices[data-type*=select-one].is-open:after{border-color:transparent transparent #333 transparent;margin-top:-7.5px}.choices[data-type*=select-one]:after{content:"";height:0;width:0;border-style:solid;border-color:#333 transparent transparent transparent;border-width:5px;position:absolute;right:1.15rem;top:50%;margin-top:-2.5px}.choices__inner{background-color:#f9f9f9;padding:.75rem .75rem .375rem;border:1px solid #ddd;border-radius:.25rem;font-size:1.4rem;cursor:text;overflow:hidden}.is-focused .choices__inner{border-color:#b7b7b7}.is-open .choices__inner{border-radius:.25rem .25rem 0 0}.is-flipped.is-open .choices__inner{border-radius:0 0 .25rem .25rem}.choices__list{margin:0;padding-left:0;list-style-type:none}.choices__list--single{display:inline-block}.choices__list--single .choices__item{padding:.4rem}.choices__list--multiple{display:inline}.choices__list--multiple .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 #00a5bb;color:#fff;word-break:break-all}.choices__list--multiple .choices__item.is-selected{background-color:#00a5bb}.is-disabled .choices__list--multiple .choices__item{background-color:#aaa;border:1px solid #919191}.choices__list--dropdown{display:none;z-index:1;position:absolute;width:100%;background-color:#fff;border:1px solid #ddd;top:100%;margin-top:-1px;border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem;max-height:300px;overflow:auto;will-change:scroll-position}.choices__list--dropdown.is-active{display:block}.choices__list--dropdown .choices__item{padding:1rem;font-size:1.4rem}.choices__list--dropdown .choices__item--selectable.is-highlighted:after,.choices__list--dropdown .choices__item.is-selected{opacity:.5}.choices__list--dropdown .choices__item.is-selected:hover{background-color:#fff}.choices__list--dropdown .choices__item--selectable:after{content:"Press to select";font-size:12px;opacity:0;float:right}.choices__list--dropdown .choices__item--selectable.is-highlighted{background-color:#f2f2f2}.is-open .choices__list--dropdown{border-color:#b7b7b7}.is-flipped .choices__list--dropdown{top:auto;bottom:100%;margin-top:0;margin-bottom:-1px;border-radius:.25rem .25rem 0 0}.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;opacity:.5}.choices__group .choices__heading{font-weight:600;font-size:1.2rem;padding:1rem;border-bottom:1px solid #f7f7f7;color:gray}.choices__button{text-indent:-9999px;background-color:#fff;-webkit-appearance:none;-moz-appearance:none;appearance:none;border:0}.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}hr,label{display:block}label{margin-bottom:.8rem;font-size:1.4rem;font-weight:500}hr{margin:1.2rem 0;border:0;border-bottom:1px solid #eaeaea;height:1px}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.is-disabled .choices__inner,.choices.is-disabled .choices__input{background-color:#eaeaea;cursor:not-allowed;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.choices.is-disabled .choices__item{cursor:not-allowed}.choices[data-type*=select-one].is-open:after{border-color:transparent transparent #333 transparent;margin-top:-7.5px}.choices[data-type*=select-one]:after{content:"";height:0;width:0;border-style:solid;border-color:#333 transparent transparent transparent;border-width:5px;position:absolute;right:1.15rem;top:50%;margin-top:-2.5px}.choices__inner{background-color:#f9f9f9;padding:.75rem .75rem .375rem;border:1px solid #ddd;border-radius:.25rem;font-size:1.4rem;cursor:text;overflow:hidden}.is-focused .choices__inner{border-color:#b7b7b7}.is-open .choices__inner{border-radius:.25rem .25rem 0 0}.is-flipped.is-open .choices__inner{border-radius:0 0 .25rem .25rem}.choices__list{margin:0;padding-left:0;list-style-type:none}.choices__list--single{display:inline-block}.choices__list--single .choices__item{padding:.4rem}.choices__list--multiple{display:inline}.choices__list--multiple .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 #00a5bb;color:#fff;word-break:break-all}.choices__list--multiple .choices__item[data-deletable]{padding-right:.5rem}.choices__list--multiple .choices__item.is-selected{background-color:#00a5bb}.is-disabled .choices__list--multiple .choices__item{background-color:#aaa;border:1px solid #919191}.choices__list--dropdown{display:none;z-index:1;position:absolute;width:100%;background-color:#fff;border:1px solid #ddd;top:100%;margin-top:-1px;border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem;max-height:300px;overflow:auto;will-change:scroll-position}.choices__list--dropdown.is-active{display:block}.choices__list--dropdown .choices__item{padding:1rem;font-size:1.4rem}.choices__list--dropdown .choices__item--selectable.is-highlighted:after,.choices__list--dropdown .choices__item.is-selected{opacity:.5}.choices__list--dropdown .choices__item.is-selected:hover{background-color:#fff}.choices__list--dropdown .choices__item--selectable:after{content:"Press to select";font-size:12px;opacity:0;float:right}.choices__list--dropdown .choices__item--selectable.is-highlighted{background-color:#f2f2f2}.is-open .choices__list--dropdown{border-color:#b7b7b7}.is-flipped .choices__list--dropdown{top:auto;bottom:100%;margin-top:0;margin-bottom:-1px;border-radius:.25rem .25rem 0 0}.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;opacity:.5}.choices__group .choices__heading{font-weight:600;font-size:1.2rem;padding:1rem;border-bottom:1px solid #f7f7f7;color:gray}.choices__button{text-indent:-9999px;-webkit-appearance:none;-moz-appearance:none;appearance:none;border:0;background-color:transparent;background-image:url(../../icons/cross.svg);background-repeat:no-repeat;background-position:center;background-size:8px;border-left:1px solid #00a5bb;margin-left:4px;padding-left:6px;padding-right:6px;line-height:1;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}

View file

@ -32,6 +32,14 @@ label {
font-weight: 500;
}
hr {
display: block;
margin: $global-guttering/2 0;
border: 0;
border-bottom: 1px solid #eaeaea;
height: 1px;
}
h1, h2, h3, h4, h5, h6 {
margin-top: 0;
margin-bottom: $global-guttering/2;
@ -136,6 +144,7 @@ $choices-disabled-color: #eaeaea;
border: 1px solid darken($choices-primary-color, 5%);
color: #FFFFFF;
word-break: break-all;
&[data-deletable] { padding-right: .5rem; }
&.is-selected { background-color: darken($choices-primary-color, 5%); }
.is-disabled & {
background-color: darken($choices-disabled-color, 25%);
@ -211,10 +220,20 @@ $choices-disabled-color: #eaeaea;
.choices__button {
text-indent: -9999px;
background-color: white;
-webkit-appearance: none;
appearance: none;
border: 0;
background-color: transparent;
background-image: url('../../icons/cross.svg');
background-repeat: no-repeat;
background-position: center;
background-size: 8px;
border-left: 1px solid darken($choices-primary-color, 5%);
margin-left: 4px;
padding-left: 6px;
padding-right: 6px;
line-height: 1;
cursor: pointer;
}
.choices__input {

View file

@ -11,10 +11,9 @@
<div class="container">
<div class="section">
<h1>Choices</h1>
<input type="text" value="preset-1 preset-2">
<h2>Text inputs</h2>
<label for="choices-1">Limited to 5</label>
<input id="choices-1" type="text" value="preset-1 preset-2">
<input id="choices-1" type="text" value="preset-1,preset-2" placeholder="Enter something">
<label for="choices-2">Unique values only, no pasting</label>
<input id="choices-2" type="text" value="preset-1, preset-2" placeholder="This is a placeholder" class="custom class">
@ -31,6 +30,8 @@
<label for="choices-6">Preset values passed through options</label>
<input id="choices-6" type="text" placeholder="This is a placeholder">
<hr>
<h2>Multiple select input</h2>
<label for="choices-7">Default</label>
<select name="choices-7" id="choices-7" placeholder="This is a placeholder" multiple>
@ -81,6 +82,8 @@
</optgroup>
</select>
<hr>
<h2>Single select input</h2>
<label for="choices-11">Default</label>
<select id="choices-11" name="choices-11" data-choice placeholder="This is a placeholder">
@ -131,7 +134,7 @@
document.addEventListener('DOMContentLoaded', () => {
const firstElement = document.getElementById('choices-1');
const choices1 = new Choices(firstElement, {
delimiter: ' ',
delimiter: ',',
editItems: true,
maxItems: 5,
removeButton: true