Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DateTimePicker: fix date format when switching to 12-hour time format #37465

Merged
merged 9 commits into from
Jan 26, 2022
Merged

DateTimePicker: fix date format when switching to 12-hour time format #37465

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7183757
remove condition from `dayMonthFormat` variable
amustaque97 Dec 16, 2021
8acbaca
fix unit test case to validate dayMonthFormat
amustaque97 Dec 16, 2021
7022ea5
invert `is12Hour` condition
amustaque97 Jan 25, 2022
684ea50
add changelog entry
amustaque97 Jan 25, 2022
7e67055
update README.md for `is12Hour` props
amustaque97 Jan 25, 2022
6407d4b
Merge branch 'trunk' into fix/timepicker-format
amustaque97 Jan 25, 2022
844acdb
Write proper changelog message
amustaque97 Jan 26, 2022
766662d
better is12Hour props explanation
amustaque97 Jan 26, 2022
db47594
Merge remote-tracking branch 'origin/trunk' into fix/timepicker-format
amustaque97 Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/components/src/date-time/test/time.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ describe( 'TimePicker', () => {
).toBe( true );
} );

it( 'should have different layouts/orders for 12/24 hour formats', () => {
it( 'should have same layouts/orders for 12/24 hour formats', () => {
const onChangeSpy = jest.fn();

const { rerender } = render(
Expand Down Expand Up @@ -299,7 +299,7 @@ describe( 'TimePicker', () => {
screen.getByLabelText( 'Day' )
);

expect( monthInputIndex > dayInputIndex ).toBe( true );
expect( monthInputIndex < dayInputIndex ).toBe( true );
} );

it( 'Should set a time when passed a null currentTime', () => {
Expand Down
7 changes: 1 addition & 6 deletions packages/components/src/date-time/time.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,7 @@ export function TimePicker( { is12Hour, currentTime, onChange } ) {
</div>
);

const dayMonthFormat = is12Hour ? (
amustaque97 marked this conversation as resolved.
Show resolved Hide resolved
<>
{ dayFormat }
{ monthFormat }
</>
) : (
const dayMonthFormat = (
<>
{ monthFormat }
{ dayFormat }
Expand Down