Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { CustomAggridFilterParams } from './custom-aggrid-filter.type';

export const CustomAggridComparatorFilter = ({ api, colId, filterParams }: CustomAggridFilterParams) => {
const {
selectedFilterData,
selectedFilterComparator,
decimalAfterDot,
isNumberInput,
Expand All @@ -34,11 +33,12 @@ export const CustomAggridComparatorFilter = ({ api, colId, filterParams }: Custo
options={comparators}
/>
<CustomAggridTextFilter
value={selectedFilterData}
colId={colId}
onChange={handleFilterTextChange}
onClear={handleClearFilter}
isNumberInput={isNumberInput}
decimalAfterDot={decimalAfterDot}
filterParams={filterParams}
/>
</Grid>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
import React, { useMemo } from 'react';
import { ChangeEvent, useEffect, useMemo, useState } from 'react';
import { Grid, IconButton, InputAdornment, TextField } from '@mui/material';
import ClearIcon from '@mui/icons-material/Clear';
import { DisplayRounding } from '../display-rounding';
import { useIntl } from 'react-intl';
import { mergeSx, type MuiStyles } from '@gridsuite/commons-ui';
import { FILTER_DATA_TYPES } from './custom-aggrid-filter.type';
import { useFilterSelector } from '../../../hooks/use-filter-selector';
import { FilterParams } from '../../../types/custom-aggrid-types';

const styles = {
input: {
Expand All @@ -28,32 +30,56 @@ const styles = {
} as const satisfies MuiStyles;

interface CustomAggridTextFilterProps {
value: unknown;
colId: string;
onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
onClear: () => void;
isNumberInput: boolean;
decimalAfterDot: number;
filterParams: FilterParams;
}

export const CustomAggridTextFilter: React.FC<CustomAggridTextFilterProps> = ({
value,
colId,
onChange,
onClear,
isNumberInput,
filterParams,
decimalAfterDot = 0,
}) => {
const [value, setValue] = useState('');
const intl = useIntl();

const { filters } = useFilterSelector(filterParams.type, filterParams.tab);

const isRoundingDisplayed = useMemo(() => !!(isNumberInput && value), [isNumberInput, value]);

const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
const upperCaseValue = event.target.value.toUpperCase();
setValue(upperCaseValue);
onChange(event);
};

const handleClear = () => {
setValue('');
onClear();
};

useEffect(() => {
const filterObject = filters?.find((filter) => filter.column === colId);
if (filterObject) {
setValue(String(filterObject.value));
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

return (
<Grid container direction="column" gap={0.2}>
<Grid item>
<TextField
size={'small'}
fullWidth
value={value || ''}
onChange={onChange}
onChange={handleChange}
placeholder={intl.formatMessage({
id: 'filter.filterOoo',
})}
Expand All @@ -64,7 +90,7 @@ export const CustomAggridTextFilter: React.FC<CustomAggridTextFilterProps> = ({
InputProps={{
endAdornment: value ? (
<InputAdornment position="end">
<IconButton aria-label="clear filter" onClick={onClear} edge="end" size="small">
<IconButton aria-label="clear filter" onClick={handleClear} edge="end" size="small">
<ClearIcon />
</IconButton>
</InputAdornment>
Expand Down
Loading