refactor: radio/checkbox选中判断改回正则 (#2927)

Tencent · Nov 24, 2023 · c30f142 · c30f142
1 parent 4a8eba3
commit c30f142
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/_common b/src/_common
diff --git a/src/checkbox/hooks/useKeyboardEvent.ts b/src/checkbox/hooks/useKeyboardEvent.ts
@@ -1,8 +1,8 @@
-export const CHECKED_CODE = ['Enter', 'Space'];
+import { CHECKED_CODE_REG } from '../../_common/js/common';
 
 export function useKeyboardEvent(handleChange: (e: Event) => void) {
   const keyboardEventListener = (e: KeyboardEvent) => {
-    const isCheckedCode = CHECKED_CODE.includes(e.key) || CHECKED_CODE.includes(e.code);
+    const isCheckedCode = CHECKED_CODE_REG.test(e.key) || CHECKED_CODE_REG.test(e.code);
     if (isCheckedCode) {
       e.preventDefault();
       const { disabled } = (e.currentTarget as HTMLElement).querySelector('input');

diff --git a/src/radio/group.tsx b/src/radio/group.tsx
@@ -11,7 +11,7 @@ import { emitEvent } from '../utils/event';
 import { getClassPrefixMixins } from '../config-provider/config-receiver';
 import mixins from '../utils/mixins';
 import { off, on } from '../utils/dom';
-import { CHECKED_CODE } from '../checkbox/hooks/useKeyboardEvent';
+import { CHECKED_CODE_REG } from '../_common/js/common';
 
 const classPrefixMixins = getClassPrefixMixins('radio-group');
 
@@ -114,7 +114,7 @@ export default mixins(classPrefixMixins).extend({
 
     // 注意：此处会还原区分 数字 和 数字字符串
     checkRadioInGroup(e: KeyboardEvent) {
-      const isCheckedCode = CHECKED_CODE.includes(e.key) || CHECKED_CODE.includes(e.code);
+      const isCheckedCode = CHECKED_CODE_REG.test(e.key) || CHECKED_CODE_REG.test(e.code);
       if (isCheckedCode) {
         e.preventDefault();
         const inputNode = (e.target as HTMLElement).querySelector('input');
+9 −8		js/common.ts
+6 −1		style/web/components/tag-input/_index.less