From f757caff88f993684c079ce4888fc308ac633d0c Mon Sep 17 00:00:00 2001
From: yaonianhan <yaonianhan@tencent.com>
Date: Tue, 29 Aug 2023 18:45:19 +0800
Subject: [PATCH 1/5] feat(image-viewer): button aria

---
 src/image-viewer/image-viewer.wxml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/image-viewer/image-viewer.wxml b/src/image-viewer/image-viewer.wxml
index 298e75cf1..49940ac6d 100644
--- a/src/image-viewer/image-viewer.wxml
+++ b/src/image-viewer/image-viewer.wxml
@@ -1,17 +1,29 @@
 <import src="../common/template/icon.wxml" />
 <wxs src="../common/utils.wxs" module="_" />
-
+<!-- TODO:
+ARIA:
+1. siwper control
+2. mask-close
+-->
 <view
   wx:if="{{visible}}"
   id="{{classPrefix}}"
   class="{{classPrefix}} class {{prefix}}-class"
   style="{{_._style([style, customStyle, '--td-image-viewer-top: ' + maskTop + 'px'])}}"
+  aria-modal="{{true}}"
+  aria-role="dialog"
+  aria-live="polite"
+  aria-label="图片查看器"
 >
   <view
     class="{{classPrefix}}__mask"
     data-source="overlay"
+    data-type="tap"
     bind:tap="onClose"
+    tabindex="0"
     style="{{ 'background-color: ' + backgroundColor }}"
+    aria-role="button"
+    aria-label="关闭图片查看器"
   />
   <block wx:if="{{images && images.length}}">
     <view class="{{classPrefix}}__content">
@@ -22,7 +34,12 @@
         current="{{currentSwiperIndex}}"
         bindchange="onSwiperChange"
       >
-        <swiper-item wx:for="{{images}}" wx:key="index" class="{{classPrefix}}__preview-image">
+        <swiper-item
+          wx:for="{{images}}"
+          wx:key="index"
+          class="{{classPrefix}}__preview-image"
+          aria-hidden="{{currentSwiperIndex !== index}}"
+        >
           <t-image
             t-class="t-image--external"
             style="{{imagesStyle[index].style || ''}}"
@@ -37,7 +54,7 @@
       </swiper>
     </view>
     <view class="{{classPrefix}}__nav">
-      <view class="{{classPrefix}}__nav-close" catch:tap="onClose">
+      <view class="{{classPrefix}}__nav-close" catch:tap="onClose" aria-role="button" aria-label="关闭">
         <slot name="close-btn" />
         <template wx:if="{{_closeBtn}}" is="icon" data="{{ ..._closeBtn }}" />
       </view>
@@ -46,7 +63,7 @@
         {{currentSwiperIndex + 1}}/{{images.length}}
       </view>
 
-      <view class="{{classPrefix}}__nav-delete" bind:tap="onDelete">
+      <view class="{{classPrefix}}__nav-delete" bind:tap="onDelete" aria-role="button" aria-label="删除">
         <slot name="delete-btn" />
         <template is="icon" data="{{ ..._deleteBtn }}" />
       </view>

From 351de08611cb4c15db95522ee4542d927f33820a Mon Sep 17 00:00:00 2001
From: yaonianhan <yaonianhan@tencent.com>
Date: Tue, 29 Aug 2023 20:24:46 +0800
Subject: [PATCH 2/5] fix(image-viewer): mask close

---
 src/image-viewer/image-viewer.less |  7 +++++++
 src/image-viewer/image-viewer.wxml | 11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/image-viewer/image-viewer.less b/src/image-viewer/image-viewer.less
index a2ca732a4..cfd4c6120 100644
--- a/src/image-viewer/image-viewer.less
+++ b/src/image-viewer/image-viewer.less
@@ -30,6 +30,13 @@
     top: 0;
     width: 100%;
     height: 100%;
+    &-bottom {
+      position: absolute;
+      bottom: 0;
+      height: 10%;
+      width: 100%;
+      z-index: 1001;
+    }
   }
 
   &__content {
diff --git a/src/image-viewer/image-viewer.wxml b/src/image-viewer/image-viewer.wxml
index 49940ac6d..416ba83a7 100644
--- a/src/image-viewer/image-viewer.wxml
+++ b/src/image-viewer/image-viewer.wxml
@@ -3,7 +3,6 @@
 <!-- TODO:
 ARIA:
 1. siwper control
-2. mask-close
 -->
 <view
   wx:if="{{visible}}"
@@ -18,10 +17,15 @@ ARIA:
   <view
     class="{{classPrefix}}__mask"
     data-source="overlay"
-    data-type="tap"
     bind:tap="onClose"
-    tabindex="0"
     style="{{ 'background-color: ' + backgroundColor }}"
+    aria-hidden="{{true}}"
+  />
+  <view
+    wx:if="{{!_closeBtn}}"
+    class="{{classPrefix}}__mask-bottom"
+    data-type="tap"
+    bind:tap="onClose"
     aria-role="button"
     aria-label="关闭图片查看器"
   />
@@ -33,6 +37,7 @@ ARIA:
         autoplay="{{false}}"
         current="{{currentSwiperIndex}}"
         bindchange="onSwiperChange"
+        tabindex="0"
       >
         <swiper-item
           wx:for="{{images}}"

From fe38f85817eb5e43cce3d35cad85b8207c9fc969 Mon Sep 17 00:00:00 2001
From: yaonianhan <yaonianhan@tencent.com>
Date: Wed, 30 Aug 2023 11:03:55 +0800
Subject: [PATCH 3/5] feat(image-viewer): accessibility

aria

#1062
---
 src/image-viewer/image-viewer.less |  7 -------
 src/image-viewer/image-viewer.wxml | 14 ++------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/image-viewer/image-viewer.less b/src/image-viewer/image-viewer.less
index cfd4c6120..a2ca732a4 100644
--- a/src/image-viewer/image-viewer.less
+++ b/src/image-viewer/image-viewer.less
@@ -30,13 +30,6 @@
     top: 0;
     width: 100%;
     height: 100%;
-    &-bottom {
-      position: absolute;
-      bottom: 0;
-      height: 10%;
-      width: 100%;
-      z-index: 1001;
-    }
   }
 
   &__content {
diff --git a/src/image-viewer/image-viewer.wxml b/src/image-viewer/image-viewer.wxml
index 416ba83a7..19d063c53 100644
--- a/src/image-viewer/image-viewer.wxml
+++ b/src/image-viewer/image-viewer.wxml
@@ -1,9 +1,5 @@
 <import src="../common/template/icon.wxml" />
 <wxs src="../common/utils.wxs" module="_" />
-<!-- TODO:
-ARIA:
-1. siwper control
--->
 <view
   wx:if="{{visible}}"
   id="{{classPrefix}}"
@@ -19,15 +15,8 @@ ARIA:
     data-source="overlay"
     bind:tap="onClose"
     style="{{ 'background-color: ' + backgroundColor }}"
-    aria-hidden="{{true}}"
-  />
-  <view
-    wx:if="{{!_closeBtn}}"
-    class="{{classPrefix}}__mask-bottom"
-    data-type="tap"
-    bind:tap="onClose"
     aria-role="button"
-    aria-label="关闭图片查看器"
+    aria-label="关闭"
   />
   <block wx:if="{{images && images.length}}">
     <view class="{{classPrefix}}__content">
@@ -37,6 +26,7 @@ ARIA:
         autoplay="{{false}}"
         current="{{currentSwiperIndex}}"
         bindchange="onSwiperChange"
+        bindtap="onClose"
         tabindex="0"
       >
         <swiper-item

From 074126619922156206db277b4ef03ae41d34e3f5 Mon Sep 17 00:00:00 2001
From: yaonianhan <yaonianhan@tencent.com>
Date: Wed, 30 Aug 2023 14:47:32 +0800
Subject: [PATCH 4/5] style(image-viewer): style fix

outline removed
---
 src/image-viewer/image-viewer.less | 4 ++++
 src/image-viewer/image-viewer.wxml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/image-viewer/image-viewer.less b/src/image-viewer/image-viewer.less
index a2ca732a4..0269ea00d 100644
--- a/src/image-viewer/image-viewer.less
+++ b/src/image-viewer/image-viewer.less
@@ -41,6 +41,10 @@
     z-index: 1005;
   }
 
+  .swiper {
+    outline: 0;
+  }
+
   &__image {
     width: 100%;
     display: inline-block;
diff --git a/src/image-viewer/image-viewer.wxml b/src/image-viewer/image-viewer.wxml
index 19d063c53..4c9937609 100644
--- a/src/image-viewer/image-viewer.wxml
+++ b/src/image-viewer/image-viewer.wxml
@@ -1,5 +1,6 @@
 <import src="../common/template/icon.wxml" />
 <wxs src="../common/utils.wxs" module="_" />
+
 <view
   wx:if="{{visible}}"
   id="{{classPrefix}}"
@@ -7,7 +8,6 @@
   style="{{_._style([style, customStyle, '--td-image-viewer-top: ' + maskTop + 'px'])}}"
   aria-modal="{{true}}"
   aria-role="dialog"
-  aria-live="polite"
   aria-label="图片查看器"
 >
   <view

From 48202324697833be7e9817f445f6e2a44560ec44 Mon Sep 17 00:00:00 2001
From: MichaelHyn <hanyaonian@outlook.com>
Date: Wed, 30 Aug 2023 20:25:14 +0800
Subject: [PATCH 5/5] chore(image-viewer): remove unused code

remove unused code
---
 src/image-viewer/image-viewer.wxml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/image-viewer/image-viewer.wxml b/src/image-viewer/image-viewer.wxml
index 4c9937609..d5954a744 100644
--- a/src/image-viewer/image-viewer.wxml
+++ b/src/image-viewer/image-viewer.wxml
@@ -29,12 +29,7 @@
         bindtap="onClose"
         tabindex="0"
       >
-        <swiper-item
-          wx:for="{{images}}"
-          wx:key="index"
-          class="{{classPrefix}}__preview-image"
-          aria-hidden="{{currentSwiperIndex !== index}}"
-        >
+        <swiper-item wx:for="{{images}}" wx:key="index" class="{{classPrefix}}__preview-image">
           <t-image
             t-class="t-image--external"
             style="{{imagesStyle[index].style || ''}}"