From 3da2c556f6f197a918f207b5bf975af0b8b5aeeb Mon Sep 17 00:00:00 2001
From: zhangpaopao <zhangpaopao0609@gmail.com>
Date: Tue, 7 Feb 2023 15:35:21 +0800
Subject: [PATCH 1/5] feat(datetimepicker): support aria

---
 src/picker/picker.wxml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/picker/picker.wxml b/src/picker/picker.wxml
index d29d02304..542899c5a 100644
--- a/src/picker/picker.wxml
+++ b/src/picker/picker.wxml
@@ -3,13 +3,23 @@
 <t-popup visible="{{visible}}" placement="bottom" bind:visible-change="onPopupChange">
   <view slot="content" style="{{_._style([style, customStyle])}}" class="{{classPrefix}} {{prefix}}-class">
     <view class="{{classPrefix}}__toolbar" wx:if="{{header}}">
-      <view class="{{classPrefix}}__cancel {{prefix}}-class-cancel" wx:if="{{cancelBtn}}" bindtap="onCancel"
-        >{{cancelBtn}}</view
+      <view
+        class="{{classPrefix}}__cancel {{prefix}}-class-cancel"
+        wx:if="{{cancelBtn}}"
+        bindtap="onCancel"
+        aria-role="button"
       >
+        {{cancelBtn}}
+      </view>
       <view class="{{classPrefix}}__title {{prefix}}-class-title">{{title}}</view>
-      <view class="{{classPrefix}}__confirm {{prefix}}-class-confirm" wx:if="{{confirmBtn}}" bindtap="onConfirm"
-        >{{confirmBtn}}</view
+      <view
+        class="{{classPrefix}}__confirm {{prefix}}-class-confirm"
+        wx:if="{{confirmBtn}}"
+        bindtap="onConfirm"
+        aria-role="button"
       >
+        {{confirmBtn}}
+      </view>
     </view>
     <slot name="header" />
     <view class="{{_.cls(classPrefix + '__main', [])}}">

From e5206c0c435099f4f57fa3e3316bc2b151f0d1f1 Mon Sep 17 00:00:00 2001
From: zhangpaopao <zhangpaopao0609@gmail.com>
Date: Tue, 7 Feb 2023 16:39:45 +0800
Subject: [PATCH 2/5] feat(datetimepicker): update snap

---
 .../__test__/__snapshots__/index.test.js.snap          | 10 ++++++++--
 src/picker/__test__/__snapshots__/index.test.js.snap   | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/date-time-picker/__test__/__snapshots__/index.test.js.snap b/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
index d037302af..03199de82 100644
--- a/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
+++ b/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
@@ -36,10 +36,13 @@ exports[`date-time-picker :base 1`] = `
                 class="t-picker__toolbar"
               >
                 <wx-view
+                  ariaRole="button"
                   class="t-picker__cancel t-class-cancel"
                   bind:tap="onCancel"
                 >
-                  取消
+                  
+        取消
+      
                 </wx-view>
                 <wx-view
                   class="t-picker__title t-class-title"
@@ -47,10 +50,13 @@ exports[`date-time-picker :base 1`] = `
                   选择日期
                 </wx-view>
                 <wx-view
+                  ariaRole="button"
                   class="t-picker__confirm t-class-confirm"
                   bind:tap="onConfirm"
                 >
-                  确定
+                  
+        确定
+      
                 </wx-view>
               </wx-view>
               <wx-view
diff --git a/src/picker/__test__/__snapshots__/index.test.js.snap b/src/picker/__test__/__snapshots__/index.test.js.snap
index 7cf667a1a..20974fb9e 100644
--- a/src/picker/__test__/__snapshots__/index.test.js.snap
+++ b/src/picker/__test__/__snapshots__/index.test.js.snap
@@ -34,10 +34,13 @@ exports[`picker :base 1`] = `
             class="t-picker__toolbar"
           >
             <wx-view
+              ariaRole="button"
               class="t-picker__cancel t-class-cancel"
               bind:tap="onCancel"
             >
-              取消
+              
+        取消
+      
             </wx-view>
             <wx-view
               class="t-picker__title t-class-title"
@@ -45,10 +48,13 @@ exports[`picker :base 1`] = `
               
             </wx-view>
             <wx-view
+              ariaRole="button"
               class="t-picker__confirm t-class-confirm"
               bind:tap="onConfirm"
             >
-              确认
+              
+        确认
+      
             </wx-view>
           </wx-view>
           <wx-view

From 5f1fd75b6e2d7251aaba61d86efcc1777c3e9993 Mon Sep 17 00:00:00 2001
From: zhangpaopao <zhangpaopao0609@gmail.com>
Date: Tue, 14 Feb 2023 14:21:45 +0800
Subject: [PATCH 3/5] feat(picker): support aria

---
 src/picker-item/picker-item.less | 32 ++++++++++++++++++++++++++++++++
 src/picker-item/picker-item.ts   | 26 ++++++++++++++++++++++----
 src/picker-item/picker-item.wxml | 27 +++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/src/picker-item/picker-item.less b/src/picker-item/picker-item.less
index 5ba7b3d87..4487a70e6 100644
--- a/src/picker-item/picker-item.less
+++ b/src/picker-item/picker-item.less
@@ -18,10 +18,42 @@
     overflow: hidden;
     flex: 1;
     z-index: 1;
+    position: relative;
   }
 
   &__wrapper {
     padding: 144rpx 0;
+    position: absolute;
+    z-index: 1;
+    width: 100%;
+    left: 0;
+  }
+
+  &__accessible {
+    position: relative;
+    // top: calc(@picker-item-height * -1);
+    top: 0;
+    width: 100%;
+    height: 100%;
+    // pointer-events: none;
+    opacity: 0;
+    display: flex;
+    flex-direction: column;
+    z-index: 1;
+    padding-bottom: 1px;
+
+    &--current {
+      width: 100%;
+      height: 100%;
+      flex: 1;
+      text-overflow: ellipsis;
+    }
+    &--button {
+      width: 100%;
+      height: 100%;
+      flex: 2;
+      text-overflow: ellipsis;
+    }
   }
 
   &__item {
diff --git a/src/picker-item/picker-item.ts b/src/picker-item/picker-item.ts
index 2406857b5..71cad2f9f 100644
--- a/src/picker-item/picker-item.ts
+++ b/src/picker-item/picker-item.ts
@@ -63,15 +63,23 @@ export default class PickerItem extends SuperComponent {
       });
     },
 
-    onTouchEnd() {
+    onTouchEnd(_, nowIndex) {
       const { offset } = this.data;
       const { options } = this.properties;
 
-      if (offset === this.StartOffset) {
+      let index = nowIndex;
+      if (index !== undefined && (index < 0 || index > options.length - 1)) {
         return;
       }
-      // 调整偏移量
-      const index = range(Math.round(-offset / this.itemHeight), 0, this.getCount() - 1);
+
+      if (index === undefined) {
+        if (offset === this.StartOffset) {
+          return;
+        }
+        // 调整偏移量
+        index = range(Math.round(-offset / this.itemHeight), 0, this.getCount() - 1);
+      }
+
       this.setData({
         curIndex: index,
         offset: -index * this.itemHeight,
@@ -92,6 +100,16 @@ export default class PickerItem extends SuperComponent {
       });
     },
 
+    onClickPrev() {
+      const { curIndex } = this.data;
+      this.onTouchEnd(null, curIndex - 1);
+    },
+
+    onClickNext() {
+      const { curIndex } = this.data;
+      this.onTouchEnd(null, curIndex + 1);
+    },
+
     // 刷新选中状态
     update() {
       const { options, value } = this.data;
diff --git a/src/picker-item/picker-item.wxml b/src/picker-item/picker-item.wxml
index 805e6e9f6..c7a08a8c1 100644
--- a/src/picker-item/picker-item.wxml
+++ b/src/picker-item/picker-item.wxml
@@ -10,6 +10,7 @@
 >
   <view
     class="{{classPrefix}}__wrapper"
+    aria-hidden="{{true}}"
     style="transition: transform {{ duration }}ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, {{ offset }}px, 0)"
   >
     <view
@@ -22,4 +23,30 @@
       {{option.label}}
     </view>
   </view>
+
+  <view class="{{classPrefix}}__accessible">
+    <view
+      class="{{classPrefix}}__accessible--button"
+      aria-role="{{options[curIndex-1] ? 'button' : 'text'}}"
+      aria-label="{{ !options[curIndex-1] ? '没有上一项' : '选择上一项：'+ options[curIndex-1].label}}"
+      bind:tap="onClickPrev"
+    >
+      -
+    </view>
+    <view
+      class="{{classPrefix}}__accessible--current"
+      aria-role="text"
+      aria-label="{{ options[curIndex] ? '当前选择的是：' + options[curIndex].label : '当前未选择' }}"
+    >
+      -
+    </view>
+    <view
+      class="{{classPrefix}}__accessible--button"
+      aria-role="{{options[curIndex+1] ? 'button' : 'text'}}"
+      aria-label="{{!options[curIndex+1] ? '没有下一项' : '选择下一项：' + options[curIndex+1].label}}"
+      bind:tap="onClickNext"
+    >
+      -
+    </view>
+  </view>
 </view>

From c1db7dc2dfc2b2e8438916aaf1622bfbc6716954 Mon Sep 17 00:00:00 2001
From: zhangpaopao <zhangpaopao0609@gmail.com>
Date: Tue, 14 Feb 2023 17:08:12 +0800
Subject: [PATCH 4/5] chore(picker): update snap

---
 .../__test__/__snapshots__/index.test.js.snap | 68 +++++++++++++++++++
 .../__test__/__snapshots__/index.test.js.snap | 68 +++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/src/date-time-picker/__test__/__snapshots__/index.test.js.snap b/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
index 03199de82..511bf6f69 100644
--- a/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
+++ b/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
@@ -75,6 +75,7 @@ exports[`date-time-picker :base 1`] = `
                     bind:touchstart="onTouchStart"
                   >
                     <wx-view
+                      ariaHidden="{{true}}"
                       class="t-picker-item__wrapper"
                       style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, -924px, 0)"
                     >
@@ -325,6 +326,39 @@ exports[`date-time-picker :base 1`] = `
                         
       2030年
     
+                      </wx-view>
+                    </wx-view>
+                    <wx-view
+                      class="t-picker-item__accessible"
+                    >
+                      <wx-view
+                        ariaLabel="选择上一项：2020年"
+                        ariaRole="button"
+                        class="t-picker-item__accessible--button"
+                        bind:tap="onClickPrev"
+                      >
+                        
+      -
+    
+                      </wx-view>
+                      <wx-view
+                        ariaLabel="当前选择的是：2021年"
+                        ariaRole="text"
+                        class="t-picker-item__accessible--current"
+                      >
+                        
+      -
+    
+                      </wx-view>
+                      <wx-view
+                        ariaLabel="选择下一项：2022年"
+                        ariaRole="button"
+                        class="t-picker-item__accessible--button"
+                        bind:tap="onClickNext"
+                      >
+                        
+      -
+    
                       </wx-view>
                     </wx-view>
                   </wx-view>
@@ -342,6 +376,7 @@ exports[`date-time-picker :base 1`] = `
                     bind:touchstart="onTouchStart"
                   >
                     <wx-view
+                      ariaHidden="{{true}}"
                       class="t-picker-item__wrapper"
                       style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, -352px, 0)"
                     >
@@ -440,6 +475,39 @@ exports[`date-time-picker :base 1`] = `
                         
       12月
     
+                      </wx-view>
+                    </wx-view>
+                    <wx-view
+                      class="t-picker-item__accessible"
+                    >
+                      <wx-view
+                        ariaLabel="选择上一项：8月"
+                        ariaRole="button"
+                        class="t-picker-item__accessible--button"
+                        bind:tap="onClickPrev"
+                      >
+                        
+      -
+    
+                      </wx-view>
+                      <wx-view
+                        ariaLabel="当前选择的是：9月"
+                        ariaRole="text"
+                        class="t-picker-item__accessible--current"
+                      >
+                        
+      -
+    
+                      </wx-view>
+                      <wx-view
+                        ariaLabel="选择下一项：10月"
+                        ariaRole="button"
+                        class="t-picker-item__accessible--button"
+                        bind:tap="onClickNext"
+                      >
+                        
+      -
+    
                       </wx-view>
                     </wx-view>
                   </wx-view>
diff --git a/src/picker/__test__/__snapshots__/index.test.js.snap b/src/picker/__test__/__snapshots__/index.test.js.snap
index 20974fb9e..ecca49825 100644
--- a/src/picker/__test__/__snapshots__/index.test.js.snap
+++ b/src/picker/__test__/__snapshots__/index.test.js.snap
@@ -70,6 +70,7 @@ exports[`picker :base 1`] = `
                 bind:touchstart="onTouchStart"
               >
                 <wx-view
+                  ariaHidden="{{true}}"
                   class="t-picker-item__wrapper"
                   style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, 0px, 0)"
                 >
@@ -96,6 +97,39 @@ exports[`picker :base 1`] = `
                     
       2019年
     
+                  </wx-view>
+                </wx-view>
+                <wx-view
+                  class="t-picker-item__accessible"
+                >
+                  <wx-view
+                    ariaLabel="没有上一项"
+                    ariaRole="text"
+                    class="t-picker-item__accessible--button"
+                    bind:tap="onClickPrev"
+                  >
+                    
+      -
+    
+                  </wx-view>
+                  <wx-view
+                    ariaLabel="当前选择的是：2021年"
+                    ariaRole="text"
+                    class="t-picker-item__accessible--current"
+                  >
+                    
+      -
+    
+                  </wx-view>
+                  <wx-view
+                    ariaLabel="选择下一项：2020年"
+                    ariaRole="button"
+                    class="t-picker-item__accessible--button"
+                    bind:tap="onClickNext"
+                  >
+                    
+      -
+    
                   </wx-view>
                 </wx-view>
               </wx-view>
@@ -110,6 +144,7 @@ exports[`picker :base 1`] = `
                 bind:touchstart="onTouchStart"
               >
                 <wx-view
+                  ariaHidden="{{true}}"
                   class="t-picker-item__wrapper"
                   style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, 0px, 0)"
                 >
@@ -144,6 +179,39 @@ exports[`picker :base 1`] = `
                     
       冬
     
+                  </wx-view>
+                </wx-view>
+                <wx-view
+                  class="t-picker-item__accessible"
+                >
+                  <wx-view
+                    ariaLabel="没有上一项"
+                    ariaRole="text"
+                    class="t-picker-item__accessible--button"
+                    bind:tap="onClickPrev"
+                  >
+                    
+      -
+    
+                  </wx-view>
+                  <wx-view
+                    ariaLabel="当前选择的是：春"
+                    ariaRole="text"
+                    class="t-picker-item__accessible--current"
+                  >
+                    
+      -
+    
+                  </wx-view>
+                  <wx-view
+                    ariaLabel="选择下一项：夏"
+                    ariaRole="button"
+                    class="t-picker-item__accessible--button"
+                    bind:tap="onClickNext"
+                  >
+                    
+      -
+    
                   </wx-view>
                 </wx-view>
               </wx-view>

From 9790cfc4c165217e25ed64b89e55d545ad3fc0d9 Mon Sep 17 00:00:00 2001
From: zhangpaopao <zhangpaopao0609@gmail.com>
Date: Fri, 24 Mar 2023 17:23:28 +0800
Subject: [PATCH 5/5] chore(datetimepicker): update snap

---
 .../index.test.js.snap                        |  2 +-
 .../index.test.js.snap                        | 80 +++++++++++++++++--
 .../index.test.js.snap                        | 78 +++++++++++++++++-
 .../__virtualHostSnapshot__/demo.test.js.snap |  4 +-
 4 files changed, 154 insertions(+), 10 deletions(-)

diff --git a/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap
index f643b662c..5e9f6aaf6 100644
--- a/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/calendar/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -748,7 +748,7 @@ exports[`calendar :base 1`] = `
             bind:getuserinfo="getuserinfo"
             bind:launchapp="launchapp"
             bind:opensetting="opensetting"
-            catch:tap=""
+            catch:tap="handleTap"
           >
             <wx-view
               class="t-button__content"
diff --git a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
index be5b2624b..1b6eb80fb 100644
--- a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -21,10 +21,13 @@ exports[`date-time-picker :base 1`] = `
           class="t-picker__toolbar"
         >
           <wx-view
+            ariaRole="button"
             class="t-picker__cancel t-class-cancel"
             bind:tap="onCancel"
           >
-            取消
+            
+        取消
+      
           </wx-view>
           <wx-view
             class="t-picker__title t-class-title"
@@ -32,10 +35,13 @@ exports[`date-time-picker :base 1`] = `
             选择日期
           </wx-view>
           <wx-view
+            ariaRole="button"
             class="t-picker__confirm t-class-confirm"
             bind:tap="onConfirm"
           >
-            确定
+            
+        确定
+      
           </wx-view>
         </wx-view>
         <wx-view
@@ -50,6 +56,7 @@ exports[`date-time-picker :base 1`] = `
             bind:touchstart="onTouchStart"
           >
             <wx-view
+              ariaHidden="{{true}}"
               class="t-picker-item__wrapper"
               style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, -924px, 0)"
             >
@@ -300,6 +307,39 @@ exports[`date-time-picker :base 1`] = `
                 
       2030年
     
+              </wx-view>
+            </wx-view>
+            <wx-view
+              class="t-picker-item__accessible"
+            >
+              <wx-view
+                ariaLabel="选择上一项：2020年"
+                ariaRole="button"
+                class="t-picker-item__accessible--button"
+                bind:tap="onClickPrev"
+              >
+                
+      -
+    
+              </wx-view>
+              <wx-view
+                ariaLabel="当前选择的是：2021年"
+                ariaRole="text"
+                class="t-picker-item__accessible--current"
+              >
+                
+      -
+    
+              </wx-view>
+              <wx-view
+                ariaLabel="选择下一项：2022年"
+                ariaRole="button"
+                class="t-picker-item__accessible--button"
+                bind:tap="onClickNext"
+              >
+                
+      -
+    
               </wx-view>
             </wx-view>
           </wx-view>
@@ -312,6 +352,7 @@ exports[`date-time-picker :base 1`] = `
             bind:touchstart="onTouchStart"
           >
             <wx-view
+              ariaHidden="{{true}}"
               class="t-picker-item__wrapper"
               style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, -352px, 0)"
             >
@@ -413,9 +454,38 @@ exports[`date-time-picker :base 1`] = `
               </wx-view>
             </wx-view>
             <wx-view
-              class="t-popup__close"
-              bind:tap="handleClose"
-            />
+              class="t-picker-item__accessible"
+            >
+              <wx-view
+                ariaLabel="选择上一项：8月"
+                ariaRole="button"
+                class="t-picker-item__accessible--button"
+                bind:tap="onClickPrev"
+              >
+                
+      -
+    
+              </wx-view>
+              <wx-view
+                ariaLabel="当前选择的是：9月"
+                ariaRole="text"
+                class="t-picker-item__accessible--current"
+              >
+                
+      -
+    
+              </wx-view>
+              <wx-view
+                ariaLabel="选择下一项：10月"
+                ariaRole="button"
+                class="t-picker-item__accessible--button"
+                bind:tap="onClickNext"
+              >
+                
+      -
+    
+              </wx-view>
+            </wx-view>
           </wx-view>
           <wx-view
             class="t-picker__mask t-picker__mask--top"
diff --git a/src/picker/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/picker/__test__/__virtualHostSnapshot__/index.test.js.snap
index 4fa9f7066..c27ea1d50 100644
--- a/src/picker/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/picker/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -20,10 +20,13 @@ exports[`picker :base 1`] = `
         class="t-picker__toolbar"
       >
         <wx-view
+          ariaRole="button"
           class="t-picker__cancel t-class-cancel"
           bind:tap="onCancel"
         >
-          取消
+          
+        取消
+      
         </wx-view>
         <wx-view
           class="t-picker__title t-class-title"
@@ -31,10 +34,13 @@ exports[`picker :base 1`] = `
           
         </wx-view>
         <wx-view
+          ariaRole="button"
           class="t-picker__confirm t-class-confirm"
           bind:tap="onConfirm"
         >
-          确认
+          
+        确认
+      
         </wx-view>
       </wx-view>
       <wx-view
@@ -49,6 +55,7 @@ exports[`picker :base 1`] = `
           bind:touchstart="onTouchStart"
         >
           <wx-view
+            ariaHidden="{{true}}"
             class="t-picker-item__wrapper"
             style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, 0px, 0)"
           >
@@ -75,6 +82,39 @@ exports[`picker :base 1`] = `
               
       2019年
     
+            </wx-view>
+          </wx-view>
+          <wx-view
+            class="t-picker-item__accessible"
+          >
+            <wx-view
+              ariaLabel="没有上一项"
+              ariaRole="text"
+              class="t-picker-item__accessible--button"
+              bind:tap="onClickPrev"
+            >
+              
+      -
+    
+            </wx-view>
+            <wx-view
+              ariaLabel="当前选择的是：2021年"
+              ariaRole="text"
+              class="t-picker-item__accessible--current"
+            >
+              
+      -
+    
+            </wx-view>
+            <wx-view
+              ariaLabel="选择下一项：2020年"
+              ariaRole="button"
+              class="t-picker-item__accessible--button"
+              bind:tap="onClickNext"
+            >
+              
+      -
+    
             </wx-view>
           </wx-view>
         </wx-view>
@@ -87,6 +127,7 @@ exports[`picker :base 1`] = `
           bind:touchstart="onTouchStart"
         >
           <wx-view
+            ariaHidden="{{true}}"
             class="t-picker-item__wrapper"
             style="transition: transform 0ms cubic-bezier(0.215, 0.61, 0.355, 1); transform: translate3d(0, 0px, 0)"
           >
@@ -121,6 +162,39 @@ exports[`picker :base 1`] = `
               
       冬
     
+            </wx-view>
+          </wx-view>
+          <wx-view
+            class="t-picker-item__accessible"
+          >
+            <wx-view
+              ariaLabel="没有上一项"
+              ariaRole="text"
+              class="t-picker-item__accessible--button"
+              bind:tap="onClickPrev"
+            >
+              
+      -
+    
+            </wx-view>
+            <wx-view
+              ariaLabel="当前选择的是：春"
+              ariaRole="text"
+              class="t-picker-item__accessible--current"
+            >
+              
+      -
+    
+            </wx-view>
+            <wx-view
+              ariaLabel="选择下一项：夏"
+              ariaRole="button"
+              class="t-picker-item__accessible--button"
+              bind:tap="onClickNext"
+            >
+              
+      -
+    
             </wx-view>
           </wx-view>
         </wx-view>
diff --git a/src/switch/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/switch/__test__/__virtualHostSnapshot__/demo.test.js.snap
index c0d1f83ce..fc066d891 100644
--- a/src/switch/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/switch/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -40,8 +40,8 @@ exports[`Switch Switch label demo works fine 1`] = `
     <t-switch
       label="{{
         Array [
-          "关",
           "开",
+          "关",
         ]
       }}"
       slot="note"
@@ -57,8 +57,8 @@ exports[`Switch Switch label demo works fine 1`] = `
       defaultValue="{{true}}"
       icon="{{
         Array [
-          "close",
           "check",
+          "close",
         ]
       }}"
       slot="note"