remove unnecessary structuredClone() call, simplify SortActions

grid-js · Jan 14, 2024 · 7090d69 · 7090d69
1 parent a221513
commit 7090d69
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/view/plugin/sort/actions.ts b/src/view/plugin/sort/actions.ts
@@ -8,7 +8,11 @@ export const SortColumn =
     compare?: Comparator<TCell>,
   ) =>
   (state) => {
-    let columns = state.sort ? structuredClone(state.sort.columns) : [];
+    let columns = state.sort?.columns
+      ? state.sort.columns.map((x) => {
+          return { ...x };
+        })
+      : [];
     const count = columns.length;
     const column = columns.find((x) => x.index === index);
     const exists = column !== undefined;
@@ -86,23 +90,23 @@ export const SortColumn =
 
 export const SortToggle =
   (index: number, multi: boolean, compare?: Comparator<TCell>) => (state) => {
-    const columns = state.sort ? structuredClone(state.sort.columns) : [];
+    const columns = state.sort ? [...state.sort.columns] : [];
     const column = columns.find((x) => x.index === index);
 
     if (!column) {
       return {
         ...state,
         ...SortColumn(index, 1, multi, compare)(state),
       };
-    } else {
-      return {
-        ...state,
-        ...SortColumn(
-          index,
-          column.direction === 1 ? -1 : 1,
-          multi,
-          compare,
-        )(state),
-      };
     }
+
+    return {
+      ...state,
+      ...SortColumn(
+        index,
+        column.direction === 1 ? -1 : 1,
+        multi,
+        compare,
+      )(state),
+    };
   };