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.

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

[DataTable] Refresh visible columns #150

Merged
merged 5 commits into from Jul 1, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -7,7 +7,7 @@
"type": "git",
"url": "git+https://github.com/eyeseetea/d2-ui-components.git"
},
"version": "1.3.3-beta.4",
"version": "1.3.1-beta.3",
"main": "index.js",
"types": "index.d.ts",
"peerDependencies": {
Expand Down
24 changes: 13 additions & 11 deletions src/data-table/DataTable.tsx
Expand Up @@ -122,19 +122,21 @@ export function DataTable<T extends ReferenceObject = TableObject>(props: DataTa
mouseActionsMapping,
} = props;

const initialSorting = initialState.sorting || {
field: columns[0].name,
order: "asc" as const,
};
const initialSelection = initialState.selection || [];
const initialPagination = initialState.pagination;
const initialVisibleColumns = columns.filter(({ hidden }) => !hidden).map(({ name }) => name);
const [stateSelection, updateSelection] = useState(initialState.selection || []);
const [statePagination, updatePagination] = useState(initialState.pagination);
const [visibleColumns, updateVisibleColumns] = useState([]);
const [stateSorting, updateSorting] = useState(
initialState.sorting || {
field: columns[0].name,
order: "asc" as const,
}
);

const [stateSorting, updateSorting] = useState(initialSorting);
const [stateSelection, updateSelection] = useState(initialSelection);
const [statePagination, updatePagination] = useState(initialPagination);
const [visibleColumns, updateVisibleColumns] = useState(initialVisibleColumns);
useEffect(() => updatePagination(pagination => ({ ...pagination, page: 1 })), [resetKey]);
useEffect(() => {
const newVisibleColumns = columns.filter(({ hidden }) => !hidden).map(({ name }) => name);
updateVisibleColumns(visibleColumns => _.uniq([...visibleColumns, ...newVisibleColumns]));
}, [columns]);

const sorting = controlledSorting || stateSorting;
const selection = controlledSelection || stateSelection;
Expand Down