|
12 | 12 |
|
13 | 13 | import {act, fireEvent, pointerMap, render as render_, waitFor, within} from '@react-spectrum/test-utils-internal';
|
14 | 14 | import {Button} from '@react-spectrum/button';
|
15 |
| -import {CalendarDate, CalendarDateTime, EthiopicCalendar, getLocalTimeZone, JapaneseCalendar, parseZonedDateTime, toCalendarDateTime, today} from '@internationalized/date'; |
| 15 | +import {CalendarDate, CalendarDateTime, DateFormatter, EthiopicCalendar, getLocalTimeZone, JapaneseCalendar, parseZonedDateTime, toCalendarDateTime, today} from '@internationalized/date'; |
16 | 16 | import {DatePicker} from '../';
|
17 | 17 | import {Form} from '@react-spectrum/form';
|
18 | 18 | import {Provider} from '@react-spectrum/provider';
|
@@ -584,7 +584,7 @@ describe('DatePicker', function () {
|
584 | 584 | let month = parts.find(p => p.type === 'month').value;
|
585 | 585 | let day = parts.find(p => p.type === 'day').value;
|
586 | 586 | let year = parts.find(p => p.type === 'year').value;
|
587 |
| - |
| 587 | + |
588 | 588 | expectPlaceholder(combobox, `${month}/${day}/${year}, 12:00 AM`);
|
589 | 589 |
|
590 | 590 | await user.keyboard('{ArrowRight}');
|
@@ -1928,7 +1928,17 @@ describe('DatePicker', function () {
|
1928 | 1928 | await user.tab();
|
1929 | 1929 | await user.keyboard('{Backspace}');
|
1930 | 1930 |
|
1931 |
| - expectPlaceholder(combobox, 'mm/dd/yyyy, ––:–– AM PDT'); |
| 1931 | + let timeZoneName = |
| 1932 | + new DateFormatter('en-US', |
| 1933 | + { |
| 1934 | + timeZone: 'America/Los_Angeles', |
| 1935 | + timeZoneName: 'short' |
| 1936 | + }) |
| 1937 | + .formatToParts(new Date()) |
| 1938 | + .find(p => p.type === 'timeZoneName') |
| 1939 | + .value; |
| 1940 | + |
| 1941 | + expectPlaceholder(combobox, `mm/dd/yyyy, ––:–– AM ${timeZoneName}`); |
1932 | 1942 | });
|
1933 | 1943 |
|
1934 | 1944 | it('should keep timeZone from defaultValue when date and time are cleared then set', async function () {
|
|
0 commit comments