@vuu-ui/vuu-utils 0.8.26-debug → 0.8.27-debug

package/esm/index.js

@@ -553,7 +553,7 @@ var applyGroupByToColumns = (columns, groupBy, confirmed = true) => {
   }
   return columns;
 };
-var applySortToColumns = (colunms, sort) => colunms.map((column) => {
+var applySortToColumns = (columns, sort) => columns.map((column) => {
   const sorted = getSortType(column, sort);
   if (sorted !== void 0) {
     return {
@@ -569,6 +569,8 @@ var applySortToColumns = (colunms, sort) => colunms.map((column) => {
     return column;
   }
 });
+var removeSort = (columns) => columns.map((col) => col.sorted ? { ...col, sorted: void 0 } : col);
+var existingSort = (columns) => columns.some((col) => col.sorted);
 var applyFilterToColumns = (columns, { filterStruct }) => columns.map((column) => {
   const filter = extractFilterForColumn(filterStruct, column.name);
   if (filter !== void 0) {
@@ -3388,20 +3390,33 @@ function splitRange([from, to], itemIndex) {
 }
 
 // src/sort-utils.ts
-var toggle = (sortType) => sortType === "A" ? "D" : "A";
-var applySort = ({ sortDefs }, { name: column }, extendSort = false, sortType) => {
+var cycleSortType = (sortType) => sortType === "A" ? "D" : sortType === "D" ? void 0 : "A";
+var NO_SORT = { sortDefs: [] };
+var toggleOrApplySort = ({ sortDefs }, { name: column }, extendSort = false, sortType) => {
   if (extendSort) {
-    return {
-      sortDefs: sortDefs.concat({
-        column,
-        sortType: sortType != null ? sortType : "A"
-      })
-    };
+    const existingDef = sortDefs.find((sortDef) => sortDef.column === column);
+    if (existingDef) {
+      return {
+        sortDefs: sortDefs.map(
+          (sortDef) => sortDef.column === column ? {
+            column,
+            sortType: sortDef.sortType === "A" ? "D" : "A"
+          } : sortDef
+        )
+      };
+    } else {
+      return {
+        sortDefs: sortDefs.concat({
+          column,
+          sortType: sortType != null ? sortType : "A"
+        })
+      };
+    }
   }
-  const newSortType = typeof sortType === "string" ? sortType : sortDefs.length === 1 && sortDefs[0].column === column ? toggle(sortDefs[0].sortType) : "A";
-  return {
+  const newSortType = typeof sortType === "string" ? sortType : sortDefs.length === 1 && sortDefs[0].column === column ? cycleSortType(sortDefs[0].sortType) : "A";
+  return newSortType ? {
     sortDefs: [{ column, sortType: newSortType }]
-  };
+  } : NO_SORT;
 };
 var setSortColumn = ({ sortDefs }, column, sortType) => {
   if (sortType === void 0) {
@@ -3627,7 +3642,6 @@ export {
   applyDefaultColumnConfig,
   applyFilterToColumns,
   applyGroupByToColumns,
-  applySort,
   applySortToColumns,
   applyWidthToColumns,
   asDataSourceRowObject,
@@ -3645,6 +3659,7 @@ export {
   deselectItem,
   dispatchCustomEvent,
   dispatchMouseEvent,
+  existingSort,
   expandSelection,
   extractFilterForColumn,
   extractGroupColumn,
@@ -3784,6 +3799,7 @@ export {
   registerComponent,
   registerConfigurationEditor,
   removeColumnFromFilter,
+  removeSort,
   replaceColumn,
   resetRange,
   roundDecimal,
@@ -3802,6 +3818,7 @@ export {
   toCalendarDate,
   toColumnDescriptor,
   toDataSourceColumns,
+  toggleOrApplySort,
   updateColumn,
   updateColumnFormatting,
   updateColumnRenderProps,