cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-20 06:29:07 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix/178 (#179)

Browse Source 
* chore(DND): upgrade dependencies
* fix(EditableCell): fix bad prop
* fix(EditableCell): fix reordering bug with hidden columns
This commit is contained in:
Carlos Valente
2022-07-18 20:17:15 +02:00
committed by GitHub
parent a20909b882
commit a757058511
4 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/features/table/OntimeTable.jsx
+7 -7
View File
@@ -81,6 +81,7 @@ export default function OntimeTable({ tableData, userFields, handleUpdate, selec
);
const handleResetReordering = useCallback(() => {
console.log('called reset', defaultColumnOrder)
saveColumnOrder(defaultColumnOrder);
setColumnOrder(defaultColumnOrder);
}, [saveColumnOrder, setColumnOrder]);
@@ -105,12 +106,7 @@ export default function OntimeTable({ tableData, userFields, handleUpdate, selec
// cancel if delta y is greater than 200
if (delta.y > 200) return;
// create temp object and remove hidden columns
const cols = [...columnOrder].filter((col) => !hiddenColumns.includes(col));
if (cols === null) {
return;
}
const cols = [...columnOrder];
// get index of from
const fromIndex = cols.findIndex((i) => i === active.id);
@@ -118,13 +114,17 @@ export default function OntimeTable({ tableData, userFields, handleUpdate, selec
// get index of to
const toIndex = cols.findIndex((i) => i === over.id);
if (toIndex === -1) {
return;
}
// reorder
const [reorderedItem] = cols.splice(fromIndex, 1);
cols.splice(toIndex, 0, reorderedItem);
saveColumnOrder(cols);
setColumnOrder(cols);
}, [columnOrder, hiddenColumns, saveColumnOrder, setColumnOrder]);
}, [columnOrder, saveColumnOrder, setColumnOrder]);
// save hidden columns object to local storage
useEffect(() => {