2
0
mirror of https://github.com/tenrok/vue-select.git synced 2026-06-04 06:32:23 +03:00

feat: merge upstream into beta channel (#1589)

This commit is contained in:
Jeff Sagal
2022-02-18 13:55:34 -08:00
committed by GitHub
parent 7a3b373d43
commit ff2806876d
40 changed files with 2565 additions and 3146 deletions
+8 -9
View File
@@ -1,5 +1,5 @@
<style lang="scss">
@import '../scss/vue-select.scss';
<style>
@import '../css/vue-select.css';
</style>
<template>
@@ -33,8 +33,7 @@
</slot>
<button
v-if="multiple"
ref="deselectButtons"
:ref="el => deselectButtons[i] = el"
:ref="(el) => (deselectButtons[i] = el)"
:disabled="disabled"
type="button"
class="vs__deselect"
@@ -119,9 +118,9 @@
</slot>
</li>
<li v-if="filteredOptions.length === 0" class="vs__no-options">
<slot name="no-options" v-bind="scope.noOptions"
>Sorry, no matching options.</slot
>
<slot name="no-options" v-bind="scope.noOptions">
Sorry, no matching options.
</slot>
</li>
<slot name="list-footer" v-bind="scope.listFooter" />
</ul>
@@ -694,7 +693,7 @@ export default {
pushedTags: [],
// eslint-disable-next-line vue/no-reserved-keys
_value: [], // Internal value managed by Vue Select if no `value` prop is passed
deselectButtons: []
deselectButtons: [],
}
},
@@ -723,7 +722,7 @@ export default {
value = this.$data._value
}
if (value) {
if (value !== undefined && value !== null) {
return [].concat(value)
}