From 66b92174a4d0b7fd7ac6dbd351cb2391e3c38c49 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Fri, 26 Apr 2024 14:13:26 -0400
Subject: [PATCH 01/16] added fillOnSelected, clearOnSelected, and blurOnSelect
 to autocomplete

---
 packages/autocomplete/src/autocomplete.vue | 25 ++++++++++++++++++++--
 packages/input/src/input.vue               | 19 ++++++++++------
 src/index.js                               |  2 +-
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index af8d1195cd..faa35208c4 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -10,6 +10,7 @@
     <el-input
       ref="input"
       v-bind="[$props, $attrs]"
+      :disable-blur-event="disableInputBlur"
       @input="handleInput"
       @change="handleChange"
       @focus="handleFocus"
@@ -131,6 +132,18 @@
       highlightFirstItem: {
         type: Boolean,
         default: false
+      },
+      fillOnSelect: {
+        type: Boolean,
+        default: true
+      },
+      blurOnSelect: {
+        type: Boolean,
+        default: false
+      },
+      clearOnSelect: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -139,7 +152,8 @@
         suggestions: [],
         loading: false,
         highlightedIndex: -1,
-        suggestionDisabled: false
+        suggestionDisabled: false,
+        disableInputBlur: false
       };
     },
     computed: {
@@ -230,11 +244,18 @@
         }
       },
       select(item) {
-        this.$emit('input', item[this.valueKey]);
+        this.disableInputBlur = true;
+        if (this.fillOnSelected) {
+          this.$emit('input', item[this.valueKey]);
+        }
+        if (this.clearOnSelected) {
+          this.$emit('input', '');
+        }
         this.$emit('select', item);
         this.$nextTick(_ => {
           this.suggestions = [];
           this.highlightedIndex = -1;
+          this.disableInputBlur = false;
         });
       },
       highlight(index) {
diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index b4b35926c6..f6afc21335 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -16,7 +16,7 @@
     @mouseleave="hovering = false"
   >
     <template v-if="type !== 'textarea'">
-      <!-- 前置元素 -->
+       <!-- Prepend element -->
       <div class="el-input-group__prepend" v-if="$slots.prepend">
         <slot name="prepend"></slot>
       </div>
@@ -39,7 +39,7 @@
         @change="handleChange"
         :aria-label="label"
       >
-      <!-- 前置内容 -->
+      <!-- Prefix content -->
       <span class="el-input__prefix" v-if="$slots.prefix || prefixIcon">
         <slot name="prefix"></slot>
         <i class="el-input__icon"
@@ -47,7 +47,7 @@
            :class="prefixIcon">
         </i>
       </span>
-      <!-- 后置内容 -->
+      <!-- Suffix content -->
       <span
         class="el-input__suffix"
         v-if="getSuffixVisible()">
@@ -79,7 +79,7 @@
           :class="['el-input__validateIcon', validateIcon]">
         </i>
       </span>
-      <!-- 后置元素 -->
+      <!-- Append element -->
       <div class="el-input-group__append" v-if="$slots.append">
         <slot name="append"></slot>
       </div>
@@ -189,9 +189,12 @@
         type: Boolean,
         default: false
       },
-      tabindex: String
+      tabindex: String,
+      disableBlurEvent: {
+        type: Boolean,
+        default: false
+      }
     },
-
     computed: {
       _elFormItemSize() {
         return (this.elFormItem || {}).elFormItemSize;
@@ -303,6 +306,10 @@
         };
       },
       handleBlur(event) {
+        if (this.disableBlurEvent) {
+          event.preventDefault();
+          this.$refs.input.focus();
+        }
         this.focused = false;
         this.$emit('blur', event);
         if (this.validateEvent) {
diff --git a/src/index.js b/src/index.js
index 40f8a36cc5..4bc2c56ec4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -198,7 +198,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.13.2',
+  version: '2.13.2-37',
   locale: locale.use,
   i18n: locale.i18n,
   install,

From 29a9128bc340a1d7442f82d0f08de4f5abd78e92 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Fri, 26 Apr 2024 14:23:57 -0400
Subject: [PATCH 02/16] remove clearOnSelect

---
 packages/autocomplete/src/autocomplete.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index faa35208c4..2ac3cc0a1e 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -140,10 +140,6 @@
       blurOnSelect: {
         type: Boolean,
         default: false
-      },
-      clearOnSelect: {
-        type: Boolean,
-        default: false
       }
     },
     data() {
@@ -248,9 +244,6 @@
         if (this.fillOnSelected) {
           this.$emit('input', item[this.valueKey]);
         }
-        if (this.clearOnSelected) {
-          this.$emit('input', '');
-        }
         this.$emit('select', item);
         this.$nextTick(_ => {
           this.suggestions = [];

From 87344b826e9afd367c9943b66d4a2b6144863752 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Fri, 26 Apr 2024 16:03:51 -0400
Subject: [PATCH 03/16] new implementation

---
 packages/autocomplete/src/autocomplete.vue |  8 +++-----
 packages/input/src/input.vue               | 17 +++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index 2ac3cc0a1e..beead5e295 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -10,7 +10,6 @@
     <el-input
       ref="input"
       v-bind="[$props, $attrs]"
-      :disable-blur-event="disableInputBlur"
       @input="handleInput"
       @change="handleChange"
       @focus="handleFocus"
@@ -148,8 +147,7 @@
         suggestions: [],
         loading: false,
         highlightedIndex: -1,
-        suggestionDisabled: false,
-        disableInputBlur: false
+        suggestionDisabled: false
       };
     },
     computed: {
@@ -199,6 +197,7 @@
       },
       handleInput(value) {
         this.$emit('input', value);
+        this.$refs.input.ignoreNextBlur(true);
         this.suggestionDisabled = false;
         if (!this.triggerOnFocus && !value) {
           this.suggestionDisabled = true;
@@ -228,6 +227,7 @@
         this.activated = false;
       },
       handleKeyEnter(e) {
+        this.$refs.input.ignoreNextBlur(false);
         if (this.suggestionVisible && this.highlightedIndex >= 0 && this.highlightedIndex < this.suggestions.length) {
           e.preventDefault();
           this.select(this.suggestions[this.highlightedIndex]);
@@ -240,7 +240,6 @@
         }
       },
       select(item) {
-        this.disableInputBlur = true;
         if (this.fillOnSelected) {
           this.$emit('input', item[this.valueKey]);
         }
@@ -248,7 +247,6 @@
         this.$nextTick(_ => {
           this.suggestions = [];
           this.highlightedIndex = -1;
-          this.disableInputBlur = false;
         });
       },
       highlight(index) {
diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index f6afc21335..a06a3c13ff 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -138,7 +138,8 @@
         hovering: false,
         focused: false,
         isComposing: false,
-        passwordVisible: false
+        passwordVisible: false,
+        ignoreBlur: false
       };
     },
 
@@ -189,11 +190,7 @@
         type: Boolean,
         default: false
       },
-      tabindex: String,
-      disableBlurEvent: {
-        type: Boolean,
-        default: false
-      }
+      tabindex: String
     },
     computed: {
       _elFormItemSize() {
@@ -305,10 +302,14 @@
           }
         };
       },
+      ignoreNextBlur(state) {
+        this.ignoreBlur = state;
+      },
       handleBlur(event) {
-        if (this.disableBlurEvent) {
+        if (this.ignoreBlur) {
+          this.ignoreBlur = false;
           event.preventDefault();
-          this.$refs.input.focus();
+          return;
         }
         this.focused = false;
         this.$emit('blur', event);

From 6a1113d5a4c7c84c0363f362e1cf05c90b087fd5 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Fri, 26 Apr 2024 16:08:02 -0400
Subject: [PATCH 04/16] revert change to index.js

---
 src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.js b/src/index.js
index 4bc2c56ec4..40f8a36cc5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -198,7 +198,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.13.2-37',
+  version: '2.13.2',
   locale: locale.use,
   i18n: locale.i18n,
   install,

From 5621579273db0dfb30c411363035cf58b0ec4bc5 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Fri, 26 Apr 2024 16:08:59 -0400
Subject: [PATCH 05/16] tidy

---
 packages/input/src/input.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index a06a3c13ff..7f9d831f20 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -192,6 +192,7 @@
       },
       tabindex: String
     },
+    
     computed: {
       _elFormItemSize() {
         return (this.elFormItem || {}).elFormItemSize;

From ef65ec15e285593785e1999c8dd90b0a52cb674e Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Fri, 26 Apr 2024 16:09:18 -0400
Subject: [PATCH 06/16] tidy

---
 packages/input/src/input.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index 7f9d831f20..ac7fa69fa4 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -192,7 +192,7 @@
       },
       tabindex: String
     },
-    
+
     computed: {
       _elFormItemSize() {
         return (this.elFormItem || {}).elFormItemSize;

From 7921c4d68121ea7055b535334b22f68232fc129b Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Fri, 26 Apr 2024 16:16:09 -0400
Subject: [PATCH 07/16] prevent default doesn't work in this case

---
 packages/input/src/input.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index ac7fa69fa4..f0fce7215f 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -309,7 +309,7 @@
       handleBlur(event) {
         if (this.ignoreBlur) {
           this.ignoreBlur = false;
-          event.preventDefault();
+          this.$refs.input.focus();
           return;
         }
         this.focused = false;

From ea43005be0a62638785727911519e4fb1ffea799 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Fri, 26 Apr 2024 16:28:09 -0400
Subject: [PATCH 08/16] prop fixes

---
 packages/autocomplete/src/autocomplete.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index beead5e295..7210e93297 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -197,7 +197,7 @@
       },
       handleInput(value) {
         this.$emit('input', value);
-        this.$refs.input.ignoreNextBlur(true);
+        if (this.blurOnSelect) { this.$refs.input.ignoreNextBlur(true); }
         this.suggestionDisabled = false;
         if (!this.triggerOnFocus && !value) {
           this.suggestionDisabled = true;
@@ -227,7 +227,7 @@
         this.activated = false;
       },
       handleKeyEnter(e) {
-        this.$refs.input.ignoreNextBlur(false);
+        if (this.blurOnSelect) { this.$refs.input.ignoreNextBlur(false); }
         if (this.suggestionVisible && this.highlightedIndex >= 0 && this.highlightedIndex < this.suggestions.length) {
           e.preventDefault();
           this.select(this.suggestions[this.highlightedIndex]);
@@ -240,7 +240,7 @@
         }
       },
       select(item) {
-        if (this.fillOnSelected) {
+        if (this.fillOnSelect) {
           this.$emit('input', item[this.valueKey]);
         }
         this.$emit('select', item);

From b9cf351317c3756bb67c2254049796cbf72618f1 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Mon, 29 Apr 2024 16:33:07 -0400
Subject: [PATCH 09/16] new approach

---
 packages/autocomplete/src/autocomplete.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index 7210e93297..e848e70dce 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -19,6 +19,7 @@
       @keydown.down.native.prevent="highlight(highlightedIndex + 1)"
       @keydown.enter.native="handleKeyEnter"
       @keydown.native.tab="close"
+      @keydown.tab="close"
     >
       <template slot="prepend" v-if="$slots.prepend">
         <slot name="prepend"></slot>
@@ -138,7 +139,7 @@
       },
       blurOnSelect: {
         type: Boolean,
-        default: false
+        default: true
       }
     },
     data() {
@@ -147,7 +148,8 @@
         suggestions: [],
         loading: false,
         highlightedIndex: -1,
-        suggestionDisabled: false
+        suggestionDisabled: false,
+        selected: false
       };
     },
     computed: {
@@ -197,7 +199,8 @@
       },
       handleInput(value) {
         this.$emit('input', value);
-        if (this.blurOnSelect) { this.$refs.input.ignoreNextBlur(true); }
+        this.selected = false;
+        if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(true); }
         this.suggestionDisabled = false;
         if (!this.triggerOnFocus && !value) {
           this.suggestionDisabled = true;
@@ -225,6 +228,10 @@
       },
       close(e) {
         this.activated = false;
+        if (!this.selected) {
+          this.selected = true;
+          this.$refs.input.blur();
+        }
       },
       handleKeyEnter(e) {
         if (this.blurOnSelect) { this.$refs.input.ignoreNextBlur(false); }
@@ -240,9 +247,8 @@
         }
       },
       select(item) {
-        if (this.fillOnSelect) {
-          this.$emit('input', item[this.valueKey]);
-        }
+        this.selected = true;
+        if (this.fillOnSelect) { this.$emit('input', item[this.valueKey]); }
         this.$emit('select', item);
         this.$nextTick(_ => {
           this.suggestions = [];

From 94222db730edc1945dc37ec66707fbf483d33362 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Tue, 30 Apr 2024 08:20:06 -0400
Subject: [PATCH 10/16] tidy

---
 packages/autocomplete/src/autocomplete.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index e848e70dce..df9a6177b2 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -228,13 +228,13 @@
       },
       close(e) {
         this.activated = false;
-        if (!this.selected) {
+        if (!this.selected && !this.blurOnSelect) {
           this.selected = true;
           this.$refs.input.blur();
         }
       },
       handleKeyEnter(e) {
-        if (this.blurOnSelect) { this.$refs.input.ignoreNextBlur(false); }
+        if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(false); }
         if (this.suggestionVisible && this.highlightedIndex >= 0 && this.highlightedIndex < this.suggestions.length) {
           e.preventDefault();
           this.select(this.suggestions[this.highlightedIndex]);

From 2eefe2be264404bd3f384d7cb95afc7eb0ad6c7d Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Tue, 30 Apr 2024 11:37:16 -0400
Subject: [PATCH 11/16] fix tab not dismissing suggestions

---
 packages/autocomplete/src/autocomplete.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index df9a6177b2..5231cecd2e 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -19,7 +19,6 @@
       @keydown.down.native.prevent="highlight(highlightedIndex + 1)"
       @keydown.enter.native="handleKeyEnter"
       @keydown.native.tab="close"
-      @keydown.tab="close"
     >
       <template slot="prepend" v-if="$slots.prepend">
         <slot name="prepend"></slot>
@@ -220,6 +219,7 @@
         }
       },
       handleBlur(event) {
+        this.activated = false;
         this.$emit('blur', event);
       },
       handleClear() {

From c97cdb7e2c1d59a7af2ac64306c75b0202aa26ac Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Tue, 30 Apr 2024 16:26:02 -0400
Subject: [PATCH 12/16] update tab method

---
 packages/autocomplete/src/autocomplete.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index 5231cecd2e..bfe6df7240 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -18,7 +18,7 @@
       @keydown.up.native.prevent="highlight(highlightedIndex - 1)"
       @keydown.down.native.prevent="highlight(highlightedIndex + 1)"
       @keydown.enter.native="handleKeyEnter"
-      @keydown.native.tab="close"
+      @keydown.native.tab="handleKeyEnter"
     >
       <template slot="prepend" v-if="$slots.prepend">
         <slot name="prepend"></slot>

From 716849eb386bb65045739f886db41201303bdc79 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Tue, 30 Apr 2024 17:37:57 -0400
Subject: [PATCH 13/16] tidy

---
 packages/autocomplete/src/autocomplete.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index bfe6df7240..9d369b28fe 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -148,7 +148,7 @@
         loading: false,
         highlightedIndex: -1,
         suggestionDisabled: false,
-        selected: false
+        handledSelection: false
       };
     },
     computed: {
@@ -198,7 +198,7 @@
       },
       handleInput(value) {
         this.$emit('input', value);
-        this.selected = false;
+        this.handledSelection = false;
         if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(true); }
         this.suggestionDisabled = false;
         if (!this.triggerOnFocus && !value) {
@@ -219,7 +219,6 @@
         }
       },
       handleBlur(event) {
-        this.activated = false;
         this.$emit('blur', event);
       },
       handleClear() {
@@ -228,8 +227,8 @@
       },
       close(e) {
         this.activated = false;
-        if (!this.selected && !this.blurOnSelect) {
-          this.selected = true;
+        if (!this.handledSelection && !this.blurOnSelect) {
+          this.handledSelection = true;
           this.$refs.input.blur();
         }
       },
@@ -247,7 +246,7 @@
         }
       },
       select(item) {
-        this.selected = true;
+        this.handledSelection = true;
         if (this.fillOnSelect) { this.$emit('input', item[this.valueKey]); }
         this.$emit('select', item);
         this.$nextTick(_ => {

From b8169c22d2a50d372069a5180104855159b3b210 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Wed, 1 May 2024 18:54:33 -0400
Subject: [PATCH 14/16] fix tab behavior

---
 packages/autocomplete/src/autocomplete.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index 9d369b28fe..7c7caf72d8 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -18,7 +18,7 @@
       @keydown.up.native.prevent="highlight(highlightedIndex - 1)"
       @keydown.down.native.prevent="highlight(highlightedIndex + 1)"
       @keydown.enter.native="handleKeyEnter"
-      @keydown.native.tab="handleKeyEnter"
+      @keydown.native.tab="handleKeyTab"
     >
       <template slot="prepend" v-if="$slots.prepend">
         <slot name="prepend"></slot>
@@ -139,6 +139,10 @@
       blurOnSelect: {
         type: Boolean,
         default: true
+      },
+      tabSelectsSuggestion: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -199,8 +203,8 @@
       handleInput(value) {
         this.$emit('input', value);
         this.handledSelection = false;
-        if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(true); }
         this.suggestionDisabled = false;
+        if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(true); }
         if (!this.triggerOnFocus && !value) {
           this.suggestionDisabled = true;
           this.suggestions = [];
@@ -228,10 +232,17 @@
       close(e) {
         this.activated = false;
         if (!this.handledSelection && !this.blurOnSelect) {
-          this.handledSelection = true;
           this.$refs.input.blur();
         }
       },
+      handleKeyTab(e) {
+        if (this.tabSelectsSuggestion) {
+          this.select(this.suggestions[this.highlightedIndex]);
+        } else {
+          if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(false); }
+          this.close(e);
+        }
+      },
       handleKeyEnter(e) {
         if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(false); }
         if (this.suggestionVisible && this.highlightedIndex >= 0 && this.highlightedIndex < this.suggestions.length) {

From c500dc95fe8f70bc99f3dd8419abc357582d9108 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Thu, 2 May 2024 15:49:08 -0400
Subject: [PATCH 15/16] handleKeyTab uses handleKeyEnter

---
 packages/autocomplete/src/autocomplete.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index 7c7caf72d8..d4545fdcba 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -237,7 +237,7 @@
       },
       handleKeyTab(e) {
         if (this.tabSelectsSuggestion) {
-          this.select(this.suggestions[this.highlightedIndex]);
+          this.handleKeyEnter(e);
         } else {
           if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(false); }
           this.close(e);

From e52b252263bf3bd80233a8ab1a47bf90ae98f211 Mon Sep 17 00:00:00 2001
From: Trevor Honeycutt <trevor@cognitoforms.com>
Date: Thu, 2 May 2024 16:07:26 -0400
Subject: [PATCH 16/16] update autocomplete

---
 packages/autocomplete/src/autocomplete.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/autocomplete/src/autocomplete.vue b/packages/autocomplete/src/autocomplete.vue
index d4545fdcba..6cde1687aa 100644
--- a/packages/autocomplete/src/autocomplete.vue
+++ b/packages/autocomplete/src/autocomplete.vue
@@ -236,8 +236,8 @@
         }
       },
       handleKeyTab(e) {
-        if (this.tabSelectsSuggestion) {
-          this.handleKeyEnter(e);
+        if (this.tabSelectsSuggestion && this.highlightedIndex >= 0 && this.highlightedIndex < this.suggestions.length) {
+          this.select(this.suggestions[this.highlightedIndex]);
         } else {
           if (!this.blurOnSelect) { this.$refs.input.ignoreNextBlur(false); }
           this.close(e);