@insticc/react-datagrid-2 1.0.29 → 1.0.30

package/build/wrapper/index.js

@@ -202,13 +202,19 @@ var DataGrid = function DataGrid(_ref) {
         enableClickToCopy: (_column$enableClickTo = column.enableClickToCopy) !== null && _column$enableClickTo !== void 0 ? _column$enableClickTo : false,
         enableColumnActions: (_column$enableColumnA = column.enableColumnActions) !== null && _column$enableColumnA !== void 0 ? _column$enableColumnA : false,
         // sortingFn: --> basic default, datetime for date
-        sortingFn: column.isDateColumn ? function (rowA, rowB, columnId) {
-          var dateA = rowA.getValue(columnId) ? new Date(rowA.getValue(columnId)).getTime() : null;
-          var dateB = rowB.getValue(columnId) ? new Date(rowB.getValue(columnId)).getTime() : null;
-          if (dateA === null) return 1;
-          if (dateB === null) return -1;
-          return dateA - dateB; // Sort by timestamp
+        sortingFn: column.sortingFn ? column.sortingFn : column.isDateColumn // Use custom sorting for date columns
+        ? function (rowA, rowB, columnId) {
+          var valueA = rowA.getValue(columnId);
+          var valueB = rowB.getValue(columnId);
+          // Parse values as timestamps or handle invalid dates
+          var dateA = valueA && !isNaN(new Date(valueA).getTime()) ? new Date(valueA).getTime() : null;
+          var dateB = valueB && !isNaN(new Date(valueB).getTime()) ? new Date(valueB).getTime() : null;
+          if (dateA === null && dateB === null) return 0; // Both null, equal
+          if (dateA === null) return 1; // Null values go last
+          if (dateB === null) return -1; // Null values go last
+          return dateA - dateB; // Compare by timestamp
         } : 'basic',
+        // Use default sorting for non-date columns
         Cell: function Cell(props) {
           return column.cellClass ? /*#__PURE__*/_react["default"].createElement("div", {
             className: column.cellClass

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@insticc/react-datagrid-2",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "",
   "main": "build/index.js",
   "scripts": {