handsontable 0.0.0-next-0d1b629-20240507 → 0.0.0-next-7cf23cf-20240507

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-0d1b629-20240507";
+  const hotVersion = "0.0.0-next-7cf23cf-20240507";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-0d1b629-20240507";
+  const hotVersion = "0.0.0-next-7cf23cf-20240507";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-0d1b629-20240507",
+  "version": "0.0.0-next-7cf23cf-20240507",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/columnSorting/sortFunction/date.js

@@ -2,10 +2,7 @@
 
 exports.__esModule = true;
 exports.compareFunctionFactory = compareFunctionFactory;
-var _moment = _interopRequireDefault(require("moment"));
-var _mixed = require("../../../helpers/mixed");
-var _sortService = require("../sortService");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _utils = require("../utils");
 /**
  * Date sorting compare function factory. Method get as parameters `sortOrder` and `columnMeta` and return compare function.
  *
@@ -15,47 +12,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @returns {Function} The compare function.
  */
 function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettings) {
-  return function (value, nextValue) {
-    const {
-      sortEmptyCells
-    } = columnPluginSettings;
-    if (value === nextValue) {
-      return _sortService.DO_NOT_SWAP;
-    }
-    if ((0, _mixed.isEmpty)(value)) {
-      if ((0, _mixed.isEmpty)(nextValue)) {
-        return _sortService.DO_NOT_SWAP;
-      }
-
-      // Just fist value is empty and `sortEmptyCells` option was set
-      if (sortEmptyCells) {
-        return sortOrder === 'asc' ? _sortService.FIRST_BEFORE_SECOND : _sortService.FIRST_AFTER_SECOND;
-      }
-      return _sortService.FIRST_AFTER_SECOND;
-    }
-    if ((0, _mixed.isEmpty)(nextValue)) {
-      // Just second value is empty and `sortEmptyCells` option was set
-      if (sortEmptyCells) {
-        return sortOrder === 'asc' ? _sortService.FIRST_AFTER_SECOND : _sortService.FIRST_BEFORE_SECOND;
-      }
-      return _sortService.FIRST_BEFORE_SECOND;
-    }
-    const dateFormat = columnMeta.dateFormat;
-    const firstDate = (0, _moment.default)(value, dateFormat);
-    const nextDate = (0, _moment.default)(nextValue, dateFormat);
-    if (!firstDate.isValid()) {
-      return _sortService.FIRST_AFTER_SECOND;
-    }
-    if (!nextDate.isValid()) {
-      return _sortService.FIRST_BEFORE_SECOND;
-    }
-    if (nextDate.isAfter(firstDate)) {
-      return sortOrder === 'asc' ? _sortService.FIRST_BEFORE_SECOND : _sortService.FIRST_AFTER_SECOND;
-    }
-    if (nextDate.isBefore(firstDate)) {
-      return sortOrder === 'asc' ? _sortService.FIRST_AFTER_SECOND : _sortService.FIRST_BEFORE_SECOND;
-    }
-    return _sortService.DO_NOT_SWAP;
-  };
+  return (0, _utils.createDateTimeCompareFunction)(sortOrder, columnMeta.dateFormat, columnPluginSettings);
 }
 const COLUMN_DATA_TYPE = exports.COLUMN_DATA_TYPE = 'date';

package/plugins/columnSorting/sortFunction/date.mjs

@@ -1,6 +1,4 @@
-import moment from 'moment';
-import { isEmpty } from "../../../helpers/mixed.mjs";
-import { DO_NOT_SWAP, FIRST_BEFORE_SECOND, FIRST_AFTER_SECOND } from "../sortService/index.mjs";
+import { createDateTimeCompareFunction } from "../utils.mjs";
 /**
  * Date sorting compare function factory. Method get as parameters `sortOrder` and `columnMeta` and return compare function.
  *
@@ -10,47 +8,6 @@ import { DO_NOT_SWAP, FIRST_BEFORE_SECOND, FIRST_AFTER_SECOND } from "../sortSer
  * @returns {Function} The compare function.
  */
 export function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettings) {
-  return function (value, nextValue) {
-    const {
-      sortEmptyCells
-    } = columnPluginSettings;
-    if (value === nextValue) {
-      return DO_NOT_SWAP;
-    }
-    if (isEmpty(value)) {
-      if (isEmpty(nextValue)) {
-        return DO_NOT_SWAP;
-      }
-
-      // Just fist value is empty and `sortEmptyCells` option was set
-      if (sortEmptyCells) {
-        return sortOrder === 'asc' ? FIRST_BEFORE_SECOND : FIRST_AFTER_SECOND;
-      }
-      return FIRST_AFTER_SECOND;
-    }
-    if (isEmpty(nextValue)) {
-      // Just second value is empty and `sortEmptyCells` option was set
-      if (sortEmptyCells) {
-        return sortOrder === 'asc' ? FIRST_AFTER_SECOND : FIRST_BEFORE_SECOND;
-      }
-      return FIRST_BEFORE_SECOND;
-    }
-    const dateFormat = columnMeta.dateFormat;
-    const firstDate = moment(value, dateFormat);
-    const nextDate = moment(nextValue, dateFormat);
-    if (!firstDate.isValid()) {
-      return FIRST_AFTER_SECOND;
-    }
-    if (!nextDate.isValid()) {
-      return FIRST_BEFORE_SECOND;
-    }
-    if (nextDate.isAfter(firstDate)) {
-      return sortOrder === 'asc' ? FIRST_BEFORE_SECOND : FIRST_AFTER_SECOND;
-    }
-    if (nextDate.isBefore(firstDate)) {
-      return sortOrder === 'asc' ? FIRST_AFTER_SECOND : FIRST_BEFORE_SECOND;
-    }
-    return DO_NOT_SWAP;
-  };
+  return createDateTimeCompareFunction(sortOrder, columnMeta.dateFormat, columnPluginSettings);
 }
 export const COLUMN_DATA_TYPE = 'date';

package/plugins/columnSorting/sortFunction/time.js

@@ -0,0 +1,17 @@
+"use strict";
+
+exports.__esModule = true;
+exports.compareFunctionFactory = compareFunctionFactory;
+var _utils = require("../utils");
+/**
+ * Date sorting compare function factory. Method get as parameters `sortOrder` and `columnMeta` and return compare function.
+ *
+ * @param {string} sortOrder Sort order (`asc` for ascending, `desc` for descending).
+ * @param {object} columnMeta Column meta object.
+ * @param {object} columnPluginSettings Plugin settings for the column.
+ * @returns {Function} The compare function.
+ */
+function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettings) {
+  return (0, _utils.createDateTimeCompareFunction)(sortOrder, columnMeta.timeFormat, columnPluginSettings);
+}
+const COLUMN_DATA_TYPE = exports.COLUMN_DATA_TYPE = 'time';

package/plugins/columnSorting/sortFunction/time.mjs

@@ -0,0 +1,13 @@
+import { createDateTimeCompareFunction } from "../utils.mjs";
+/**
+ * Date sorting compare function factory. Method get as parameters `sortOrder` and `columnMeta` and return compare function.
+ *
+ * @param {string} sortOrder Sort order (`asc` for ascending, `desc` for descending).
+ * @param {object} columnMeta Column meta object.
+ * @param {object} columnPluginSettings Plugin settings for the column.
+ * @returns {Function} The compare function.
+ */
+export function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettings) {
+  return createDateTimeCompareFunction(sortOrder, columnMeta.timeFormat, columnPluginSettings);
+}
+export const COLUMN_DATA_TYPE = 'time';

package/plugins/columnSorting/sortService/registry.js

@@ -6,6 +6,7 @@ var _default = require("../sortFunction/default");
 var _numeric = require("../sortFunction/numeric");
 var _checkbox = require("../sortFunction/checkbox");
 var _date = require("../sortFunction/date");
+var _time = require("../sortFunction/time");
 var _staticRegister = _interopRequireDefault(require("../../../utils/staticRegister"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const {
@@ -32,7 +33,8 @@ function getCompareFunctionFactory(type) {
   }
   return getGloballyCompareFunctionFactory(_default.COLUMN_DATA_TYPE);
 }
-registerCompareFunctionFactory(_numeric.COLUMN_DATA_TYPE, _numeric.compareFunctionFactory);
 registerCompareFunctionFactory(_checkbox.COLUMN_DATA_TYPE, _checkbox.compareFunctionFactory);
 registerCompareFunctionFactory(_date.COLUMN_DATA_TYPE, _date.compareFunctionFactory);
-registerCompareFunctionFactory(_default.COLUMN_DATA_TYPE, _default.compareFunctionFactory);
+registerCompareFunctionFactory(_default.COLUMN_DATA_TYPE, _default.compareFunctionFactory);
+registerCompareFunctionFactory(_numeric.COLUMN_DATA_TYPE, _numeric.compareFunctionFactory);
+registerCompareFunctionFactory(_time.COLUMN_DATA_TYPE, _time.compareFunctionFactory);

package/plugins/columnSorting/sortService/registry.mjs

@@ -2,6 +2,7 @@ import { compareFunctionFactory as defaultSort, COLUMN_DATA_TYPE as DEFAULT_DATA
 import { compareFunctionFactory as numericSort, COLUMN_DATA_TYPE as NUMERIC_DATA_TYPE } from "../sortFunction/numeric.mjs";
 import { compareFunctionFactory as checkboxSort, COLUMN_DATA_TYPE as CHECKBOX_DATA_TYPE } from "../sortFunction/checkbox.mjs";
 import { compareFunctionFactory as dateSort, COLUMN_DATA_TYPE as DATE_DATA_TYPE } from "../sortFunction/date.mjs";
+import { compareFunctionFactory as timeSort, COLUMN_DATA_TYPE as TIME_DATA_TYPE } from "../sortFunction/time.mjs";
 import staticRegister from "../../../utils/staticRegister.mjs";
 const {
   register: registerCompareFunctionFactory,
@@ -25,8 +26,9 @@ export function getCompareFunctionFactory(type) {
   }
   return getGloballyCompareFunctionFactory(DEFAULT_DATA_TYPE);
 }
-registerCompareFunctionFactory(NUMERIC_DATA_TYPE, numericSort);
 registerCompareFunctionFactory(CHECKBOX_DATA_TYPE, checkboxSort);
 registerCompareFunctionFactory(DATE_DATA_TYPE, dateSort);
 registerCompareFunctionFactory(DEFAULT_DATA_TYPE, defaultSort);
+registerCompareFunctionFactory(NUMERIC_DATA_TYPE, numericSort);
+registerCompareFunctionFactory(TIME_DATA_TYPE, timeSort);
 export { registerRootComparator, getRootComparator };

package/plugins/columnSorting/utils.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.areValidSortStates = areValidSortStates;
+exports.createDateTimeCompareFunction = createDateTimeCompareFunction;
 exports.getHeaderSpanElement = getHeaderSpanElement;
 exports.getNextSortOrder = getNextSortOrder;
 exports.isFirstLevelColumnHeader = isFirstLevelColumnHeader;
@@ -13,8 +14,12 @@ require("core-js/modules/esnext.set.is-subset-of.v2.js");
 require("core-js/modules/esnext.set.is-superset-of.v2.js");
 require("core-js/modules/esnext.set.symmetric-difference.v2.js");
 require("core-js/modules/esnext.set.union.v2.js");
+var _moment = _interopRequireDefault(require("moment"));
 var _object = require("../../helpers/object");
 var _event = require("../../helpers/dom/event");
+var _mixed = require("../../helpers/mixed");
+var _sortService = require("./sortService");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const ASC_SORT_STATE = exports.ASC_SORT_STATE = 'asc';
 const DESC_SORT_STATE = exports.DESC_SORT_STATE = 'desc';
 const HEADER_SPAN_CLASS = exports.HEADER_SPAN_CLASS = 'colHeader';
@@ -113,4 +118,56 @@ function isFirstLevelColumnHeader(column, TH) {
  */
 function wasHeaderClickedProperly(row, column, clickEvent) {
   return row === -1 && column >= 0 && (0, _event.isRightClick)(clickEvent) === false;
+}
+
+/**
+ * Creates date or time sorting compare function.
+ *
+ * @param {string} sortOrder Sort order (`asc` for ascending, `desc` for descending).
+ * @param {string} format Date or time format.
+ * @param {object} columnPluginSettings Plugin settings for the column.
+ * @returns {Function} The compare function.
+ */
+function createDateTimeCompareFunction(sortOrder, format, columnPluginSettings) {
+  return function (value, nextValue) {
+    const {
+      sortEmptyCells
+    } = columnPluginSettings;
+    if (value === nextValue) {
+      return _sortService.DO_NOT_SWAP;
+    }
+    if ((0, _mixed.isEmpty)(value)) {
+      if ((0, _mixed.isEmpty)(nextValue)) {
+        return _sortService.DO_NOT_SWAP;
+      }
+
+      // Just fist value is empty and `sortEmptyCells` option was set
+      if (sortEmptyCells) {
+        return sortOrder === 'asc' ? _sortService.FIRST_BEFORE_SECOND : _sortService.FIRST_AFTER_SECOND;
+      }
+      return _sortService.FIRST_AFTER_SECOND;
+    }
+    if ((0, _mixed.isEmpty)(nextValue)) {
+      // Just second value is empty and `sortEmptyCells` option was set
+      if (sortEmptyCells) {
+        return sortOrder === 'asc' ? _sortService.FIRST_AFTER_SECOND : _sortService.FIRST_BEFORE_SECOND;
+      }
+      return _sortService.FIRST_BEFORE_SECOND;
+    }
+    const firstDate = (0, _moment.default)(value, format);
+    const nextDate = (0, _moment.default)(nextValue, format);
+    if (!firstDate.isValid()) {
+      return _sortService.FIRST_AFTER_SECOND;
+    }
+    if (!nextDate.isValid()) {
+      return _sortService.FIRST_BEFORE_SECOND;
+    }
+    if (nextDate.isAfter(firstDate)) {
+      return sortOrder === 'asc' ? _sortService.FIRST_BEFORE_SECOND : _sortService.FIRST_AFTER_SECOND;
+    }
+    if (nextDate.isBefore(firstDate)) {
+      return sortOrder === 'asc' ? _sortService.FIRST_AFTER_SECOND : _sortService.FIRST_BEFORE_SECOND;
+    }
+    return _sortService.DO_NOT_SWAP;
+  };
 }

package/plugins/columnSorting/utils.mjs

@@ -5,8 +5,11 @@ import "core-js/modules/esnext.set.is-subset-of.v2.js";
 import "core-js/modules/esnext.set.is-superset-of.v2.js";
 import "core-js/modules/esnext.set.symmetric-difference.v2.js";
 import "core-js/modules/esnext.set.union.v2.js";
+import moment from 'moment';
 import { isObject } from "../../helpers/object.mjs";
 import { isRightClick } from "../../helpers/dom/event.mjs";
+import { isEmpty } from "../../helpers/mixed.mjs";
+import { DO_NOT_SWAP, FIRST_BEFORE_SECOND, FIRST_AFTER_SECOND } from "./sortService/index.mjs";
 export const ASC_SORT_STATE = 'asc';
 export const DESC_SORT_STATE = 'desc';
 export const HEADER_SPAN_CLASS = 'colHeader';
@@ -105,4 +108,56 @@ export function isFirstLevelColumnHeader(column, TH) {
  */
 export function wasHeaderClickedProperly(row, column, clickEvent) {
   return row === -1 && column >= 0 && isRightClick(clickEvent) === false;
+}
+
+/**
+ * Creates date or time sorting compare function.
+ *
+ * @param {string} sortOrder Sort order (`asc` for ascending, `desc` for descending).
+ * @param {string} format Date or time format.
+ * @param {object} columnPluginSettings Plugin settings for the column.
+ * @returns {Function} The compare function.
+ */
+export function createDateTimeCompareFunction(sortOrder, format, columnPluginSettings) {
+  return function (value, nextValue) {
+    const {
+      sortEmptyCells
+    } = columnPluginSettings;
+    if (value === nextValue) {
+      return DO_NOT_SWAP;
+    }
+    if (isEmpty(value)) {
+      if (isEmpty(nextValue)) {
+        return DO_NOT_SWAP;
+      }
+
+      // Just fist value is empty and `sortEmptyCells` option was set
+      if (sortEmptyCells) {
+        return sortOrder === 'asc' ? FIRST_BEFORE_SECOND : FIRST_AFTER_SECOND;
+      }
+      return FIRST_AFTER_SECOND;
+    }
+    if (isEmpty(nextValue)) {
+      // Just second value is empty and `sortEmptyCells` option was set
+      if (sortEmptyCells) {
+        return sortOrder === 'asc' ? FIRST_AFTER_SECOND : FIRST_BEFORE_SECOND;
+      }
+      return FIRST_BEFORE_SECOND;
+    }
+    const firstDate = moment(value, format);
+    const nextDate = moment(nextValue, format);
+    if (!firstDate.isValid()) {
+      return FIRST_AFTER_SECOND;
+    }
+    if (!nextDate.isValid()) {
+      return FIRST_BEFORE_SECOND;
+    }
+    if (nextDate.isAfter(firstDate)) {
+      return sortOrder === 'asc' ? FIRST_BEFORE_SECOND : FIRST_AFTER_SECOND;
+    }
+    if (nextDate.isBefore(firstDate)) {
+      return sortOrder === 'asc' ? FIRST_AFTER_SECOND : FIRST_BEFORE_SECOND;
+    }
+    return DO_NOT_SWAP;
+  };
 }

package/validators/dateValidator/dateValidator.js

@@ -40,9 +40,7 @@ function dateValidator(value, callback) {
     if (this.correctFormat === true) {
       // if format correction is enabled
       const correctedValue = correctFormat(valueToValidate, this.dateFormat);
-      const row = this.instance.toVisualRow(this.row);
-      const column = this.instance.toVisualColumn(this.col);
-      this.instance.setDataAtCell(row, column, correctedValue, 'dateValidator');
+      this.instance.setDataAtCell(this.visualRow, this.visualCol, correctedValue, 'dateValidator');
       valid = true;
     } else {
       valid = false;

package/validators/dateValidator/dateValidator.mjs

@@ -34,9 +34,7 @@ export function dateValidator(value, callback) {
     if (this.correctFormat === true) {
       // if format correction is enabled
       const correctedValue = correctFormat(valueToValidate, this.dateFormat);
-      const row = this.instance.toVisualRow(this.row);
-      const column = this.instance.toVisualColumn(this.col);
-      this.instance.setDataAtCell(row, column, correctedValue, 'dateValidator');
+      this.instance.setDataAtCell(this.visualRow, this.visualCol, correctedValue, 'dateValidator');
       valid = true;
     } else {
       valid = false;

package/validators/timeValidator/timeValidator.js

@@ -49,9 +49,7 @@ function timeValidator(value, callback) {
     if (this.correctFormat === true) {
       // if format correction is enabled
       const correctedValue = date.format(timeFormat);
-      const row = this.instance.toVisualRow(this.row);
-      const column = this.instance.toVisualColumn(this.col);
-      this.instance.setDataAtCell(row, column, correctedValue, 'timeValidator');
+      this.instance.setDataAtCell(this.visualRow, this.visualCol, correctedValue, 'timeValidator');
       valid = true;
     } else {
       valid = false;

package/validators/timeValidator/timeValidator.mjs

@@ -45,9 +45,7 @@ export function timeValidator(value, callback) {
     if (this.correctFormat === true) {
       // if format correction is enabled
       const correctedValue = date.format(timeFormat);
-      const row = this.instance.toVisualRow(this.row);
-      const column = this.instance.toVisualColumn(this.col);
-      this.instance.setDataAtCell(row, column, correctedValue, 'timeValidator');
+      this.instance.setDataAtCell(this.visualRow, this.visualCol, correctedValue, 'timeValidator');
       valid = true;
     } else {
       valid = false;