handsontable 0.0.0-next-9b2cada-20230905 → 0.0.0-next-5c1663f-20230911

package/editors/autocompleteEditor/autocompleteEditor.js

@@ -148,7 +148,6 @@ class AutocompleteEditor extends _handsontableEditor.HandsontableEditor {
   open() {
     const priv = privatePool.get(this);
     super.open();
-    const choicesListHot = this.htEditor.getInstance();
     const trimDropdown = this.cellProperties.trimDropdown === void 0 ? true : this.cellProperties.trimDropdown;
     this.showEditableElement();
     this.focus();
@@ -158,7 +157,7 @@ class AutocompleteEditor extends _handsontableEditor.HandsontableEditor {
     }
 
     this.addHook('beforeKeyDown', event => this.onBeforeKeyDown(event));
-    choicesListHot.updateSettings({
+    this.htEditor.updateSettings({
       colWidths: trimDropdown ? [(0, _element.outerWidth)(this.TEXTAREA) - 2] : void 0,
       width: trimDropdown ? (0, _element.outerWidth)(this.TEXTAREA) + scrollbarWidth : void 0,
       renderer: (instance, TD, row, col, prop, value, cellProperties) => {
@@ -271,10 +270,15 @@ class AutocompleteEditor extends _handsontableEditor.HandsontableEditor {
     }
     this.strippedChoices = choices;
     this.htEditor.loadData((0, _array.pivot)([choices]));
-    this.updateDropdownHeight();
-    this.flipDropdownIfNeeded();
-    if (this.cellProperties.strict === true) {
-      this.highlightBestMatchingChoice(highlightIndex);
+    if (choices.length === 0) {
+      this.htEditor.rootElement.style.display = 'none';
+    } else {
+      this.htEditor.rootElement.style.display = '';
+      this.updateDropdownHeight();
+      this.flipDropdownIfNeeded();
+      if (this.cellProperties.strict === true) {
+        this.highlightBestMatchingChoice(highlightIndex);
+      }
     }
     this.hot.listen();
     (0, _element.setCaretPosition)(this.TEXTAREA, pos, pos === endPos ? void 0 : endPos);
@@ -411,7 +415,7 @@ class AutocompleteEditor extends _handsontableEditor.HandsontableEditor {
    * @returns {number}
    */
   getDropdownHeight() {
-    const firstRowHeight = this.htEditor.getInstance().getRowHeight(0) || 23;
+    const firstRowHeight = this.htEditor.getRowHeight(0) || 23;
     const visibleRows = this.cellProperties.visibleRows;
     return this.strippedChoices.length >= visibleRows ? visibleRows * firstRowHeight : this.strippedChoices.length * firstRowHeight + 8; // eslint-disable-line max-len
   }

package/editors/autocompleteEditor/autocompleteEditor.mjs

@@ -144,7 +144,6 @@ export class AutocompleteEditor extends HandsontableEditor {
   open() {
     const priv = privatePool.get(this);
     super.open();
-    const choicesListHot = this.htEditor.getInstance();
     const trimDropdown = this.cellProperties.trimDropdown === void 0 ? true : this.cellProperties.trimDropdown;
     this.showEditableElement();
     this.focus();
@@ -154,7 +153,7 @@ export class AutocompleteEditor extends HandsontableEditor {
     }
 
     this.addHook('beforeKeyDown', event => this.onBeforeKeyDown(event));
-    choicesListHot.updateSettings({
+    this.htEditor.updateSettings({
       colWidths: trimDropdown ? [outerWidth(this.TEXTAREA) - 2] : void 0,
       width: trimDropdown ? outerWidth(this.TEXTAREA) + scrollbarWidth : void 0,
       renderer: (instance, TD, row, col, prop, value, cellProperties) => {
@@ -267,10 +266,15 @@ export class AutocompleteEditor extends HandsontableEditor {
     }
     this.strippedChoices = choices;
     this.htEditor.loadData(pivot([choices]));
-    this.updateDropdownHeight();
-    this.flipDropdownIfNeeded();
-    if (this.cellProperties.strict === true) {
-      this.highlightBestMatchingChoice(highlightIndex);
+    if (choices.length === 0) {
+      this.htEditor.rootElement.style.display = 'none';
+    } else {
+      this.htEditor.rootElement.style.display = '';
+      this.updateDropdownHeight();
+      this.flipDropdownIfNeeded();
+      if (this.cellProperties.strict === true) {
+        this.highlightBestMatchingChoice(highlightIndex);
+      }
     }
     this.hot.listen();
     setCaretPosition(this.TEXTAREA, pos, pos === endPos ? void 0 : endPos);
@@ -407,7 +411,7 @@ export class AutocompleteEditor extends HandsontableEditor {
    * @returns {number}
    */
   getDropdownHeight() {
-    const firstRowHeight = this.htEditor.getInstance().getRowHeight(0) || 23;
+    const firstRowHeight = this.htEditor.getRowHeight(0) || 23;
     const visibleRows = this.cellProperties.visibleRows;
     return this.strippedChoices.length >= visibleRows ? visibleRows * firstRowHeight : this.strippedChoices.length * firstRowHeight + 8; // eslint-disable-line max-len
   }

package/editors/baseEditor/baseEditor.js

@@ -492,21 +492,30 @@ class BaseEditor {
     const horizontalScrollPosition = Math.abs(wtOverlays.inlineStartOverlay.getScrollPosition());
     const verticalScrollPosition = wtOverlays.topOverlay.getScrollPosition();
     const scrollbarWidth = (0, _element.getScrollbarWidth)(this.hot.rootDocument);
-    const cellTopOffset = TD.offsetTop + firstRowOffset - verticalScrollPosition;
-    let cellStartOffset = 0;
+    let cellTopOffset = TD.offsetTop;
+    if (['inline_start', 'master'].includes(overlayName)) {
+      cellTopOffset += firstRowOffset - verticalScrollPosition;
+    }
+    if (['bottom', 'bottom_inline_start_corner'].includes(overlayName)) {
+      const {
+        wtViewport: bottomWtViewport,
+        wtTable: bottomWtTable
+      } = wtOverlays.bottomOverlay.clone;
+      cellTopOffset += bottomWtViewport.getWorkspaceHeight() - bottomWtTable.getHeight() - scrollbarWidth;
+    }
+    let cellStartOffset = TD.offsetLeft;
     if (this.hot.isRtl()) {
-      const cellOffset = TD.offsetLeft;
-      if (cellOffset >= 0) {
+      if (cellStartOffset >= 0) {
         cellStartOffset = overlayTable.getWidth() - TD.offsetLeft;
       } else {
         // The `offsetLeft` returns negative values when the parent offset element has position relative
         // (it happens when on the cell the selection is applied - the `area` CSS class).
         // When it happens the `offsetLeft` value is calculated from the right edge of the parent element.
-        cellStartOffset = Math.abs(cellOffset);
+        cellStartOffset = Math.abs(cellStartOffset);
       }
       cellStartOffset += firstColumnOffset - horizontalScrollPosition - cellWidth;
-    } else {
-      cellStartOffset = TD.offsetLeft + firstColumnOffset - horizontalScrollPosition;
+    } else if (['top', 'master', 'bottom'].includes(overlayName)) {
+      cellStartOffset += firstColumnOffset - horizontalScrollPosition;
     }
     const cellComputedStyle = (0, _element.getComputedStyle)(this.TD, this.hot.rootWindow);
     const borderPhysicalWidthProp = this.hot.isRtl() ? 'borderRightWidth' : 'borderLeftWidth';

package/editors/baseEditor/baseEditor.mjs

@@ -485,21 +485,30 @@ export class BaseEditor {
     const horizontalScrollPosition = Math.abs(wtOverlays.inlineStartOverlay.getScrollPosition());
     const verticalScrollPosition = wtOverlays.topOverlay.getScrollPosition();
     const scrollbarWidth = getScrollbarWidth(this.hot.rootDocument);
-    const cellTopOffset = TD.offsetTop + firstRowOffset - verticalScrollPosition;
-    let cellStartOffset = 0;
+    let cellTopOffset = TD.offsetTop;
+    if (['inline_start', 'master'].includes(overlayName)) {
+      cellTopOffset += firstRowOffset - verticalScrollPosition;
+    }
+    if (['bottom', 'bottom_inline_start_corner'].includes(overlayName)) {
+      const {
+        wtViewport: bottomWtViewport,
+        wtTable: bottomWtTable
+      } = wtOverlays.bottomOverlay.clone;
+      cellTopOffset += bottomWtViewport.getWorkspaceHeight() - bottomWtTable.getHeight() - scrollbarWidth;
+    }
+    let cellStartOffset = TD.offsetLeft;
     if (this.hot.isRtl()) {
-      const cellOffset = TD.offsetLeft;
-      if (cellOffset >= 0) {
+      if (cellStartOffset >= 0) {
         cellStartOffset = overlayTable.getWidth() - TD.offsetLeft;
       } else {
         // The `offsetLeft` returns negative values when the parent offset element has position relative
         // (it happens when on the cell the selection is applied - the `area` CSS class).
         // When it happens the `offsetLeft` value is calculated from the right edge of the parent element.
-        cellStartOffset = Math.abs(cellOffset);
+        cellStartOffset = Math.abs(cellStartOffset);
       }
       cellStartOffset += firstColumnOffset - horizontalScrollPosition - cellWidth;
-    } else {
-      cellStartOffset = TD.offsetLeft + firstColumnOffset - horizontalScrollPosition;
+    } else if (['top', 'master', 'bottom'].includes(overlayName)) {
+      cellStartOffset += firstColumnOffset - horizontalScrollPosition;
     }
     const cellComputedStyle = getComputedStyle(this.TD, this.hot.rootWindow);
     const borderPhysicalWidthProp = this.hot.isRtl() ? 'borderRightWidth' : 'borderLeftWidth';

package/editors/handsontableEditor/handsontableEditor.js

@@ -139,7 +139,7 @@ class HandsontableEditor extends _textEditor.TextEditor {
     }
 
     if (this.htEditor && this.htEditor.getSelectedLast()) {
-      const value = this.htEditor.getInstance().getValue();
+      const value = this.htEditor.getValue();
       if (value !== void 0) {
         // if the value is undefined then it means we don't want to set the value
         this.setValue(value);
@@ -176,7 +176,7 @@ class HandsontableEditor extends _textEditor.TextEditor {
       position: 'before'
     };
     const action = (rowToSelect, event) => {
-      const innerHOT = this.htEditor.getInstance();
+      const innerHOT = this.htEditor;
       if (rowToSelect !== void 0) {
         if (rowToSelect < 0 || innerHOT.flipped && rowToSelect > innerHOT.countRows() - 1) {
           innerHOT.deselectCell();
@@ -195,7 +195,7 @@ class HandsontableEditor extends _textEditor.TextEditor {
     editorContext.addShortcuts([{
       keys: [['ArrowUp']],
       callback: event => {
-        const innerHOT = this.htEditor.getInstance();
+        const innerHOT = this.htEditor;
         let rowToSelect;
         let selectedRow;
         if (!innerHOT.getSelectedLast() && innerHOT.flipped) {
@@ -215,7 +215,7 @@ class HandsontableEditor extends _textEditor.TextEditor {
     }, {
       keys: [['ArrowDown']],
       callback: event => {
-        const innerHOT = this.htEditor.getInstance();
+        const innerHOT = this.htEditor;
         let rowToSelect;
         let selectedRow;
         if (!innerHOT.getSelectedLast() && !innerHOT.flipped) {

package/editors/handsontableEditor/handsontableEditor.mjs

@@ -135,7 +135,7 @@ export class HandsontableEditor extends TextEditor {
     }
 
     if (this.htEditor && this.htEditor.getSelectedLast()) {
-      const value = this.htEditor.getInstance().getValue();
+      const value = this.htEditor.getValue();
       if (value !== void 0) {
         // if the value is undefined then it means we don't want to set the value
         this.setValue(value);
@@ -172,7 +172,7 @@ export class HandsontableEditor extends TextEditor {
       position: 'before'
     };
     const action = (rowToSelect, event) => {
-      const innerHOT = this.htEditor.getInstance();
+      const innerHOT = this.htEditor;
       if (rowToSelect !== void 0) {
         if (rowToSelect < 0 || innerHOT.flipped && rowToSelect > innerHOT.countRows() - 1) {
           innerHOT.deselectCell();
@@ -191,7 +191,7 @@ export class HandsontableEditor extends TextEditor {
     editorContext.addShortcuts([{
       keys: [['ArrowUp']],
       callback: event => {
-        const innerHOT = this.htEditor.getInstance();
+        const innerHOT = this.htEditor;
         let rowToSelect;
         let selectedRow;
         if (!innerHOT.getSelectedLast() && innerHOT.flipped) {
@@ -211,7 +211,7 @@ export class HandsontableEditor extends TextEditor {
     }, {
       keys: [['ArrowDown']],
       callback: event => {
-        const innerHOT = this.htEditor.getInstance();
+        const innerHOT = this.htEditor;
         let rowToSelect;
         let selectedRow;
         if (!innerHOT.getSelectedLast() && !innerHOT.flipped) {

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-9b2cada-20230905";
+  const hotVersion = "0.0.0-next-5c1663f-20230911";
   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-9b2cada-20230905";
+  const hotVersion = "0.0.0-next-5c1663f-20230911";
   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-9b2cada-20230905",
+  "version": "0.0.0-next-5c1663f-20230911",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",