handsontable 12.1.2 → 12.2.0

package/plugins/columnSorting/domHelpers.js

@@ -3,31 +3,22 @@
 exports.__esModule = true;
 exports.getClassesToAdd = getClassesToAdd;
 exports.getClassesToRemove = getClassesToRemove;
-
 require("core-js/modules/es.array.iterator.js");
-
 require("core-js/modules/es.map.js");
-
 require("core-js/modules/es.object.to-string.js");
-
 require("core-js/modules/es.string.iterator.js");
-
 require("core-js/modules/web.dom-collections.iterator.js");
-
 require("core-js/modules/es.array.concat.js");
-
 require("core-js/modules/es.array.from.js");
-
 var _mixed = require("../../helpers/mixed");
-
 var _utils = require("./utils");
-
 var HEADER_CLASS_ASC_SORT = 'ascending';
 var HEADER_CLASS_DESC_SORT = 'descending';
 var HEADER_CLASS_INDICATOR_DISABLED = 'indicatorDisabled';
 var HEADER_SORT_CLASS = 'columnSorting';
 var HEADER_ACTION_CLASS = 'sortAction';
 var orderToCssClass = new Map([[_utils.ASC_SORT_STATE, HEADER_CLASS_ASC_SORT], [_utils.DESC_SORT_STATE, HEADER_CLASS_DESC_SORT]]);
+
 /**
  * Get CSS classes which should be added to particular column header.
  *
@@ -37,34 +28,27 @@ var orderToCssClass = new Map([[_utils.ASC_SORT_STATE, HEADER_CLASS_ASC_SORT], [
  * @param {boolean} headerAction Indicates if header click to sort should be possible.
  * @returns {Array} Array of CSS classes.
  */
-
 function getClassesToAdd(columnStatesManager, column, showSortIndicator, headerAction) {
   var cssClasses = [HEADER_SORT_CLASS];
-
   if (headerAction) {
     cssClasses.push(HEADER_ACTION_CLASS);
   }
-
   if (showSortIndicator === false) {
     cssClasses.push(HEADER_CLASS_INDICATOR_DISABLED);
     return cssClasses;
   }
-
   var columnOrder = columnStatesManager.getSortOrderOfColumn(column);
-
   if ((0, _mixed.isDefined)(columnOrder)) {
     cssClasses.push(orderToCssClass.get(columnOrder));
   }
-
   return cssClasses;
 }
+
 /**
  * Get CSS classes which should be removed from column header.
  *
  * @returns {Array} Array of CSS classes.
  */
-
-
 function getClassesToRemove() {
   return Array.from(orderToCssClass.values()).concat(HEADER_ACTION_CLASS, HEADER_CLASS_INDICATOR_DISABLED, HEADER_SORT_CLASS);
 }

package/plugins/columnSorting/domHelpers.mjs

@@ -13,6 +13,7 @@ var HEADER_CLASS_INDICATOR_DISABLED = 'indicatorDisabled';
 var HEADER_SORT_CLASS = 'columnSorting';
 var HEADER_ACTION_CLASS = 'sortAction';
 var orderToCssClass = new Map([[ASC_SORT_STATE, HEADER_CLASS_ASC_SORT], [DESC_SORT_STATE, HEADER_CLASS_DESC_SORT]]);
+
 /**
  * Get CSS classes which should be added to particular column header.
  *
@@ -22,33 +23,27 @@ var orderToCssClass = new Map([[ASC_SORT_STATE, HEADER_CLASS_ASC_SORT], [DESC_SO
  * @param {boolean} headerAction Indicates if header click to sort should be possible.
  * @returns {Array} Array of CSS classes.
  */
-
 export function getClassesToAdd(columnStatesManager, column, showSortIndicator, headerAction) {
   var cssClasses = [HEADER_SORT_CLASS];
-
   if (headerAction) {
     cssClasses.push(HEADER_ACTION_CLASS);
   }
-
   if (showSortIndicator === false) {
     cssClasses.push(HEADER_CLASS_INDICATOR_DISABLED);
     return cssClasses;
   }
-
   var columnOrder = columnStatesManager.getSortOrderOfColumn(column);
-
   if (isDefined(columnOrder)) {
     cssClasses.push(orderToCssClass.get(columnOrder));
   }
-
   return cssClasses;
 }
+
 /**
  * Get CSS classes which should be removed from column header.
  *
  * @returns {Array} Array of CSS classes.
  */
-
 export function getClassesToRemove() {
   return Array.from(orderToCssClass.values()).concat(HEADER_ACTION_CLASS, HEADER_CLASS_INDICATOR_DISABLED, HEADER_SORT_CLASS);
 }

package/plugins/columnSorting/index.js

@@ -2,9 +2,7 @@
 
 exports.__esModule = true;
 exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.ColumnSorting = void 0;
-
 var _columnSorting = require("./columnSorting");
-
 exports.PLUGIN_KEY = _columnSorting.PLUGIN_KEY;
 exports.PLUGIN_PRIORITY = _columnSorting.PLUGIN_PRIORITY;
 exports.ColumnSorting = _columnSorting.ColumnSorting;

package/plugins/columnSorting/rootComparator.js

@@ -1,44 +1,25 @@
 "use strict";
 
 require("core-js/modules/es.symbol.js");
-
 require("core-js/modules/es.symbol.description.js");
-
 require("core-js/modules/es.object.to-string.js");
-
 require("core-js/modules/es.symbol.iterator.js");
-
 require("core-js/modules/es.array.iterator.js");
-
 require("core-js/modules/es.string.iterator.js");
-
 require("core-js/modules/web.dom-collections.iterator.js");
-
 require("core-js/modules/es.array.from.js");
-
 require("core-js/modules/es.function.name.js");
-
 require("core-js/modules/es.regexp.exec.js");
-
 exports.__esModule = true;
 exports.rootComparator = rootComparator;
-
 require("core-js/modules/es.array.slice.js");
-
 var _sortService = require("./sortService");
-
 function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 /**
  * Sort comparator handled by conventional sort algorithm.
  *
@@ -51,11 +32,9 @@ function rootComparator(sortingOrders, columnMetas) {
     // We sort array of arrays. Single array is in form [rowIndex, ...values].
     // We compare just values, stored at second index of array.
     var _rowIndexWithValues = _toArray(rowIndexWithValues),
-        values = _rowIndexWithValues.slice(1);
-
+      values = _rowIndexWithValues.slice(1);
     var _nextRowIndexWithValu = _toArray(nextRowIndexWithValues),
-        nextValues = _nextRowIndexWithValu.slice(1);
-
+      nextValues = _nextRowIndexWithValu.slice(1);
     return function getCompareResult(column) {
       var sortingOrder = sortingOrders[column];
       var columnMeta = columnMetas[column];
@@ -63,7 +42,9 @@ function rootComparator(sortingOrders, columnMetas) {
       var nextValue = nextValues[column];
       var pluginSettings = columnMeta.columnSorting;
       var compareFunctionFactory = pluginSettings.compareFunctionFactory ? pluginSettings.compareFunctionFactory : (0, _sortService.getCompareFunctionFactory)(columnMeta.type);
-      var compareResult = compareFunctionFactory(sortingOrder, columnMeta, pluginSettings)(value, nextValue); // DIFF - MultiColumnSorting & ColumnSorting: removed iteration through next sorted columns.
+      var compareResult = compareFunctionFactory(sortingOrder, columnMeta, pluginSettings)(value, nextValue);
+
+      // DIFF - MultiColumnSorting & ColumnSorting: removed iteration through next sorted columns.
 
       return compareResult;
     }(0);

package/plugins/columnSorting/rootComparator.mjs

@@ -9,38 +9,27 @@ import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.from.js";
 import "core-js/modules/es.function.name.js";
 import "core-js/modules/es.regexp.exec.js";
-
 function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-import { getCompareFunctionFactory } from "./sortService/index.mjs";
-/**
- * Sort comparator handled by conventional sort algorithm.
- *
- * @param {Array} sortingOrders Sort orders (`asc` for ascending, `desc` for descending).
- * @param {Array} columnMetas Column meta objects.
- * @returns {Function}
- */
-
+import { getCompareFunctionFactory } from "./sortService/index.mjs"; /**
+                                                                      * Sort comparator handled by conventional sort algorithm.
+                                                                      *
+                                                                      * @param {Array} sortingOrders Sort orders (`asc` for ascending, `desc` for descending).
+                                                                      * @param {Array} columnMetas Column meta objects.
+                                                                      * @returns {Function}
+                                                                      */
 export function rootComparator(sortingOrders, columnMetas) {
   return function (rowIndexWithValues, nextRowIndexWithValues) {
     // We sort array of arrays. Single array is in form [rowIndex, ...values].
     // We compare just values, stored at second index of array.
     var _rowIndexWithValues = _toArray(rowIndexWithValues),
-        values = _rowIndexWithValues.slice(1);
-
+      values = _rowIndexWithValues.slice(1);
     var _nextRowIndexWithValu = _toArray(nextRowIndexWithValues),
-        nextValues = _nextRowIndexWithValu.slice(1);
-
+      nextValues = _nextRowIndexWithValu.slice(1);
     return function getCompareResult(column) {
       var sortingOrder = sortingOrders[column];
       var columnMeta = columnMetas[column];
@@ -48,7 +37,9 @@ export function rootComparator(sortingOrders, columnMetas) {
       var nextValue = nextValues[column];
       var pluginSettings = columnMeta.columnSorting;
       var compareFunctionFactory = pluginSettings.compareFunctionFactory ? pluginSettings.compareFunctionFactory : getCompareFunctionFactory(columnMeta.type);
-      var compareResult = compareFunctionFactory(sortingOrder, columnMeta, pluginSettings)(value, nextValue); // DIFF - MultiColumnSorting & ColumnSorting: removed iteration through next sorted columns.
+      var compareResult = compareFunctionFactory(sortingOrder, columnMeta, pluginSettings)(value, nextValue);
+
+      // DIFF - MultiColumnSorting & ColumnSorting: removed iteration through next sorted columns.
 
       return compareResult;
     }(0);

package/plugins/columnSorting/sortFunction/checkbox.js

@@ -3,13 +3,9 @@
 exports.__esModule = true;
 exports.COLUMN_DATA_TYPE = void 0;
 exports.compareFunctionFactory = compareFunctionFactory;
-
 var _sortService = require("../sortService");
-
 var _default = require("../sortFunction/default");
-
 var _mixed = require("../../../helpers/mixed");
-
 /**
  * Checkbox sorting compare function factory. Method get as parameters `sortOrder` and `columnMeta` and return compare function.
  *
@@ -28,45 +24,41 @@ function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettings) {
     var unifiedValue = isEmptyValue ? uncheckedTemplate : value;
     var unifiedNextValue = isEmptyNextValue ? uncheckedTemplate : nextValue;
     var isValueFromTemplate = unifiedValue === uncheckedTemplate || unifiedValue === checkedTemplate;
-    var isNextValueFromTemplate = unifiedNextValue === uncheckedTemplate || unifiedNextValue === checkedTemplate; // As an empty cell we recognize cells with undefined, null and '' values.
+    var isNextValueFromTemplate = unifiedNextValue === uncheckedTemplate || unifiedNextValue === checkedTemplate;
 
+    // As an empty cell we recognize cells with undefined, null and '' values.
     if (sortEmptyCells === false) {
       if (isEmptyValue && isEmptyNextValue === false) {
         return _sortService.FIRST_AFTER_SECOND;
       }
-
       if (isEmptyValue === false && isEmptyNextValue) {
         return _sortService.FIRST_BEFORE_SECOND;
       }
-    } // 1st value === #BAD_VALUE#
-
+    }
 
+    // 1st value === #BAD_VALUE#
     if (isValueFromTemplate === false && isNextValueFromTemplate) {
       return sortOrder === 'asc' ? _sortService.FIRST_BEFORE_SECOND : _sortService.FIRST_AFTER_SECOND;
-    } // 2nd value === #BAD_VALUE#
-
+    }
 
+    // 2nd value === #BAD_VALUE#
     if (isValueFromTemplate && isNextValueFromTemplate === false) {
       return sortOrder === 'asc' ? _sortService.FIRST_AFTER_SECOND : _sortService.FIRST_BEFORE_SECOND;
-    } // 1st value === #BAD_VALUE# && 2nd value === #BAD_VALUE#
-
+    }
 
+    // 1st value === #BAD_VALUE# && 2nd value === #BAD_VALUE#
     if (isValueFromTemplate === false && isNextValueFromTemplate === false) {
       // Sorting by values (not just by visual representation).
       return (0, _default.compareFunctionFactory)(sortOrder, columnMeta, columnPluginSettings)(value, nextValue);
     }
-
     if (unifiedValue === uncheckedTemplate && unifiedNextValue === checkedTemplate) {
       return sortOrder === 'asc' ? _sortService.FIRST_BEFORE_SECOND : _sortService.FIRST_AFTER_SECOND;
     }
-
     if (unifiedValue === checkedTemplate && unifiedNextValue === uncheckedTemplate) {
       return sortOrder === 'asc' ? _sortService.FIRST_AFTER_SECOND : _sortService.FIRST_BEFORE_SECOND;
     }
-
     return _sortService.DO_NOT_SWAP;
   };
 }
-
 var COLUMN_DATA_TYPE = 'checkbox';
 exports.COLUMN_DATA_TYPE = COLUMN_DATA_TYPE;

package/plugins/columnSorting/sortFunction/checkbox.mjs

@@ -1,15 +1,13 @@
 import { DO_NOT_SWAP, FIRST_BEFORE_SECOND, FIRST_AFTER_SECOND } from "../sortService/index.mjs";
 import { compareFunctionFactory as defaultCompareFunctionFactory } from "../sortFunction/default.mjs";
-import { isEmpty } from "../../../helpers/mixed.mjs";
-/**
- * Checkbox 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.
- */
-
+import { isEmpty } from "../../../helpers/mixed.mjs"; /**
+                                                       * Checkbox 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) {
   var checkedTemplate = columnMeta.checkedTemplate;
   var uncheckedTemplate = columnMeta.uncheckedTemplate;
@@ -20,42 +18,39 @@ export function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettin
     var unifiedValue = isEmptyValue ? uncheckedTemplate : value;
     var unifiedNextValue = isEmptyNextValue ? uncheckedTemplate : nextValue;
     var isValueFromTemplate = unifiedValue === uncheckedTemplate || unifiedValue === checkedTemplate;
-    var isNextValueFromTemplate = unifiedNextValue === uncheckedTemplate || unifiedNextValue === checkedTemplate; // As an empty cell we recognize cells with undefined, null and '' values.
+    var isNextValueFromTemplate = unifiedNextValue === uncheckedTemplate || unifiedNextValue === checkedTemplate;
 
+    // As an empty cell we recognize cells with undefined, null and '' values.
     if (sortEmptyCells === false) {
       if (isEmptyValue && isEmptyNextValue === false) {
         return FIRST_AFTER_SECOND;
       }
-
       if (isEmptyValue === false && isEmptyNextValue) {
         return FIRST_BEFORE_SECOND;
       }
-    } // 1st value === #BAD_VALUE#
-
+    }
 
+    // 1st value === #BAD_VALUE#
     if (isValueFromTemplate === false && isNextValueFromTemplate) {
       return sortOrder === 'asc' ? FIRST_BEFORE_SECOND : FIRST_AFTER_SECOND;
-    } // 2nd value === #BAD_VALUE#
-
+    }
 
+    // 2nd value === #BAD_VALUE#
     if (isValueFromTemplate && isNextValueFromTemplate === false) {
       return sortOrder === 'asc' ? FIRST_AFTER_SECOND : FIRST_BEFORE_SECOND;
-    } // 1st value === #BAD_VALUE# && 2nd value === #BAD_VALUE#
-
+    }
 
+    // 1st value === #BAD_VALUE# && 2nd value === #BAD_VALUE#
     if (isValueFromTemplate === false && isNextValueFromTemplate === false) {
       // Sorting by values (not just by visual representation).
       return defaultCompareFunctionFactory(sortOrder, columnMeta, columnPluginSettings)(value, nextValue);
     }
-
     if (unifiedValue === uncheckedTemplate && unifiedNextValue === checkedTemplate) {
       return sortOrder === 'asc' ? FIRST_BEFORE_SECOND : FIRST_AFTER_SECOND;
     }
-
     if (unifiedValue === checkedTemplate && unifiedNextValue === uncheckedTemplate) {
       return sortOrder === 'asc' ? FIRST_AFTER_SECOND : FIRST_BEFORE_SECOND;
     }
-
     return DO_NOT_SWAP;
   };
 }

package/plugins/columnSorting/sortFunction/date.js

@@ -3,15 +3,10 @@
 exports.__esModule = true;
 exports.COLUMN_DATA_TYPE = void 0;
 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 }; }
-
 /**
  * Date sorting compare function factory. Method get as parameters `sortOrder` and `columnMeta` and return compare function.
  *
@@ -23,56 +18,44 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettings) {
   return function (value, nextValue) {
     var sortEmptyCells = columnPluginSettings.sortEmptyCells;
-
     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
-
+      }
 
+      // 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;
     }
-
     var dateFormat = columnMeta.dateFormat;
     var firstDate = (0, _moment.default)(value, dateFormat);
     var 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;
   };
 }
-
 var COLUMN_DATA_TYPE = 'date';
 exports.COLUMN_DATA_TYPE = COLUMN_DATA_TYPE;

package/plugins/columnSorting/sortFunction/date.mjs

@@ -1,65 +1,52 @@
 import moment from 'moment';
 import { isEmpty } from "../../../helpers/mixed.mjs";
-import { DO_NOT_SWAP, FIRST_BEFORE_SECOND, FIRST_AFTER_SECOND } from "../sortService/index.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.
- */
-
+import { DO_NOT_SWAP, FIRST_BEFORE_SECOND, FIRST_AFTER_SECOND } from "../sortService/index.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 function (value, nextValue) {
     var sortEmptyCells = columnPluginSettings.sortEmptyCells;
-
     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
-
+      }
 
+      // 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;
     }
-
     var dateFormat = columnMeta.dateFormat;
     var firstDate = moment(value, dateFormat);
     var 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;
   };
 }

package/plugins/columnSorting/sortFunction/default.js

@@ -3,11 +3,8 @@
 exports.__esModule = true;
 exports.COLUMN_DATA_TYPE = void 0;
 exports.compareFunctionFactory = compareFunctionFactory;
-
 var _mixed = require("../../../helpers/mixed");
-
 var _sortService = require("../sortService");
-
 /**
  * Default sorting compare function factory. Method get as parameters `sortOrder` and `columnMeta` and return compare function.
  *
@@ -20,41 +17,33 @@ function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettings) {
   var locale = columnMeta.locale;
   return function (value, nextValue) {
     var sortEmptyCells = columnPluginSettings.sortEmptyCells;
-
     if (typeof value === 'string') {
       value = value.toLocaleLowerCase(locale);
     }
-
     if (typeof nextValue === 'string') {
       nextValue = nextValue.toLocaleLowerCase(locale);
     }
-
     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
-
+      }
 
+      // 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;
     }
-
     if (isNaN(value) && !isNaN(nextValue)) {
       return sortOrder === 'asc' ? _sortService.FIRST_AFTER_SECOND : _sortService.FIRST_BEFORE_SECOND;
     } else if (!isNaN(value) && isNaN(nextValue)) {
@@ -63,18 +52,14 @@ function compareFunctionFactory(sortOrder, columnMeta, columnPluginSettings) {
       value = parseFloat(value);
       nextValue = parseFloat(nextValue);
     }
-
     if (value < nextValue) {
       return sortOrder === 'asc' ? _sortService.FIRST_BEFORE_SECOND : _sortService.FIRST_AFTER_SECOND;
     }
-
     if (value > nextValue) {
       return sortOrder === 'asc' ? _sortService.FIRST_AFTER_SECOND : _sortService.FIRST_BEFORE_SECOND;
     }
-
     return _sortService.DO_NOT_SWAP;
   };
 }
-
 var COLUMN_DATA_TYPE = 'default';
 exports.COLUMN_DATA_TYPE = COLUMN_DATA_TYPE;