handsontable 0.0.0-next-0bd37c1-20240513 → 0.0.0-next-c2f1254-20240515

package/base.js

@@ -45,8 +45,8 @@ Handsontable.hooks = _pluginHooks.default.getSingleton();
 Handsontable.CellCoords = _src.CellCoords;
 Handsontable.CellRange = _src.CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "13/05/2024 07:18:43";
-Handsontable.version = "0.0.0-next-0bd37c1-20240513";
+Handsontable.buildDate = "15/05/2024 07:15:18";
+Handsontable.version = "0.0.0-next-c2f1254-20240515";
 Handsontable.languages = {
   dictionaryKeys: _registry.dictionaryKeys,
   getLanguageDictionary: _registry.getLanguageDictionary,

package/base.mjs

@@ -35,8 +35,8 @@ Handsontable.hooks = Hooks.getSingleton();
 Handsontable.CellCoords = CellCoords;
 Handsontable.CellRange = CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "13/05/2024 07:18:49";
-Handsontable.version = "0.0.0-next-0bd37c1-20240513";
+Handsontable.buildDate = "15/05/2024 07:15:24";
+Handsontable.version = "0.0.0-next-c2f1254-20240515";
 Handsontable.languages = {
   dictionaryKeys,
   getLanguageDictionary,

package/core.js

@@ -337,7 +337,7 @@ function Core(rootElement, userSettings) {
       hiddenIndexesChanged
     } = _ref;
     if (hiddenIndexesChanged) {
-      this.selection.refresh();
+      this.selection.commit();
     }
   };
   this.columnIndexMapper.addLocalHook('cacheUpdated', onIndexMapperCacheUpdate);
@@ -372,7 +372,11 @@ function Core(rootElement, userSettings) {
     } else {
       (0, _element.removeClass)(this.rootElement, ['ht__selection--rows', 'ht__selection--columns']);
     }
-    this._refreshBorders(null);
+    if (selection.getSelectionSource() !== 'shift') {
+      editorManager.closeEditor(null);
+    }
+    instance.view.render();
+    editorManager.prepareEditor();
   });
   this.selection.addLocalHook('beforeSetFocus', cellCoords => {
     this.runHooks('beforeSelectionFocusSet', cellCoords.row, cellCoords.col);
@@ -383,7 +387,9 @@ function Core(rootElement, userSettings) {
     if (!preventScrolling.isTouched() || preventScrolling.isTouched() && !preventScrolling.value) {
       viewportScroller.scrollTo(cellCoords);
     }
-    this._refreshBorders(null);
+    editorManager.closeEditor();
+    instance.view.render();
+    editorManager.prepareEditor();
   });
   this.selection.addLocalHook('afterSelectionFinished', cellRanges => {
     const selectionLayerLevel = cellRanges.length - 1;
@@ -401,8 +407,8 @@ function Core(rootElement, userSettings) {
     }
   });
   this.selection.addLocalHook('afterDeselect', () => {
-    editorManager.destroyEditor();
-    this._refreshBorders();
+    editorManager.closeEditor();
+    instance.view.render();
     (0, _element.removeClass)(this.rootElement, ['ht__selection--rows', 'ht__selection--columns']);
     this.runHooks('afterDeselect');
   });
@@ -557,47 +563,7 @@ function Core(rootElement, userSettings) {
             source,
             mode: insertRowMode
           });
-          if (rowDelta) {
-            const currentSelectedRange = selection.selectedRange.current();
-            const currentFromRange = currentSelectedRange === null || currentSelectedRange === void 0 ? void 0 : currentSelectedRange.from;
-            const currentFromRow = currentFromRange === null || currentFromRange === void 0 ? void 0 : currentFromRange.row;
-            const startVisualRowIndex = instance.toVisualRow(startRowPhysicalIndex);
-            if (selection.isSelectedByCorner()) {
-              selection.selectAll(true, true, {
-                disableHeadersHighlight: true
-              });
-            } else if ((0, _mixed.isDefined)(currentFromRow) && currentFromRow >= startVisualRowIndex) {
-              // Moving the selection (if it exists) downward – it should be applied to the "old" row.
-              // TODO: The logic here should be handled by selection module.
-              const {
-                row: currentToRow,
-                col: currentToColumn
-              } = currentSelectedRange.to;
-              let currentFromColumn = currentFromRange.col;
-
-              // Workaround: headers are not stored inside selection.
-              if (selection.isSelectedByRowHeader()) {
-                currentFromColumn = -1;
-              }
-
-              // Remove from the stack the last added selection as that selection below will be
-              // replaced by new transformed selection.
-              selection.getSelectedRange().pop();
-              instance.addHookOnce('afterSelection', function () {
-                for (var _len16 = arguments.length, _ref5 = new Array(_len16), _key16 = 0; _key16 < _len16; _key16++) {
-                  _ref5[_key16] = arguments[_key16];
-                }
-                let [,,,, preventScrolling] = _ref5;
-                preventScrolling.value = true;
-              });
-
-              // I can't use transforms as they don't work in negative indexes.
-              selection.setRangeStartOnly(instance._createCellCoords(currentFromRow + rowDelta, currentFromColumn), true);
-              selection.setRangeEnd(instance._createCellCoords(currentToRow + rowDelta, currentToColumn)); // will call render() internally
-            } else {
-              instance._refreshBorders(); // it will call render and prepare methods
-            }
-          }
+          selection.shiftRows(instance.toVisualRow(startRowPhysicalIndex), rowDelta);
           break;
         case 'insert_col_start':
         case 'insert_col_end':
@@ -620,38 +586,7 @@ function Core(rootElement, userSettings) {
               spliceArray.length += colDelta; // inserts empty (undefined) elements at the end of an array
               Array.prototype.splice.apply(tableMeta.colHeaders, spliceArray); // inserts empty (undefined) elements into the colHeader array
             }
-            const currentSelectedRange = selection.selectedRange.current();
-            const currentFromRange = currentSelectedRange === null || currentSelectedRange === void 0 ? void 0 : currentSelectedRange.from;
-            const currentFromColumn = currentFromRange === null || currentFromRange === void 0 ? void 0 : currentFromRange.col;
-            const startVisualColumnIndex = instance.toVisualColumn(startColumnPhysicalIndex);
-            if (selection.isSelectedByCorner()) {
-              selection.selectAll(true, true, {
-                disableHeadersHighlight: true
-              });
-            } else if ((0, _mixed.isDefined)(currentFromColumn) && currentFromColumn >= startVisualColumnIndex) {
-              // Moving the selection (if it exists) rightward – it should be applied to the "old" column.
-              // TODO: The logic here should be handled by selection module.
-              const {
-                row: currentToRow,
-                col: currentToColumn
-              } = currentSelectedRange.to;
-              let currentFromRow = currentFromRange.row;
-
-              // Workaround: headers are not stored inside selection.
-              if (selection.isSelectedByColumnHeader()) {
-                currentFromRow = -1;
-              }
-
-              // Remove from the stack the last added selection as that selection below will be
-              // replaced by new transformed selection.
-              selection.getSelectedRange().pop();
-
-              // I can't use transforms as they don't work in negative indexes.
-              selection.setRangeStartOnly(instance._createCellCoords(currentFromRow, currentFromColumn + colDelta), true);
-              selection.setRangeEnd(instance._createCellCoords(currentToRow, currentToColumn + colDelta)); // will call render() internally
-            } else {
-              instance._refreshBorders(); // it will call render and prepare methods
-            }
+            selection.shiftColumns(instance.toVisualColumn(startColumnPhysicalIndex), colDelta);
           }
           break;
         case 'remove_row':
@@ -659,8 +594,8 @@ function Core(rootElement, userSettings) {
             let offset = 0;
 
             // Normalize the {index, amount} groups into bigger groups.
-            (0, _array.arrayEach)(indexes, _ref6 => {
-              let [groupIndex, groupAmount] = _ref6;
+            (0, _array.arrayEach)(indexes, _ref5 => {
+              let [groupIndex, groupAmount] = _ref5;
               const calcIndex = (0, _mixed.isEmpty)(groupIndex) ? instance.countRows() - 1 : Math.max(groupIndex - offset, 0);
 
               // If the 'index' is an integer decrease it by 'offset' otherwise pass it through to make the value
@@ -676,7 +611,22 @@ function Core(rootElement, userSettings) {
               if (!wasRemoved) {
                 return;
               }
+              if (selection.isSelected()) {
+                const {
+                  row
+                } = instance.getSelectedRangeLast().highlight;
+                if (row >= groupIndex && row <= groupIndex + groupAmount - 1) {
+                  editorManager.closeEditor(true);
+                }
+              }
               const totalRows = instance.countRows();
+              if (totalRows === 0) {
+                selection.deselect();
+              } else if (source === 'ContextMenu.removeRow') {
+                selection.refresh();
+              } else {
+                selection.shiftRows(groupIndex, -groupAmount);
+              }
               const fixedRowsTop = tableMeta.fixedRowsTop;
               if (fixedRowsTop >= calcIndex + 1) {
                 tableMeta.fixedRowsTop -= Math.min(groupAmount, fixedRowsTop - calcIndex);
@@ -693,16 +643,14 @@ function Core(rootElement, userSettings) {
           } else {
             removeRow([[index, amount]]);
           }
-          grid.adjustRowsAndCols();
-          instance._refreshBorders(); // it will call render and prepare methods
           break;
         case 'remove_col':
           const removeCol = indexes => {
             let offset = 0;
 
             // Normalize the {index, amount} groups into bigger groups.
-            (0, _array.arrayEach)(indexes, _ref7 => {
-              let [groupIndex, groupAmount] = _ref7;
+            (0, _array.arrayEach)(indexes, _ref6 => {
+              let [groupIndex, groupAmount] = _ref6;
               const calcIndex = (0, _mixed.isEmpty)(groupIndex) ? instance.countCols() - 1 : Math.max(groupIndex - offset, 0);
               let physicalColumnIndex = instance.toPhysicalColumn(calcIndex);
 
@@ -719,6 +667,22 @@ function Core(rootElement, userSettings) {
               if (!wasRemoved) {
                 return;
               }
+              if (selection.isSelected()) {
+                const {
+                  col
+                } = instance.getSelectedRangeLast().highlight;
+                if (col >= groupIndex && col <= groupIndex + groupAmount - 1) {
+                  editorManager.closeEditor(true);
+                }
+              }
+              const totalColumns = instance.countCols();
+              if (totalColumns === 0) {
+                selection.deselect();
+              } else if (source === 'ContextMenu.removeColumn') {
+                selection.refresh();
+              } else {
+                selection.shiftColumns(groupIndex, -groupAmount);
+              }
               const fixedColumnsStart = tableMeta.fixedColumnsStart;
               if (fixedColumnsStart >= calcIndex + 1) {
                 tableMeta.fixedColumnsStart -= Math.min(groupAmount, fixedColumnsStart - calcIndex);
@@ -737,13 +701,11 @@ function Core(rootElement, userSettings) {
           } else {
             removeCol([[index, amount]]);
           }
-          grid.adjustRowsAndCols();
-          instance._refreshBorders(); // it will call render and prepare methods
-
           break;
         default:
           throw new Error(`There is no such action "${action}"`);
       }
+      instance.view.render();
       if (!keepEmptyRows) {
         grid.adjustRowsAndCols(); // makes sure that we did not add rows that will be removed in next refresh
       }
@@ -758,9 +720,6 @@ function Core(rootElement, userSettings) {
       const minSpareRows = tableMeta.minSpareRows;
       const minCols = tableMeta.minCols;
       const minSpareCols = tableMeta.minSpareCols;
-      if (instance.countRows() === 0 && instance.countCols() === 0) {
-        selection.deselect();
-      }
       if (minRows) {
         // should I add empty rows to data source to meet minRows?
         const nrOfRows = instance.countRows();
@@ -819,55 +778,6 @@ function Core(rootElement, userSettings) {
           });
         }
       }
-      if (selection.isSelected()) {
-        const rowCount = instance.countRows();
-        const colCount = instance.countCols();
-        (0, _array.arrayEach)(selection.selectedRange, range => {
-          let selectionChanged = false;
-          let fromRow = range.from.row;
-          let fromCol = range.from.col;
-          let toRow = range.to.row;
-          let toCol = range.to.col;
-
-          // if selection is outside, move selection to last row
-          if (fromRow > rowCount - 1) {
-            fromRow = rowCount - 1;
-            selectionChanged = true;
-            if (toRow > fromRow) {
-              toRow = fromRow;
-            }
-          } else if (toRow > rowCount - 1) {
-            toRow = rowCount - 1;
-            selectionChanged = true;
-            if (fromRow > toRow) {
-              fromRow = toRow;
-            }
-          }
-          // if selection is outside, move selection to last row
-          if (fromCol > colCount - 1) {
-            fromCol = colCount - 1;
-            selectionChanged = true;
-            if (toCol > fromCol) {
-              toCol = fromCol;
-            }
-          } else if (toCol > colCount - 1) {
-            toCol = colCount - 1;
-            selectionChanged = true;
-            if (fromCol > toCol) {
-              fromCol = toCol;
-            }
-          }
-          if (selectionChanged) {
-            if (fromCol < 0) {
-              instance.selectRows(fromRow, toRow, fromCol);
-            } else if (fromRow < 0) {
-              instance.selectColumns(fromCol, toCol, fromRow);
-            } else {
-              instance.selectCell(fromRow, fromCol, toRow, toCol);
-            }
-          }
-        });
-      }
       if (instance.view) {
         instance.view.adjustElementsSize();
       }
@@ -1314,7 +1224,9 @@ function Core(rootElement, userSettings) {
     instance.forceFullRender = true; // used when data was changed
     grid.adjustRowsAndCols();
     instance.runHooks('beforeChangeRender', changes, source);
-    instance._refreshBorders(null);
+    editorManager.closeEditor();
+    instance.view.render();
+    editorManager.prepareEditor();
     instance.view.adjustElementsSize();
     instance.runHooks('afterChange', changes, source || 'edit');
     const activeEditor = instance.getActiveEditor();
@@ -1594,7 +1506,11 @@ function Core(rootElement, userSettings) {
   this.destroyEditor = function () {
     let revertOriginal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     let prepareEditorIfNeeded = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    instance._refreshBorders(revertOriginal, prepareEditorIfNeeded);
+    editorManager.closeEditor(revertOriginal);
+    instance.view.render();
+    if (prepareEditorIfNeeded && selection.isSelected()) {
+      editorManager.prepareEditor();
+    }
   };
 
   /**
@@ -1636,8 +1552,8 @@ function Core(rootElement, userSettings) {
    * @returns {Array} Returns removed portion of columns.
    */
   this.spliceCol = function (column, index, amount) {
-    for (var _len17 = arguments.length, elements = new Array(_len17 > 3 ? _len17 - 3 : 0), _key17 = 3; _key17 < _len17; _key17++) {
-      elements[_key17 - 3] = arguments[_key17];
+    for (var _len16 = arguments.length, elements = new Array(_len16 > 3 ? _len16 - 3 : 0), _key16 = 3; _key16 < _len16; _key16++) {
+      elements[_key16 - 3] = arguments[_key16];
     }
     return datamap.spliceCol(column, index, amount, ...elements);
   };
@@ -1654,8 +1570,8 @@ function Core(rootElement, userSettings) {
    * @returns {Array} Returns removed portion of rows.
    */
   this.spliceRow = function (row, index, amount) {
-    for (var _len18 = arguments.length, elements = new Array(_len18 > 3 ? _len18 - 3 : 0), _key18 = 3; _key18 < _len18; _key18++) {
-      elements[_key18 - 3] = arguments[_key18];
+    for (var _len17 = arguments.length, elements = new Array(_len17 > 3 ? _len17 - 3 : 0), _key17 = 3; _key17 < _len17; _key17++) {
+      elements[_key17 - 3] = arguments[_key17];
     }
     return datamap.spliceRow(row, index, amount, ...elements);
   };
@@ -1676,11 +1592,11 @@ function Core(rootElement, userSettings) {
   this.getSelected = function () {
     // https://github.com/handsontable/handsontable/issues/44  //cjl
     if (selection.isSelected()) {
-      return (0, _array.arrayMap)(selection.getSelectedRange(), _ref8 => {
+      return (0, _array.arrayMap)(selection.getSelectedRange(), _ref7 => {
         let {
           from,
           to
-        } = _ref8;
+        } = _ref7;
         return [from.row, from.col, to.row, to.col];
       });
     }
@@ -1857,7 +1773,7 @@ function Core(rootElement, userSettings) {
       if (this.renderCall) {
         this.render();
       } else {
-        this._refreshBorders(null);
+        instance.view.render();
       }
     }
   };
@@ -1878,9 +1794,7 @@ function Core(rootElement, userSettings) {
       this.forceFullRender = true; // used when data was changed
 
       if (!this.isRenderSuspended()) {
-        editorManager.lockEditor();
-        this._refreshBorders(null);
-        editorManager.unlockEditor();
+        instance.view.render();
       }
     }
   };
@@ -2147,6 +2061,7 @@ function Core(rootElement, userSettings) {
       instance.columnIndexMapper.fitToLength(this.getInitialColumnCount());
       instance.rowIndexMapper.fitToLength(this.countSourceRows());
       grid.adjustRowsAndCols();
+      selection.refresh();
     }, {
       hotInstance: instance,
       dataMap: datamap,
@@ -2187,6 +2102,7 @@ function Core(rootElement, userSettings) {
       metaManager.clearCellsCache();
       instance.initIndexMappers();
       grid.adjustRowsAndCols();
+      selection.refresh();
       if (firstRun) {
         firstRun = [null, 'loadData'];
       }
@@ -2474,10 +2390,8 @@ function Core(rootElement, userSettings) {
     grid.adjustRowsAndCols();
     if (instance.view && !firstRun) {
       instance.forceFullRender = true; // used when data was changed
-      editorManager.lockEditor();
-      instance._refreshBorders(null);
+      instance.view.render();
       instance.view._wt.wtOverlays.adjustElementsSize();
-      editorManager.unlockEditor();
     }
     if (!init && instance.view && (currentHeight === '' || height === '' || height === undefined) && currentHeight !== height) {
       instance.view._wt.wtOverlays.updateMainScrollableElements();
@@ -2906,15 +2820,15 @@ function Core(rootElement, userSettings) {
     const isThereAnySetSourceListener = this.hasHook('afterSetSourceDataAtCell');
     const changesForHook = [];
     if (isThereAnySetSourceListener) {
-      (0, _array.arrayEach)(input, _ref9 => {
-        let [changeRow, changeProp, changeValue] = _ref9;
+      (0, _array.arrayEach)(input, _ref8 => {
+        let [changeRow, changeProp, changeValue] = _ref8;
         changesForHook.push([changeRow, changeProp, dataSource.getAtCell(changeRow, changeProp),
         // The previous value.
         changeValue]);
       });
     }
-    (0, _array.arrayEach)(input, _ref10 => {
-      let [changeRow, changeProp, changeValue] = _ref10;
+    (0, _array.arrayEach)(input, _ref9 => {
+      let [changeRow, changeProp, changeValue] = _ref9;
       dataSource.setAtCell(changeRow, changeProp, changeValue);
     });
     if (isThereAnySetSourceListener) {
@@ -3052,8 +2966,8 @@ function Core(rootElement, userSettings) {
    */
   this.spliceCellsMeta = function (visualIndex) {
     let deleteAmount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-    for (var _len19 = arguments.length, cellMetaRows = new Array(_len19 > 2 ? _len19 - 2 : 0), _key19 = 2; _key19 < _len19; _key19++) {
-      cellMetaRows[_key19 - 2] = arguments[_key19];
+    for (var _len18 = arguments.length, cellMetaRows = new Array(_len18 > 2 ? _len18 - 2 : 0), _key18 = 2; _key18 < _len18; _key18++) {
+      cellMetaRows[_key18 - 2] = arguments[_key18];
     }
     if (cellMetaRows.length > 0 && !Array.isArray(cellMetaRows[0])) {
       throw new Error('The 3rd argument (cellMetaRows) has to be passed as an array of cell meta objects array.');
@@ -4266,8 +4180,8 @@ function Core(rootElement, userSettings) {
     instance.batchExecution(() => {
       instance.rowIndexMapper.unregisterAll();
       instance.columnIndexMapper.unregisterAll();
-      pluginsRegistry.getItems().forEach(_ref11 => {
-        let [, plugin] = _ref11;
+      pluginsRegistry.getItems().forEach(_ref10 => {
+        let [, plugin] = _ref10;
         plugin.destroy();
       });
       pluginsRegistry.clear();
@@ -4555,23 +4469,6 @@ function Core(rootElement, userSettings) {
     });
   };
 
-  /**
-   * Refresh selection borders. This is temporary method relic after selection rewrite.
-   *
-   * @private
-   * @param {boolean} [revertOriginal=false] If `true`, the previous value will be restored. Otherwise, the edited value will be saved.
-   * @param {boolean} [prepareEditorIfNeeded=true] If `true` the editor under the selected cell will be prepared to open.
-   */
-  this._refreshBorders = function () {
-    let revertOriginal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    let prepareEditorIfNeeded = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    editorManager.destroyEditor(revertOriginal);
-    instance.view.render();
-    if (prepareEditorIfNeeded && selection.isSelected()) {
-      editorManager.prepareEditor();
-    }
-  };
-
   /**
    * Gets the instance of the EditorManager.
    *