handsontable 0.0.0-next-7b93b7d-20231107 → 0.0.0-next-5f253b5-20231108

package/selection/utils.js

@@ -64,7 +64,9 @@ function detectSelectionType(selectionRanges) {
  * Factory function designed for normalization data schema from different data structures of the selection ranges.
  *
  * @param {number} type Selection type which will be processed.
- * @param {object} [options] The normalization options.
+ * @param {object} options The normalization options.
+ * @param {function(number, number): CellCoords} options.createCellCoords The factory function that returns an instance of the `CellCoords` class.
+ * @param {function(CellCoords, CellCoords, CellCoords): CellRange} options.createCellRange The factory function that returns an instance of the `CellRange` class.
  * @param {boolean} [options.keepDirection=false] If `true`, the coordinates which contain the direction of the
  *                                                selected cells won't be changed. Otherwise, the selection will be
  *                                                normalized to values starting from top-left to bottom-right.
@@ -74,6 +76,8 @@ function detectSelectionType(selectionRanges) {
  */
 function normalizeSelectionFactory(type) {
   let {
+    createCellCoords,
+    createCellRange,
     keepDirection = false,
     propToCol
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -110,9 +114,9 @@ function normalizeSelectionFactory(type) {
       rowEnd = Math.max(origRowStart, origRowEnd);
       columnEnd = Math.max(origColumnStart, origColumnEnd);
     }
-    const from = new _src.CellCoords(rowStart, columnStart);
-    const to = new _src.CellCoords(rowEnd, columnEnd);
-    return new _src.CellRange(from, from, to);
+    const from = createCellCoords(rowStart, columnStart);
+    const to = createCellCoords(rowEnd, columnEnd);
+    return createCellRange(from, from, to);
   };
 }
 
@@ -122,22 +126,25 @@ function normalizeSelectionFactory(type) {
  * contains an array of arrays. The single item contains at index 0 visual column index from the selection was
  * started and at index 1 distance as a count of selected columns.
  *
- * @param {Array[]|CellRange[]} selectionRanges Selection ranges produced by Handsontable.
+ * @param {Core} hotInstance The Handsontable instance.
  * @returns {Array[]} Returns an array of arrays with ranges defines in that schema:
  *                   `[[visualColumnStart, distance], [visualColumnStart, distance], ...]`.
  *                   The column distances are always created starting from the left (zero index) to the
  *                   right (the latest column index).
  */
-function transformSelectionToColumnDistance(selectionRanges) {
-  const selectionType = detectSelectionType(selectionRanges);
+function transformSelectionToColumnDistance(hotInstance) {
+  const selectionType = detectSelectionType(hotInstance.getSelected());
   if (selectionType === SELECTION_TYPE_UNRECOGNIZED || selectionType === SELECTION_TYPE_EMPTY) {
     return [];
   }
-  const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
+  const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType, {
+    createCellCoords: hotInstance._createCellCoords.bind(hotInstance),
+    createCellRange: hotInstance._createCellRange.bind(hotInstance)
+  });
   const unorderedIndexes = new Set();
 
   // Iterate through all ranges and collect all column indexes which are not saved yet.
-  (0, _array.arrayEach)(selectionRanges, selection => {
+  (0, _array.arrayEach)(hotInstance.getSelected(), selection => {
     const {
       from,
       to
@@ -170,22 +177,25 @@ function transformSelectionToColumnDistance(selectionRanges) {
  * contains an array of arrays. The single item contains at index 0 visual column index from the selection was
  * started and at index 1 distance as a count of selected columns.
  *
- * @param {Array[]|CellRange[]} selectionRanges Selection ranges produced by Handsontable.
+ * @param {Core} hotInstance The Handsontable instance.
  * @returns {Array[]} Returns an array of arrays with ranges defines in that schema:
  *                   `[[visualColumnStart, distance], [visualColumnStart, distance], ...]`.
  *                   The column distances are always created starting from the left (zero index) to the
  *                   right (the latest column index).
  */
-function transformSelectionToRowDistance(selectionRanges) {
-  const selectionType = detectSelectionType(selectionRanges);
+function transformSelectionToRowDistance(hotInstance) {
+  const selectionType = detectSelectionType(hotInstance.getSelected());
   if (selectionType === SELECTION_TYPE_UNRECOGNIZED || selectionType === SELECTION_TYPE_EMPTY) {
     return [];
   }
-  const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
+  const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType, {
+    createCellCoords: hotInstance._createCellCoords.bind(hotInstance),
+    createCellRange: hotInstance._createCellRange.bind(hotInstance)
+  });
   const unorderedIndexes = new Set();
 
   // Iterate through all ranges and collect all column indexes which are not saved yet.
-  (0, _array.arrayEach)(selectionRanges, selection => {
+  (0, _array.arrayEach)(hotInstance.getSelected(), selection => {
     const {
       from,
       to

package/selection/utils.mjs

@@ -1,6 +1,6 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
-import { CellRange, CellCoords } from "./../3rdparty/walkontable/src/index.mjs";
+import { CellRange } from "./../3rdparty/walkontable/src/index.mjs";
 import { arrayEach, arrayReduce } from "./../helpers/array.mjs";
 import { isUndefined } from "./../helpers/mixed.mjs";
 export const SELECTION_TYPE_UNRECOGNIZED = 0;
@@ -52,7 +52,9 @@ export function detectSelectionType(selectionRanges) {
  * Factory function designed for normalization data schema from different data structures of the selection ranges.
  *
  * @param {number} type Selection type which will be processed.
- * @param {object} [options] The normalization options.
+ * @param {object} options The normalization options.
+ * @param {function(number, number): CellCoords} options.createCellCoords The factory function that returns an instance of the `CellCoords` class.
+ * @param {function(CellCoords, CellCoords, CellCoords): CellRange} options.createCellRange The factory function that returns an instance of the `CellRange` class.
  * @param {boolean} [options.keepDirection=false] If `true`, the coordinates which contain the direction of the
  *                                                selected cells won't be changed. Otherwise, the selection will be
  *                                                normalized to values starting from top-left to bottom-right.
@@ -62,6 +64,8 @@ export function detectSelectionType(selectionRanges) {
  */
 export function normalizeSelectionFactory(type) {
   let {
+    createCellCoords,
+    createCellRange,
     keepDirection = false,
     propToCol
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -98,9 +102,9 @@ export function normalizeSelectionFactory(type) {
       rowEnd = Math.max(origRowStart, origRowEnd);
       columnEnd = Math.max(origColumnStart, origColumnEnd);
     }
-    const from = new CellCoords(rowStart, columnStart);
-    const to = new CellCoords(rowEnd, columnEnd);
-    return new CellRange(from, from, to);
+    const from = createCellCoords(rowStart, columnStart);
+    const to = createCellCoords(rowEnd, columnEnd);
+    return createCellRange(from, from, to);
   };
 }
 
@@ -110,22 +114,25 @@ export function normalizeSelectionFactory(type) {
  * contains an array of arrays. The single item contains at index 0 visual column index from the selection was
  * started and at index 1 distance as a count of selected columns.
  *
- * @param {Array[]|CellRange[]} selectionRanges Selection ranges produced by Handsontable.
+ * @param {Core} hotInstance The Handsontable instance.
  * @returns {Array[]} Returns an array of arrays with ranges defines in that schema:
  *                   `[[visualColumnStart, distance], [visualColumnStart, distance], ...]`.
  *                   The column distances are always created starting from the left (zero index) to the
  *                   right (the latest column index).
  */
-export function transformSelectionToColumnDistance(selectionRanges) {
-  const selectionType = detectSelectionType(selectionRanges);
+export function transformSelectionToColumnDistance(hotInstance) {
+  const selectionType = detectSelectionType(hotInstance.getSelected());
   if (selectionType === SELECTION_TYPE_UNRECOGNIZED || selectionType === SELECTION_TYPE_EMPTY) {
     return [];
   }
-  const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
+  const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType, {
+    createCellCoords: hotInstance._createCellCoords.bind(hotInstance),
+    createCellRange: hotInstance._createCellRange.bind(hotInstance)
+  });
   const unorderedIndexes = new Set();
 
   // Iterate through all ranges and collect all column indexes which are not saved yet.
-  arrayEach(selectionRanges, selection => {
+  arrayEach(hotInstance.getSelected(), selection => {
     const {
       from,
       to
@@ -158,22 +165,25 @@ export function transformSelectionToColumnDistance(selectionRanges) {
  * contains an array of arrays. The single item contains at index 0 visual column index from the selection was
  * started and at index 1 distance as a count of selected columns.
  *
- * @param {Array[]|CellRange[]} selectionRanges Selection ranges produced by Handsontable.
+ * @param {Core} hotInstance The Handsontable instance.
  * @returns {Array[]} Returns an array of arrays with ranges defines in that schema:
  *                   `[[visualColumnStart, distance], [visualColumnStart, distance], ...]`.
  *                   The column distances are always created starting from the left (zero index) to the
  *                   right (the latest column index).
  */
-export function transformSelectionToRowDistance(selectionRanges) {
-  const selectionType = detectSelectionType(selectionRanges);
+export function transformSelectionToRowDistance(hotInstance) {
+  const selectionType = detectSelectionType(hotInstance.getSelected());
   if (selectionType === SELECTION_TYPE_UNRECOGNIZED || selectionType === SELECTION_TYPE_EMPTY) {
     return [];
   }
-  const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
+  const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType, {
+    createCellCoords: hotInstance._createCellCoords.bind(hotInstance),
+    createCellRange: hotInstance._createCellRange.bind(hotInstance)
+  });
   const unorderedIndexes = new Set();
 
   // Iterate through all ranges and collect all column indexes which are not saved yet.
-  arrayEach(selectionRanges, selection => {
+  arrayEach(hotInstance.getSelected(), selection => {
     const {
       from,
       to

package/shortcuts/manager.js

@@ -131,7 +131,7 @@ const createShortcutManager = _ref => {
         captureCtrl,
         forwardToContext
       } = shortcuts[index];
-      if (runOnlyIf(event) !== false) {
+      if (runOnlyIf(event) === true) {
         isCtrlKeySilenced = captureCtrl;
         isExecutionCancelled = callback(event, keys) === false;
         isCtrlKeySilenced = false;

package/shortcuts/manager.mjs

@@ -128,7 +128,7 @@ export const createShortcutManager = _ref => {
         captureCtrl,
         forwardToContext
       } = shortcuts[index];
-      if (runOnlyIf(event) !== false) {
+      if (runOnlyIf(event) === true) {
         isCtrlKeySilenced = captureCtrl;
         isExecutionCancelled = callback(event, keys) === false;
         isCtrlKeySilenced = false;