diff --git a/assets/index.less b/assets/index.less
index 48522d422..4d02a5f1d 100644
--- a/assets/index.less
+++ b/assets/index.less
@@ -173,13 +173,10 @@
 
   // Preset
   &-presets {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
     background: #ccccff;
-
-    ul {
-      margin: 0;
-      padding: 0;
-      list-style: none;
-    }
   }
 
   &-footer,
diff --git a/src/PickerInput/Popup/PresetPanel.tsx b/src/PickerInput/Popup/PresetPanel.tsx
index d145cdcc5..fc86ee896 100644
--- a/src/PickerInput/Popup/PresetPanel.tsx
+++ b/src/PickerInput/Popup/PresetPanel.tsx
@@ -23,24 +23,23 @@ export default function PresetPanel<DateType extends object = any>(
 
   return (
     <div className={`${prefixCls}-presets`}>
-      <ul>
-        {presets.map(({ label, value }, index) => (
-          <li
-            key={index}
-            onClick={() => {
-              onClick(executeValue(value));
-            }}
-            onMouseEnter={() => {
-              onHover(executeValue(value));
-            }}
-            onMouseLeave={() => {
-              onHover(null);
-            }}
-          >
-            {label}
-          </li>
-        ))}
-      </ul>
+      {presets.map(({ label, value }, index) => (
+        <button
+          key={index}
+          type="button"
+          onClick={() => {
+            onClick(executeValue(value));
+          }}
+          onMouseEnter={() => {
+            onHover(executeValue(value));
+          }}
+          onMouseLeave={() => {
+            onHover(null);
+          }}
+        >
+          {label}
+        </button>
+      ))}
     </div>
   );
 }
diff --git a/src/PickerInput/Popup/index.tsx b/src/PickerInput/Popup/index.tsx
index f02810390..d96505f87 100644
--- a/src/PickerInput/Popup/index.tsx
+++ b/src/PickerInput/Popup/index.tsx
@@ -20,7 +20,8 @@ export type PopupShowTimeConfig<DateType extends object = any> = Omit<
   Pick<SharedTimeProps<DateType>, 'disabledTime'>;
 
 export interface PopupProps<DateType extends object = any, PresetValue = DateType>
-  extends Pick<React.InputHTMLAttributes<HTMLDivElement>, 'onFocus' | 'onBlur'>,
+  extends
+    Pick<React.InputHTMLAttributes<HTMLDivElement>, 'onFocus' | 'onBlur'>,
     FooterProps<DateType>,
     PopupPanelProps<DateType> {
   panelRender?: SharedPickerProps['panelRender'];
@@ -218,6 +219,7 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
     <div
       onMouseDown={onPanelMouseDown}
       tabIndex={-1}
+      role="dialog"
       className={clsx(
         containerPrefixCls,
         // Used for Today Button style, safe to remove if no need
diff --git a/src/PickerInput/Selector/Input.tsx b/src/PickerInput/Selector/Input.tsx
index 926eded61..93d481472 100644
--- a/src/PickerInput/Selector/Input.tsx
+++ b/src/PickerInput/Selector/Input.tsx
@@ -29,6 +29,7 @@ export interface InputProps extends Omit<React.InputHTMLAttributes<HTMLInputElem
   format?: string;
   validateFormat: (value: string) => boolean;
   active?: boolean;
+  open?: boolean;
   /** Used for single picker only */
   showActiveCls?: boolean;
   suffixIcon?: React.ReactNode;
@@ -52,6 +53,7 @@ const Input = React.forwardRef<InputRef, InputProps>((props, ref) => {
   const {
     className,
     active,
+    open,
     showActiveCls = true,
     suffixIcon,
     format,
@@ -405,6 +407,8 @@ const Input = React.forwardRef<InputRef, InputProps>((props, ref) => {
       <Component
         ref={inputRef}
         aria-invalid={invalid}
+        aria-haspopup="dialog"
+        aria-expanded={open}
         autoComplete="off"
         {...restProps}
         onKeyDown={onSharedKeyDown}
diff --git a/src/PickerInput/Selector/hooks/useInputProps.ts b/src/PickerInput/Selector/hooks/useInputProps.ts
index 605551afb..c7af200b8 100644
--- a/src/PickerInput/Selector/hooks/useInputProps.ts
+++ b/src/PickerInput/Selector/hooks/useInputProps.ts
@@ -157,6 +157,8 @@ export default function useInputProps<DateType extends object = any>(
 
       active: activeIndex === index,
 
+      open,
+
       helped: allHelp || (activeHelp && activeIndex === index),
 
       disabled: getProp(disabled),
diff --git a/src/PickerPanel/DatePanel/index.tsx b/src/PickerPanel/DatePanel/index.tsx
index 42013ebff..c5955acd4 100644
--- a/src/PickerPanel/DatePanel/index.tsx
+++ b/src/PickerPanel/DatePanel/index.tsx
@@ -48,7 +48,26 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
   const weekFirstDay = generateConfig.locale.getWeekFirstDay(locale.locale);
   const monthStartDate = generateConfig.setDate(pickerValue, 1);
   const baseDate = getWeekStartDate(locale.locale, generateConfig, monthStartDate);
+
+  const yearLabel = formatValue(pickerValue, {
+    locale,
+    format: locale.yearFormat,
+    generateConfig,
+  });
+
+  const monthsLocale: string[] =
+    locale.shortMonths ||
+    (generateConfig.locale.getShortMonths
+      ? generateConfig.locale.getShortMonths(locale.locale)
+      : []);
   const month = generateConfig.getMonth(pickerValue);
+  const monthLabel = locale.monthFormat
+    ? formatValue(pickerValue, {
+        locale,
+        format: locale.monthFormat,
+        generateConfig,
+      })
+    : monthsLocale[month];
 
   // =========================== PrefixColumn ===========================
   const showPrefixColumn = showWeek === undefined ? isWeek : showWeek;
@@ -56,10 +75,13 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
     ? (date: DateType) => {
         // >>> Additional check for disabled
         const disabled = disabledDate?.(date, { type: 'week' });
+        const label = generateConfig.locale.getWeek(locale.locale, date);
 
         return (
           <td
             key="week"
+            role="rowheader"
+            aria-label={`${locale.week} ${label}`}
             className={clsx(cellPrefixCls, `${cellPrefixCls}-week`, {
               [`${cellPrefixCls}-disabled`]: disabled,
             })}
@@ -80,9 +102,7 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
               }
             }}
           >
-            <div className={`${cellPrefixCls}-inner`}>
-              {generateConfig.locale.getWeek(locale.locale, date)}
-            </div>
+            <div className={`${cellPrefixCls}-inner`}>{label}</div>
           </td>
         );
       }
@@ -132,13 +152,14 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
     return classObj;
   };
 
-  // ========================= Header =========================
-  const monthsLocale: string[] =
-    locale.shortMonths ||
-    (generateConfig.locale.getShortMonths
-      ? generateConfig.locale.getShortMonths(locale.locale)
-      : []);
+  const getCellAttributes = (date: DateType): React.TdHTMLAttributes<HTMLTableCellElement> => {
+    if (isSameDate(generateConfig, date, now)) {
+      return { 'aria-current': 'date' };
+    }
+    return {};
+  };
 
+  // ========================= Header =========================
   const yearNode: React.ReactNode = (
     <button
       type="button"
@@ -147,14 +168,9 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
       onClick={() => {
         onModeChange('year', pickerValue);
       }}
-      tabIndex={-1}
       className={`${prefixCls}-year-btn`}
     >
-      {formatValue(pickerValue, {
-        locale,
-        format: locale.yearFormat,
-        generateConfig,
-      })}
+      {yearLabel}
     </button>
   );
   const monthNode: React.ReactNode = (
@@ -165,20 +181,16 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
       onClick={() => {
         onModeChange('month', pickerValue);
       }}
-      tabIndex={-1}
       className={`${prefixCls}-month-btn`}
     >
-      {locale.monthFormat
-        ? formatValue(pickerValue, {
-            locale,
-            format: locale.monthFormat,
-            generateConfig,
-          })
-        : monthsLocale[month]}
+      {monthLabel}
     </button>
   );
 
   const monthYearNodes = locale.monthBeforeYear ? [monthNode, yearNode] : [yearNode, monthNode];
+  const tableLabel = locale.monthBeforeYear
+    ? `${monthLabel} ${yearLabel}`
+    : `${yearLabel} ${monthLabel}`;
 
   // ========================= Render =========================
   return (
@@ -196,6 +208,12 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
             clone = generateConfig.addMonth(clone, 1);
             return generateConfig.addDate(clone, -1);
           }}
+          labels={{
+            superPrev: locale.previousYear,
+            prev: locale.previousMonth,
+            next: locale.nextMonth,
+            superNext: locale.nextYear,
+          }}
         >
           {monthYearNodes}
         </PanelHeader>
@@ -213,8 +231,10 @@ export default function DatePanel<DateType extends object = any>(props: DatePane
           getCellDate={getCellDate}
           getCellText={getCellText}
           getCellClassName={getCellClassName}
+          getCellAttributes={getCellAttributes}
           prefixColumn={prefixColumn}
           cellSelection={!isWeek}
+          tableLabel={tableLabel}
         />
       </div>
     </PanelContext.Provider>
diff --git a/src/PickerPanel/DecadePanel/index.tsx b/src/PickerPanel/DecadePanel/index.tsx
index 748015d9f..390736cc7 100644
--- a/src/PickerPanel/DecadePanel/index.tsx
+++ b/src/PickerPanel/DecadePanel/index.tsx
@@ -61,6 +61,13 @@ export default function DecadePanel<DateType extends object = any>(
     };
   };
 
+  const getCellAttributes = (date: DateType): React.TdHTMLAttributes<HTMLTableCellElement> => {
+    if (isSameDecade(generateConfig, date, generateConfig.getNow())) {
+      return { 'aria-current': 'date' };
+    }
+    return {};
+  };
+
   // ======================== Disabled ========================
   const mergedDisabledDate: DisabledDate<DateType> = disabledDate
     ? (currentDate, disabledInfo) => {
@@ -81,7 +88,7 @@ export default function DecadePanel<DateType extends object = any>(
     : null;
 
   // ========================= Header =========================
-  const yearNode = `${formatValue(startYearDate, {
+  const yearLabel = `${formatValue(startYearDate, {
     locale,
     format: locale.yearFormat,
     generateConfig,
@@ -102,8 +109,9 @@ export default function DecadePanel<DateType extends object = any>(
           // Limitation
           getStart={getStartYear}
           getEnd={getEndYear}
+          labels={{ superPrev: locale.previousCentury, superNext: locale.nextCentury }}
         >
-          {yearNode}
+          {yearLabel}
         </PanelHeader>
 
         {/* Body */}
@@ -113,10 +121,12 @@ export default function DecadePanel<DateType extends object = any>(
           colNum={3}
           rowNum={4}
           baseDate={baseDate}
+          tableLabel={yearLabel}
           // Body
           getCellDate={getCellDate}
           getCellText={getCellText}
           getCellClassName={getCellClassName}
+          getCellAttributes={getCellAttributes}
         />
       </div>
     </PanelContext.Provider>
diff --git a/src/PickerPanel/MonthPanel/index.tsx b/src/PickerPanel/MonthPanel/index.tsx
index cfd22079f..d84517275 100644
--- a/src/PickerPanel/MonthPanel/index.tsx
+++ b/src/PickerPanel/MonthPanel/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { DisabledDate, SharedPanelProps } from '../../interface';
-import { formatValue } from '../../utils/dateUtil';
+import { formatValue, isSameMonth } from '../../utils/dateUtil';
 import { PanelContext, useInfo } from '../context';
 import PanelBody from '../PanelBody';
 import PanelHeader from '../PanelHeader';
@@ -23,6 +23,11 @@ export default function MonthPanel<DateType extends object = any>(
   // ========================== Base ==========================
   const [info] = useInfo(props, 'month');
   const baseDate = generateConfig.setMonth(pickerValue, 0);
+  const yearLabel = formatValue(pickerValue, {
+    locale,
+    format: locale.yearFormat,
+    generateConfig,
+  });
 
   // ========================= Month ==========================
   const monthsLocale: string[] =
@@ -52,6 +57,13 @@ export default function MonthPanel<DateType extends object = any>(
     [`${prefixCls}-cell-in-view`]: true,
   });
 
+  const getCellAttributes = (date: DateType): React.TdHTMLAttributes<HTMLTableCellElement> => {
+    if (isSameMonth(generateConfig, date, generateConfig.getNow())) {
+      return { 'aria-current': 'date' };
+    }
+    return {};
+  };
+
   // ======================== Disabled ========================
   const mergedDisabledDate: DisabledDate<DateType> = disabledDate
     ? (currentDate, disabledInfo) => {
@@ -75,14 +87,9 @@ export default function MonthPanel<DateType extends object = any>(
       onClick={() => {
         onModeChange('year');
       }}
-      tabIndex={-1}
       className={`${prefixCls}-year-btn`}
     >
-      {formatValue(pickerValue, {
-        locale,
-        format: locale.yearFormat,
-        generateConfig,
-      })}
+      {yearLabel}
     </button>
   );
 
@@ -97,6 +104,7 @@ export default function MonthPanel<DateType extends object = any>(
           // Limitation
           getStart={(date) => generateConfig.setMonth(date, 0)}
           getEnd={(date) => generateConfig.setMonth(date, 11)}
+          labels={{ superPrev: locale.previousYear, superNext: locale.nextYear }}
         >
           {yearNode}
         </PanelHeader>
@@ -109,10 +117,12 @@ export default function MonthPanel<DateType extends object = any>(
           colNum={3}
           rowNum={4}
           baseDate={baseDate}
+          tableLabel={yearLabel}
           // Body
           getCellDate={getCellDate}
           getCellText={getCellText}
           getCellClassName={getCellClassName}
+          getCellAttributes={getCellAttributes}
         />
       </div>
     </PanelContext.Provider>
diff --git a/src/PickerPanel/PanelBody.tsx b/src/PickerPanel/PanelBody.tsx
index 34b6fe011..67e36a327 100644
--- a/src/PickerPanel/PanelBody.tsx
+++ b/src/PickerPanel/PanelBody.tsx
@@ -15,6 +15,7 @@ export interface PanelBodyProps<DateType = any> {
   getCellDate: (date: DateType, offset: number) => DateType;
   getCellText: (date: DateType) => React.ReactNode;
   getCellClassName: (date: DateType) => Record<string, any>;
+  getCellAttributes: (date: DateType) => React.TdHTMLAttributes<HTMLTableCellElement>;
 
   disabledDate?: DisabledDate<DateType>;
 
@@ -25,6 +26,7 @@ export interface PanelBodyProps<DateType = any> {
   prefixColumn?: (date: DateType) => React.ReactNode;
   rowClassName?: (date: DateType) => string;
   cellSelection?: boolean;
+  tableLabel?: string;
 }
 
 export default function PanelBody<DateType extends object = any>(props: PanelBodyProps<DateType>) {
@@ -38,9 +40,11 @@ export default function PanelBody<DateType extends object = any>(props: PanelBod
     titleFormat,
     getCellText,
     getCellClassName,
+    getCellAttributes,
     headerCells,
     cellSelection = true,
     disabledDate,
+    tableLabel,
   } = props;
 
   const {
@@ -118,6 +122,12 @@ export default function PanelBody<DateType extends object = any>(props: PanelBod
           })
         : undefined;
 
+      const isSelected =
+        !hoverRangeValue &&
+        // WeekPicker use row instead
+        type !== 'week' &&
+        matchValues(currentDate);
+
       // Render
       const inner = <div className={`${cellPrefixCls}-inner`}>{getCellText(currentDate)}</div>;
 
@@ -125,6 +135,11 @@ export default function PanelBody<DateType extends object = any>(props: PanelBod
         <td
           key={col}
           title={title}
+          role="gridcell"
+          aria-label={title}
+          aria-selected={isSelected}
+          aria-disabled={disabled}
+          {...getCellAttributes(currentDate)}
           className={clsx(cellPrefixCls, classNames.item, {
             [`${cellPrefixCls}-disabled`]: disabled,
             [`${cellPrefixCls}-hover`]: (hoverValue || []).some((date) =>
@@ -133,11 +148,7 @@ export default function PanelBody<DateType extends object = any>(props: PanelBod
             [`${cellPrefixCls}-in-range`]: inRange && !rangeStart && !rangeEnd,
             [`${cellPrefixCls}-range-start`]: rangeStart,
             [`${cellPrefixCls}-range-end`]: rangeEnd,
-            [`${prefixCls}-cell-selected`]:
-              !hoverRangeValue &&
-              // WeekPicker use row instead
-              type !== 'week' &&
-              matchValues(currentDate),
+            [`${prefixCls}-cell-selected`]: isSelected,
             ...getCellClassName(currentDate),
           })}
           style={styles.item}
@@ -176,7 +187,7 @@ export default function PanelBody<DateType extends object = any>(props: PanelBod
     }
 
     rows.push(
-      <tr key={row} className={rowClassName?.(rowStartDate!)}>
+      <tr key={row} role="row" className={rowClassName?.(rowStartDate!)}>
         {rowNode}
       </tr>,
     );
@@ -185,9 +196,14 @@ export default function PanelBody<DateType extends object = any>(props: PanelBod
   // ============================== Render ==============================
   return (
     <div className={clsx(`${prefixCls}-body`, classNames.body)} style={styles.body}>
-      <table className={clsx(`${prefixCls}-content`, classNames.content)} style={styles.content}>
+      <table
+        role="grid"
+        aria-label={tableLabel}
+        className={clsx(`${prefixCls}-content`, classNames.content)}
+        style={styles.content}
+      >
         {headerCells && (
-          <thead>
+          <thead aria-hidden="true">
             <tr>{headerCells}</tr>
           </thead>
         )}
diff --git a/src/PickerPanel/PanelHeader.tsx b/src/PickerPanel/PanelHeader.tsx
index 407489a59..f94919619 100644
--- a/src/PickerPanel/PanelHeader.tsx
+++ b/src/PickerPanel/PanelHeader.tsx
@@ -7,6 +7,13 @@ const HIDDEN_STYLE: React.CSSProperties = {
   visibility: 'hidden',
 };
 
+interface PanelHeaderLabels {
+  superPrev?: string;
+  prev?: string;
+  next?: string;
+  superNext?: string;
+}
+
 export interface HeaderProps<DateType extends object> {
   offset?: (distance: number, date: DateType) => DateType;
   superOffset?: (distance: number, date: DateType) => DateType;
@@ -16,6 +23,8 @@ export interface HeaderProps<DateType extends object> {
   getStart?: (date: DateType) => DateType;
   getEnd?: (date: DateType) => DateType;
 
+  labels?: PanelHeaderLabels;
+
   children?: React.ReactNode;
 }
 
@@ -28,6 +37,8 @@ function PanelHeader<DateType extends object>(props: HeaderProps<DateType>) {
     getStart,
     getEnd,
 
+    labels,
+
     children,
   } = props;
 
@@ -124,9 +135,8 @@ function PanelHeader<DateType extends object>(props: HeaderProps<DateType>) {
       {superOffset && (
         <button
           type="button"
-          aria-label={locale.previousYear}
+          aria-label={labels?.superPrev ?? locale.previousYear}
           onClick={() => onSuperOffset(-1)}
-          tabIndex={-1}
           className={clsx(
             superPrevBtnCls,
             disabledSuperOffsetPrev && `${superPrevBtnCls}-disabled`,
@@ -140,9 +150,8 @@ function PanelHeader<DateType extends object>(props: HeaderProps<DateType>) {
       {offset && (
         <button
           type="button"
-          aria-label={locale.previousMonth}
+          aria-label={labels?.prev ?? locale.previousMonth}
           onClick={() => onOffset(-1)}
-          tabIndex={-1}
           className={clsx(prevBtnCls, disabledOffsetPrev && `${prevBtnCls}-disabled`)}
           disabled={disabledOffsetPrev}
           style={hidePrev ? HIDDEN_STYLE : {}}
@@ -154,9 +163,8 @@ function PanelHeader<DateType extends object>(props: HeaderProps<DateType>) {
       {offset && (
         <button
           type="button"
-          aria-label={locale.nextMonth}
+          aria-label={labels?.next ?? locale.nextMonth}
           onClick={() => onOffset(1)}
-          tabIndex={-1}
           className={clsx(nextBtnCls, disabledOffsetNext && `${nextBtnCls}-disabled`)}
           disabled={disabledOffsetNext}
           style={hideNext ? HIDDEN_STYLE : {}}
@@ -167,9 +175,8 @@ function PanelHeader<DateType extends object>(props: HeaderProps<DateType>) {
       {superOffset && (
         <button
           type="button"
-          aria-label={locale.nextYear}
+          aria-label={labels?.superNext ?? locale.nextYear}
           onClick={() => onSuperOffset(1)}
-          tabIndex={-1}
           className={clsx(
             superNextBtnCls,
             disabledSuperOffsetNext && `${superNextBtnCls}-disabled`,
diff --git a/src/PickerPanel/QuarterPanel/index.tsx b/src/PickerPanel/QuarterPanel/index.tsx
index 86542087a..6afdd691c 100644
--- a/src/PickerPanel/QuarterPanel/index.tsx
+++ b/src/PickerPanel/QuarterPanel/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { SharedPanelProps } from '../../interface';
-import { formatValue } from '../../utils/dateUtil';
+import { formatValue, isSameQuarter } from '../../utils/dateUtil';
 import { PanelContext, useInfo } from '../context';
 import PanelBody from '../PanelBody';
 import PanelHeader from '../PanelHeader';
@@ -16,6 +16,11 @@ export default function QuarterPanel<DateType extends object = any>(
   // ========================== Base ==========================
   const [info] = useInfo(props, 'quarter');
   const baseDate = generateConfig.setMonth(pickerValue, 0);
+  const yearLabel = formatValue(pickerValue, {
+    locale,
+    format: locale.yearFormat,
+    generateConfig,
+  });
 
   // ========================= Cells ==========================
   const getCellDate = (date: DateType, offset: number) => {
@@ -34,6 +39,13 @@ export default function QuarterPanel<DateType extends object = any>(
     [`${prefixCls}-cell-in-view`]: true,
   });
 
+  const getCellAttributes = (date: DateType): React.TdHTMLAttributes<HTMLTableCellElement> => {
+    if (isSameQuarter(generateConfig, date, generateConfig.getNow())) {
+      return { 'aria-current': 'date' };
+    }
+    return {};
+  };
+
   // ========================= Header =========================
   const yearNode: React.ReactNode = (
     <button
@@ -43,14 +55,9 @@ export default function QuarterPanel<DateType extends object = any>(
       onClick={() => {
         onModeChange('year');
       }}
-      tabIndex={-1}
       className={`${prefixCls}-year-btn`}
     >
-      {formatValue(pickerValue, {
-        locale,
-        format: locale.yearFormat,
-        generateConfig,
-      })}
+      {yearLabel}
     </button>
   );
 
@@ -65,6 +72,7 @@ export default function QuarterPanel<DateType extends object = any>(
           // Limitation
           getStart={(date) => generateConfig.setMonth(date, 0)}
           getEnd={(date) => generateConfig.setMonth(date, 11)}
+          labels={{ superPrev: locale.previousYear, superNext: locale.nextYear }}
         >
           {yearNode}
         </PanelHeader>
@@ -76,10 +84,12 @@ export default function QuarterPanel<DateType extends object = any>(
           colNum={4}
           rowNum={1}
           baseDate={baseDate}
+          tableLabel={yearLabel}
           // Body
           getCellDate={getCellDate}
           getCellText={getCellText}
           getCellClassName={getCellClassName}
+          getCellAttributes={getCellAttributes}
         />
       </div>
     </PanelContext.Provider>
diff --git a/src/PickerPanel/YearPanel/index.tsx b/src/PickerPanel/YearPanel/index.tsx
index ae7e42811..9b242745a 100644
--- a/src/PickerPanel/YearPanel/index.tsx
+++ b/src/PickerPanel/YearPanel/index.tsx
@@ -35,6 +35,17 @@ export default function YearPanel<DateType extends object = any>(
   const endYearDate = getEndYear(pickerValue);
 
   const baseDate = generateConfig.addYear(startYearDate, -1);
+  const startYearLabel = formatValue(startYearDate, {
+    locale,
+    format: locale.yearFormat,
+    generateConfig,
+  });
+  const endYearLabel = formatValue(endYearDate, {
+    locale,
+    format: locale.yearFormat,
+    generateConfig,
+  });
+  const decadeLabel = `${startYearLabel}-${endYearLabel}`;
 
   // ========================= Cells ==========================
   const getCellDate = (date: DateType, offset: number) => {
@@ -58,6 +69,13 @@ export default function YearPanel<DateType extends object = any>(
     };
   };
 
+  const getCellAttributes = (date: DateType): React.TdHTMLAttributes<HTMLTableCellElement> => {
+    if (isSameYear(generateConfig, date, generateConfig.getNow())) {
+      return { 'aria-current': 'date' };
+    }
+    return {};
+  };
+
   // ======================== Disabled ========================
   const mergedDisabledDate: DisabledDate<DateType> = disabledDate
     ? (currentDate, disabledInfo) => {
@@ -81,20 +99,9 @@ export default function YearPanel<DateType extends object = any>(
       onClick={() => {
         onModeChange('decade');
       }}
-      tabIndex={-1}
       className={`${prefixCls}-decade-btn`}
     >
-      {formatValue(startYearDate, {
-        locale,
-        format: locale.yearFormat,
-        generateConfig,
-      })}
-      -
-      {formatValue(endYearDate, {
-        locale,
-        format: locale.yearFormat,
-        generateConfig,
-      })}
+      {decadeLabel}
     </button>
   );
 
@@ -109,6 +116,7 @@ export default function YearPanel<DateType extends object = any>(
           // Limitation
           getStart={getStartYear}
           getEnd={getEndYear}
+          labels={{ superPrev: locale.previousDecade, superNext: locale.nextDecade }}
         >
           {yearNode}
         </PanelHeader>
@@ -121,10 +129,12 @@ export default function YearPanel<DateType extends object = any>(
           colNum={3}
           rowNum={4}
           baseDate={baseDate}
+          tableLabel={decadeLabel}
           // Body
           getCellDate={getCellDate}
           getCellText={getCellText}
           getCellClassName={getCellClassName}
+          getCellAttributes={getCellAttributes}
         />
       </div>
     </PanelContext.Provider>
diff --git a/tests/__snapshots__/panel.spec.tsx.snap b/tests/__snapshots__/panel.spec.tsx.snap
index 34125971b..1a0895e8f 100644
--- a/tests/__snapshots__/panel.spec.tsx.snap
+++ b/tests/__snapshots__/panel.spec.tsx.snap
@@ -15,7 +15,6 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -23,7 +22,6 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
         <button
           aria-label="Previous month (PageUp)"
           class="rc-picker-header-prev-btn"
-          tabindex="-1"
           type="button"
         >
           ‹
@@ -34,7 +32,6 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
           <button
             aria-label="Choose a month"
             class="rc-picker-month-btn"
-            tabindex="-1"
             type="button"
           >
             Sep
@@ -42,7 +39,6 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -51,7 +47,6 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
         <button
           aria-label="Next month (PageDown)"
           class="rc-picker-header-next-btn"
-          tabindex="-1"
           type="button"
         >
           ›
@@ -59,7 +54,6 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -69,9 +63,13 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="Sep 1990"
           class="rc-picker-content"
+          role="grid"
         >
-          <thead>
+          <thead
+            aria-hidden="true"
+          >
             <tr>
               <th>
                 Su
@@ -97,9 +95,14 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
             </tr>
           </thead>
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-08-26"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-26"
               >
                 <div
@@ -113,7 +116,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-27"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-27"
               >
                 <div
@@ -127,7 +133,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-28"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-28"
               >
                 <div
@@ -141,7 +150,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-29"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-29"
               >
                 <div
@@ -155,7 +167,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-30"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-30"
               >
                 <div
@@ -169,7 +184,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-31"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-31"
               >
                 <div
@@ -183,7 +201,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-01"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-01"
               >
                 <div
@@ -197,9 +218,14 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-02"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-02"
               >
                 <div
@@ -213,7 +239,11 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-09-03"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view rc-picker-cell-today"
+                role="gridcell"
                 title="1990-09-03"
               >
                 <div
@@ -227,7 +257,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-04"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-04"
               >
                 <div
@@ -241,7 +274,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-05"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-05"
               >
                 <div
@@ -255,7 +291,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-06"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-06"
               >
                 <div
@@ -269,7 +308,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-07"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-07"
               >
                 <div
@@ -283,7 +325,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-08"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-08"
               >
                 <div
@@ -297,9 +342,14 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-09"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-09"
               >
                 <div
@@ -313,7 +363,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-10"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-10"
               >
                 <div
@@ -327,7 +380,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-11"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-11"
               >
                 <div
@@ -341,7 +397,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-12"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-12"
               >
                 <div
@@ -355,7 +414,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-13"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-13"
               >
                 <div
@@ -369,7 +431,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-14"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-14"
               >
                 <div
@@ -383,7 +448,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-15"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-15"
               >
                 <div
@@ -397,9 +465,14 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-16"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-16"
               >
                 <div
@@ -413,7 +486,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-17"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-17"
               >
                 <div
@@ -427,7 +503,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-18"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-18"
               >
                 <div
@@ -441,7 +520,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-19"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-19"
               >
                 <div
@@ -455,7 +537,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-20"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-20"
               >
                 <div
@@ -469,7 +554,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-21"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-21"
               >
                 <div
@@ -483,7 +571,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-22"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-22"
               >
                 <div
@@ -497,9 +588,14 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-23"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-23"
               >
                 <div
@@ -513,7 +609,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-24"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-24"
               >
                 <div
@@ -527,7 +626,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-25"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-25"
               >
                 <div
@@ -541,7 +643,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-26"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-26"
               >
                 <div
@@ -555,7 +660,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-27"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-27"
               >
                 <div
@@ -569,7 +677,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-28"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-28"
               >
                 <div
@@ -583,7 +694,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-29"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-29"
               >
                 <div
@@ -597,9 +711,14 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-30"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-30"
               >
                 <div
@@ -613,7 +732,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-01"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-01"
               >
                 <div
@@ -627,7 +749,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-02"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-02"
               >
                 <div
@@ -641,7 +766,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-03"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-03"
               >
                 <div
@@ -655,7 +783,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-04"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-04"
               >
                 <div
@@ -669,7 +800,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-05"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-05"
               >
                 <div
@@ -683,7 +817,10 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-06"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-06"
               >
                 <div
@@ -718,9 +855,8 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
         class="rc-picker-header"
       >
         <button
-          aria-label="Last year (Control + left)"
+          aria-label="Last century"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -731,9 +867,8 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
           1900-1999
         </div>
         <button
-          aria-label="Next year (Control + right)"
+          aria-label="Next century"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -743,12 +878,18 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="1900-1999"
           class="rc-picker-content"
+          role="grid"
         >
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -761,7 +902,9 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -774,7 +917,9 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -787,9 +932,13 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -802,7 +951,9 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -815,7 +966,9 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -828,9 +981,13 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -843,7 +1000,9 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -856,7 +1015,9 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -869,9 +1030,13 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -884,7 +1049,10 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -897,7 +1065,9 @@ exports[`Picker.Panel append cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
               >
                 <div
                   class="rc-picker-cell-inner customInner"
@@ -933,7 +1103,6 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -944,7 +1113,6 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -953,7 +1121,6 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -963,12 +1130,19 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="1990"
           class="rc-picker-content"
+          role="grid"
         >
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-01"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-01"
               >
                 <div
@@ -982,7 +1156,10 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-02"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-02"
               >
                 <div
@@ -996,7 +1173,10 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-03"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-03"
               >
                 <div
@@ -1010,9 +1190,14 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-04"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-04"
               >
                 <div
@@ -1026,7 +1211,10 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-05"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-05"
               >
                 <div
@@ -1040,7 +1228,10 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-06"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-06"
               >
                 <div
@@ -1054,9 +1245,14 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-07"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-07"
               >
                 <div
@@ -1070,7 +1266,10 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-08"
               >
                 <div
@@ -1084,7 +1283,11 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-09"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09"
               >
                 <div
@@ -1098,9 +1301,14 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-10"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-10"
               >
                 <div
@@ -1114,7 +1322,10 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-11"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-11"
               >
                 <div
@@ -1128,7 +1339,10 @@ exports[`Picker.Panel append cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-12"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-12"
               >
                 <div
@@ -1165,7 +1379,6 @@ exports[`Picker.Panel append cell with cellRender in quarter 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -1176,7 +1389,6 @@ exports[`Picker.Panel append cell with cellRender in quarter 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -1185,7 +1397,6 @@ exports[`Picker.Panel append cell with cellRender in quarter 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -1195,12 +1406,19 @@ exports[`Picker.Panel append cell with cellRender in quarter 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="1990"
           class="rc-picker-content"
+          role="grid"
         >
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-Q1"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-Q1"
               >
                 <div
@@ -1214,7 +1432,10 @@ exports[`Picker.Panel append cell with cellRender in quarter 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-Q2"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-Q2"
               >
                 <div
@@ -1228,7 +1449,11 @@ exports[`Picker.Panel append cell with cellRender in quarter 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-Q3"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-Q3"
               >
                 <div
@@ -1242,7 +1467,10 @@ exports[`Picker.Panel append cell with cellRender in quarter 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-Q4"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-Q4"
               >
                 <div
@@ -3337,7 +3565,6 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -3345,7 +3572,6 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
         <button
           aria-label="Previous month (PageUp)"
           class="rc-picker-header-prev-btn"
-          tabindex="-1"
           type="button"
         >
           ‹
@@ -3356,7 +3582,6 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
           <button
             aria-label="Choose a month"
             class="rc-picker-month-btn"
-            tabindex="-1"
             type="button"
           >
             Sep
@@ -3364,7 +3589,6 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -3373,7 +3597,6 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
         <button
           aria-label="Next month (PageDown)"
           class="rc-picker-header-next-btn"
-          tabindex="-1"
           type="button"
         >
           ›
@@ -3381,7 +3604,6 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -3391,9 +3613,13 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="Sep 1990"
           class="rc-picker-content"
+          role="grid"
         >
-          <thead>
+          <thead
+            aria-hidden="true"
+          >
             <tr>
               <th>
                 <span
@@ -3428,9 +3654,12 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
           <tbody>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 35"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -3439,7 +3668,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-26"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-26"
               >
                 <div
@@ -3453,7 +3685,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-27"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-27"
               >
                 <div
@@ -3467,7 +3702,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-28"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-28"
               >
                 <div
@@ -3481,7 +3719,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-29"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-29"
               >
                 <div
@@ -3495,7 +3736,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-30"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-30"
               >
                 <div
@@ -3509,7 +3753,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-31"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-31"
               >
                 <div
@@ -3523,7 +3770,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-01"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-01"
               >
                 <div
@@ -3539,9 +3789,12 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 36"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -3550,7 +3803,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-02"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-02"
               >
                 <div
@@ -3564,7 +3820,11 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-09-03"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view rc-picker-cell-today"
+                role="gridcell"
                 title="1990-09-03"
               >
                 <div
@@ -3578,7 +3838,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-04"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-04"
               >
                 <div
@@ -3592,7 +3855,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-05"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-05"
               >
                 <div
@@ -3606,7 +3872,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-06"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-06"
               >
                 <div
@@ -3620,7 +3889,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-07"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-07"
               >
                 <div
@@ -3634,7 +3906,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-08"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-08"
               >
                 <div
@@ -3650,9 +3925,12 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 37"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -3661,7 +3939,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-09"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-09"
               >
                 <div
@@ -3675,7 +3956,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-10"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-10"
               >
                 <div
@@ -3689,7 +3973,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-11"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-11"
               >
                 <div
@@ -3703,7 +3990,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-12"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-12"
               >
                 <div
@@ -3717,7 +4007,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-13"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-13"
               >
                 <div
@@ -3731,7 +4024,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-14"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-14"
               >
                 <div
@@ -3745,7 +4041,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-15"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-15"
               >
                 <div
@@ -3761,9 +4060,12 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 38"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -3772,7 +4074,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-16"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-16"
               >
                 <div
@@ -3786,7 +4091,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-17"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-17"
               >
                 <div
@@ -3800,7 +4108,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-18"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-18"
               >
                 <div
@@ -3814,7 +4125,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-19"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-19"
               >
                 <div
@@ -3828,7 +4142,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-20"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-20"
               >
                 <div
@@ -3842,7 +4159,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-21"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-21"
               >
                 <div
@@ -3856,7 +4176,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-22"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-22"
               >
                 <div
@@ -3872,9 +4195,12 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 39"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -3883,7 +4209,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-23"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-23"
               >
                 <div
@@ -3897,7 +4226,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-24"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-24"
               >
                 <div
@@ -3911,7 +4243,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-25"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-25"
               >
                 <div
@@ -3925,7 +4260,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-26"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-26"
               >
                 <div
@@ -3939,7 +4277,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-27"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-27"
               >
                 <div
@@ -3953,7 +4294,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-28"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-28"
               >
                 <div
@@ -3967,7 +4311,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-29"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-29"
               >
                 <div
@@ -3983,9 +4330,12 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 40"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -3994,7 +4344,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-30"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-30"
               >
                 <div
@@ -4008,7 +4361,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-01"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-01"
               >
                 <div
@@ -4022,7 +4378,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-02"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-02"
               >
                 <div
@@ -4036,7 +4395,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-03"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-03"
               >
                 <div
@@ -4050,7 +4412,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-04"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-04"
               >
                 <div
@@ -4064,7 +4429,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-05"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-05"
               >
                 <div
@@ -4078,7 +4446,10 @@ exports[`Picker.Panel append cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-06"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-06"
               >
                 <div
@@ -4113,9 +4484,8 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
         class="rc-picker-header"
       >
         <button
-          aria-label="Last year (Control + left)"
+          aria-label="Last decade"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -4126,18 +4496,14 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
           <button
             aria-label="Choose a decade"
             class="rc-picker-decade-btn"
-            tabindex="-1"
             type="button"
           >
-            1990
-            -
-            1999
+            1990-1999
           </button>
         </div>
         <button
-          aria-label="Next year (Control + right)"
+          aria-label="Next decade"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -4147,12 +4513,19 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="1990-1999"
           class="rc-picker-content"
+          role="grid"
         >
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1989"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1989"
               >
                 <div
@@ -4166,7 +4539,11 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990"
               >
                 <div
@@ -4180,7 +4557,10 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1991"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1991"
               >
                 <div
@@ -4194,9 +4574,14 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1992"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1992"
               >
                 <div
@@ -4210,7 +4595,10 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1993"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1993"
               >
                 <div
@@ -4224,7 +4612,10 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1994"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1994"
               >
                 <div
@@ -4238,9 +4629,14 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1995"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1995"
               >
                 <div
@@ -4254,7 +4650,10 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1996"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1996"
               >
                 <div
@@ -4268,7 +4667,10 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1997"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1997"
               >
                 <div
@@ -4282,9 +4684,14 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1998"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1998"
               >
                 <div
@@ -4298,7 +4705,10 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1999"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1999"
               >
                 <div
@@ -4312,7 +4722,10 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="2000"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="2000"
               >
                 <div
@@ -4336,81 +4749,126 @@ exports[`Picker.Panel append cell with cellRender in year 1`] = `
 
 exports[`Picker.Panel monthCellRender 1`] = `
 <tbody>
-  <tr>
+  <tr
+    role="row"
+  >
     <td
+      aria-label="1990-01"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-01"
     >
       1990-01
     </td>
     <td
+      aria-label="1990-02"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-02"
     >
       1990-02
     </td>
     <td
+      aria-label="1990-03"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-03"
     >
       1990-03
     </td>
   </tr>
-  <tr>
+  <tr
+    role="row"
+  >
     <td
+      aria-label="1990-04"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-04"
     >
       1990-04
     </td>
     <td
+      aria-label="1990-05"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-05"
     >
       1990-05
     </td>
     <td
+      aria-label="1990-06"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-06"
     >
       1990-06
     </td>
   </tr>
-  <tr>
+  <tr
+    role="row"
+  >
     <td
+      aria-label="1990-07"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-07"
     >
       1990-07
     </td>
     <td
+      aria-label="1990-08"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-08"
     >
       1990-08
     </td>
     <td
+      aria-current="date"
+      aria-label="1990-09"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-09"
     >
       1990-09
     </td>
   </tr>
-  <tr>
+  <tr
+    role="row"
+  >
     <td
+      aria-label="1990-10"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-10"
     >
       1990-10
     </td>
     <td
+      aria-label="1990-11"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-11"
     >
       1990-11
     </td>
     <td
+      aria-label="1990-12"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-12"
     >
       1990-12
@@ -4434,7 +4892,6 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -4442,7 +4899,6 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
         <button
           aria-label="Previous month (PageUp)"
           class="rc-picker-header-prev-btn"
-          tabindex="-1"
           type="button"
         >
           ‹
@@ -4453,7 +4909,6 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
           <button
             aria-label="Choose a month"
             class="rc-picker-month-btn"
-            tabindex="-1"
             type="button"
           >
             Sep
@@ -4461,7 +4916,6 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -4470,7 +4924,6 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
         <button
           aria-label="Next month (PageDown)"
           class="rc-picker-header-next-btn"
-          tabindex="-1"
           type="button"
         >
           ›
@@ -4478,7 +4931,6 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -4488,9 +4940,13 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="Sep 1990"
           class="rc-picker-content"
+          role="grid"
         >
-          <thead>
+          <thead
+            aria-hidden="true"
+          >
             <tr>
               <th>
                 Su
@@ -4516,9 +4972,14 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
             </tr>
           </thead>
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-08-26"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-26"
               >
                 <div
@@ -4528,7 +4989,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-27"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-27"
               >
                 <div
@@ -4538,7 +5002,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-28"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-28"
               >
                 <div
@@ -4548,7 +5015,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-29"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-29"
               >
                 <div
@@ -4558,7 +5028,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-30"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-30"
               >
                 <div
@@ -4568,7 +5041,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-31"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-31"
               >
                 <div
@@ -4578,7 +5054,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-01"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-01"
               >
                 <div
@@ -4588,9 +5067,14 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-02"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-02"
               >
                 <div
@@ -4600,7 +5084,11 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-09-03"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view rc-picker-cell-today"
+                role="gridcell"
                 title="1990-09-03"
               >
                 <div
@@ -4610,7 +5098,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-04"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-04"
               >
                 <div
@@ -4620,7 +5111,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-05"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-05"
               >
                 <div
@@ -4630,7 +5124,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-06"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-06"
               >
                 <div
@@ -4640,7 +5137,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-07"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-07"
               >
                 <div
@@ -4650,7 +5150,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-08"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-08"
               >
                 <div
@@ -4660,9 +5163,14 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-09"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-09"
               >
                 <div
@@ -4672,7 +5180,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-10"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-10"
               >
                 <div
@@ -4682,7 +5193,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-11"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-11"
               >
                 <div
@@ -4692,7 +5206,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-12"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-12"
               >
                 <div
@@ -4702,7 +5219,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-13"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-13"
               >
                 <div
@@ -4712,7 +5232,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-14"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-14"
               >
                 <div
@@ -4722,7 +5245,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-15"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-15"
               >
                 <div
@@ -4732,9 +5258,14 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-16"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-16"
               >
                 <div
@@ -4744,7 +5275,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-17"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-17"
               >
                 <div
@@ -4754,7 +5288,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-18"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-18"
               >
                 <div
@@ -4764,7 +5301,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-19"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-19"
               >
                 <div
@@ -4774,7 +5314,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-20"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-20"
               >
                 <div
@@ -4784,7 +5327,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-21"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-21"
               >
                 <div
@@ -4794,7 +5340,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-22"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-22"
               >
                 <div
@@ -4804,9 +5353,14 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-23"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-23"
               >
                 <div
@@ -4816,7 +5370,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-24"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-24"
               >
                 <div
@@ -4826,7 +5383,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-25"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-25"
               >
                 <div
@@ -4836,7 +5396,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-26"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-26"
               >
                 <div
@@ -4846,7 +5409,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-27"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-27"
               >
                 <div
@@ -4856,7 +5422,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-28"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-28"
               >
                 <div
@@ -4866,7 +5435,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-29"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-29"
               >
                 <div
@@ -4876,9 +5448,14 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-30"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-30"
               >
                 <div
@@ -4888,7 +5465,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-01"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-01"
               >
                 <div
@@ -4898,7 +5478,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-02"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-02"
               >
                 <div
@@ -4908,7 +5491,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-03"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-03"
               >
                 <div
@@ -4918,7 +5504,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-04"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-04"
               >
                 <div
@@ -4928,7 +5517,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-05"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-05"
               >
                 <div
@@ -4938,7 +5530,10 @@ exports[`Picker.Panel override cell with cellRender in date 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-06"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-06"
               >
                 <div
@@ -4969,9 +5564,8 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
         class="rc-picker-header"
       >
         <button
-          aria-label="Last year (Control + left)"
+          aria-label="Last century"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -4982,9 +5576,8 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
           1900-1999
         </div>
         <button
-          aria-label="Next year (Control + right)"
+          aria-label="Next century"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -4994,12 +5587,18 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="1900-1999"
           class="rc-picker-content"
+          role="grid"
         >
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5008,7 +5607,9 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5017,7 +5618,9 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5026,9 +5629,13 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5037,7 +5644,9 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5046,7 +5655,9 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5055,9 +5666,13 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5066,7 +5681,9 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5075,7 +5692,9 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5084,9 +5703,13 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5095,7 +5718,10 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5104,7 +5730,9 @@ exports[`Picker.Panel override cell with cellRender in decade 1`] = `
                 </div>
               </td>
               <td
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
               >
                 <div
                   class="customWrapper"
@@ -5136,7 +5764,6 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -5147,7 +5774,6 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -5156,7 +5782,6 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -5166,12 +5791,19 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="1990"
           class="rc-picker-content"
+          role="grid"
         >
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-01"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-01"
               >
                 <div
@@ -5181,7 +5813,10 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-02"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-02"
               >
                 <div
@@ -5191,7 +5826,10 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-03"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-03"
               >
                 <div
@@ -5201,9 +5839,14 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-04"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-04"
               >
                 <div
@@ -5213,7 +5856,10 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-05"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-05"
               >
                 <div
@@ -5223,7 +5869,10 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-06"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-06"
               >
                 <div
@@ -5233,9 +5882,14 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-07"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-07"
               >
                 <div
@@ -5245,7 +5899,10 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-08"
               >
                 <div
@@ -5255,7 +5912,11 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-09"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09"
               >
                 <div
@@ -5265,9 +5926,14 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-10"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-10"
               >
                 <div
@@ -5277,7 +5943,10 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-11"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-11"
               >
                 <div
@@ -5287,7 +5956,10 @@ exports[`Picker.Panel override cell with cellRender in month 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-12"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-12"
               >
                 <div
@@ -5320,7 +5992,6 @@ exports[`Picker.Panel override cell with cellRender in quarter 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -5331,7 +6002,6 @@ exports[`Picker.Panel override cell with cellRender in quarter 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -5340,7 +6010,6 @@ exports[`Picker.Panel override cell with cellRender in quarter 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -5350,12 +6019,19 @@ exports[`Picker.Panel override cell with cellRender in quarter 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="1990"
           class="rc-picker-content"
+          role="grid"
         >
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-Q1"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-Q1"
               >
                 <div
@@ -5365,7 +6041,10 @@ exports[`Picker.Panel override cell with cellRender in quarter 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-Q2"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-Q2"
               >
                 <div
@@ -5375,7 +6054,11 @@ exports[`Picker.Panel override cell with cellRender in quarter 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-Q3"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-Q3"
               >
                 <div
@@ -5385,7 +6068,10 @@ exports[`Picker.Panel override cell with cellRender in quarter 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-Q4"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-Q4"
               >
                 <div
@@ -6900,7 +7586,6 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -6908,7 +7593,6 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
         <button
           aria-label="Previous month (PageUp)"
           class="rc-picker-header-prev-btn"
-          tabindex="-1"
           type="button"
         >
           ‹
@@ -6919,7 +7603,6 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
           <button
             aria-label="Choose a month"
             class="rc-picker-month-btn"
-            tabindex="-1"
             type="button"
           >
             Sep
@@ -6927,7 +7610,6 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -6936,7 +7618,6 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
         <button
           aria-label="Next month (PageDown)"
           class="rc-picker-header-next-btn"
-          tabindex="-1"
           type="button"
         >
           ›
@@ -6944,7 +7625,6 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -6954,9 +7634,13 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="Sep 1990"
           class="rc-picker-content"
+          role="grid"
         >
-          <thead>
+          <thead
+            aria-hidden="true"
+          >
             <tr>
               <th>
                 <span
@@ -6991,9 +7675,12 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
           <tbody>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 35"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -7002,7 +7689,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-26"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-26"
               >
                 <div
@@ -7012,7 +7702,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-27"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-27"
               >
                 <div
@@ -7022,7 +7715,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-28"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-28"
               >
                 <div
@@ -7032,7 +7728,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-29"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-29"
               >
                 <div
@@ -7042,7 +7741,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-30"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-30"
               >
                 <div
@@ -7052,7 +7754,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-31"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-31"
               >
                 <div
@@ -7062,7 +7767,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-01"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-01"
               >
                 <div
@@ -7074,9 +7782,12 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 36"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -7085,7 +7796,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-02"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-02"
               >
                 <div
@@ -7095,7 +7809,11 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-09-03"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view rc-picker-cell-today"
+                role="gridcell"
                 title="1990-09-03"
               >
                 <div
@@ -7105,7 +7823,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-04"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-04"
               >
                 <div
@@ -7115,7 +7836,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-05"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-05"
               >
                 <div
@@ -7125,7 +7849,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-06"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-06"
               >
                 <div
@@ -7135,7 +7862,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-07"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-07"
               >
                 <div
@@ -7145,7 +7875,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-08"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-08"
               >
                 <div
@@ -7157,9 +7890,12 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 37"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -7168,7 +7904,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-09"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-09"
               >
                 <div
@@ -7178,7 +7917,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-10"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-10"
               >
                 <div
@@ -7188,7 +7930,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-11"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-11"
               >
                 <div
@@ -7198,7 +7943,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-12"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-12"
               >
                 <div
@@ -7208,7 +7956,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-13"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-13"
               >
                 <div
@@ -7218,7 +7969,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-14"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-14"
               >
                 <div
@@ -7228,7 +7982,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-15"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-15"
               >
                 <div
@@ -7240,9 +7997,12 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 38"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -7251,7 +8011,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-16"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-16"
               >
                 <div
@@ -7261,7 +8024,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-17"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-17"
               >
                 <div
@@ -7271,7 +8037,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-18"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-18"
               >
                 <div
@@ -7281,7 +8050,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-19"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-19"
               >
                 <div
@@ -7291,7 +8063,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-20"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-20"
               >
                 <div
@@ -7301,7 +8076,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-21"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-21"
               >
                 <div
@@ -7311,7 +8089,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-22"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-22"
               >
                 <div
@@ -7323,9 +8104,12 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 39"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -7334,7 +8118,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-23"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-23"
               >
                 <div
@@ -7344,7 +8131,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-24"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-24"
               >
                 <div
@@ -7354,7 +8144,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-25"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-25"
               >
                 <div
@@ -7364,7 +8157,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-26"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-26"
               >
                 <div
@@ -7374,7 +8170,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-27"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-27"
               >
                 <div
@@ -7384,7 +8183,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-28"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-28"
               >
                 <div
@@ -7394,7 +8196,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-29"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-29"
               >
                 <div
@@ -7406,9 +8211,12 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
             </tr>
             <tr
               class="rc-picker-week-panel-row"
+              role="row"
             >
               <td
+                aria-label="Week 40"
                 class="rc-picker-cell rc-picker-cell-week"
+                role="rowheader"
               >
                 <div
                   class="rc-picker-cell-inner"
@@ -7417,7 +8225,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-30"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-30"
               >
                 <div
@@ -7427,7 +8238,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-01"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-01"
               >
                 <div
@@ -7437,7 +8251,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-02"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-02"
               >
                 <div
@@ -7447,7 +8264,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-03"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-03"
               >
                 <div
@@ -7457,7 +8277,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-04"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-04"
               >
                 <div
@@ -7467,7 +8290,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-05"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-05"
               >
                 <div
@@ -7477,7 +8303,10 @@ exports[`Picker.Panel override cell with cellRender in week 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-06"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-06"
               >
                 <div
@@ -7508,9 +8337,8 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
         class="rc-picker-header"
       >
         <button
-          aria-label="Last year (Control + left)"
+          aria-label="Last decade"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -7521,18 +8349,14 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
           <button
             aria-label="Choose a decade"
             class="rc-picker-decade-btn"
-            tabindex="-1"
             type="button"
           >
-            1990
-            -
-            1999
+            1990-1999
           </button>
         </div>
         <button
-          aria-label="Next year (Control + right)"
+          aria-label="Next decade"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -7542,12 +8366,19 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="1990-1999"
           class="rc-picker-content"
+          role="grid"
         >
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1989"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1989"
               >
                 <div
@@ -7557,7 +8388,11 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990"
               >
                 <div
@@ -7567,7 +8402,10 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1991"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1991"
               >
                 <div
@@ -7577,9 +8415,14 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1992"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1992"
               >
                 <div
@@ -7589,7 +8432,10 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1993"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1993"
               >
                 <div
@@ -7599,7 +8445,10 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1994"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1994"
               >
                 <div
@@ -7609,9 +8458,14 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1995"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1995"
               >
                 <div
@@ -7621,7 +8475,10 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1996"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1996"
               >
                 <div
@@ -7631,7 +8488,10 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1997"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1997"
               >
                 <div
@@ -7641,9 +8501,14 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1998"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1998"
               >
                 <div
@@ -7653,7 +8518,10 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1999"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1999"
               >
                 <div
@@ -7663,7 +8531,10 @@ exports[`Picker.Panel override cell with cellRender in year 1`] = `
                 </div>
               </td>
               <td
+                aria-label="2000"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="2000"
               >
                 <div
@@ -7699,7 +8570,6 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
           <button
             aria-label="Last year (Control + left)"
             class="rc-picker-header-super-prev-btn"
-            tabindex="-1"
             type="button"
           >
             «
@@ -7707,7 +8577,6 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
           <button
             aria-label="Previous month (PageUp)"
             class="rc-picker-header-prev-btn"
-            tabindex="-1"
             type="button"
           >
             ‹
@@ -7718,7 +8587,6 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
             <button
               aria-label="Choose a month"
               class="rc-picker-month-btn"
-              tabindex="-1"
               type="button"
             >
               Sep
@@ -7726,7 +8594,6 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
             <button
               aria-label="Choose a year"
               class="rc-picker-year-btn"
-              tabindex="-1"
               type="button"
             >
               1990
@@ -7735,7 +8602,6 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
           <button
             aria-label="Next month (PageDown)"
             class="rc-picker-header-next-btn"
-            tabindex="-1"
             type="button"
           >
             ›
@@ -7743,7 +8609,6 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
           <button
             aria-label="Next year (Control + right)"
             class="rc-picker-header-super-next-btn"
-            tabindex="-1"
             type="button"
           >
             »
@@ -7753,9 +8618,13 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
           class="rc-picker-body"
         >
           <table
+            aria-label="Sep 1990"
             class="rc-picker-content"
+            role="grid"
           >
-            <thead>
+            <thead
+              aria-hidden="true"
+            >
               <tr>
                 <th>
                   Su
@@ -7781,9 +8650,14 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
               </tr>
             </thead>
             <tbody>
-              <tr>
+              <tr
+                role="row"
+              >
                 <td
+                  aria-label="1990-08-26"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-08-26"
                 >
                   <div
@@ -7793,7 +8667,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-08-27"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-08-27"
                 >
                   <div
@@ -7803,7 +8680,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-08-28"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-08-28"
                 >
                   <div
@@ -7813,7 +8693,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-08-29"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-08-29"
                 >
                   <div
@@ -7823,7 +8706,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-08-30"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-08-30"
                 >
                   <div
@@ -7833,7 +8719,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-08-31"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-08-31"
                 >
                   <div
@@ -7843,7 +8732,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-01"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-01"
                 >
                   <div
@@ -7853,9 +8745,14 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
               </tr>
-              <tr>
+              <tr
+                role="row"
+              >
                 <td
+                  aria-label="1990-09-02"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-02"
                 >
                   <div
@@ -7865,7 +8762,11 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-current="date"
+                  aria-label="1990-09-03"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view rc-picker-cell-today"
+                  role="gridcell"
                   title="1990-09-03"
                 >
                   <div
@@ -7875,7 +8776,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-04"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-04"
                 >
                   <div
@@ -7885,7 +8789,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-05"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-05"
                 >
                   <div
@@ -7895,7 +8802,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-06"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-06"
                 >
                   <div
@@ -7905,7 +8815,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-07"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-07"
                 >
                   <div
@@ -7915,7 +8828,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-08"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-08"
                 >
                   <div
@@ -7925,9 +8841,14 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
               </tr>
-              <tr>
+              <tr
+                role="row"
+              >
                 <td
+                  aria-label="1990-09-09"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-09"
                 >
                   <div
@@ -7937,7 +8858,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-10"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-10"
                 >
                   <div
@@ -7947,7 +8871,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-11"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-11"
                 >
                   <div
@@ -7957,7 +8884,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-12"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-12"
                 >
                   <div
@@ -7967,7 +8897,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-13"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-13"
                 >
                   <div
@@ -7977,7 +8910,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-14"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-14"
                 >
                   <div
@@ -7987,7 +8923,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-15"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-15"
                 >
                   <div
@@ -7997,9 +8936,14 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
               </tr>
-              <tr>
+              <tr
+                role="row"
+              >
                 <td
+                  aria-label="1990-09-16"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-16"
                 >
                   <div
@@ -8009,7 +8953,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-17"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-17"
                 >
                   <div
@@ -8019,7 +8966,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-18"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-18"
                 >
                   <div
@@ -8029,7 +8979,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-19"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-19"
                 >
                   <div
@@ -8039,7 +8992,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-20"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-20"
                 >
                   <div
@@ -8049,7 +9005,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-21"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-21"
                 >
                   <div
@@ -8059,7 +9018,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-22"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-22"
                 >
                   <div
@@ -8069,9 +9031,14 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
               </tr>
-              <tr>
+              <tr
+                role="row"
+              >
                 <td
+                  aria-label="1990-09-23"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-23"
                 >
                   <div
@@ -8081,7 +9048,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-24"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-24"
                 >
                   <div
@@ -8091,7 +9061,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-25"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-25"
                 >
                   <div
@@ -8101,7 +9074,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-26"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-26"
                 >
                   <div
@@ -8111,7 +9087,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-27"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-27"
                 >
                   <div
@@ -8121,7 +9100,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-28"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-28"
                 >
                   <div
@@ -8131,7 +9113,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-09-29"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-29"
                 >
                   <div
@@ -8141,9 +9126,14 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
               </tr>
-              <tr>
+              <tr
+                role="row"
+              >
                 <td
+                  aria-label="1990-09-30"
+                  aria-selected="false"
                   class="rc-picker-cell rc-picker-cell-in-view"
+                  role="gridcell"
                   title="1990-09-30"
                 >
                   <div
@@ -8153,7 +9143,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-10-01"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-10-01"
                 >
                   <div
@@ -8163,7 +9156,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-10-02"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-10-02"
                 >
                   <div
@@ -8173,7 +9169,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-10-03"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-10-03"
                 >
                   <div
@@ -8183,7 +9182,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-10-04"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-10-04"
                 >
                   <div
@@ -8193,7 +9195,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-10-05"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-10-05"
                 >
                   <div
@@ -8203,7 +9208,10 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
                   </div>
                 </td>
                 <td
+                  aria-label="1990-10-06"
+                  aria-selected="false"
                   class="rc-picker-cell"
+                  role="gridcell"
                   title="1990-10-06"
                 >
                   <div
@@ -9696,9 +10704,14 @@ exports[`Picker.Panel override cell with cellRender when pass showTime 1`] = `
 
 exports[`Picker.Panel pass dateRender when picker is month 1`] = `
 <tbody>
-  <tr>
+  <tr
+    role="row"
+  >
     <td
+      aria-label="1990-01"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-01"
     >
       <div
@@ -9708,7 +10721,10 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
     <td
+      aria-label="1990-02"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-02"
     >
       <div
@@ -9718,7 +10734,10 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
     <td
+      aria-label="1990-03"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-03"
     >
       <div
@@ -9728,9 +10747,14 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
   </tr>
-  <tr>
+  <tr
+    role="row"
+  >
     <td
+      aria-label="1990-04"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-04"
     >
       <div
@@ -9740,7 +10764,10 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
     <td
+      aria-label="1990-05"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-05"
     >
       <div
@@ -9750,7 +10777,10 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
     <td
+      aria-label="1990-06"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-06"
     >
       <div
@@ -9760,9 +10790,14 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
   </tr>
-  <tr>
+  <tr
+    role="row"
+  >
     <td
+      aria-label="1990-07"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-07"
     >
       <div
@@ -9772,7 +10807,10 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
     <td
+      aria-label="1990-08"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-08"
     >
       <div
@@ -9782,7 +10820,11 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
     <td
+      aria-current="date"
+      aria-label="1990-09"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-09"
     >
       <div
@@ -9792,9 +10834,14 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
   </tr>
-  <tr>
+  <tr
+    role="row"
+  >
     <td
+      aria-label="1990-10"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-10"
     >
       <div
@@ -9804,7 +10851,10 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
     <td
+      aria-label="1990-11"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-11"
     >
       <div
@@ -9814,7 +10864,10 @@ exports[`Picker.Panel pass dateRender when picker is month 1`] = `
       </div>
     </td>
     <td
+      aria-label="1990-12"
+      aria-selected="false"
       class="rc-picker-cell rc-picker-cell-in-view"
+      role="gridcell"
       title="1990-12"
     >
       <div
@@ -9842,7 +10895,6 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
         <button
           aria-label="Last year (Control + left)"
           class="rc-picker-header-super-prev-btn"
-          tabindex="-1"
           type="button"
         >
           «
@@ -9850,7 +10902,6 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
         <button
           aria-label="Previous month (PageUp)"
           class="rc-picker-header-prev-btn"
-          tabindex="-1"
           type="button"
         >
           ‹
@@ -9861,7 +10912,6 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
           <button
             aria-label="Choose a month"
             class="rc-picker-month-btn"
-            tabindex="-1"
             type="button"
           >
             Sep
@@ -9869,7 +10919,6 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
           <button
             aria-label="Choose a year"
             class="rc-picker-year-btn"
-            tabindex="-1"
             type="button"
           >
             1990
@@ -9878,7 +10927,6 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
         <button
           aria-label="Next month (PageDown)"
           class="rc-picker-header-next-btn"
-          tabindex="-1"
           type="button"
         >
           ›
@@ -9886,7 +10934,6 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
         <button
           aria-label="Next year (Control + right)"
           class="rc-picker-header-super-next-btn"
-          tabindex="-1"
           type="button"
         >
           »
@@ -9896,9 +10943,13 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
         class="rc-picker-body"
       >
         <table
+          aria-label="Sep 1990"
           class="rc-picker-content"
+          role="grid"
         >
-          <thead>
+          <thead
+            aria-hidden="true"
+          >
             <tr>
               <th>
                 Su
@@ -9924,9 +10975,14 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
             </tr>
           </thead>
           <tbody>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-08-26"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-26"
               >
                 <div
@@ -9936,7 +10992,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-27"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-27"
               >
                 <div
@@ -9946,7 +11005,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-28"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-28"
               >
                 <div
@@ -9956,7 +11018,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-29"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-29"
               >
                 <div
@@ -9966,7 +11031,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-30"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-30"
               >
                 <div
@@ -9976,7 +11044,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-08-31"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-08-31"
               >
                 <div
@@ -9986,7 +11057,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-01"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-01"
               >
                 <div
@@ -9996,9 +11070,14 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-02"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-02"
               >
                 <div
@@ -10008,7 +11087,11 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-current="date"
+                aria-label="1990-09-03"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view rc-picker-cell-today"
+                role="gridcell"
                 title="1990-09-03"
               >
                 <div
@@ -10018,7 +11101,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-04"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-04"
               >
                 <div
@@ -10028,7 +11114,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-05"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-05"
               >
                 <div
@@ -10038,7 +11127,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-06"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-06"
               >
                 <div
@@ -10048,7 +11140,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-07"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-07"
               >
                 <div
@@ -10058,7 +11153,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-08"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-08"
               >
                 <div
@@ -10068,9 +11166,14 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-09"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-09"
               >
                 <div
@@ -10080,7 +11183,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-10"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-10"
               >
                 <div
@@ -10090,7 +11196,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-11"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-11"
               >
                 <div
@@ -10100,7 +11209,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-12"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-12"
               >
                 <div
@@ -10110,7 +11222,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-13"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-13"
               >
                 <div
@@ -10120,7 +11235,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-14"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-14"
               >
                 <div
@@ -10130,7 +11248,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-15"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-15"
               >
                 <div
@@ -10140,9 +11261,14 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-16"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-16"
               >
                 <div
@@ -10152,7 +11278,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-17"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-17"
               >
                 <div
@@ -10162,7 +11291,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-18"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-18"
               >
                 <div
@@ -10172,7 +11304,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-19"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-19"
               >
                 <div
@@ -10182,7 +11317,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-20"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-20"
               >
                 <div
@@ -10192,7 +11330,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-21"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-21"
               >
                 <div
@@ -10202,7 +11343,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-22"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-22"
               >
                 <div
@@ -10212,9 +11356,14 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-23"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-23"
               >
                 <div
@@ -10224,7 +11373,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-24"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-24"
               >
                 <div
@@ -10234,7 +11386,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-25"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-25"
               >
                 <div
@@ -10244,7 +11399,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-26"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-26"
               >
                 <div
@@ -10254,7 +11412,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-27"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-27"
               >
                 <div
@@ -10264,7 +11425,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-28"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-28"
               >
                 <div
@@ -10274,7 +11438,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-09-29"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-29"
               >
                 <div
@@ -10284,9 +11451,14 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
             </tr>
-            <tr>
+            <tr
+              role="row"
+            >
               <td
+                aria-label="1990-09-30"
+                aria-selected="false"
                 class="rc-picker-cell rc-picker-cell-in-view"
+                role="gridcell"
                 title="1990-09-30"
               >
                 <div
@@ -10296,7 +11468,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-01"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-01"
               >
                 <div
@@ -10306,7 +11481,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-02"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-02"
               >
                 <div
@@ -10316,7 +11494,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-03"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-03"
               >
                 <div
@@ -10326,7 +11507,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-04"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-04"
               >
                 <div
@@ -10336,7 +11520,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-05"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-05"
               >
                 <div
@@ -10346,7 +11533,10 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
                 </div>
               </td>
               <td
+                aria-label="1990-10-06"
+                aria-selected="false"
                 class="rc-picker-cell"
+                role="gridcell"
                 title="1990-10-06"
               >
                 <div
diff --git a/tests/__snapshots__/picker.spec.tsx.snap b/tests/__snapshots__/picker.spec.tsx.snap
index 10e4195bb..407d37866 100644
--- a/tests/__snapshots__/picker.spec.tsx.snap
+++ b/tests/__snapshots__/picker.spec.tsx.snap
@@ -5,6 +5,8 @@ exports[`Picker.Basic icon 1`] = `
   class="rc-picker-input"
 >
   <input
+    aria-expanded="false"
+    aria-haspopup="dialog"
     aria-invalid="false"
     autocomplete="off"
     size="12"
@@ -34,6 +36,8 @@ exports[`Picker.Basic inputRender 1`] = `
   class="rc-picker-input"
 >
   <input
+    aria-expanded="false"
+    aria-haspopup="dialog"
     aria-invalid="false"
     autocomplete="off"
     data-customize="yes"
@@ -51,6 +55,8 @@ exports[`Picker.Basic panelRender 1`] = `
     class="rc-picker-input"
   >
     <input
+      aria-expanded="true"
+      aria-haspopup="dialog"
       aria-invalid="false"
       autocomplete="off"
       size="12"
@@ -69,6 +75,8 @@ exports[`Picker.Basic pass data- & aria- & role 1`] = `
       class="rc-picker-input"
     >
       <input
+        aria-expanded="false"
+        aria-haspopup="dialog"
         aria-invalid="false"
         aria-label="3334"
         autocomplete="off"
@@ -91,6 +99,8 @@ exports[`Picker.Basic should render correctly in rtl 1`] = `
       class="rc-picker-input"
     >
       <input
+        aria-expanded="false"
+        aria-haspopup="dialog"
         aria-invalid="false"
         autocomplete="off"
         size="12"
diff --git a/tests/__snapshots__/range.spec.tsx.snap b/tests/__snapshots__/range.spec.tsx.snap
index d4ec74c86..a153db50b 100644
--- a/tests/__snapshots__/range.spec.tsx.snap
+++ b/tests/__snapshots__/range.spec.tsx.snap
@@ -9,6 +9,8 @@ exports[`Picker.Range icon 1`] = `
       class="rc-picker-input rc-picker-input-start"
     >
       <input
+        aria-expanded="false"
+        aria-haspopup="dialog"
         aria-invalid="false"
         autocomplete="off"
         date-range="start"
@@ -25,6 +27,8 @@ exports[`Picker.Range icon 1`] = `
       class="rc-picker-input rc-picker-input-end"
     >
       <input
+        aria-expanded="false"
+        aria-haspopup="dialog"
         aria-invalid="false"
         autocomplete="off"
         date-range="end"
@@ -65,6 +69,8 @@ exports[`Picker.Range onPanelChange is array args should render correctly in pla
       class="rc-picker-input rc-picker-input-active rc-picker-input-start"
     >
       <input
+        aria-expanded="true"
+        aria-haspopup="dialog"
         aria-invalid="false"
         autocomplete="off"
         date-range="start"
@@ -81,6 +87,8 @@ exports[`Picker.Range onPanelChange is array args should render correctly in pla
       class="rc-picker-input rc-picker-input-end"
     >
       <input
+        aria-expanded="true"
+        aria-haspopup="dialog"
         aria-invalid="false"
         autocomplete="off"
         date-range="end"
@@ -105,6 +113,8 @@ exports[`Picker.Range onPanelChange is array args should render correctly in rtl
       class="rc-picker-input rc-picker-input-start"
     >
       <input
+        aria-expanded="false"
+        aria-haspopup="dialog"
         aria-invalid="false"
         autocomplete="off"
         date-range="start"
@@ -121,6 +131,8 @@ exports[`Picker.Range onPanelChange is array args should render correctly in rtl
       class="rc-picker-input rc-picker-input-end"
     >
       <input
+        aria-expanded="false"
+        aria-haspopup="dialog"
         aria-invalid="false"
         autocomplete="off"
         date-range="end"
@@ -146,6 +158,8 @@ exports[`Picker.Range panelRender 1`] = `
         class="rc-picker-input rc-picker-input-active rc-picker-input-start"
       >
         <input
+          aria-expanded="true"
+          aria-haspopup="dialog"
           aria-invalid="false"
           autocomplete="off"
           date-range="start"
@@ -162,6 +176,8 @@ exports[`Picker.Range panelRender 1`] = `
         class="rc-picker-input rc-picker-input-end"
       >
         <input
+          aria-expanded="true"
+          aria-haspopup="dialog"
           aria-invalid="false"
           autocomplete="off"
           date-range="end"
@@ -189,6 +205,7 @@ exports[`Picker.Range panelRender 1`] = `
         />
         <div
           class="rc-picker-panel-container rc-picker-date-panel-container"
+          role="dialog"
           style="margin-left: 0px; margin-right: auto;"
           tabindex="-1"
         >
@@ -212,6 +229,8 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
         class="rc-picker-input rc-picker-input-active rc-picker-input-start"
       >
         <input
+          aria-expanded="true"
+          aria-haspopup="dialog"
           aria-invalid="false"
           autocomplete="off"
           date-range="start"
@@ -228,6 +247,8 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
         class="rc-picker-input rc-picker-input-end"
       >
         <input
+          aria-expanded="true"
+          aria-haspopup="dialog"
           aria-invalid="false"
           autocomplete="off"
           date-range="end"
@@ -255,6 +276,7 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
         />
         <div
           class="rc-picker-panel-container rc-picker-date-panel-container"
+          role="dialog"
           style="margin-left: 0px; margin-right: auto;"
           tabindex="-1"
         >
@@ -278,7 +300,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                       <button
                         aria-label="上一年 (Control键加左方向键)"
                         class="rc-picker-header-super-prev-btn"
-                        tabindex="-1"
                         type="button"
                       >
                         «
@@ -286,7 +307,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                       <button
                         aria-label="上个月 (翻页上键)"
                         class="rc-picker-header-prev-btn"
-                        tabindex="-1"
                         type="button"
                       >
                         ‹
@@ -297,7 +317,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                         <button
                           aria-label="选择年份"
                           class="rc-picker-year-btn"
-                          tabindex="-1"
                           type="button"
                         >
                           1990年
@@ -305,7 +324,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                         <button
                           aria-label="选择月份"
                           class="rc-picker-month-btn"
-                          tabindex="-1"
                           type="button"
                         >
                           9月
@@ -315,7 +333,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                         aria-label="下个月 (翻页下键)"
                         class="rc-picker-header-next-btn"
                         style="visibility: hidden;"
-                        tabindex="-1"
                         type="button"
                       >
                         ›
@@ -324,7 +341,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                         aria-label="下一年 (Control键加右方向键)"
                         class="rc-picker-header-super-next-btn"
                         style="visibility: hidden;"
-                        tabindex="-1"
                         type="button"
                       >
                         »
@@ -334,9 +350,13 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                       class="rc-picker-body"
                     >
                       <table
+                        aria-label="1990年 9月"
                         class="rc-picker-content"
+                        role="grid"
                       >
-                        <thead>
+                        <thead
+                          aria-hidden="true"
+                        >
                           <tr>
                             <th>
                               一
@@ -362,9 +382,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                           </tr>
                         </thead>
                         <tbody>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-08-27"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-08-27"
                             >
                               <div>
@@ -373,7 +399,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-08-28"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-08-28"
                             >
                               <div>
@@ -382,7 +412,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-08-29"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-08-29"
                             >
                               <div>
@@ -391,7 +425,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-08-30"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-08-30"
                             >
                               <div>
@@ -400,7 +438,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-08-31"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-08-31"
                             >
                               <div>
@@ -409,7 +451,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-01"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-01"
                             >
                               <div>
@@ -418,7 +464,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-02"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-02"
                             >
                               <div>
@@ -427,9 +477,16 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
-                            <td
+                          <tr
+                            role="row"
+                          >
+                            <td
+                              aria-current="date"
+                              aria-disabled="false"
+                              aria-label="1990-09-03"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view rc-picker-cell-today"
+                              role="gridcell"
                               title="1990-09-03"
                             >
                               <div>
@@ -438,7 +495,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-04"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-04"
                             >
                               <div>
@@ -447,7 +508,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-05"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-05"
                             >
                               <div>
@@ -456,7 +521,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-06"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-06"
                             >
                               <div>
@@ -465,7 +534,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-07"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-07"
                             >
                               <div>
@@ -474,7 +547,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-08"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-08"
                             >
                               <div>
@@ -483,7 +560,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-09"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-09"
                             >
                               <div>
@@ -492,9 +573,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-10"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-10"
                             >
                               <div>
@@ -503,7 +590,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-11"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-11"
                             >
                               <div>
@@ -512,7 +603,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-12"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-12"
                             >
                               <div>
@@ -521,7 +616,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-13"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-13"
                             >
                               <div>
@@ -530,7 +629,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-14"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-14"
                             >
                               <div>
@@ -539,7 +642,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-15"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-15"
                             >
                               <div>
@@ -548,7 +655,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-16"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-16"
                             >
                               <div>
@@ -557,9 +668,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-17"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-17"
                             >
                               <div>
@@ -568,7 +685,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-18"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-18"
                             >
                               <div>
@@ -577,7 +698,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-19"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-19"
                             >
                               <div>
@@ -586,7 +711,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-20"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-20"
                             >
                               <div>
@@ -595,7 +724,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-21"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-21"
                             >
                               <div>
@@ -604,7 +737,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-22"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-22"
                             >
                               <div>
@@ -613,7 +750,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-23"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-23"
                             >
                               <div>
@@ -622,9 +763,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-24"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-24"
                             >
                               <div>
@@ -633,7 +780,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-25"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-25"
                             >
                               <div>
@@ -642,7 +793,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-26"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-26"
                             >
                               <div>
@@ -651,7 +806,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-27"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-27"
                             >
                               <div>
@@ -660,7 +819,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-28"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-28"
                             >
                               <div>
@@ -669,7 +832,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-29"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-29"
                             >
                               <div>
@@ -678,7 +845,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-09-30"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09-30"
                             >
                               <div>
@@ -687,9 +858,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-01"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-10-01"
                             >
                               <div>
@@ -698,7 +875,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-02"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-10-02"
                             >
                               <div>
@@ -707,7 +888,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-03"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-10-03"
                             >
                               <div>
@@ -716,7 +901,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-04"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-10-04"
                             >
                               <div>
@@ -725,7 +914,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-05"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-10-05"
                             >
                               <div>
@@ -734,7 +927,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-06"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-10-06"
                             >
                               <div>
@@ -743,7 +940,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-07"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-10-07"
                             >
                               <div>
@@ -771,7 +972,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                         aria-label="上一年 (Control键加左方向键)"
                         class="rc-picker-header-super-prev-btn"
                         style="visibility: hidden;"
-                        tabindex="-1"
                         type="button"
                       >
                         «
@@ -780,7 +980,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                         aria-label="上个月 (翻页上键)"
                         class="rc-picker-header-prev-btn"
                         style="visibility: hidden;"
-                        tabindex="-1"
                         type="button"
                       >
                         ‹
@@ -791,7 +990,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                         <button
                           aria-label="选择年份"
                           class="rc-picker-year-btn"
-                          tabindex="-1"
                           type="button"
                         >
                           1990年
@@ -799,7 +997,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                         <button
                           aria-label="选择月份"
                           class="rc-picker-month-btn"
-                          tabindex="-1"
                           type="button"
                         >
                           10月
@@ -808,7 +1005,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                       <button
                         aria-label="下个月 (翻页下键)"
                         class="rc-picker-header-next-btn"
-                        tabindex="-1"
                         type="button"
                       >
                         ›
@@ -816,7 +1012,6 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                       <button
                         aria-label="下一年 (Control键加右方向键)"
                         class="rc-picker-header-super-next-btn"
-                        tabindex="-1"
                         type="button"
                       >
                         »
@@ -826,9 +1021,13 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                       class="rc-picker-body"
                     >
                       <table
+                        aria-label="1990年 10月"
                         class="rc-picker-content"
+                        role="grid"
                       >
-                        <thead>
+                        <thead
+                          aria-hidden="true"
+                        >
                           <tr>
                             <th>
                               一
@@ -854,9 +1053,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                           </tr>
                         </thead>
                         <tbody>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-01"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-01"
                             >
                               <div>
@@ -865,7 +1070,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-02"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-02"
                             >
                               <div>
@@ -874,7 +1083,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-03"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-03"
                             >
                               <div>
@@ -883,7 +1096,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-04"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-04"
                             >
                               <div>
@@ -892,7 +1109,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-05"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-05"
                             >
                               <div>
@@ -901,7 +1122,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-06"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-06"
                             >
                               <div>
@@ -910,7 +1135,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-07"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-07"
                             >
                               <div>
@@ -919,9 +1148,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-08"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-08"
                             >
                               <div>
@@ -930,7 +1165,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-09"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-09"
                             >
                               <div>
@@ -939,7 +1178,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-10"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-10"
                             >
                               <div>
@@ -948,7 +1191,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-11"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-11"
                             >
                               <div>
@@ -957,7 +1204,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-12"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-12"
                             >
                               <div>
@@ -966,7 +1217,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-13"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-13"
                             >
                               <div>
@@ -975,7 +1230,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-14"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-14"
                             >
                               <div>
@@ -984,9 +1243,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-15"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-15"
                             >
                               <div>
@@ -995,7 +1260,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-16"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-16"
                             >
                               <div>
@@ -1004,7 +1273,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-17"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-17"
                             >
                               <div>
@@ -1013,7 +1286,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-18"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-18"
                             >
                               <div>
@@ -1022,7 +1299,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-19"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-19"
                             >
                               <div>
@@ -1031,7 +1312,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-20"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-20"
                             >
                               <div>
@@ -1040,7 +1325,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-21"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-21"
                             >
                               <div>
@@ -1049,9 +1338,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-22"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-22"
                             >
                               <div>
@@ -1060,7 +1355,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-23"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-23"
                             >
                               <div>
@@ -1069,7 +1368,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-24"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-24"
                             >
                               <div>
@@ -1078,7 +1381,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-25"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-25"
                             >
                               <div>
@@ -1087,7 +1394,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-26"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-26"
                             >
                               <div>
@@ -1096,7 +1407,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-27"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-27"
                             >
                               <div>
@@ -1105,7 +1420,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-28"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-28"
                             >
                               <div>
@@ -1114,9 +1433,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-29"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-29"
                             >
                               <div>
@@ -1125,7 +1450,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-30"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-30"
                             >
                               <div>
@@ -1134,7 +1463,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10-31"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10-31"
                             >
                               <div>
@@ -1143,7 +1476,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-01"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-01"
                             >
                               <div>
@@ -1152,7 +1489,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-02"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-02"
                             >
                               <div>
@@ -1161,7 +1502,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-03"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-03"
                             >
                               <div>
@@ -1170,7 +1515,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-04"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-04"
                             >
                               <div>
@@ -1179,9 +1528,15 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-05"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-05"
                             >
                               <div>
@@ -1190,7 +1545,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-06"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-06"
                             >
                               <div>
@@ -1199,7 +1558,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-07"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-07"
                             >
                               <div>
@@ -1208,7 +1571,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-08"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-08"
                             >
                               <div>
@@ -1217,7 +1584,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-09"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-09"
                             >
                               <div>
@@ -1226,7 +1597,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-10"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-10"
                             >
                               <div>
@@ -1235,7 +1610,11 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11-11"
+                              aria-selected="false"
                               class="rc-picker-cell"
+                              role="gridcell"
                               title="1990-11-11"
                             >
                               <div>
@@ -1269,6 +1648,8 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
         class="rc-picker-input rc-picker-input-active rc-picker-input-start"
       >
         <input
+          aria-expanded="true"
+          aria-haspopup="dialog"
           aria-invalid="false"
           autocomplete="off"
           date-range="start"
@@ -1285,6 +1666,8 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
         class="rc-picker-input rc-picker-input-end"
       >
         <input
+          aria-expanded="true"
+          aria-haspopup="dialog"
           aria-invalid="false"
           autocomplete="off"
           date-range="end"
@@ -1312,6 +1695,7 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
         />
         <div
           class="rc-picker-panel-container rc-picker-month-panel-container"
+          role="dialog"
           style="margin-left: 0px; margin-right: auto;"
           tabindex="-1"
         >
@@ -1335,7 +1719,6 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                       <button
                         aria-label="上一年 (Control键加左方向键)"
                         class="rc-picker-header-super-prev-btn"
-                        tabindex="-1"
                         type="button"
                       >
                         «
@@ -1346,7 +1729,6 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                         <button
                           aria-label="选择年份"
                           class="rc-picker-year-btn"
-                          tabindex="-1"
                           type="button"
                         >
                           1990年
@@ -1356,7 +1738,6 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                         aria-label="下一年 (Control键加右方向键)"
                         class="rc-picker-header-super-next-btn"
                         style="visibility: hidden;"
-                        tabindex="-1"
                         type="button"
                       >
                         »
@@ -1366,12 +1747,20 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                       class="rc-picker-body"
                     >
                       <table
+                        aria-label="1990年"
                         class="rc-picker-content"
+                        role="grid"
                       >
                         <tbody>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-01"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-01"
                             >
                               <div>
@@ -1380,7 +1769,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-02"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-02"
                             >
                               <div>
@@ -1389,7 +1782,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-03"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-03"
                             >
                               <div>
@@ -1398,9 +1795,15 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-04"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-04"
                             >
                               <div>
@@ -1409,7 +1812,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-05"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-05"
                             >
                               <div>
@@ -1418,7 +1825,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-06"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-06"
                             >
                               <div>
@@ -1427,9 +1838,15 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-07"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-07"
                             >
                               <div>
@@ -1438,7 +1855,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-08"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-08"
                             >
                               <div>
@@ -1447,7 +1868,12 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-current="date"
+                              aria-disabled="false"
+                              aria-label="1990-09"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-09"
                             >
                               <div>
@@ -1456,9 +1882,15 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-10"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-10"
                             >
                               <div>
@@ -1467,7 +1899,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-11"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-11"
                             >
                               <div>
@@ -1476,7 +1912,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1990-12"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1990-12"
                             >
                               <div>
@@ -1504,7 +1944,6 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                         aria-label="上一年 (Control键加左方向键)"
                         class="rc-picker-header-super-prev-btn"
                         style="visibility: hidden;"
-                        tabindex="-1"
                         type="button"
                       >
                         «
@@ -1515,7 +1954,6 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                         <button
                           aria-label="选择年份"
                           class="rc-picker-year-btn"
-                          tabindex="-1"
                           type="button"
                         >
                           1991年
@@ -1524,7 +1962,6 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                       <button
                         aria-label="下一年 (Control键加右方向键)"
                         class="rc-picker-header-super-next-btn"
-                        tabindex="-1"
                         type="button"
                       >
                         »
@@ -1534,12 +1971,20 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                       class="rc-picker-body"
                     >
                       <table
+                        aria-label="1991年"
                         class="rc-picker-content"
+                        role="grid"
                       >
                         <tbody>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-01"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-01"
                             >
                               <div>
@@ -1548,7 +1993,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-02"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-02"
                             >
                               <div>
@@ -1557,7 +2006,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-03"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-03"
                             >
                               <div>
@@ -1566,9 +2019,15 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-04"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-04"
                             >
                               <div>
@@ -1577,7 +2036,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-05"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-05"
                             >
                               <div>
@@ -1586,7 +2049,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-06"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-06"
                             >
                               <div>
@@ -1595,9 +2062,15 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-07"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-07"
                             >
                               <div>
@@ -1606,7 +2079,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-08"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-08"
                             >
                               <div>
@@ -1615,7 +2092,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-09"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-09"
                             >
                               <div>
@@ -1624,9 +2105,15 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                           </tr>
-                          <tr>
+                          <tr
+                            role="row"
+                          >
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-10"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-10"
                             >
                               <div>
@@ -1635,7 +2122,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-11"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-11"
                             >
                               <div>
@@ -1644,7 +2135,11 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
                               </div>
                             </td>
                             <td
+                              aria-disabled="false"
+                              aria-label="1991-12"
+                              aria-selected="false"
                               class="rc-picker-cell rc-picker-cell-in-view"
+                              role="gridcell"
                               title="1991-12"
                             >
                               <div>
diff --git a/tests/new-range.spec.tsx b/tests/new-range.spec.tsx
index 85a4dd07c..e2744348c 100644
--- a/tests/new-range.spec.tsx
+++ b/tests/new-range.spec.tsx
@@ -434,7 +434,7 @@ describe('NewPicker.Range', () => {
       );
 
       openPicker(container);
-      fireEvent.click(document.querySelector('.rc-picker-presets li'));
+      fireEvent.click(document.querySelector('.rc-picker-presets button'));
 
       expect(onChange).not.toHaveBeenCalled();
       expect(onCalendarChange).toHaveBeenCalled();
diff --git a/tests/panel.spec.tsx b/tests/panel.spec.tsx
index 7bd3dadf9..313a5077e 100644
--- a/tests/panel.spec.tsx
+++ b/tests/panel.spec.tsx
@@ -3,6 +3,7 @@ import dayjs, { type Dayjs } from 'dayjs';
 import { resetWarned } from '@rc-component/util';
 import React from 'react';
 import type { PanelMode } from '../src/interface';
+import dayGenerateConfig from '../src/generate/dayjs';
 import enUS from '../src/locale/en_US';
 import zhCN from '../src/locale/zh_CN';
 import { clickButton, DayPickerPanel, getDay, isSame, selectCell } from './util/commonUtil';
@@ -163,6 +164,34 @@ describe('Picker.Panel', () => {
     });
   });
 
+  describe('date panel month label', () => {
+    it('uses `locale.monthFormat` when provided', () => {
+      render(
+        <DayPickerPanel
+          defaultValue={getDay('1990-09-03')}
+          locale={{ ...enUS, monthFormat: 'MM' }}
+        />,
+      );
+
+      expect(document.querySelector('.rc-picker-month-btn').textContent).toEqual('09');
+    });
+
+    it('falls back to empty short months when `generateConfig` has no `getShortMonths`', () => {
+      render(
+        <DayPickerPanel
+          defaultValue={getDay('1990-09-03')}
+          generateConfig={{
+            ...dayGenerateConfig,
+            locale: { ...dayGenerateConfig.locale, getShortMonths: undefined },
+          }}
+        />,
+      );
+
+      // `monthsLocale` resolves to `[]`, so the month button has no label
+      expect(document.querySelector('.rc-picker-month-btn').textContent).toEqual('');
+    });
+  });
+
   it('showTime.defaultValue only works at first render', () => {
     const onSelect = jest.fn();
     render(
diff --git a/tests/picker.spec.tsx b/tests/picker.spec.tsx
index 15b964ede..4880dcd3a 100644
--- a/tests/picker.spec.tsx
+++ b/tests/picker.spec.tsx
@@ -1193,15 +1193,15 @@ describe('Picker.Basic', () => {
       />,
     );
 
-    const presetEle = document.querySelector('.rc-picker-presets li');
-    expect(document.querySelector('.rc-picker-presets li').textContent).toBe('Bamboo');
+    const presetEle = document.querySelector('.rc-picker-presets button');
+    expect(document.querySelector('.rc-picker-presets button').textContent).toBe('Bamboo');
 
     // Hover
     fireEvent.mouseEnter(presetEle);
     expect(findCell(4)).toHaveClass('rc-picker-cell-hover');
 
     // Click
-    fireEvent.click(document.querySelector('.rc-picker-presets li'));
+    fireEvent.click(document.querySelector('.rc-picker-presets button'));
     expect(onChange.mock.calls[0][0].format('YYYY-MM-DD')).toEqual('1990-09-04');
   });
 
@@ -1222,7 +1222,7 @@ describe('Picker.Basic', () => {
       />,
     );
 
-    const firstPreset = document.querySelector('.rc-picker-presets li');
+    const firstPreset = document.querySelector('.rc-picker-presets button');
     expect(firstPreset.textContent).toBe('Bamboo');
 
     fireEvent.click(firstPreset);
diff --git a/tests/range.spec.tsx b/tests/range.spec.tsx
index 174a1d64a..7c317cee4 100644
--- a/tests/range.spec.tsx
+++ b/tests/range.spec.tsx
@@ -408,7 +408,7 @@ describe('Picker.Range', () => {
 
       // Basic
       openPicker(container);
-      testNode = document.querySelector('.rc-picker-presets li');
+      testNode = document.querySelector('.rc-picker-presets button');
       expect(testNode.textContent).toEqual('test');
       // testNode.simulate('click');
       fireEvent.click(testNode);
@@ -420,7 +420,7 @@ describe('Picker.Range', () => {
 
       // Function
       openPicker(container);
-      testNode = document.querySelector('.rc-picker-presets li:last-child');
+      testNode = document.querySelector('.rc-picker-presets button:last-child');
       expect(testNode.textContent).toEqual('func');
       // testNode.simulate('click');
       fireEvent.click(testNode);
@@ -441,12 +441,12 @@ describe('Picker.Range', () => {
       );
 
       openPicker(container);
-      fireEvent.mouseEnter(document.querySelector('.rc-picker-presets li'));
+      fireEvent.mouseEnter(document.querySelector('.rc-picker-presets button'));
       expect(findCell(11)).toHaveClass('rc-picker-cell-range-start');
       expect(findCell(12)).toHaveClass('rc-picker-cell-in-range');
       expect(findCell(13)).toHaveClass('rc-picker-cell-range-end');
 
-      fireEvent.mouseLeave(document.querySelector('.rc-picker-presets li'));
+      fireEvent.mouseLeave(document.querySelector('.rc-picker-presets button'));
       expect(findCell(11)).not.toHaveClass('rc-picker-cell-range-start');
       expect(findCell(12)).not.toHaveClass('rc-picker-cell-in-range');
       expect(findCell(13)).not.toHaveClass('rc-picker-cell-range-end');