fix(comp:select): trigger handleInput when onCompositionEnd (#801)

fix #786
IDuxFE · Mar 12, 2022 · d157f0c · d157f0c
1 parent 93231ab
commit d157f0c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/components/input/src/useInput.ts b/packages/components/input/src/useInput.ts
@@ -72,8 +72,8 @@ export function useInput(
   watch(accessor.valueRef, () => syncValue())
 
   const isComposing = ref(false)
-  const handleInput = (evt: Event) => {
-    callEmit(props.onInput, evt)
+  const handleInput = (evt: Event, emitInput = true) => {
+    emitInput && callEmit(props.onInput, evt)
     if (isComposing.value) {
       return
     }
@@ -96,7 +96,7 @@ export function useInput(
     callEmit(props.onCompositionEnd, evt)
     if (isComposing.value) {
       isComposing.value = false
-      handleInput(evt)
+      handleInput(evt, false)
     }
   }
 

diff --git a/packages/components/select/src/composables/useInputState.ts b/packages/components/select/src/composables/useInputState.ts
@@ -58,14 +58,15 @@ export function useInputState(
   }
 
   const handleCompositionEnd = (evt: CompositionEvent) => {
+    callEmit(props.onCompositionEnd, evt)
     if (isComposing.value) {
       isComposing.value = false
+      handleInput(evt, false)
     }
-    callEmit(props.onCompositionEnd, evt)
   }
 
-  const handleInput = (evt: Event) => {
-    callEmit(props.onInput, evt)
+  const handleInput = (evt: Event, emitInput = true) => {
+    emitInput && callEmit(props.onInput, evt)
     if (isComposing.value) {
       return
     }