Commit 799c42d3 authored by hetech's avatar hetech Committed by iamkun

Select: not toggle dropdown when filtering (#12210)

parent ef33295a
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
:autocomplete="autoComplete || autocomplete" :autocomplete="autoComplete || autocomplete"
@focus="handleFocus" @focus="handleFocus"
@blur="softFocus = false" @blur="softFocus = false"
@click.stop
@keyup="managePlaceholder" @keyup="managePlaceholder"
@keydown="resetInputState" @keydown="resetInputState"
@keydown.down.prevent="navigateOptions('next')" @keydown.down.prevent="navigateOptions('next')"
...@@ -58,6 +57,7 @@ ...@@ -58,6 +57,7 @@
@keydown.enter.prevent="selectOption" @keydown.enter.prevent="selectOption"
@keydown.esc.stop.prevent="visible = false" @keydown.esc.stop.prevent="visible = false"
@keydown.delete="deletePrevTag" @keydown.delete="deletePrevTag"
@keydown.tab="visible = false"
@compositionstart="handleComposition" @compositionstart="handleComposition"
@compositionupdate="handleComposition" @compositionupdate="handleComposition"
@compositionend="handleComposition" @compositionend="handleComposition"
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
:readonly="readonly" :readonly="readonly"
:validate-event="false" :validate-event="false"
:class="{ 'is-focus': visible }" :class="{ 'is-focus': visible }"
:tabindex="(multiple && filterable) ? '-1' : null"
@focus="handleFocus" @focus="handleFocus"
@blur="handleBlur" @blur="handleBlur"
@keyup.native="debouncedOnInputChange" @keyup.native="debouncedOnInputChange"
...@@ -380,6 +381,7 @@ ...@@ -380,6 +381,7 @@
this.previousQuery = null; this.previousQuery = null;
this.selectedLabel = ''; this.selectedLabel = '';
this.inputLength = 20; this.inputLength = 20;
this.menuVisibleOnFocus = false;
this.resetHoverIndex(); this.resetHoverIndex();
this.$nextTick(() => { this.$nextTick(() => {
if (this.$refs.input && if (this.$refs.input &&
...@@ -575,7 +577,9 @@ ...@@ -575,7 +577,9 @@
if (!this.softFocus) { if (!this.softFocus) {
if (this.automaticDropdown || this.filterable) { if (this.automaticDropdown || this.filterable) {
this.visible = true; this.visible = true;
this.menuVisibleOnFocus = true; if (this.filterable) {
this.menuVisibleOnFocus = true;
}
} }
this.$emit('focus', event); this.$emit('focus', event);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment