From 8214bf8d0211f2352886d10ec2c74dc71a848119 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Wed, 17 Nov 2021 16:57:47 +0800
Subject: [PATCH] feat(Popover): add tabindex and aria-disabled for a11y
 (#9889)

---
 packages/vant/src/popover/Popover.tsx                       | 2 ++
 .../vant/src/popover/test/__snapshots__/index.spec.tsx.snap | 2 ++
 packages/vant/src/rate/Rate.tsx                             | 2 +-
 packages/vant/src/slider/Slider.tsx                         | 4 ++--
 packages/vant/src/stepper/Stepper.tsx                       | 6 +++---
 .../vant/src/stepper/test/__snapshots__/demo.spec.ts.snap   | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/vant/src/popover/Popover.tsx b/packages/vant/src/popover/Popover.tsx
index 194ba5d03..5116e8a9c 100644
--- a/packages/vant/src/popover/Popover.tsx
+++ b/packages/vant/src/popover/Popover.tsx
@@ -173,6 +173,8 @@ export default defineComponent({
           role="menuitem"
           class={[bem('action', { disabled, 'with-icon': icon }), className]}
           style={{ color }}
+          tabindex={disabled ? undefined : 0}
+          aria-disabled={disabled || undefined}
           onClick={() => onClickAction(action, index)}
         >
           {icon && (
diff --git a/packages/vant/src/popover/test/__snapshots__/index.spec.tsx.snap b/packages/vant/src/popover/test/__snapshots__/index.spec.tsx.snap
index 09edde75a..cbb839bc2 100644
--- a/packages/vant/src/popover/test/__snapshots__/index.spec.tsx.snap
+++ b/packages/vant/src/popover/test/__snapshots__/index.spec.tsx.snap
@@ -3,6 +3,7 @@
 exports[`should allow to custom the className of action 1`] = `
 <div role="menuitem"
      class="van-popover__action foo"
+     tabindex="0"
 >
   <div class="van-popover__action-text van-hairline--bottom">
     Option
@@ -22,6 +23,7 @@ exports[`should change icon class prefix when using icon-prefix prop 1`] = `
     >
       <div role="menuitem"
            class="van-popover__action van-popover__action--with-icon"
+           tabindex="0"
       >
         <i class="van-badge__wrapper my-icon my-icon-success van-popover__action-icon">
         </i>
diff --git a/packages/vant/src/rate/Rate.tsx b/packages/vant/src/rate/Rate.tsx
index 5880d8d65..6cbbddfa3 100644
--- a/packages/vant/src/rate/Rate.tsx
+++ b/packages/vant/src/rate/Rate.tsx
@@ -196,7 +196,7 @@ export default defineComponent({
           style={style}
           class={bem('item')}
           tabindex={disabled ? undefined : 0}
-          aria-setsize={+count}
+          aria-setsize={count}
           aria-posinset={score}
           aria-checked={!isVoid}
           onClick={onClickItem}
diff --git a/packages/vant/src/slider/Slider.tsx b/packages/vant/src/slider/Slider.tsx
index bd9fc7b6b..5f2559f23 100644
--- a/packages/vant/src/slider/Slider.tsx
+++ b/packages/vant/src/slider/Slider.tsx
@@ -295,9 +295,9 @@ export default defineComponent({
           role="slider"
           class={getButtonClassName(index)}
           tabindex={props.disabled ? undefined : 0}
-          aria-valuemin={+props.min}
+          aria-valuemin={props.min}
           aria-valuenow={current}
-          aria-valuemax={+props.max}
+          aria-valuemax={props.max}
           aria-disabled={props.disabled || undefined}
           aria-readonly={props.readonly || undefined}
           aria-orientation={props.vertical ? 'vertical' : 'horizontal'}
diff --git a/packages/vant/src/stepper/Stepper.tsx b/packages/vant/src/stepper/Stepper.tsx
index 8963c0559..e62389f6f 100644
--- a/packages/vant/src/stepper/Stepper.tsx
+++ b/packages/vant/src/stepper/Stepper.tsx
@@ -313,9 +313,9 @@ export default defineComponent({
           // set keyboard in modern browsers
           inputmode={props.integer ? 'numeric' : 'decimal'}
           placeholder={props.placeholder}
-          aria-valuemax={+props.max}
-          aria-valuemin={+props.min}
-          aria-valuenow={+current.value}
+          aria-valuemax={props.max}
+          aria-valuemin={props.min}
+          aria-valuenow={current.value}
           onBlur={onBlur}
           onInput={onInput}
           onFocus={onFocus}
diff --git a/packages/vant/src/stepper/test/__snapshots__/demo.spec.ts.snap b/packages/vant/src/stepper/test/__snapshots__/demo.spec.ts.snap
index 5728c7439..6b4dbd184 100644
--- a/packages/vant/src/stepper/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/vant/src/stepper/test/__snapshots__/demo.spec.ts.snap
@@ -206,7 +206,7 @@ exports[`should render demo and match snapshot 1`] = `
                inputmode="decimal"
                aria-valuemax="Infinity"
                aria-valuemin="1"
-               aria-valuenow="1"
+               aria-valuenow="1.0"
         >
         <button type="button"
                 class="van-stepper__plus van-haptics-feedback"