refactor(Select): reuse input composing function (#4971)

* chore: bump version 9.1.9-beta01

Co-Authored-By: SamXMG <[email protected]>

* refactor: 提高代码复用率

* refactor: 重构代码

* Revert "chore: bump version 9.1.9-beta01"

This reverts commit b9f6deb.

# Conflicts:
#	src/BootstrapBlazor/BootstrapBlazor.csproj

---------

Co-authored-by: SamXMG <[email protected]>

Author: ArgoZhang

src/BootstrapBlazor/Components/Select/Select.razor.js

@@ -2,6 +2,7 @@
 import Data from "../../modules/data.js"
 import EventHandler from "../../modules/event-handler.js"
 import Popover from "../../modules/base-popover.js"
+import Input from "../../modules/input.js"
 
 export function init(id, invoke, options) {
     const el = document.getElementById(id)
@@ -10,7 +11,7 @@ export function init(id, invoke, options) {
         return
     }
 
-    const search = el.querySelector("input.search-text")
+    const search = el.querySelector(".search-text")
     const popover = Popover.init(el)
 
     const shown = () => {
@@ -73,31 +74,17 @@ export function init(id, invoke, options) {
     EventHandler.on(el, 'shown.bs.dropdown', shown);
     EventHandler.on(el, 'keydown', keydown)
 
+    const onSearch = debounce(v => invoke.invokeMethodAsync(searchMethodCallback, v));
+    if (search) {
+        Input.composition(search, onSearch);
+    }
+
     const select = {
         el,
+        search,
         popover
     }
     Data.set(id, select);
-
-    const onSearch = debounce(v => invoke.invokeMethodAsync(searchMethodCallback, v));
-    let isComposing = false;
-
-    EventHandler.on(el, 'input', '.search-text', e => {
-        if (isComposing) {
-            return;
-        }
-
-        onSearch(e.delegateTarget.value);
-    });
-
-    EventHandler.on(el, 'compositionstart', '.search-text', e => {
-        isComposing = true;
-    });
-
-    EventHandler.on(el, 'compositionend', '.search-text', e => {
-        isComposing = false;
-        onSearch(e.delegateTarget.value);
-    });
 }
 
 export function show(id) {
@@ -129,14 +116,11 @@ export function dispose(id) {
     if (select) {
         EventHandler.off(select.el, 'shown.bs.dropdown')
         EventHandler.off(select.el, 'keydown');
-        EventHandler.off(select.el, 'input');
-        EventHandler.off(select.el, 'compositionstart');
-        EventHandler.off(select.el, 'compositionend')
         Popover.dispose(select.popover)
+        Input.dispose(select.search);
     }
 }
 
-
 function scrollToActive(el, activeItem) {
     if (!activeItem) {
         activeItem = el.querySelector('.dropdown-item.active')

src/BootstrapBlazor/wwwroot/modules/input.js

@@ -1,33 +1,25 @@
 import EventHandler from "./event-handler.js"
 
 export default {
-    composition(id, invoke, callback) {
-        const el = document.getElementById(id)
+    composition(el, callback) {
         if (el) {
-            var isInputZh = false
+            let isComposing = false
             EventHandler.on(el, 'compositionstart', e => {
-                isInputZh = true
-            })
+                isComposing = true;
+            });
             EventHandler.on(el, 'compositionend', e => {
-                isInputZh = false
-            })
+                isComposing = false;
+                callback(el.value);
+            });
             EventHandler.on(el, 'input', e => {
-                if (isInputZh) {
-                    e.stopPropagation()
-                    e.preventDefault()
-                    const handler = setTimeout(() => {
-                        if (!isInputZh) {
-                            clearTimeout(handler)
-                            invoke.invokeMethodAsync(callback, el.value)
-                        }
-                    }, 15)
+                if (!isComposing) {
+                    callback(el.value);
                 }
-            })
+            });
         }
     },
 
-    dispose(id) {
-        const el = document.getElementById(id)
+    dispose(el) {
         if (el) {
             EventHandler.off(el, 'compositionstart')
             EventHandler.off(el, 'compositionend')