handsontable 0.0.0-next-317e00f-20240111 → 0.0.0-next-d247bd5-20240112

package/editorManager.js

@@ -29,7 +29,6 @@ class EditorManager {
      *
      * @param {MouseEvent} event The mouse event object.
      * @param {object} coords The cell coordinates.
-     * @param {HTMLTableCellElement|HTMLTableHeaderCellElement} elem The element which triggers the action.
      */
     _classPrivateMethodInitSpec(this, _onCellDblClick);
     /**
@@ -220,6 +219,19 @@ class EditorManager {
       this.clearActiveEditor();
       return;
     }
+    const selection = this.hot.getSelectedRangeLast();
+    let allowOpening = this.hot.runHooks('beforeBeginEditing', selection.highlight.row, selection.highlight.col, newInitialValue, event, enableFullEditMode);
+
+    // If the above hook does not return boolean apply default behavior which disallows opening
+    // an editor after double mouse click for non-contiguous selection (while pressing Ctrl/Cmd) and
+    // for multiple selected cells (while pressing SHIFT).
+    if (event instanceof MouseEvent && typeof allowOpening !== 'boolean') {
+      allowOpening = this.hot.selection.getLayerLevel() === 0 && selection.isSingle();
+    }
+    if (allowOpening === false) {
+      this.clearActiveEditor();
+      return;
+    }
     if (!this.activeEditor) {
       this.hot.scrollToFocusedCell();
       this.prepareEditor();
@@ -373,9 +385,8 @@ function _onAfterDocumentKeyDown2(event) {
     }
   }
 }
-function _onCellDblClick2(event, coords, elem) {
-  // may be TD or TH
-  if (elem.nodeName === 'TD') {
+function _onCellDblClick2(event, coords) {
+  if (coords.isCell()) {
     this.openEditor(null, event, true);
   }
 }

package/editorManager.mjs

@@ -25,7 +25,6 @@ class EditorManager {
      *
      * @param {MouseEvent} event The mouse event object.
      * @param {object} coords The cell coordinates.
-     * @param {HTMLTableCellElement|HTMLTableHeaderCellElement} elem The element which triggers the action.
      */
     _classPrivateMethodInitSpec(this, _onCellDblClick);
     /**
@@ -216,6 +215,19 @@ class EditorManager {
       this.clearActiveEditor();
       return;
     }
+    const selection = this.hot.getSelectedRangeLast();
+    let allowOpening = this.hot.runHooks('beforeBeginEditing', selection.highlight.row, selection.highlight.col, newInitialValue, event, enableFullEditMode);
+
+    // If the above hook does not return boolean apply default behavior which disallows opening
+    // an editor after double mouse click for non-contiguous selection (while pressing Ctrl/Cmd) and
+    // for multiple selected cells (while pressing SHIFT).
+    if (event instanceof MouseEvent && typeof allowOpening !== 'boolean') {
+      allowOpening = this.hot.selection.getLayerLevel() === 0 && selection.isSingle();
+    }
+    if (allowOpening === false) {
+      this.clearActiveEditor();
+      return;
+    }
     if (!this.activeEditor) {
       this.hot.scrollToFocusedCell();
       this.prepareEditor();
@@ -369,9 +381,8 @@ function _onAfterDocumentKeyDown2(event) {
     }
   }
 }
-function _onCellDblClick2(event, coords, elem) {
-  // may be TD or TH
-  if (elem.nodeName === 'TD') {
+function _onCellDblClick2(event, coords) {
+  if (coords.isCell()) {
     this.openEditor(null, event, true);
   }
 }

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-317e00f-20240111";
+  const hotVersion = "0.0.0-next-d247bd5-20240112";
   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-317e00f-20240111";
+  const hotVersion = "0.0.0-next-d247bd5-20240112";
   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-317e00f-20240111",
+  "version": "0.0.0-next-d247bd5-20240112",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/pluginHooks.d.ts

@@ -157,6 +157,7 @@ export interface Events {
   afterViewRender?: (isForced: boolean) => void;
   beforeAddChild?: (parent: RowObject, element?: RowObject, index?: number) => void;
   beforeAutofill?: (selectionData: CellValue[][], sourceRange: CellRange, targetRange: CellRange, direction: 'up' | 'down' | 'left' | 'right') => CellValue[][] | boolean | void;
+  beforeBeginEditing?: (row: number, column: number, initialValue: any, event: MouseEvent | KeyboardEvent, fullEditMode: boolean) => boolean | void;
   beforeCellAlignment?: (stateBefore: { [row: number]: string[] }, range: CellRange[], type: 'horizontal' | 'vertical',
     alignmentClass: 'htLeft' | 'htCenter' | 'htRight' | 'htJustify' | 'htTop' | 'htMiddle' | 'htBottom') => void;
   beforeChange?: (changes: Array<CellChange | null>, source: ChangeSource) => void | boolean;

package/pluginHooks.js

@@ -2398,6 +2398,24 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  * @param {number} finalElementPosition The final row index of the detached element.
  */
 'afterDetachChild',
+/**
+ * Fired before the editor is opened and rendered.
+ *
+ * @since 14.1.0
+ * @event Hooks#beforeBeginEditing
+ * @param {number} row Visual row index of the edited cell.
+ * @param {number} column Visual column index of the edited cell.
+ * @param {*} initialValue The initial editor value.
+ * @param {MouseEvent | KeyboardEvent} event The event which was responsible for opening the editor.
+ * @param {boolean} fullEditMode `true` if the editor is opened in full edit mode, `false` otherwise.
+ * Editor opened in full edit mode does not close after pressing Arrow keys.
+ * @returns {boolean | undefined} If the callback returns `false,` the editor won't be opened after
+ * the mouse double click or after pressing the Enter key. Returning `undefined` (or other value
+ * than boolean) will result in default behavior, which disallows opening an editor for non-contiguous
+ * selection (while pressing Ctrl/Cmd) and for multiple selected cells (while pressing SHIFT).
+ * Returning `true` removes those restrictions.
+ */
+'beforeBeginEditing',
 /**
  * Fired after the editor is opened and rendered.
  *

package/pluginHooks.mjs

@@ -2394,6 +2394,24 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  * @param {number} finalElementPosition The final row index of the detached element.
  */
 'afterDetachChild',
+/**
+ * Fired before the editor is opened and rendered.
+ *
+ * @since 14.1.0
+ * @event Hooks#beforeBeginEditing
+ * @param {number} row Visual row index of the edited cell.
+ * @param {number} column Visual column index of the edited cell.
+ * @param {*} initialValue The initial editor value.
+ * @param {MouseEvent | KeyboardEvent} event The event which was responsible for opening the editor.
+ * @param {boolean} fullEditMode `true` if the editor is opened in full edit mode, `false` otherwise.
+ * Editor opened in full edit mode does not close after pressing Arrow keys.
+ * @returns {boolean | undefined} If the callback returns `false,` the editor won't be opened after
+ * the mouse double click or after pressing the Enter key. Returning `undefined` (or other value
+ * than boolean) will result in default behavior, which disallows opening an editor for non-contiguous
+ * selection (while pressing Ctrl/Cmd) and for multiple selected cells (while pressing SHIFT).
+ * Returning `true` removes those restrictions.
+ */
+'beforeBeginEditing',
 /**
  * Fired after the editor is opened and rendered.
  *

package/plugins/formulas/formulas.js

@@ -1290,6 +1290,7 @@ function _onEngineSheetAdded2(addedSheetDisplayName) {
   this.hot.runHooks('afterSheetAdded', addedSheetDisplayName);
 }
 function _onEngineSheetRenamed2(oldDisplayName, newDisplayName) {
+  this.sheetName = newDisplayName;
   this.hot.runHooks('afterSheetRenamed', oldDisplayName, newDisplayName);
 }
 function _onEngineSheetRemoved2(removedSheetDisplayName, changes) {

package/plugins/formulas/formulas.mjs

@@ -1285,6 +1285,7 @@ function _onEngineSheetAdded2(addedSheetDisplayName) {
   this.hot.runHooks('afterSheetAdded', addedSheetDisplayName);
 }
 function _onEngineSheetRenamed2(oldDisplayName, newDisplayName) {
+  this.sheetName = newDisplayName;
   this.hot.runHooks('afterSheetRenamed', oldDisplayName, newDisplayName);
 }
 function _onEngineSheetRemoved2(removedSheetDisplayName, changes) {

package/plugins/formulas/indexSyncer/axisSyncer.js

@@ -282,7 +282,7 @@ class AxisSyncer {
         return;
       }
       const newSequence = _classPrivateFieldGet(this, _indexMapper).getIndexesSequence();
-      if (source === 'update') {
+      if (source === 'update' && newSequence.length > 0) {
         const relativeTransformation = _classPrivateFieldGet(this, _indexesSequence).map(index => newSequence.indexOf(index));
         const sheetDimensions = _classPrivateFieldGet(this, _indexSyncer).getEngine().getSheetDimensions(_classPrivateFieldGet(this, _indexSyncer).getSheetId());
         let sizeForAxis;

package/plugins/formulas/indexSyncer/axisSyncer.mjs

@@ -279,7 +279,7 @@ class AxisSyncer {
         return;
       }
       const newSequence = _classPrivateFieldGet(this, _indexMapper).getIndexesSequence();
-      if (source === 'update') {
+      if (source === 'update' && newSequence.length > 0) {
         const relativeTransformation = _classPrivateFieldGet(this, _indexesSequence).map(index => newSequence.indexOf(index));
         const sheetDimensions = _classPrivateFieldGet(this, _indexSyncer).getEngine().getSheetDimensions(_classPrivateFieldGet(this, _indexSyncer).getSheetId());
         let sizeForAxis;

package/plugins/mergeCells/cellsCollection.js

@@ -77,7 +77,7 @@ class MergedCellsCollection {
   }
 
   /**
-   * Get a merged cell containing the provided range.
+   * Get the first-found merged cell containing the provided range.
    *
    * @param {CellRange|object} range The range to search merged cells for.
    * @returns {MergedCellCoords|boolean}

package/plugins/mergeCells/cellsCollection.mjs

@@ -73,7 +73,7 @@ class MergedCellsCollection {
   }
 
   /**
-   * Get a merged cell containing the provided range.
+   * Get the first-found merged cell containing the provided range.
    *
    * @param {CellRange|object} range The range to search merged cells for.
    * @returns {MergedCellCoords|boolean}

package/plugins/mergeCells/mergeCells.js

@@ -98,9 +98,20 @@ var _onBeforeDrawAreaBorders = /*#__PURE__*/new WeakSet();
 var _onAfterModifyTransformStart = /*#__PURE__*/new WeakSet();
 var _onAfterDrawSelection = /*#__PURE__*/new WeakSet();
 var _onBeforeRemoveCellClassNames = /*#__PURE__*/new WeakSet();
+var _onBeforeBeginEditing = /*#__PURE__*/new WeakSet();
 class MergeCells extends _base.BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Allows to prevent opening the editor while more than one merged cell is selected.
+     *
+     * @param {number} row Visual row index of the edited cell.
+     * @param {number} column Visual column index of the edited cell.
+     * @param {string | null} initialValue The initial editor value.
+     * @param {MouseEvent | KeyboardEvent} event The event which was responsible for opening the editor.
+     * @returns {boolean | undefined}
+     */
+    _classPrivateMethodInitSpec(this, _onBeforeBeginEditing);
     /**
      * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
      *
@@ -459,6 +470,12 @@ class MergeCells extends _base.BasePlugin {
       }
       return _classPrivateMethodGet(_this, _onBeforeRemoveCellClassNames, _onBeforeRemoveCellClassNames2).call(_this, ...args);
     });
+    this.addHook('beforeBeginEditing', function () {
+      for (var _len24 = arguments.length, args = new Array(_len24), _key24 = 0; _key24 < _len24; _key24++) {
+        args[_key24] = arguments[_key24];
+      }
+      return _classPrivateMethodGet(_this, _onBeforeBeginEditing, _onBeforeBeginEditing2).call(_this, ...args);
+    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -1290,4 +1307,17 @@ function _onAfterDrawSelection2(currentRow, currentColumn, cornersOfSelection, l
 }
 function _onBeforeRemoveCellClassNames2() {
   return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
+}
+function _onBeforeBeginEditing2(row, column, initialValue, event) {
+  if (!(event instanceof MouseEvent)) {
+    return;
+  }
+  const selection = this.hot.getSelectedRangeLast();
+  const mergeCell = this.mergedCellsCollection.getByRange(selection);
+  if (!mergeCell) {
+    return;
+  }
+  const from = this.hot._createCellCoords(mergeCell.row, mergeCell.col);
+  const to = this.hot._createCellCoords(mergeCell.row + mergeCell.rowspan - 1, mergeCell.col + mergeCell.colspan - 1);
+  return this.hot.selection.getLayerLevel() === 0 && selection.isEqual(this.hot._createCellRange(from, from, to));
 }

package/plugins/mergeCells/mergeCells.mjs

@@ -94,9 +94,20 @@ var _onBeforeDrawAreaBorders = /*#__PURE__*/new WeakSet();
 var _onAfterModifyTransformStart = /*#__PURE__*/new WeakSet();
 var _onAfterDrawSelection = /*#__PURE__*/new WeakSet();
 var _onBeforeRemoveCellClassNames = /*#__PURE__*/new WeakSet();
+var _onBeforeBeginEditing = /*#__PURE__*/new WeakSet();
 export class MergeCells extends BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Allows to prevent opening the editor while more than one merged cell is selected.
+     *
+     * @param {number} row Visual row index of the edited cell.
+     * @param {number} column Visual column index of the edited cell.
+     * @param {string | null} initialValue The initial editor value.
+     * @param {MouseEvent | KeyboardEvent} event The event which was responsible for opening the editor.
+     * @returns {boolean | undefined}
+     */
+    _classPrivateMethodInitSpec(this, _onBeforeBeginEditing);
     /**
      * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
      *
@@ -455,6 +466,12 @@ export class MergeCells extends BasePlugin {
       }
       return _classPrivateMethodGet(_this, _onBeforeRemoveCellClassNames, _onBeforeRemoveCellClassNames2).call(_this, ...args);
     });
+    this.addHook('beforeBeginEditing', function () {
+      for (var _len24 = arguments.length, args = new Array(_len24), _key24 = 0; _key24 < _len24; _key24++) {
+        args[_key24] = arguments[_key24];
+      }
+      return _classPrivateMethodGet(_this, _onBeforeBeginEditing, _onBeforeBeginEditing2).call(_this, ...args);
+    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -1285,4 +1302,17 @@ function _onAfterDrawSelection2(currentRow, currentColumn, cornersOfSelection, l
 }
 function _onBeforeRemoveCellClassNames2() {
   return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
+}
+function _onBeforeBeginEditing2(row, column, initialValue, event) {
+  if (!(event instanceof MouseEvent)) {
+    return;
+  }
+  const selection = this.hot.getSelectedRangeLast();
+  const mergeCell = this.mergedCellsCollection.getByRange(selection);
+  if (!mergeCell) {
+    return;
+  }
+  const from = this.hot._createCellCoords(mergeCell.row, mergeCell.col);
+  const to = this.hot._createCellCoords(mergeCell.row + mergeCell.rowspan - 1, mergeCell.col + mergeCell.colspan - 1);
+  return this.hot.selection.getLayerLevel() === 0 && selection.isEqual(this.hot._createCellRange(from, from, to));
 }