Skip to content
New issue

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

#

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

Already on GitHub? # to your account

[DataGridPro] Fix header filters rendering issue for isEmpty and isNotEmpty filter operators #14493

Merged
merged 4 commits into from
Sep 17, 2024
Merged

[DataGridPro] Fix header filters rendering issue for isEmpty and isNotEmpty filter operators #14493

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
988b10b
fix: pass disabled InputComponent for isEmpty and isNotEmpty filter o…
k-rajat19 Sep 5, 2024
ce0a0a6
fix: filter rendering issue for isEmpty and isNotEmpt yfilter operators
k-rajat19 Sep 6, 2024
22721d9
CI
MBilalShafi Sep 6, 2024
74d04b2
Lint
MBilalShafi Sep 6, 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
20 changes: 18 additions & 2 deletions packages/x-data-grid-pro/src/components/headerFiltering/GridHeaderFilterCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ import {
gridVisibleColumnFieldsSelector,
getDataGridUtilityClass,
useGridSelector,
GridFilterInputValue,
GridFilterInputDate,
GridFilterInputBoolean,
GridColType,
GridFilterInputSingleSelect,
gridFilterModelSelector,
gridFilterableColumnLookupSelector,
GridPinnedColumnPosition,
Expand Down Expand Up @@ -86,7 +91,16 @@ const useUtilityClasses = (ownerState: OwnerState) => {
const dateSx = {
[`& input[value=""]:not(:focus)`]: { color: 'transparent' },
};

const defaultInputComponents: { [key in GridColType]: React.JSXElementConstructor<any> | null } = {
string: GridFilterInputValue,
number: GridFilterInputValue,
date: GridFilterInputDate,
dateTime: GridFilterInputDate,
boolean: GridFilterInputBoolean,
singleSelect: GridFilterInputSingleSelect,
actions: null,
custom: null,
};
const GridHeaderFilterCell = React.forwardRef<HTMLDivElement, GridHeaderFilterCellProps>(
(props, ref) => {
const {
Expand Down Expand Up @@ -147,7 +161,9 @@ const GridHeaderFilterCell = React.forwardRef<HTMLDivElement, GridHeaderFilterCe
);

const InputComponent =
colDef.filterable || isFilterReadOnly ? currentOperator!.InputComponent : null;
colDef.filterable || isFilterReadOnly
? (currentOperator.InputComponent ?? defaultInputComponents[colDef.type as GridColType])
: null;

const applyFilterChanges = React.useCallback(
(updatedItem: GridFilterItem) => {
Expand Down