fix: [el-select-v2] avoid remove new option when reserve-keyword is t…

…rue (element-plus#5912)
StetroF · Feb 11, 2022 · f194efc · f194efc
1 parent 2ed6fc4
commit f194efc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/components/select-v2/src/useAllowCreate.ts b/packages/components/select-v2/src/useAllowCreate.ts
@@ -58,7 +58,14 @@ export function useAllowCreate(props: ISelectProps, states) {
   }
 
   function removeNewOption(option: Option) {
-    if (!enableAllowCreateMode.value || !option || !option.created) {
+    if (
+      !enableAllowCreateMode.value ||
+      !option ||
+      !option.created ||
+      (option.created &&
+        props.reserveKeyword &&
+        states.inputValue === option.label)
+    ) {
       return
     }
     const idx = states.createdOptions.findIndex(

diff --git a/packages/components/select-v2/src/useSelect.ts b/packages/components/select-v2/src/useSelect.ts
@@ -591,7 +591,10 @@ const useSelect = (props: ExtractPropTypes<typeof SelectProps>, emit) => {
   const onKeyboardSelect = () => {
     if (!expanded.value) {
       return toggleMenu()
-    } else if (~states.hoveringIndex) {
+    } else if (
+      ~states.hoveringIndex &&
+      filteredOptions.value[states.hoveringIndex]
+    ) {
       onSelect(
         filteredOptions.value[states.hoveringIndex],
         states.hoveringIndex,