Skip to content
Merged
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
30 changes: 18 additions & 12 deletions components/lib/datatable/DataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export const DataTable = React.forwardRef((inProps, ref) => {
const columnSortFunction = React.useRef(null);
const columnField = React.useRef(null);
const filterTimeout = React.useRef(null);
const restoredRef = React.useRef(false);

if (props.rows !== d_rowsState && !props.onPage) {
setRowsState(props.rows);
Expand Down Expand Up @@ -341,16 +342,18 @@ export const DataTable = React.forwardRef((inProps, ref) => {
}

if (restoredState.filters) {
setD_filtersState(cloneFilters(restoredState.filters));
const clonedFilters = cloneFilters(restoredState.filters);

setD_filtersState(clonedFilters);

if (props.onFilter) {
props.onFilter(
createEvent({
filters: restoredState.filters
filters: clonedFilters
})
);
} else {
setFiltersState(cloneFilters(restoredState.filters));
setFiltersState(clonedFilters);
}
}

Expand Down Expand Up @@ -1507,16 +1510,7 @@ export const DataTable = React.forwardRef((inProps, ref) => {
elementRef.current.setAttribute(attributeSelector.current, '');
}

//setFiltersState(cloneFilters(props.filters)); // Github #4248
setD_filtersState(cloneFilters(props.filters));

if (isStateful()) {
restoreState();

if (props.resizableColumns) {
restoreColumnWidths();
}
}
});

useUpdateEffect(() => {
Expand All @@ -1529,6 +1523,18 @@ export const DataTable = React.forwardRef((inProps, ref) => {
};
}, [props.breakpoint]);

useUpdateEffect(() => {
if (!restoredRef.current && isStateful()) {
restoredRef.current = true;

restoreState();

if (props.resizableColumns) {
restoreColumnWidths();
}
}
}, [context]);

useUpdateEffect(() => {
const filters = cloneFilters(props.filters);

Expand Down
Loading