Mirrors/rowy
1
0
Fork 0
mirror of https://github.com/rowyio/rowy.git synced 2025-12-29 00:16:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #611 from gibsonliketheguitar/fix-559

Browse Source 
fix-bug #559 unpredictable state of tableAction.reorder's function
This commit is contained in:
Shams
2022-01-31 16:55:11 +11:00
committed by GitHub
parent 29f86fca94 65fd0ed3f6
commit dee56366c4
2 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/hooks/useTable/useTableConfig.ts
View File

@@ -6,7 +6,7 @@ import _sortBy from "lodash/sortBy";
import useDoc, { DocActions } from "../useDoc";
import { FieldType } from "@src/constants/fields";
import { arrayMover, formatPath } from "../../utils/fns";
import { formatPath } from "../../utils/fns";
import { db, deleteField } from "../../firebase";
export type ColumnConfig = {
@@ -136,15 +136,21 @@ const useTableConfig = (tableId?: string) => {
const { columns } = tableConfigState;
const oldIndex = columns[draggedColumnKey].index;
const newIndex = columns[droppedColumnKey].index;
const columnsArray = _sortBy(Object.values(columns), "index");
arrayMover(columnsArray, oldIndex, newIndex);
let updatedColumns = columns;
columnsArray
.filter((c) => c) // arrayMover has a bug creating undefined items
.forEach((column: any, index) => {
updatedColumns[column.key] = { ...column, index };
});
//sort columns by index, remove drag col, insert it in drop position
const sortedColumns = _sortBy(Object.values(columns), "index");
const removeCol = sortedColumns.splice(oldIndex, 1);
sortedColumns.splice(newIndex, 0, removeCol[0]);
//itereate and update index to proper value
const updatedColumns = sortedColumns.reduce(
(acc: any, curr: any, index) => {
acc[curr.key] = { ...curr, index };
return acc;
},
{}
);
documentDispatch({
action: DocActions.update,
data: { columns: updatedColumns },

27
src/utils/fns.ts
View File

@@ -5,33 +5,6 @@ import _isPlainObject from "lodash/isPlainObject";
import { TABLE_GROUP_SCHEMAS, TABLE_SCHEMAS } from "@src/config/dbPaths";
/**
* reposition an element in an array
* @param arr array
* @param old_index index of element to be moved
* @param new_index new position of the moved element
*/
export const arrayMover = (
arr: any[],
old_index: number,
new_index: number
) => {
while (old_index < 0) {
old_index += arr.length;
}
while (new_index < 0) {
new_index += arr.length;
}
if (new_index >= arr.length) {
var k = new_index - arr.length + 1;
while (k--) {
arr.push(undefined);
}
}
arr.splice(new_index, 0, arr.splice(old_index, 1)[0]);
return arr; // for testing purposes
};
export const missingFieldsReducer =
(data: any) => (acc: string[], curr: string) => {
if (data[curr] === undefined) {