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

[fields] Fix new index calculation on letter section #13310

Merged
merged 10 commits into from
Jun 6, 2024
Merged

[fields] Fix new index calculation on letter section #13310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1d78d94
implements logic to adjust index for Field letter section
May 30, 2024
1490d60
implements basic tests for PageUp and PageDown
May 30, 2024
486281f
prettier fix
May 30, 2024
0056453
Merge branch 'mui:master' into fix/adjust-index-for-letter-section
arthurbalduini Jun 4, 2024
5dee884
renames index var properly
Jun 4, 2024
4dba19f
test: implements time field tests for pageUp and pageDown keys
Jun 4, 2024
2f66758
fix prettier and eslint issues
Jun 4, 2024
1d957e2
fixes test description
Jun 5, 2024
16aca5a
implements pageUp and pageDown tests for dateField
Jun 5, 2024
5f9d996
fixes prettier and eslint issues
Jun 5, 2024
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
230 changes: 229 additions & 1 deletion packages/x-date-pickers/src/DateField/tests/editing.DateField.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ describe('<DateField /> - Editing', () => {
});
});

describeAdapters(`key: Delete`, DateField, ({ adapter, testFieldKeyPress, renderWithProps }) => {
describeAdapters('key: Delete', DateField, ({ adapter, testFieldKeyPress, renderWithProps }) => {
it('should clear the selected section when only this section is completed', () => {
// Test with v7 input
const v7Response = renderWithProps({
Expand Down Expand Up @@ -516,6 +516,234 @@ describe('<DateField /> - Editing', () => {
});
});

describeAdapters('key: PageUp', DateField, ({ adapter, testFieldKeyPress }) => {
describe('day section (PageUp)', () => {
it('should set day to minimal when no value is provided', () => {
testFieldKeyPress({
format: adapter.formats.dayOfMonth,
key: 'PageUp',
expectedValue: '01',
});
});

it('should increment day by 5 when value is provided', () => {
testFieldKeyPress({
format: adapter.formats.dayOfMonth,
defaultValue: adapter.date('2022-01-15'),
key: 'PageUp',
expectedValue: '20',
});
});

it('should flip day field when value is higher than 27', () => {
testFieldKeyPress({
format: adapter.formats.dayOfMonth,
defaultValue: adapter.date('2022-01-28'),
key: 'PageUp',
expectedValue: '02',
});
});
});

describe('weekday section (PageUp)', () => {
it('should set weekday to Sunday when no value is provided', () => {
testFieldKeyPress({
format: adapter.formats.weekday,
key: 'PageUp',
expectedValue: 'Sunday',
});
});

it('should increment weekday by 5 when value is provided', () => {
testFieldKeyPress({
format: adapter.formats.weekday,
defaultValue: adapter.date('2024-06-03'),
key: 'PageUp',
expectedValue: 'Saturday',
});
});

it('should flip weekday field when value is higher than 3', () => {
testFieldKeyPress({
format: adapter.formats.weekday,
defaultValue: adapter.date('2024-06-07'),
key: 'PageUp',
expectedValue: 'Wednesday',
});
});
});

describe('month section (PageUp)', () => {
it('should set month to January when no value is provided', () => {
testFieldKeyPress({
format: adapter.formats.month,
key: 'PageUp',
expectedValue: 'January',
});
});

it('should increment month by 5 when value is provided', () => {
testFieldKeyPress({
format: adapter.formats.month,
defaultValue: adapter.date('2022-01-15'),
key: 'PageUp',
expectedValue: 'June',
});
});

it('should flip month field when value is higher than 7', () => {
testFieldKeyPress({
format: adapter.formats.month,
defaultValue: adapter.date('2022-08-15'),
key: 'PageUp',
expectedValue: 'January',
});
});
});

describe('year section (PageUp)', () => {
it('should set year to current year when no value is provided', () => {
testFieldKeyPress({
format: adapter.formats.year,
key: 'PageUp',
expectedValue: new Date().getFullYear().toString(),
});
});

it('should increment year by 5 when value is provided', () => {
testFieldKeyPress({
format: adapter.formats.year,
defaultValue: adapter.date('2022-01-15'),
key: 'PageUp',
expectedValue: '2027',
});
});

it('should flip year field when value is higher than 9995', () => {
testFieldKeyPress({
format: adapter.formats.year,
defaultValue: adapter.date('9996-01-15'),
key: 'PageUp',
expectedValue: '0001',
});
});
});
});

describeAdapters('key: PageDown', DateField, ({ adapter, testFieldKeyPress }) => {
describe('day section (PageDown)', () => {
it('should set day to maximal when no value is provided', () => {
testFieldKeyPress({
format: adapter.formats.dayOfMonth,
key: 'PageDown',
expectedValue: '31',
});
});

it('should decrement day by 5 when value is provided', () => {
testFieldKeyPress({
format: adapter.formats.dayOfMonth,
defaultValue: adapter.date('2022-01-15'),
key: 'PageDown',
expectedValue: '10',
});
});

it('should flip day field when value is lower than 5', () => {
testFieldKeyPress({
format: adapter.formats.dayOfMonth,
defaultValue: adapter.date('2022-01-04'),
key: 'PageDown',
expectedValue: '30',
});
});
});

describe('weekday section (PageDown)', () => {
it('should set weekday to Saturday when no value is provided', () => {
testFieldKeyPress({
format: adapter.formats.weekday,
key: 'PageDown',
expectedValue: 'Saturday',
});
});

it('should decrement weekday by 5 when value is provided', () => {
testFieldKeyPress({
format: adapter.formats.weekday,
defaultValue: adapter.date('2024-06-22'),
key: 'PageDown',
expectedValue: 'Monday',
});
});

it('should flip weekday field when value is lower than 5', () => {
testFieldKeyPress({
format: adapter.formats.weekday,
defaultValue: adapter.date('2024-06-23'),
key: 'PageDown',
expectedValue: 'Tuesday',
});
});
});

describe('month section (PageDown)', () => {
it('should set month to December when no value is provided', () => {
testFieldKeyPress({
format: adapter.formats.month,
key: 'PageDown',
expectedValue: 'December',
});
});

it('should decrement month by 5 when value is provided', () => {
testFieldKeyPress({
format: adapter.formats.month,
defaultValue: adapter.date('2022-10-15'),
key: 'PageDown',
expectedValue: 'May',
});
});

it('should flip month field when value is lower than 5', () => {
testFieldKeyPress({
format: adapter.formats.month,
defaultValue: adapter.date('2022-04-15'),
key: 'PageDown',
expectedValue: 'November',
});
});
});

describe('year section (PageDown)', () => {
it('should set year to current year when no value is provided', () => {
testFieldKeyPress({
format: adapter.formats.year,
key: 'PageDown',
expectedValue: new Date().getFullYear().toString(),
});
});

it('should decrement year by 5 when value is provided', () => {
testFieldKeyPress({
format: adapter.formats.year,
defaultValue: adapter.date('2022-01-15'),
key: 'PageDown',
expectedValue: '2017',
});
});

it('should flip year field when value is lower than 5', () => {
testFieldKeyPress({
format: adapter.formats.year,
defaultValue: adapter.date('0003-01-15'),
key: 'PageDown',
expectedValue: adapter.lib === 'dayjs' ? '1898' : '9998',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@flaviendelangle WDYT about making the minimum and maximum aware of the minDate and maxDate?
Didn't we do it only, because shouldDisableYear exists? 🤔
IMHO, the current behavior seems a bit strange, especially given the differences in adapters. 🙈

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How would this behave for sections other than year?
For year, I do agree that having the min/max respect the validation (even if shouldDisableYear is not supported) would be a plus.
For the other fields, I'm not sure what the exact behavior should be.

});
});
});
});

describeAdapters('Digit editing', DateField, ({ adapter, testFieldChange, renderWithProps }) => {
it('should set the day to the digit pressed when no digit no value is provided', () => {
testFieldChange({
Expand Down
Loading
Loading