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

[DataGrid] Fix invalid date error when filtering date/dateTime columns #12709

Merged
merged 2 commits into from
Apr 11, 2024
Merged

[DataGrid] Fix invalid date error when filtering date/dateTime columns #12709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5dcaf3
fix invalid date error when filtering date/dateTime columns
cherniavskii Apr 8, 2024
aa94e0e
add test
cherniavskii Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/x-data-grid/src/components/panel/filterPanel/GridFilterInputDate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ function convertFilterItemValueToInputValue(
return '';
}
const dateCopy = new Date(itemValue);
if (Number.isNaN(dateCopy.getTime())) {
return '';
}
// The date picker expects the date to be in the local timezone.
// But .toISOString() converts it to UTC with zero offset.
// So we need to subtract the timezone offset.
Expand Down Expand Up @@ -69,7 +72,8 @@ function GridFilterInputDate(props: GridFilterInputDateProps) {

setIsApplying(true);
filterTimeout.start(rootProps.filterDebounceMs, () => {
applyValue({ ...item, value: new Date(value) });
const date = new Date(value);
applyValue({ ...item, value: Number.isNaN(date.getTime()) ? undefined : date });
setIsApplying(false);
});
},
Expand Down
24 changes: 24 additions & 0 deletions test/e2e/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
devices,
BrowserContextOptions,
BrowserType,
WebError,
} from '@playwright/test';
import { pickersTextFieldClasses } from '@mui/x-date-pickers/PickersTextField';
import { pickersSectionListClasses } from '@mui/x-date-pickers/PickersSectionList';
Expand Down Expand Up @@ -514,6 +515,29 @@ async function initializeEnvironment(
await page.locator('[role="gridcell"][data-field="brand"] input').inputValue(),
).not.to.equal('v');
});

// https://github.com/mui/mui-x/issues/12705
it('should not crash if the date is invalid', async () => {
await renderFixture('DataGrid/KeyboardEditDate');

await page.hover('div[role="columnheader"][data-field="birthday"]');
await page.click(
'div[role="columnheader"][data-field="birthday"] button[aria-label="Menu"]',
);
await page.click('"Filter"');
await page.keyboard.type('08/04/2024', { delay: 10 });

let thrownError: Error | null = null;
context.once('weberror', (webError: WebError) => {
thrownError = webError.error();
console.error(thrownError);
});

await page.keyboard.press('Backspace');

await sleep(200);
expect(thrownError).to.equal(null);
});
});

describe('<DatePicker />', () => {
Expand Down