From 9de9b857225d36db7799e330755fade683a995f6 Mon Sep 17 00:00:00 2001 From: cssking Date: Wed, 20 Dec 2023 22:17:01 +0800 Subject: [PATCH 01/16] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E9=94=AE=E7=9B=98=E5=8F=8A=E8=99=9A=E6=8B=9F=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=97=A0=E9=9A=9C=E7=A2=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/mask/mask.tsx | 1 + src/components/number-keyboard/number-keyboard.tsx | 12 ++++++------ src/components/virtual-input/virtual-input.tsx | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/mask/mask.tsx b/src/components/mask/mask.tsx index 9cc8a248ad..99d0aadaf1 100644 --- a/src/components/mask/mask.tsx +++ b/src/components/mask/mask.tsx @@ -101,6 +101,7 @@ export const Mask: FC = p => { = p => { onClick={() => { props.onClose?.() }} - role='grid' - title='CLOSE' + role='button' + title='收起' tabIndex={-1} > @@ -160,7 +160,7 @@ export const NumberKeyboard: FC = p => { const ariaProps = key ? { - role: 'grid', + role: 'button', title: key, tabIndex: -1, } @@ -233,8 +233,8 @@ export const NumberKeyboard: FC = p => { // Long press should not trigger native context menu e.preventDefault() }} - title='BACKSPACE' - role='grid' + title='删除' + role='button' tabIndex={-1} > @@ -242,7 +242,7 @@ export const NumberKeyboard: FC = p => {
onKeyPress(e, 'OK')} - role='grid' + role='button' tabIndex={-1} aria-label={confirmText} > diff --git a/src/components/virtual-input/virtual-input.tsx b/src/components/virtual-input/virtual-input.tsx index 26ba5b6203..955496f4b0 100644 --- a/src/components/virtual-input/virtual-input.tsx +++ b/src/components/virtual-input/virtual-input.tsx @@ -130,7 +130,7 @@ export const VirtualInput = forwardRef( [`${classPrefix}-disabled`]: props.disabled, })} tabIndex={props.disabled ? undefined : 0} - role='option' + role='textbox' onFocus={onFocus} onBlur={onBlur} onClick={props.onClick} From 59460e8524a0a2633667e48a26e0c2138ed8e806 Mon Sep 17 00:00:00 2001 From: cssking Date: Thu, 21 Dec 2023 21:37:59 +0800 Subject: [PATCH 02/16] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96test=20snapshots?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/__snapshots__/action-sheet.test.tsx.snap | 1 + .../tests/__snapshots__/image-viewer.test.tsx.snap | 1 + .../number-keyboard/tests/number-keyboard.test.tsx | 6 +++--- src/components/virtual-input/tests/virtual-input.test.tsx | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/action-sheet/tests/__snapshots__/action-sheet.test.tsx.snap b/src/components/action-sheet/tests/__snapshots__/action-sheet.test.tsx.snap index 0f64c3b4be..14dcaea0e1 100644 --- a/src/components/action-sheet/tests/__snapshots__/action-sheet.test.tsx.snap +++ b/src/components/action-sheet/tests/__snapshots__/action-sheet.test.tsx.snap @@ -18,6 +18,7 @@ exports[`ActionSheet basic usage 1`] = ` class="adm-popup adm-action-sheet-popup" >