From bfc21e3c8e76c738aa7186bc1a79c3a7b02bdbf5 Mon Sep 17 00:00:00 2001
From: Aaron <acam271292a@gmail.com>
Date: Mon, 16 Oct 2023 21:01:48 -0600
Subject: [PATCH] fix(a11y): add aria label to icon button

---
 src/calendar/icon-button.vue |  2 ++
 src/calendar/table-date.vue  | 27 +++++++++++++++++----------
 src/calendar/table-month.vue | 15 ++++++++++-----
 src/calendar/table-year.vue  | 19 ++++++++++++++-----
 src/locale/en.js             |  6 ++++++
 src/style/index.scss         | 14 +++++---------
 6 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/src/calendar/icon-button.vue b/src/calendar/icon-button.vue
index 10438714..58e06e23 100644
--- a/src/calendar/icon-button.vue
+++ b/src/calendar/icon-button.vue
@@ -1,6 +1,7 @@
 <template>
   <button
     type="button"
+    :aria-label="ariaLabel"
     :disabled="disabled"
     :class="[
       `${prefixClass}-btn ${prefixClass}-btn-text ${prefixClass}-btn-icon-${type}`,
@@ -17,6 +18,7 @@
 <script>
 export default {
   props: {
+    ariaLabel: String,
     type: String,
     disabled: Boolean,
   },
diff --git a/src/calendar/table-date.vue b/src/calendar/table-date.vue
index 04390424..81098cbf 100644
--- a/src/calendar/table-date.vue
+++ b/src/calendar/table-date.vue
@@ -3,24 +3,16 @@
     <div :class="`${prefixClass}-calendar-header`">
       <icon-button
         type="double-left"
+        :aria-label="locale.prevYear"
         :disabled="isDisabledArrows('last-year')"
         @click="handleIconDoubleLeftClick"
       ></icon-button>
       <icon-button
         type="left"
+        :aria-label="locale.prevMonth"
         :disabled="isDisabledArrows('last-month')"
         @click="handleIconLeftClick"
       ></icon-button>
-      <icon-button
-        type="double-right"
-        :disabled="isDisabledArrows('next-year')"
-        @click="handleIconDoubleRightClick"
-      ></icon-button>
-      <icon-button
-        type="right"
-        :disabled="isDisabledArrows('next-month')"
-        @click="handleIconRightClick"
-      ></icon-button>
       <span :class="`${prefixClass}-calendar-header-label`">
         <button
           v-for="item in yearMonth"
@@ -34,6 +26,18 @@
           {{ item.label }}
         </button>
       </span>
+      <icon-button
+        type="right"
+        :aria-label="locale.nextMonth"
+        :disabled="isDisabledArrows('next-month')"
+        @click="handleIconRightClick"
+      ></icon-button>
+      <icon-button
+        type="double-right"
+        :aria-label="locale.nextYear"
+        :disabled="isDisabledArrows('next-year')"
+        @click="handleIconDoubleRightClick"
+      ></icon-button>
     </div>
     <div :class="`${prefixClass}-calendar-content`">
       <table :class="`${prefixClass}-table ${prefixClass}-table-date`">
@@ -159,6 +163,9 @@ export default {
       });
       return chunk(arr, 7);
     },
+    locale() {
+      return this.getLocale();
+    },
   },
   methods: {
     isDisabledArrows(type) {
diff --git a/src/calendar/table-month.vue b/src/calendar/table-month.vue
index 21f940a9..f5d1b3ce 100644
--- a/src/calendar/table-month.vue
+++ b/src/calendar/table-month.vue
@@ -3,14 +3,10 @@
     <div :class="`${prefixClass}-calendar-header`">
       <icon-button
         type="double-left"
+        :aria-label="locale.prev"
         :disabled="isDisabledArrows('last-year')"
         @click="handleIconDoubleLeftClick"
       ></icon-button>
-      <icon-button
-        type="double-right"
-        :disabled="isDisabledArrows('next-year')"
-        @click="handleIconDoubleRightClick"
-      ></icon-button>
       <span :class="`${prefixClass}-calendar-header-label`">
         <button
           type="button"
@@ -20,6 +16,12 @@
           {{ calendarYear }}
         </button>
       </span>
+      <icon-button
+        type="double-right"
+        :aria-label="locale.next"
+        :disabled="isDisabledArrows('next-year')"
+        @click="handleIconDoubleRightClick"
+      ></icon-button>
     </div>
     <div :class="`${prefixClass}-calendar-content`">
       <table :class="`${prefixClass}-table ${prefixClass}-table-month`" @click="handleClick">
@@ -82,6 +84,9 @@ export default {
       });
       return chunk(months, 3);
     },
+    locale() {
+      return this.getLocale();
+    },
   },
   methods: {
     isDisabledArrows(type) {
diff --git a/src/calendar/table-year.vue b/src/calendar/table-year.vue
index dbf9c8d9..0ff9923f 100644
--- a/src/calendar/table-year.vue
+++ b/src/calendar/table-year.vue
@@ -3,19 +3,21 @@
     <div :class="`${prefixClass}-calendar-header`">
       <icon-button
         type="double-left"
+        :aria-label="locale.prev"
         :disabled="isDisabledArrows('last-decade')"
         @click="handleIconDoubleLeftClick"
       ></icon-button>
-      <icon-button
-        type="double-right"
-        :disabled="isDisabledArrows('next-decade')"
-        @click="handleIconDoubleRightClick"
-      ></icon-button>
       <span :class="`${prefixClass}-calendar-header-label`">
         <span>{{ firstYear }}</span>
         <span :class="`${prefixClass}-calendar-decade-separator`"></span>
         <span>{{ lastYear }}</span>
       </span>
+      <icon-button
+        type="double-right"
+        :aria-label="locale.next"
+        :disabled="isDisabledArrows('next-decade')"
+        @click="handleIconDoubleRightClick"
+      ></icon-button>
     </div>
     <div :class="`${prefixClass}-calendar-content`">
       <table :class="`${prefixClass}-table ${prefixClass}-table-year`" @click="handleClick">
@@ -39,11 +41,15 @@
 import IconButton from './icon-button';
 import { chunk } from '../util/base';
 import { setYear } from '../util/date';
+import { getLocale } from '../locale';
 
 export default {
   name: 'TableYear',
   components: { IconButton },
   inject: {
+    getLocale: {
+      default: () => getLocale,
+    },
     prefixClass: {
       default: 'mx',
     },
@@ -80,6 +86,9 @@ export default {
       const last = arr => arr[arr.length - 1];
       return last(last(this.years));
     },
+    locale() {
+      return this.getLocale();
+    },
   },
   methods: {
     isDisabledArrows(type) {
diff --git a/src/locale/en.js b/src/locale/en.js
index 7cf55ef5..399ec0bb 100644
--- a/src/locale/en.js
+++ b/src/locale/en.js
@@ -5,6 +5,12 @@ const lang = {
   yearFormat: 'YYYY',
   monthFormat: 'MMM',
   monthBeforeYear: true,
+  next: 'Next Page',
+  prev: 'Previous Page',
+  nextYear: 'Next Year',
+  prevMonth: 'Previous Month',
+  nextMonth: 'Next Month',
+  prevYear: 'Previous Year',
 };
 
 export default lang;
diff --git a/src/style/index.scss b/src/style/index.scss
index 6ba834cc..95b81149 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -154,15 +154,8 @@
   line-height: 34px;
   text-align: center;
   overflow: hidden;
-}
-
-.#{$namespace}-btn-icon-left,
-.#{$namespace}-btn-icon-double-left {
-  float: left;
-}
-.#{$namespace}-btn-icon-right,
-.#{$namespace}-btn-icon-double-right {
-  float: right;
+  display: flex;
+  justify-content: space-between;
 }
 
 .#{$namespace}-calendar-header-label {
@@ -200,6 +193,9 @@
       color: $disabled-color;
       background-color: $disabled-background-color;
     }
+    &.focus {
+      outline: -webkit-focus-ring-color auto 1px;
+    }
   }
 }