@insticc/react-datagrid-2 1.0.25 → 1.0.26

package/build/wrapper/index.js

@@ -184,15 +184,24 @@ var DataGrid = function DataGrid(_ref) {
    */
   var createColumns = function createColumns(columns) {
     return columns.map(function (column) {
+      var _column$enableSorting, _column$enableColumnF, _column$enableColumnF2, _column$filterFn, _column$enableResizin, _column$grow, _column$enableClickTo, _column$enableColumnA;
       return _objectSpread(_objectSpread({}, column), {}, {
-        enableSorting: column.enableSorting ? column.enableSorting : true,
-        enableColumnFilter: column.enableColumnFilter ? column.enableColumnFilter : true,
-        enableColumnFilterModes: column.enableColumnFilterModes ? column.enableColumnFilterModes : true,
-        filterFn: column.filterFn ? column.filterFn : 'contains',
-        enableResizing: column.enableResizing ? column.enableResizing : true,
-        grow: column.grow ? column.grow : true,
-        enableClickToCopy: column.enableClickToCopy ? column.enableClickToCopy : false,
-        enableColumnActions: column.enableColumnActions ? column.enableColumnActions : false,
+        enableSorting: (_column$enableSorting = column.enableSorting) !== null && _column$enableSorting !== void 0 ? _column$enableSorting : true,
+        enableColumnFilter: (_column$enableColumnF = column.enableColumnFilter) !== null && _column$enableColumnF !== void 0 ? _column$enableColumnF : true,
+        enableColumnFilterModes: (_column$enableColumnF2 = column.enableColumnFilterModes) !== null && _column$enableColumnF2 !== void 0 ? _column$enableColumnF2 : true,
+        filterFn: (_column$filterFn = column.filterFn) !== null && _column$filterFn !== void 0 ? _column$filterFn : 'contains',
+        enableResizing: (_column$enableResizin = column.enableResizing) !== null && _column$enableResizin !== void 0 ? _column$enableResizin : true,
+        grow: (_column$grow = column.grow) !== null && _column$grow !== void 0 ? _column$grow : true,
+        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: 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
+        } : undefined,
+        // 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.25",
+  "version": "1.0.26",
   "description": "",
   "main": "build/index.js",
   "scripts": {