handsontable 0.0.0-next-3e0b40d-20241017 → 0.0.0-next-662a118-20241017

package/editors/autocompleteEditor/autocompleteEditor.js

@@ -375,7 +375,7 @@ class AutocompleteEditor extends _handsontableEditor.HandsontableEditor {
       let lastRowHeight = 0;
       let height = null;
       do {
-        lastRowHeight = this.htEditor.getRowHeight(i) || this.htEditor.view.getDefaultRowHeight();
+        lastRowHeight = this.htEditor.getRowHeight(i) || this.htEditor.view._wt.getSetting('defaultRowHeight');
         tempHeight += lastRowHeight;
         i += 1;
       } while (tempHeight < spaceAvailable);

package/editors/autocompleteEditor/autocompleteEditor.mjs

@@ -372,7 +372,7 @@ export class AutocompleteEditor extends HandsontableEditor {
       let lastRowHeight = 0;
       let height = null;
       do {
-        lastRowHeight = this.htEditor.getRowHeight(i) || this.htEditor.view.getDefaultRowHeight();
+        lastRowHeight = this.htEditor.getRowHeight(i) || this.htEditor.view._wt.getSetting('defaultRowHeight');
         tempHeight += lastRowHeight;
         i += 1;
       } while (tempHeight < spaceAvailable);

package/editors/baseEditor/baseEditor.js

@@ -492,7 +492,7 @@ class BaseEditor {
     const actualVerticalScrollbarWidth = (0, _element.hasVerticalScrollbar)(scrollableContainerTop) ? scrollbarWidth : 0;
     const actualHorizontalScrollbarWidth = (0, _element.hasHorizontalScrollbar)(scrollableContainerLeft) ? scrollbarWidth : 0;
     const maxWidth = this.hot.view.maximumVisibleElementWidth(cellStartOffset) - actualVerticalScrollbarWidth + inlineStartBorderCompensation;
-    const maxHeight = Math.max(this.hot.view.maximumVisibleElementHeight(cellTopOffset) - actualHorizontalScrollbarWidth + topBorderCompensation, this.hot.view.getDefaultRowHeight());
+    const maxHeight = Math.max(this.hot.view.maximumVisibleElementHeight(cellTopOffset) - actualHorizontalScrollbarWidth + topBorderCompensation, 23);
     return {
       top: topPos,
       start: inlineStartPos,

package/editors/baseEditor/baseEditor.mjs

@@ -488,7 +488,7 @@ export class BaseEditor {
     const actualVerticalScrollbarWidth = hasVerticalScrollbar(scrollableContainerTop) ? scrollbarWidth : 0;
     const actualHorizontalScrollbarWidth = hasHorizontalScrollbar(scrollableContainerLeft) ? scrollbarWidth : 0;
     const maxWidth = this.hot.view.maximumVisibleElementWidth(cellStartOffset) - actualVerticalScrollbarWidth + inlineStartBorderCompensation;
-    const maxHeight = Math.max(this.hot.view.maximumVisibleElementHeight(cellTopOffset) - actualHorizontalScrollbarWidth + topBorderCompensation, this.hot.view.getDefaultRowHeight());
+    const maxHeight = Math.max(this.hot.view.maximumVisibleElementHeight(cellTopOffset) - actualHorizontalScrollbarWidth + topBorderCompensation, 23);
     return {
       top: topPos,
       start: inlineStartPos,

package/editors/dateEditor/dateEditor.js

@@ -66,9 +66,7 @@ class DateEditor extends _textEditor.TextEditor {
     this.datePickerStyle.left = 0;
     this.datePickerStyle.zIndex = 9999;
     this.datePicker.setAttribute('dir', this.hot.isRtl() ? 'rtl' : 'ltr');
-    const themeClassName = this.hot.getSettings().themeName;
     (0, _element.addClass)(this.datePicker, 'htDatepickerHolder');
-    (0, _element.addClass)(this.datePicker, themeClassName);
     this.hot.rootDocument.body.appendChild(this.datePicker);
 
     /**

package/editors/dateEditor/dateEditor.mjs

@@ -62,9 +62,7 @@ export class DateEditor extends TextEditor {
     this.datePickerStyle.left = 0;
     this.datePickerStyle.zIndex = 9999;
     this.datePicker.setAttribute('dir', this.hot.isRtl() ? 'rtl' : 'ltr');
-    const themeClassName = this.hot.getSettings().themeName;
     addClass(this.datePicker, 'htDatepickerHolder');
-    addClass(this.datePicker, themeClassName);
     this.hot.rootDocument.body.appendChild(this.datePicker);
 
     /**

package/editors/handsontableEditor/handsontableEditor.js

@@ -158,7 +158,7 @@ class HandsontableEditor extends _textEditor.TextEditor {
    * @returns {number}
    */
   getHeight() {
-    return this.htEditor.view.getTableHeight() + 1;
+    return this.htEditor.view.getTableHeight();
   }
 
   /**

package/editors/handsontableEditor/handsontableEditor.mjs

@@ -155,7 +155,7 @@ export class HandsontableEditor extends TextEditor {
    * @returns {number}
    */
   getHeight() {
-    return this.htEditor.view.getTableHeight() + 1;
+    return this.htEditor.view.getTableHeight();
   }
 
   /**

package/editors/passwordEditor/passwordEditor.js

@@ -3,7 +3,6 @@
 exports.__esModule = true;
 var _textEditor = require("../textEditor");
 var _element = require("../../helpers/dom/element");
-var _a11y = require("../../helpers/a11y");
 const EDITOR_TYPE = exports.EDITOR_TYPE = 'password';
 
 /**
@@ -23,9 +22,6 @@ class PasswordEditor extends _textEditor.TextEditor {
     this.textareaStyle = this.TEXTAREA.style;
     this.textareaStyle.width = 0;
     this.textareaStyle.height = 0;
-    if (this.hot.getSettings().ariaTags) {
-      (0, _element.setAttribute)(this.TEXTAREA, [(0, _a11y.A11Y_HIDDEN)()]);
-    }
     (0, _element.empty)(this.TEXTAREA_PARENT);
     this.TEXTAREA_PARENT.appendChild(this.TEXTAREA);
   }

package/editors/passwordEditor/passwordEditor.mjs

@@ -1,6 +1,5 @@
 import { TextEditor } from "../textEditor/index.mjs";
-import { empty, setAttribute } from "../../helpers/dom/element.mjs";
-import { A11Y_HIDDEN } from "../../helpers/a11y.mjs";
+import { empty } from "../../helpers/dom/element.mjs";
 export const EDITOR_TYPE = 'password';
 
 /**
@@ -20,9 +19,6 @@ export class PasswordEditor extends TextEditor {
     this.textareaStyle = this.TEXTAREA.style;
     this.textareaStyle.width = 0;
     this.textareaStyle.height = 0;
-    if (this.hot.getSettings().ariaTags) {
-      setAttribute(this.TEXTAREA, [A11Y_HIDDEN()]);
-    }
     empty(this.TEXTAREA_PARENT);
     this.TEXTAREA_PARENT.appendChild(this.TEXTAREA);
   }

package/editors/selectEditor/selectEditor.js

@@ -4,7 +4,6 @@ exports.__esModule = true;
 var _baseEditor = require("../baseEditor");
 var _element = require("../../helpers/dom/element");
 var _object = require("../../helpers/object");
-var _a11y = require("../../helpers/a11y");
 const EDITOR_VISIBLE_CLASS_NAME = 'ht_editor_visible';
 const SHORTCUTS_GROUP = 'selectEditor';
 const EDITOR_TYPE = exports.EDITOR_TYPE = 'select';
@@ -22,21 +21,11 @@ class SelectEditor extends _baseEditor.BaseEditor {
    * Initializes editor instance, DOM Element and mount hooks.
    */
   init() {
-    this.selectWrapper = this.hot.rootDocument.createElement('div');
     this.select = this.hot.rootDocument.createElement('select');
     this.select.setAttribute('data-hot-input', 'true');
-    this.selectWrapper.style.display = 'none';
-    const ARROW = this.hot.rootDocument.createElement('DIV');
-    const isAriaEnabled = this.hot.getSettings().ariaTags;
-    ARROW.className = 'htAutocompleteArrow';
-    if (isAriaEnabled) {
-      ARROW.setAttribute(...(0, _a11y.A11Y_HIDDEN)());
-    }
-    ARROW.appendChild(this.hot.rootDocument.createTextNode(String.fromCharCode(9660)));
-    (0, _element.addClass)(this.selectWrapper, 'htSelectEditor');
-    this.selectWrapper.appendChild(this.select);
-    this.selectWrapper.insertBefore(ARROW, this.selectWrapper.firstChild);
-    this.hot.rootElement.appendChild(this.selectWrapper);
+    this.select.style.display = 'none';
+    (0, _element.addClass)(this.select, 'htSelectEditor');
+    this.hot.rootElement.appendChild(this.select);
     this.registerHooks();
   }
 
@@ -64,7 +53,7 @@ class SelectEditor extends _baseEditor.BaseEditor {
   open() {
     this._opened = true;
     this.refreshDimensions();
-    this.selectWrapper.style.display = '';
+    this.select.style.display = '';
     const shortcutManager = this.hot.getShortcutManager();
     shortcutManager.setActiveContextName('editor');
     this.registerShortcuts();
@@ -75,9 +64,9 @@ class SelectEditor extends _baseEditor.BaseEditor {
    */
   close() {
     this._opened = false;
-    this.selectWrapper.style.display = 'none';
-    if ((0, _element.hasClass)(this.selectWrapper, EDITOR_VISIBLE_CLASS_NAME)) {
-      (0, _element.removeClass)(this.selectWrapper, EDITOR_VISIBLE_CLASS_NAME);
+    this.select.style.display = 'none';
+    if ((0, _element.hasClass)(this.select, EDITOR_VISIBLE_CLASS_NAME)) {
+      (0, _element.removeClass)(this.select, EDITOR_VISIBLE_CLASS_NAME);
     }
     this.unregisterShortcuts();
     this.clearHooks();
@@ -183,13 +172,13 @@ class SelectEditor extends _baseEditor.BaseEditor {
       width,
       height
     } = this.getEditedCellRect();
-    const selectStyle = this.selectWrapper.style;
+    const selectStyle = this.select.style;
     selectStyle.height = `${height}px`;
     selectStyle.width = `${width}px`;
     selectStyle.top = `${top}px`;
     selectStyle[this.hot.isRtl() ? 'right' : 'left'] = `${start}px`;
     selectStyle.margin = '0px';
-    (0, _element.addClass)(this.selectWrapper, EDITOR_VISIBLE_CLASS_NAME);
+    (0, _element.addClass)(this.select, EDITOR_VISIBLE_CLASS_NAME);
   }
 
   /**

package/editors/selectEditor/selectEditor.mjs

@@ -1,7 +1,6 @@
 import { BaseEditor, EDITOR_STATE } from "../baseEditor/index.mjs";
 import { addClass, empty, fastInnerHTML, hasClass, removeClass } from "../../helpers/dom/element.mjs";
 import { objectEach } from "../../helpers/object.mjs";
-import { A11Y_HIDDEN } from "../../helpers/a11y.mjs";
 const EDITOR_VISIBLE_CLASS_NAME = 'ht_editor_visible';
 const SHORTCUTS_GROUP = 'selectEditor';
 export const EDITOR_TYPE = 'select';
@@ -19,21 +18,11 @@ export class SelectEditor extends BaseEditor {
    * Initializes editor instance, DOM Element and mount hooks.
    */
   init() {
-    this.selectWrapper = this.hot.rootDocument.createElement('div');
     this.select = this.hot.rootDocument.createElement('select');
     this.select.setAttribute('data-hot-input', 'true');
-    this.selectWrapper.style.display = 'none';
-    const ARROW = this.hot.rootDocument.createElement('DIV');
-    const isAriaEnabled = this.hot.getSettings().ariaTags;
-    ARROW.className = 'htAutocompleteArrow';
-    if (isAriaEnabled) {
-      ARROW.setAttribute(...A11Y_HIDDEN());
-    }
-    ARROW.appendChild(this.hot.rootDocument.createTextNode(String.fromCharCode(9660)));
-    addClass(this.selectWrapper, 'htSelectEditor');
-    this.selectWrapper.appendChild(this.select);
-    this.selectWrapper.insertBefore(ARROW, this.selectWrapper.firstChild);
-    this.hot.rootElement.appendChild(this.selectWrapper);
+    this.select.style.display = 'none';
+    addClass(this.select, 'htSelectEditor');
+    this.hot.rootElement.appendChild(this.select);
     this.registerHooks();
   }
 
@@ -61,7 +50,7 @@ export class SelectEditor extends BaseEditor {
   open() {
     this._opened = true;
     this.refreshDimensions();
-    this.selectWrapper.style.display = '';
+    this.select.style.display = '';
     const shortcutManager = this.hot.getShortcutManager();
     shortcutManager.setActiveContextName('editor');
     this.registerShortcuts();
@@ -72,9 +61,9 @@ export class SelectEditor extends BaseEditor {
    */
   close() {
     this._opened = false;
-    this.selectWrapper.style.display = 'none';
-    if (hasClass(this.selectWrapper, EDITOR_VISIBLE_CLASS_NAME)) {
-      removeClass(this.selectWrapper, EDITOR_VISIBLE_CLASS_NAME);
+    this.select.style.display = 'none';
+    if (hasClass(this.select, EDITOR_VISIBLE_CLASS_NAME)) {
+      removeClass(this.select, EDITOR_VISIBLE_CLASS_NAME);
     }
     this.unregisterShortcuts();
     this.clearHooks();
@@ -180,13 +169,13 @@ export class SelectEditor extends BaseEditor {
       width,
       height
     } = this.getEditedCellRect();
-    const selectStyle = this.selectWrapper.style;
+    const selectStyle = this.select.style;
     selectStyle.height = `${height}px`;
     selectStyle.width = `${width}px`;
     selectStyle.top = `${top}px`;
     selectStyle[this.hot.isRtl() ? 'right' : 'left'] = `${start}px`;
     selectStyle.margin = '0px';
-    addClass(this.selectWrapper, EDITOR_VISIBLE_CLASS_NAME);
+    addClass(this.select, EDITOR_VISIBLE_CLASS_NAME);
   }
 
   /**

package/editors/textEditor/textEditor.js

@@ -196,9 +196,6 @@ class TextEditor extends _baseEditor.BaseEditor {
     // Makes the element recognizable by Hot as its own
     // component's element.
     (0, _element.setAttribute)(this.TEXTAREA, [['data-hot-input', ''], (0, _a11y.A11Y_TABINDEX)(-1)]);
-    if (this.hot.getSettings().ariaTags) {
-      (0, _element.setAttribute)(this.TEXTAREA, [(0, _a11y.A11Y_HIDDEN)()]);
-    }
     (0, _element.addClass)(this.TEXTAREA, 'handsontableInput');
     this.textareaStyle = this.TEXTAREA.style;
     this.textareaStyle.width = 0;
@@ -312,12 +309,19 @@ class TextEditor extends _baseEditor.BaseEditor {
     this.TEXTAREA.style.fontSize = cellComputedStyle.fontSize;
     this.TEXTAREA.style.fontFamily = cellComputedStyle.fontFamily;
     this.TEXTAREA.style.backgroundColor = this.TD.style.backgroundColor;
+    const textareaComputedStyle = this.hot.rootWindow.getComputedStyle(this.TEXTAREA);
+    const horizontalPadding = parseInt(textareaComputedStyle.paddingLeft, 10) + parseInt(textareaComputedStyle.paddingRight, 10);
+    const verticalPadding = parseInt(textareaComputedStyle.paddingTop, 10) + parseInt(textareaComputedStyle.paddingBottom, 10);
+    const finalWidth = width - horizontalPadding;
+    const finalHeight = height - verticalPadding;
+    const finalMaxWidth = maxWidth - horizontalPadding;
+    const finalMaxHeight = maxHeight - verticalPadding;
     this.autoResize.init(this.TEXTAREA, {
-      minWidth: Math.min(width, maxWidth),
-      minHeight: Math.min(height, maxHeight),
+      minWidth: Math.min(finalWidth, finalMaxWidth),
+      minHeight: Math.min(finalHeight, finalMaxHeight),
       // TEXTAREA should never be wider than visible part of the viewport (should not cover the scrollbar)
-      maxWidth,
-      maxHeight
+      maxWidth: finalMaxWidth,
+      maxHeight: finalMaxHeight
     }, true);
   }
 

package/editors/textEditor/textEditor.mjs

@@ -10,7 +10,7 @@ import { rangeEach } from "../../helpers/number.mjs";
 import { createInputElementResizer } from "../../utils/autoResize.mjs";
 import { isDefined } from "../../helpers/mixed.mjs";
 import { updateCaretPosition } from "./caretPositioner.mjs";
-import { A11Y_HIDDEN, A11Y_TABINDEX } from "../../helpers/a11y.mjs";
+import { A11Y_TABINDEX } from "../../helpers/a11y.mjs";
 const EDITOR_VISIBLE_CLASS_NAME = 'ht_editor_visible';
 const EDITOR_HIDDEN_CLASS_NAME = 'ht_editor_hidden';
 const SHORTCUTS_GROUP = 'textEditor';
@@ -192,9 +192,6 @@ export class TextEditor extends BaseEditor {
     // Makes the element recognizable by Hot as its own
     // component's element.
     setAttribute(this.TEXTAREA, [['data-hot-input', ''], A11Y_TABINDEX(-1)]);
-    if (this.hot.getSettings().ariaTags) {
-      setAttribute(this.TEXTAREA, [A11Y_HIDDEN()]);
-    }
     addClass(this.TEXTAREA, 'handsontableInput');
     this.textareaStyle = this.TEXTAREA.style;
     this.textareaStyle.width = 0;
@@ -308,12 +305,19 @@ export class TextEditor extends BaseEditor {
     this.TEXTAREA.style.fontSize = cellComputedStyle.fontSize;
     this.TEXTAREA.style.fontFamily = cellComputedStyle.fontFamily;
     this.TEXTAREA.style.backgroundColor = this.TD.style.backgroundColor;
+    const textareaComputedStyle = this.hot.rootWindow.getComputedStyle(this.TEXTAREA);
+    const horizontalPadding = parseInt(textareaComputedStyle.paddingLeft, 10) + parseInt(textareaComputedStyle.paddingRight, 10);
+    const verticalPadding = parseInt(textareaComputedStyle.paddingTop, 10) + parseInt(textareaComputedStyle.paddingBottom, 10);
+    const finalWidth = width - horizontalPadding;
+    const finalHeight = height - verticalPadding;
+    const finalMaxWidth = maxWidth - horizontalPadding;
+    const finalMaxHeight = maxHeight - verticalPadding;
     this.autoResize.init(this.TEXTAREA, {
-      minWidth: Math.min(width, maxWidth),
-      minHeight: Math.min(height, maxHeight),
+      minWidth: Math.min(finalWidth, finalMaxWidth),
+      minHeight: Math.min(finalHeight, finalMaxHeight),
       // TEXTAREA should never be wider than visible part of the viewport (should not cover the scrollbar)
-      maxWidth,
-      maxHeight
+      maxWidth: finalMaxWidth,
+      maxHeight: finalMaxHeight
     }, 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-3e0b40d-20241017";
+  const hotVersion = "0.0.0-next-662a118-20241017";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';
@@ -142,7 +142,7 @@ function _injectProductInfo(key, element) {
   const schemaValidity = _checkKeySchema(key);
   if (hasValidType || isNonCommercial || schemaValidity) {
     if (schemaValidity) {
-      const releaseDate = (0, _moment.default)("01/10/2024", 'DD/MM/YYYY');
+      const releaseDate = (0, _moment.default)("17/10/2024", 'DD/MM/YYYY');
       const releaseDays = Math.floor(releaseDate.toDate().getTime() / 8.64e7);
       const keyValidityDays = _extractTime(key);
       keyValidityDate = (0, _moment.default)((keyValidityDays + 1) * 8.64e7, 'x').format('MMMM DD, YYYY');
@@ -188,7 +188,7 @@ function _injectProductInfo(key, element) {
     });
     if (message) {
       const messageNode = document.createElement('div');
-      messageNode.className = 'handsontable hot-display-license-info';
+      messageNode.className = 'hot-display-license-info';
       messageNode.innerHTML = domMessages[domMessageState]({
         keyValidityDate,
         hotVersion

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-3e0b40d-20241017";
+  const hotVersion = "0.0.0-next-662a118-20241017";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';
@@ -132,7 +132,7 @@ export function _injectProductInfo(key, element) {
   const schemaValidity = _checkKeySchema(key);
   if (hasValidType || isNonCommercial || schemaValidity) {
     if (schemaValidity) {
-      const releaseDate = moment("01/10/2024", 'DD/MM/YYYY');
+      const releaseDate = moment("17/10/2024", 'DD/MM/YYYY');
       const releaseDays = Math.floor(releaseDate.toDate().getTime() / 8.64e7);
       const keyValidityDays = _extractTime(key);
       keyValidityDate = moment((keyValidityDays + 1) * 8.64e7, 'x').format('MMMM DD, YYYY');
@@ -178,7 +178,7 @@ export function _injectProductInfo(key, element) {
     });
     if (message) {
       const messageNode = document.createElement('div');
-      messageNode.className = 'handsontable hot-display-license-info';
+      messageNode.className = 'hot-display-license-info';
       messageNode.innerHTML = domMessages[domMessageState]({
         keyValidityDate,
         hotVersion

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-3e0b40d-20241017",
+  "version": "0.0.0-next-662a118-20241017",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",
@@ -50,6 +50,7 @@
     "@babel/register": "^7.8.3",
     "@babel/runtime": "^7.11.2",
     "@babel/types": "^7.12.12",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.0.4",
     "babel-plugin-forbidden-imports": "^0.1.2",
@@ -93,10 +94,8 @@
     "string-replace-loader": "^3.1.0",
     "stylelint": "^16.3.1",
     "typescript": "3.8.2",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
     "webpack": "^5.88.1",
-    "webpack-cli": "^5.1.4",
-    "webpack-remove-empty-scripts": "^1.0.4"
+    "webpack-cli": "^5.1.4"
   },
   "optionalDependencies": {
     "hyperformula": "^2.6.2"
@@ -768,12 +767,6 @@
     "./dist/languages/zh-CN.min.js": "./dist/languages/zh-CN.min.js",
     "./dist/languages/zh-TW.js": "./dist/languages/zh-TW.js",
     "./dist/languages/zh-TW.min.js": "./dist/languages/zh-TW.min.js",
-    "./styles/handsontable.css": "./styles/handsontable.css",
-    "./styles/handsontable.min.css": "./styles/handsontable.min.css",
-    "./styles/ht-theme-gemini.css": "./styles/ht-theme-gemini.css",
-    "./styles/ht-theme-gemini.min.css": "./styles/ht-theme-gemini.min.css",
-    "./styles/ht-theme-main.css": "./styles/ht-theme-main.css",
-    "./styles/ht-theme-main.min.css": "./styles/ht-theme-main.min.css",
     ".": {
       "types": "./index.d.ts",
       "import": "./index.mjs",

package/plugins/comments/commentEditor.js

@@ -25,7 +25,6 @@ var _editor = /*#__PURE__*/new WeakMap();
 var _editorStyle = /*#__PURE__*/new WeakMap();
 var _hidden = /*#__PURE__*/new WeakMap();
 var _resizeObserver = /*#__PURE__*/new WeakMap();
-var _themeClassName = /*#__PURE__*/new WeakMap();
 class CommentEditor {
   static get CLASS_EDITOR_CONTAINER() {
     return 'htCommentsContainer';
@@ -44,7 +43,7 @@ class CommentEditor {
    * @type {Document}
    */
 
-  constructor(rootDocument, isRtl, themeClassName) {
+  constructor(rootDocument, isRtl) {
     var _this = this;
     _classPrivateFieldInitSpec(this, _rootDocument, void 0);
     /**
@@ -71,13 +70,8 @@ class CommentEditor {
      * @type {EditorResizeObserver}
      */
     _classPrivateFieldInitSpec(this, _resizeObserver, new _editorResizeObserver.EditorResizeObserver());
-    /**
-     * @type {string}
-     */
-    _classPrivateFieldInitSpec(this, _themeClassName, void 0);
     _classPrivateFieldSet(_rootDocument, this, rootDocument);
     _classPrivateFieldSet(_isRtl, this, isRtl);
-    _classPrivateFieldSet(_themeClassName, this, themeClassName);
     _classPrivateFieldSet(_editor, this, this.createEditor());
     _classPrivateFieldSet(_editorStyle, this, _classPrivateFieldGet(_editor, this).style);
     _classPrivateFieldGet(_resizeObserver, this).setObservedElement(this.getInputElement());
@@ -229,7 +223,6 @@ class CommentEditor {
     _classPrivateFieldSet(_container, this, _classPrivateFieldGet(_rootDocument, this).createElement('div'));
     _classPrivateFieldGet(_container, this).setAttribute('dir', _classPrivateFieldGet(_isRtl, this) ? 'rtl' : 'ltr');
     (0, _element.addClass)(_classPrivateFieldGet(_container, this), CommentEditor.CLASS_EDITOR_CONTAINER);
-    (0, _element.addClass)(_classPrivateFieldGet(_container, this), _classPrivateFieldGet(_themeClassName, this));
     _classPrivateFieldGet(_rootDocument, this).body.appendChild(_classPrivateFieldGet(_container, this));
     (0, _element.addClass)(editor, CommentEditor.CLASS_EDITOR);
     (0, _element.addClass)(textarea, CommentEditor.CLASS_INPUT);

package/plugins/comments/commentEditor.mjs

@@ -21,7 +21,6 @@ var _editor = /*#__PURE__*/new WeakMap();
 var _editorStyle = /*#__PURE__*/new WeakMap();
 var _hidden = /*#__PURE__*/new WeakMap();
 var _resizeObserver = /*#__PURE__*/new WeakMap();
-var _themeClassName = /*#__PURE__*/new WeakMap();
 class CommentEditor {
   static get CLASS_EDITOR_CONTAINER() {
     return 'htCommentsContainer';
@@ -40,7 +39,7 @@ class CommentEditor {
    * @type {Document}
    */
 
-  constructor(rootDocument, isRtl, themeClassName) {
+  constructor(rootDocument, isRtl) {
     var _this = this;
     _classPrivateFieldInitSpec(this, _rootDocument, void 0);
     /**
@@ -67,13 +66,8 @@ class CommentEditor {
      * @type {EditorResizeObserver}
      */
     _classPrivateFieldInitSpec(this, _resizeObserver, new EditorResizeObserver());
-    /**
-     * @type {string}
-     */
-    _classPrivateFieldInitSpec(this, _themeClassName, void 0);
     _classPrivateFieldSet(_rootDocument, this, rootDocument);
     _classPrivateFieldSet(_isRtl, this, isRtl);
-    _classPrivateFieldSet(_themeClassName, this, themeClassName);
     _classPrivateFieldSet(_editor, this, this.createEditor());
     _classPrivateFieldSet(_editorStyle, this, _classPrivateFieldGet(_editor, this).style);
     _classPrivateFieldGet(_resizeObserver, this).setObservedElement(this.getInputElement());
@@ -225,7 +219,6 @@ class CommentEditor {
     _classPrivateFieldSet(_container, this, _classPrivateFieldGet(_rootDocument, this).createElement('div'));
     _classPrivateFieldGet(_container, this).setAttribute('dir', _classPrivateFieldGet(_isRtl, this) ? 'rtl' : 'ltr');
     addClass(_classPrivateFieldGet(_container, this), CommentEditor.CLASS_EDITOR_CONTAINER);
-    addClass(_classPrivateFieldGet(_container, this), _classPrivateFieldGet(_themeClassName, this));
     _classPrivateFieldGet(_rootDocument, this).body.appendChild(_classPrivateFieldGet(_container, this));
     addClass(editor, CommentEditor.CLASS_EDITOR);
     addClass(textarea, CommentEditor.CLASS_INPUT);

package/plugins/comments/comments.js

@@ -218,7 +218,7 @@ class Comments extends _base.BasePlugin {
       return;
     }
     if (!_classPrivateFieldGet(_editor, this)) {
-      _classPrivateFieldSet(_editor, this, new _commentEditor.default(this.hot.rootDocument, this.hot.isRtl(), this.hot.getSettings().themeName));
+      _classPrivateFieldSet(_editor, this, new _commentEditor.default(this.hot.rootDocument, this.hot.isRtl()));
       _classPrivateFieldGet(_editor, this).addLocalHook('resize', function () {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];

package/plugins/comments/comments.mjs

@@ -214,7 +214,7 @@ export class Comments extends BasePlugin {
       return;
     }
     if (!_classPrivateFieldGet(_editor, this)) {
-      _classPrivateFieldSet(_editor, this, new CommentEditor(this.hot.rootDocument, this.hot.isRtl(), this.hot.getSettings().themeName));
+      _classPrivateFieldSet(_editor, this, new CommentEditor(this.hot.rootDocument, this.hot.isRtl()));
       _classPrivateFieldGet(_editor, this).addLocalHook('resize', function () {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];

package/plugins/contextMenu/menu/menu.js

@@ -579,8 +579,10 @@ class Menu {
       const currentRowHeight = itemCell ? (0, _element.outerHeight)(this.hotMenu.getCell(index, 0)) : 0;
       return accumulator + (value.name === _predefinedItems.SEPARATOR ? 1 : currentRowHeight);
     }, 0);
-    holderStyle.width = `${currentHiderWidth}px`;
-    holderStyle.height = `${realHeight}px`;
+
+    // Additional 3px to menu's size because of additional border around its `table.htCore`.
+    holderStyle.width = `${currentHiderWidth + 3}px`;
+    holderStyle.height = `${realHeight + 3}px`;
     hiderStyle.height = holderStyle.height;
   }
 
@@ -610,10 +612,8 @@ class Menu {
       container = doc.querySelector(`.${this.options.className}.${className}`);
     }
     if (!container) {
-      const themeClassName = this.hot.getSettings().themeName;
       container = doc.createElement('div');
       (0, _element.addClass)(container, `htMenu ${this.options.className}`);
-      (0, _element.addClass)(container, themeClassName);
       if (className) {
         (0, _element.addClass)(container, className);
       }

package/plugins/contextMenu/menu/menu.mjs

@@ -575,8 +575,10 @@ export class Menu {
       const currentRowHeight = itemCell ? outerHeight(this.hotMenu.getCell(index, 0)) : 0;
       return accumulator + (value.name === SEPARATOR ? 1 : currentRowHeight);
     }, 0);
-    holderStyle.width = `${currentHiderWidth}px`;
-    holderStyle.height = `${realHeight}px`;
+
+    // Additional 3px to menu's size because of additional border around its `table.htCore`.
+    holderStyle.width = `${currentHiderWidth + 3}px`;
+    holderStyle.height = `${realHeight + 3}px`;
     hiderStyle.height = holderStyle.height;
   }
 
@@ -606,10 +608,8 @@ export class Menu {
       container = doc.querySelector(`.${this.options.className}.${className}`);
     }
     if (!container) {
-      const themeClassName = this.hot.getSettings().themeName;
       container = doc.createElement('div');
       addClass(container, `htMenu ${this.options.className}`);
-      addClass(container, themeClassName);
       if (className) {
         addClass(container, className);
       }

package/plugins/manualRowMove/manualRowMove.js

@@ -317,7 +317,7 @@ class ManualRowMove extends _base.BasePlugin {
     for (let visualRowIndex = fromRow; visualRowIndex <= toRow; visualRowIndex++) {
       const renderableIndex = rowMapper.getRenderableFromVisualIndex(visualRowIndex);
       if (renderableIndex !== null) {
-        rowsHeight += this.hot.view._wt.wtTable.getRowHeight(renderableIndex) || this.hot.view.getDefaultRowHeight();
+        rowsHeight += this.hot.view._wt.wtTable.getRowHeight(renderableIndex) || 23;
       }
     }
     return rowsHeight;

package/plugins/manualRowMove/manualRowMove.mjs

@@ -313,7 +313,7 @@ export class ManualRowMove extends BasePlugin {
     for (let visualRowIndex = fromRow; visualRowIndex <= toRow; visualRowIndex++) {
       const renderableIndex = rowMapper.getRenderableFromVisualIndex(visualRowIndex);
       if (renderableIndex !== null) {
-        rowsHeight += this.hot.view._wt.wtTable.getRowHeight(renderableIndex) || this.hot.view.getDefaultRowHeight();
+        rowsHeight += this.hot.view._wt.wtTable.getRowHeight(renderableIndex) || 23;
       }
     }
     return rowsHeight;

package/plugins/mergeCells/mergeCells.js

@@ -1491,7 +1491,7 @@ function _onModifyRowHeightByOverlayName(height, row, overlayType) {
  * @returns {number}
  */
 function _sumCellsHeights(row, rowspan) {
-  const defaultHeight = this.hot.view.getDefaultRowHeight();
+  const defaultHeight = this.hot.view._wt.wtSettings.getSettingPure('defaultRowHeight');
   const autoRowSizePlugin = this.hot.getPlugin('autoRowSize');
   let height = 0;
   for (let i = row; i < row + rowspan; i++) {

package/plugins/mergeCells/mergeCells.mjs

@@ -1486,7 +1486,7 @@ function _onModifyRowHeightByOverlayName(height, row, overlayType) {
  * @returns {number}
  */
 function _sumCellsHeights(row, rowspan) {
-  const defaultHeight = this.hot.view.getDefaultRowHeight();
+  const defaultHeight = this.hot.view._wt.wtSettings.getSettingPure('defaultRowHeight');
   const autoRowSizePlugin = this.hot.getPlugin('autoRowSize');
   let height = 0;
   for (let i = row; i < row + rowspan; i++) {

package/plugins/nestedRows/ui/headers.js

@@ -125,9 +125,7 @@ class HeadersUI extends _base.default {
     if (!deepestLevelIndex) {
       deepestLevelIndex = this.dataManager.cache.levelCount;
     }
-    const verticalPadding = this.hot.view.getCSSVariableValue('cell-horizontal-padding');
-    const completeVerticalPadding = this.hot.view.isUsingClassicTheme() ? 11 : verticalPadding * 2;
-    this.rowHeaderWidthCache = Math.max(50, completeVerticalPadding + 10 * deepestLevelIndex + 25);
+    this.rowHeaderWidthCache = Math.max(50, 11 + 10 * deepestLevelIndex + 25);
     this.hot.render();
   }
 }