@carbon/ibm-products 2.43.2-canary.112 → 2.43.2-canary.113

package/es/components/Datagrid/useInitialColumnSort.js

@@ -29,6 +29,10 @@ var useInitialColumnSort = function useInitialColumnSort(instance) {
     if (sortableColumn) {
       var columnId = sortableColumn.id,
         order = sortableColumn.order;
+      // prevents edge case where initial sort state of none actually starts out as ascending
+      if (order !== 'ASC' && order !== 'DESC') {
+        return;
+      }
       var _getNewSortOrder = getNewSortOrder(order),
         newSortDesc = _getNewSortOrder.newSortDesc,
         newOrder = _getNewSortOrder.newOrder;

package/es/components/Datagrid/useSortableColumns.d.ts

@@ -5,9 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { Hooks } from 'react-table';
-export declare const getNewSortOrder: (sortOrder?: boolean | string) => {
-    newSortDesc: boolean;
-    newOrder: string;
-};
+interface Order {
+    newOrder: 'ASC' | 'DESC' | 'NONE';
+    newSortDesc: undefined | boolean;
+}
+export declare const getNewSortOrder: (currentOrder?: boolean | string) => Order;
 declare const useSortableColumns: (hooks: Hooks) => void;
 export default useSortableColumns;

package/es/components/Datagrid/useSortableColumns.js

@@ -15,23 +15,28 @@ import { SelectAll } from './Datagrid/DatagridSelectAll.js';
 import { DatagridSlug } from './Datagrid/addons/Slug/DatagridSlug.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
-var ordering = {
-  ASC: 'ASC',
-  DESC: 'DESC',
-  NONE: 'NONE'
-};
-var getNewSortOrder = function getNewSortOrder(sortOrder) {
+var getNewSortOrder = function getNewSortOrder(currentOrder) {
   var order = {
-    newSortDesc: false,
-    newOrder: ordering.NONE
+    newOrder: 'NONE',
+    newSortDesc: undefined
   };
-  if (sortOrder === false || sortOrder === ordering.DESC) {
-    order.newOrder = ordering.DESC;
+
+  // NONE => ASC
+  if (currentOrder === undefined) {
+    order.newOrder = 'ASC';
+    order.newSortDesc = false;
+  }
+
+  // ACS => DESC
+  if (currentOrder === false || currentOrder === 'DESC') {
+    order.newOrder = 'DESC';
     order.newSortDesc = true;
   }
-  if (sortOrder === undefined || sortOrder === ordering.ASC) {
-    order.newOrder = ordering.ASC;
-    order.newSortDesc = false;
+
+  // DESC => NONE
+  if (currentOrder === true || currentOrder === 'ASC') {
+    order.newOrder = 'NONE';
+    order.newSortDesc = undefined;
   }
   return order;
 };

package/lib/components/Datagrid/useInitialColumnSort.js

@@ -33,6 +33,10 @@ var useInitialColumnSort = function useInitialColumnSort(instance) {
     if (sortableColumn) {
       var columnId = sortableColumn.id,
         order = sortableColumn.order;
+      // prevents edge case where initial sort state of none actually starts out as ascending
+      if (order !== 'ASC' && order !== 'DESC') {
+        return;
+      }
       var _getNewSortOrder = useSortableColumns.getNewSortOrder(order),
         newSortDesc = _getNewSortOrder.newSortDesc,
         newOrder = _getNewSortOrder.newOrder;

package/lib/components/Datagrid/useSortableColumns.d.ts

@@ -5,9 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { Hooks } from 'react-table';
-export declare const getNewSortOrder: (sortOrder?: boolean | string) => {
-    newSortDesc: boolean;
-    newOrder: string;
-};
+interface Order {
+    newOrder: 'ASC' | 'DESC' | 'NONE';
+    newSortDesc: undefined | boolean;
+}
+export declare const getNewSortOrder: (currentOrder?: boolean | string) => Order;
 declare const useSortableColumns: (hooks: Hooks) => void;
 export default useSortableColumns;

package/lib/components/Datagrid/useSortableColumns.js

@@ -24,23 +24,28 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
-var ordering = {
-  ASC: 'ASC',
-  DESC: 'DESC',
-  NONE: 'NONE'
-};
-var getNewSortOrder = function getNewSortOrder(sortOrder) {
+var getNewSortOrder = function getNewSortOrder(currentOrder) {
   var order = {
-    newSortDesc: false,
-    newOrder: ordering.NONE
+    newOrder: 'NONE',
+    newSortDesc: undefined
   };
-  if (sortOrder === false || sortOrder === ordering.DESC) {
-    order.newOrder = ordering.DESC;
+
+  // NONE => ASC
+  if (currentOrder === undefined) {
+    order.newOrder = 'ASC';
+    order.newSortDesc = false;
+  }
+
+  // ACS => DESC
+  if (currentOrder === false || currentOrder === 'DESC') {
+    order.newOrder = 'DESC';
     order.newSortDesc = true;
   }
-  if (sortOrder === undefined || sortOrder === ordering.ASC) {
-    order.newOrder = ordering.ASC;
-    order.newSortDesc = false;
+
+  // DESC => NONE
+  if (currentOrder === true || currentOrder === 'ASC') {
+    order.newOrder = 'NONE';
+    order.newSortDesc = undefined;
   }
   return order;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.43.2-canary.112+d816aad33",
+  "version": "2.43.2-canary.113+c246a3d4c",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -96,7 +96,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.9",
     "@carbon/feature-flags": "^0.20.0",
-    "@carbon/ibm-products-styles": "^2.39.1-canary.122+d816aad33",
+    "@carbon/ibm-products-styles": "^2.42.0",
     "@carbon/telemetry": "^0.1.0",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^7.0.0",
@@ -120,5 +120,5 @@
     "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
   },
-  "gitHead": "d816aad330c70ca9902484ad301db60c58496f9b"
+  "gitHead": "c246a3d4cebb84b68cc879805e84466fd81dc1ab"
 }