diff --git a/src/components/mdChips/mdChips.theme b/src/components/mdChips/mdChips.theme index 3910710..3b43912 100644 --- a/src/components/mdChips/mdChips.theme +++ b/src/components/mdChips/mdChips.theme @@ -2,7 +2,7 @@ &.md-chip { background-color: #{'BACKGROUND-CONTRAST-0.12'}; - &:not(.md-disabled) { + &.md-deletable { &:hover, &:focus { background-color: #{'BACKGROUND-CONTRAST-0.54'}; @@ -22,22 +22,4 @@ } } } - - .md-chips.md-static { - .md-chip:not(.md-disabled) { - &:active { - box-shadow: none !important; - } - - &:hover, - &:focus { - background-color: #{'BACKGROUND-CONTRAST-0.12'}; - color: #{'BACKGROUND-CONTRAST-0.87'}; - - .md-delete { - color: #{'BACKGROUND-CONTRAST-0.87'}; - } - } - } - } } diff --git a/src/components/mdChips/mdChips.vue b/src/components/mdChips/mdChips.vue index 70e93df..31bf468 100644 --- a/src/components/mdChips/mdChips.vue +++ b/src/components/mdChips/mdChips.vue @@ -17,9 +17,9 @@ :id="inputId" :name="mdInputName" :disabled="disabled" - @keyup.native.delete="deleteLastChip" - @keyup.native.enter="selectChip" - @keyup.native.186="selectChip" + @keydown.native.delete="deleteLastChip" + @keydown.native.enter="selectChip" + @keydown.native.186="selectChip" tabindex="0" ref="input"> diff --git a/src/components/mdSnackbar/mdSnackbar.vue b/src/components/mdSnackbar/mdSnackbar.vue index a0fb287..717d4a4 100644 --- a/src/components/mdSnackbar/mdSnackbar.vue +++ b/src/components/mdSnackbar/mdSnackbar.vue @@ -68,7 +68,10 @@ }, methods: { removeElement() { - this.rootElement.removeChild(this.snackbarElement); + if (this.rootElement.contains(this.snackbarElement)) { + this.snackbarElement.querySelector('.md-ripple').classList.remove('md-active'); + this.rootElement.removeChild(this.snackbarElement); + } }, open() { if (manager.current) { @@ -86,11 +89,7 @@ if (this.$refs.container) { const removeElement = () => { this.$refs.container.removeEventListener(transitionEndEventName, removeElement); - - if (this.rootElement.contains(this.snackbarElement)) { - this.snackbarElement.querySelector('.md-ripple').classList.remove('md-active'); - this.removeElement(); - } + this.removeElement(); }; manager.current = null;