Skip to content

Commit d566890

Browse files
committed
feat: Improve Time panel keyboard navigation and semantics
1 parent 6f6bbb3 commit d566890

78 files changed

Lines changed: 2512 additions & 53 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/PickerPanel/TimePanel/TimePanelBody/TimeColumn.tsx‎

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,23 @@ import { useLayoutEffect } from '@rc-component/util';
33
import * as React from 'react';
44
import { usePanelContext } from '../../context';
55
import useScrollTo from './useScrollTo';
6+
import type { Locale } from '../../../interface';
67

78
const SCROLL_DELAY = 300;
89

910
export type Unit<ValueType = number | string> = {
10-
label: React.ReactText;
11+
label: string | number;
1112
value: ValueType;
1213
disabled?: boolean;
1314
};
1415

16+
type TimeUnitType = 'hour' | 'minute' | 'second' | 'millisecond' | 'meridiem';
17+
1518
export interface TimeUnitColumnProps {
1619
units: Unit[];
1720
value: number | string;
1821
optionalValue?: number | string;
19-
type: 'hour' | 'minute' | 'second' | 'millisecond' | 'meridiem';
22+
type: TimeUnitType;
2023
onChange: (value: number | string) => void;
2124
onHover: (value: number | string) => void;
2225
onDblClick?: VoidFunction;
@@ -28,6 +31,40 @@ function flattenUnits(units: Unit<string | number>[]) {
2831
return units.map(({ value, label, disabled }) => [value, label, disabled].join(',')).join(';');
2932
}
3033

34+
function getListLabel(type: TimeUnitType, locale: Locale) {
35+
switch (type) {
36+
case 'hour':
37+
return locale.hourSelect;
38+
case 'minute':
39+
return locale.minuteSelect;
40+
case 'second':
41+
return locale.secondSelect;
42+
case 'millisecond':
43+
return locale.millisecondSelect;
44+
case 'meridiem':
45+
return locale.meridiemSelect;
46+
default:
47+
return '';
48+
}
49+
}
50+
51+
function getListItemLabel(type: TimeUnitType, value: string | number, locale: Locale) {
52+
switch (type) {
53+
case 'hour':
54+
return `${value} ${locale.hours}`;
55+
case 'minute':
56+
return `${value} ${locale.minutes}`;
57+
case 'second':
58+
return `${value} ${locale.seconds}`;
59+
case 'millisecond':
60+
return `${value} ${locale.milliseconds}`;
61+
case 'meridiem':
62+
return value.toString();
63+
default:
64+
return '';
65+
}
66+
}
67+
3168
export default function TimeColumn<DateType extends object>(props: TimeUnitColumnProps) {
3269
const { units, value, optionalValue, type, onChange, onHover, onDblClick, changeOnScroll } =
3370
props;
@@ -96,16 +133,28 @@ export default function TimeColumn<DateType extends object>(props: TimeUnitColum
96133
const columnPrefixCls = `${panelPrefixCls}-column`;
97134

98135
return (
99-
<ul className={columnPrefixCls} ref={ulRef} data-type={type} onScroll={onInternalScroll}>
136+
<ul
137+
role="listbox"
138+
aria-label={getListLabel(type, locale)}
139+
className={columnPrefixCls}
140+
ref={ulRef}
141+
data-type={type}
142+
onScroll={onInternalScroll}
143+
>
100144
{units.map(({ label, value: unitValue, disabled }) => {
101145
const inner = <div className={`${cellPrefixCls}-inner`}>{label}</div>;
146+
const isSelected = value === unitValue;
102147

103148
return (
104149
<li
105150
key={unitValue}
151+
aria-label={getListItemLabel(type, unitValue, locale)}
152+
role="option"
153+
aria-selected={isSelected}
154+
aria-disabled={disabled}
106155
style={styles.item}
107156
className={clsx(cellPrefixCls, classNames.item, {
108-
[`${cellPrefixCls}-selected`]: value === unitValue,
157+
[`${cellPrefixCls}-selected`]: isSelected,
109158
[`${cellPrefixCls}-disabled`]: disabled,
110159
})}
111160
onClick={() => {

‎src/PickerPanel/TimePanel/TimePanelBody/index.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,11 @@ export default function TimePanelBody<DateType extends object = any>(
271271
};
272272

273273
return (
274-
<div className={clsx(`${prefixCls}-content`, classNames.content)} style={styles.content}>
274+
<div
275+
role="group"
276+
className={clsx(`${prefixCls}-content`, classNames.content)}
277+
style={styles.content}
278+
>
275279
{showHour && (
276280
<TimeColumn
277281
units={hourUnits}

‎src/interface.tsx‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,20 @@ export type Locale = {
6666
week: string;
6767
month: string;
6868
year: string;
69+
hours: string;
70+
minutes: string;
71+
seconds: string;
72+
milliseconds: string;
6973
previousMonth: string;
7074
nextMonth: string;
7175
monthSelect: string;
7276
yearSelect: string;
7377
decadeSelect: string;
78+
hourSelect: string;
79+
minuteSelect: string;
80+
secondSelect: string;
81+
millisecondSelect: string;
82+
meridiemSelect: string;
7483

7584
previousYear: string;
7685
nextYear: string;
@@ -316,13 +325,7 @@ export type SemanticName = 'root' | 'prefix' | 'input' | 'suffix';
316325
export type PreviewValueType = 'hover';
317326

318327
export type PanelSemanticName =
319-
| 'root'
320-
| 'header'
321-
| 'body'
322-
| 'content'
323-
| 'item'
324-
| 'footer'
325-
| 'container';
328+
'root' | 'header' | 'body' | 'content' | 'item' | 'footer' | 'container';
326329

327330
export interface SharedPickerProps<DateType extends object = any>
328331
extends

‎src/locale/am_ET.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,21 @@ const locale: Locale = {
1010
week: 'ሳምንት',
1111
month: 'ወር',
1212
year: 'ዓመት',
13+
hours: 'ሰዓቶች',
14+
minutes: 'ደቂቃዎች',
15+
seconds: 'ሰከንዶች',
16+
milliseconds: 'ሚሊሰከንዶች',
1317
timeSelect: 'ሰዓት ምረጥ',
1418
dateSelect: 'ቀን ምረጥ',
1519
weekSelect: 'ሳምንት ምረጥ',
1620
monthSelect: 'ወር ምረጥ',
1721
yearSelect: 'አመት ምረጥ',
1822
decadeSelect: 'አስርት አመታት ምረጥ',
23+
hourSelect: 'ሰዓት ይምረጡ',
24+
minuteSelect: 'ደቂቃ ይምረጡ',
25+
secondSelect: 'ሰከንድ ይምረጡ',
26+
millisecondSelect: 'ሚሊሰከንድ ይምረጡ',
27+
meridiemSelect: 'ሜሪዲየም ይምረጡ',
1928
yearFormat: 'YYYY',
2029
dayFormat: 'D',
2130
monthBeforeYear: true,

‎src/locale/ar_EG.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,20 @@ const locale: Locale = {
1212
week: 'الأسبوع',
1313
month: 'الشهر',
1414
year: 'السنة',
15+
hours: 'الساعات',
16+
minutes: 'الدقائق',
17+
seconds: 'الثواني',
18+
milliseconds: 'المللي ثانية',
1519
timeSelect: 'اختيار الوقت',
1620
dateSelect: 'اختيار التاريخ',
1721
monthSelect: 'اختيار الشهر',
1822
yearSelect: 'اختيار السنة',
1923
decadeSelect: 'اختيار العقد',
24+
hourSelect: 'اختر ساعة',
25+
minuteSelect: 'اختر دقيقة',
26+
secondSelect: 'اختر ثانية',
27+
millisecondSelect: 'اختر جزء من الثانية',
28+
meridiemSelect: 'اختر صباحاً/مساءً',
2029
previousMonth: 'الشهر السابق (PageUp)',
2130
nextMonth: 'الشهر التالى(PageDown)',
2231
previousYear: 'العام السابق (Control + left)',

‎src/locale/az_AZ.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,21 @@ const locale: Locale = {
1212
week: 'Həftə',
1313
month: 'Ay',
1414
year: 'İl',
15+
hours: 'Saat',
16+
minutes: 'Dəqiqə',
17+
seconds: 'Saniyə',
18+
milliseconds: 'Millisaniyə',
1519
timeSelect: 'vaxtı seç',
1620
dateSelect: 'tarixi seç',
1721
weekSelect: 'Həftə seç',
1822
monthSelect: 'Ay seç',
1923
yearSelect: 'il seç',
2024
decadeSelect: 'Onillik seçin',
25+
hourSelect: 'Saat seçin',
26+
minuteSelect: 'Dəqiqə seçin',
27+
secondSelect: 'Saniyə seçin',
28+
millisecondSelect: 'Millisaniyə seçin',
29+
meridiemSelect: 'Meridyemi seçin',
2130
previousMonth: 'Əvvəlki ay (PageUp)',
2231
nextMonth: 'Növbəti ay (PageDown)',
2332
previousYear: 'Sonuncu il (Control + left)',

‎src/locale/bg_BG.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,20 @@ const locale: Locale = {
1212
week: 'Седмица',
1313
month: 'Месец',
1414
year: 'Година',
15+
hours: 'Часове',
16+
minutes: 'Минути',
17+
seconds: 'Секунди',
18+
milliseconds: 'Милисекунди',
1519
timeSelect: 'Избор на час',
1620
dateSelect: 'Избор на дата',
1721
monthSelect: 'Избор на месец',
1822
yearSelect: 'Избор на година',
1923
decadeSelect: 'Десетилетие',
24+
hourSelect: 'Изберете час',
25+
minuteSelect: 'Изберете минута',
26+
secondSelect: 'Изберете секунда',
27+
millisecondSelect: 'Изберете милисекунда',
28+
meridiemSelect: 'Изберете меридием',
2029
previousMonth: 'Предишен месец (PageUp)',
2130
nextMonth: 'Следващ месец (PageDown)',
2231
previousYear: 'Последна година (Control + left)',

‎src/locale/bn_BD.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,21 @@ const locale: Locale = {
1212
week: 'সপ্তাহ',
1313
month: 'মাস',
1414
year: 'বছর',
15+
hours: 'ঘণ্টা',
16+
minutes: 'মিনিট',
17+
seconds: 'সেকেন্ড',
18+
milliseconds: 'মিলিসেকেন্ড',
1519
timeSelect: 'সময় নির্বাচন',
1620
dateSelect: 'তারিখ নির্বাচন',
1721
weekSelect: 'সপ্তাহ পছন্দ করুন',
1822
monthSelect: 'মাস পছন্দ করুন',
1923
yearSelect: 'বছর পছন্দ করুন',
2024
decadeSelect: 'একটি দশক পছন্দ করুন',
25+
hourSelect: 'একটি ঘণ্টা নির্বাচন করুন',
26+
minuteSelect: 'একটি মিনিট নির্বাচন করুন',
27+
secondSelect: 'একটি সেকেন্ড নির্বাচন করুন',
28+
millisecondSelect: 'একটি মিলিসেকেন্ড নির্বাচন করুন',
29+
meridiemSelect: 'মেরিডিয়েম নির্বাচন করুন',
2130
previousMonth: 'গত মাস (PageUp)',
2231
nextMonth: 'আগামী মাস (PageDown)',
2332
previousYear: 'গত বছর (Control + left)',

‎src/locale/by_BY.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,21 @@ const locale: Locale = {
1212
week: 'Тыдзень',
1313
month: 'Месяц',
1414
year: 'Год',
15+
hours: 'Гадзіны',
16+
minutes: 'Хвіліны',
17+
seconds: 'Секунды',
18+
milliseconds: 'Мілісекунды',
1519
timeSelect: 'Выбраць час',
1620
dateSelect: 'Выбраць дату',
1721
weekSelect: 'Выбраць тыдзень',
1822
monthSelect: 'Выбраць месяц',
1923
yearSelect: 'Выбраць год',
2024
decadeSelect: 'Выбраць дзесяцігоддзе',
25+
hourSelect: 'Выберыце гадзіну',
26+
minuteSelect: 'Выберыце хвіліну',
27+
secondSelect: 'Выберыце секунду',
28+
millisecondSelect: 'Выберыце мілісекунду',
29+
meridiemSelect: 'Выберыце мерыдыем',
2130

2231
previousMonth: 'Папярэдні месяц (PageUp)',
2332
nextMonth: 'Наступны месяц (PageDown)',

‎src/locale/ca_ES.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,20 @@ const locale: Locale = {
1212
week: 'Setmana',
1313
month: 'Mes',
1414
year: 'Any',
15+
hours: 'Hores',
16+
minutes: 'Minuts',
17+
seconds: 'Segons',
18+
milliseconds: 'Mil·lisegons',
1519
timeSelect: 'Seleccionar hora',
1620
dateSelect: 'Seleccionar data',
1721
monthSelect: 'Escollir un mes',
1822
yearSelect: 'Escollir un any',
1923
decadeSelect: 'Escollir una dècada',
24+
hourSelect: 'Seleccioneu una hora',
25+
minuteSelect: 'Seleccioneu un minut',
26+
secondSelect: 'Seleccioneu un segon',
27+
millisecondSelect: 'Seleccioneu un mil·lisegon',
28+
meridiemSelect: 'Seleccioneu el meridiem',
2029
previousMonth: 'Mes anterior (PageUp)',
2130
nextMonth: 'Mes següent (PageDown)',
2231
previousYear: 'Any anterior (Control + left)',

0 commit comments

Comments
 (0)