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

package/cjs/index.js

@@ -73,7 +73,6 @@ __export(src_exports, {
   applyDefaultColumnConfig: () => applyDefaultColumnConfig,
   applyFilterToColumns: () => applyFilterToColumns,
   applyGroupByToColumns: () => applyGroupByToColumns,
-  applySort: () => applySort,
   applySortToColumns: () => applySortToColumns,
   applyWidthToColumns: () => applyWidthToColumns,
   asDataSourceRowObject: () => asDataSourceRowObject,
@@ -91,6 +90,7 @@ __export(src_exports, {
   deselectItem: () => deselectItem,
   dispatchCustomEvent: () => dispatchCustomEvent,
   dispatchMouseEvent: () => dispatchMouseEvent,
+  existingSort: () => existingSort,
   expandSelection: () => expandSelection,
   extractFilterForColumn: () => extractFilterForColumn,
   extractGroupColumn: () => extractGroupColumn,
@@ -230,6 +230,7 @@ __export(src_exports, {
   registerComponent: () => registerComponent,
   registerConfigurationEditor: () => registerConfigurationEditor,
   removeColumnFromFilter: () => removeColumnFromFilter,
+  removeSort: () => removeSort,
   replaceColumn: () => replaceColumn,
   resetRange: () => resetRange,
   roundDecimal: () => roundDecimal,
@@ -248,6 +249,7 @@ __export(src_exports, {
   toCalendarDate: () => toCalendarDate,
   toColumnDescriptor: () => toColumnDescriptor,
   toDataSourceColumns: () => toDataSourceColumns,
+  toggleOrApplySort: () => toggleOrApplySort,
   updateColumn: () => updateColumn,
   updateColumnFormatting: () => updateColumnFormatting,
   updateColumnRenderProps: () => updateColumnRenderProps,
@@ -806,7 +808,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 {
@@ -822,6 +824,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) {
@@ -3641,20 +3645,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) {