handsontable 14.6.1 → 15.0.0-next-fdd4480-20241205

package/plugins/base/base.mjs

@@ -1,5 +1,7 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
@@ -8,7 +10,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
-import { defineGetter, objectEach } from "../../helpers/object.mjs";
+import { defineGetter, objectEach, isObject } from "../../helpers/object.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
 import { getPluginsNames, hasPlugin } from "../registry.mjs";
 import { hasCellType } from "../../cellTypes/registry.mjs";
@@ -17,6 +19,7 @@ import { hasRenderer } from "../../renderers/registry.mjs";
 import { hasValidator } from "../../validators/registry.mjs";
 import EventManager from "../../eventManager.mjs";
 const DEPS_TYPE_CHECKERS = new Map([['plugin', hasPlugin], ['cell-type', hasCellType], ['editor', hasEditor], ['renderer', hasRenderer], ['validator', hasValidator]]);
+export const defaultMainSettingSymbol = Symbol('mainSetting');
 export const PLUGIN_KEY = 'base';
 const missingDepsMsgs = [];
 let initializedPlugins = null;
@@ -45,6 +48,15 @@ export class BasePlugin {
     return [this.PLUGIN_KEY];
   }
 
+  /**
+   * The `DEFAULT_SETTINGS` getter defines the plugin default settings.
+   *
+   * @returns {object}
+   */
+  static get DEFAULT_SETTINGS() {
+    return {};
+  }
+
   /**
    * The instance of the {@link EventManager} class.
    *
@@ -145,6 +157,7 @@ export class BasePlugin {
     if (isAllPluginsAreInitialized) {
       if (missingDepsMsgs.length > 0) {
         const errorMsg = [`${missingDepsMsgs.join('\n')}\n`, 'You have to import and register them manually.'].join('');
+        missingDepsMsgs.length = 0;
         throw new Error(errorMsg);
       }
       this.hot.runHooks('afterPluginsInitialized');
@@ -169,6 +182,34 @@ export class BasePlugin {
     this.enabled = false;
   }
 
+  /**
+   * Gets the plugin settings. If there is no setting under the provided key, it returns the default setting
+   * provided by the DEFAULT_SETTINGS static property of the class.
+   *
+   * @param {string} [settingName] The setting name. If the setting name is not provided, it returns
+   * the whole plugin's settings object.
+   * @returns {*}
+   */
+  getSetting(settingName) {
+    const pluginSettings = this.hot.getSettings()[this.constructor.PLUGIN_KEY];
+    if (settingName === undefined) {
+      return pluginSettings;
+    }
+    const defaultSettings = this.constructor.DEFAULT_SETTINGS;
+    if ((Array.isArray(pluginSettings) || isObject(pluginSettings)) && defaultSettings[defaultMainSettingSymbol] === settingName) {
+      var _pluginSettings$setti;
+      if (Array.isArray(pluginSettings)) {
+        return pluginSettings;
+      }
+      return (_pluginSettings$setti = pluginSettings[settingName]) !== null && _pluginSettings$setti !== void 0 ? _pluginSettings$setti : defaultSettings[settingName];
+    }
+    if (isObject(pluginSettings)) {
+      var _pluginSettings$setti2;
+      return (_pluginSettings$setti2 = pluginSettings[settingName]) !== null && _pluginSettings$setti2 !== void 0 ? _pluginSettings$setti2 : defaultSettings[settingName];
+    }
+    return defaultSettings[settingName];
+  }
+
   /**
    * Add listener to plugin hooks system.
    *

package/plugins/base/index.js

@@ -3,4 +3,5 @@
 exports.__esModule = true;
 var _base = require("./base");
 exports.PLUGIN_KEY = _base.PLUGIN_KEY;
-exports.BasePlugin = _base.BasePlugin;
+exports.BasePlugin = _base.BasePlugin;
+exports.defaultMainSettingSymbol = _base.defaultMainSettingSymbol;

package/plugins/base/index.mjs

@@ -1 +1 @@
-export { PLUGIN_KEY, BasePlugin } from "./base.mjs";
+export { PLUGIN_KEY, BasePlugin, defaultMainSettingSymbol } from "./base.mjs";

package/plugins/bindRowsWithHeaders/bindRowsWithHeaders.js

@@ -88,14 +88,11 @@ class BindRowsWithHeaders extends _base.BasePlugin {
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
+    var _bindTypeToMapStrateg;
     if (this.enabled) {
       return;
     }
-    let bindType = this.hot.getSettings()[PLUGIN_KEY];
-    if (typeof bindType !== 'string') {
-      bindType = DEFAULT_BIND;
-    }
-    const MapStrategy = bindTypeToMapStrategy.get(bindType);
+    const MapStrategy = (_bindTypeToMapStrateg = bindTypeToMapStrategy.get(this.getSetting())) !== null && _bindTypeToMapStrateg !== void 0 ? _bindTypeToMapStrateg : bindTypeToMapStrategy.get(DEFAULT_BIND);
     this.headerIndexes = this.hot.rowIndexMapper.registerMap('bindRowsWithHeaders', new MapStrategy());
     this.addHook('modifyRowHeader', row => _assertClassBrand(_BindRowsWithHeaders_brand, this, _onModifyRowHeader).call(this, row));
     super.enablePlugin();

package/plugins/bindRowsWithHeaders/bindRowsWithHeaders.mjs

@@ -84,14 +84,11 @@ export class BindRowsWithHeaders extends BasePlugin {
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
+    var _bindTypeToMapStrateg;
     if (this.enabled) {
       return;
     }
-    let bindType = this.hot.getSettings()[PLUGIN_KEY];
-    if (typeof bindType !== 'string') {
-      bindType = DEFAULT_BIND;
-    }
-    const MapStrategy = bindTypeToMapStrategy.get(bindType);
+    const MapStrategy = (_bindTypeToMapStrateg = bindTypeToMapStrategy.get(this.getSetting())) !== null && _bindTypeToMapStrateg !== void 0 ? _bindTypeToMapStrateg : bindTypeToMapStrategy.get(DEFAULT_BIND);
     this.headerIndexes = this.hot.rowIndexMapper.registerMap('bindRowsWithHeaders', new MapStrategy());
     this.addHook('modifyRowHeader', row => _assertClassBrand(_BindRowsWithHeaders_brand, this, _onModifyRowHeader).call(this, row));
     super.enablePlugin();

package/plugins/columnSorting/columnSorting.js

@@ -3,6 +3,8 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.every.js");
 var _element = require("../../helpers/dom/element");
 var _mixed = require("../../helpers/mixed");
 var _object = require("../../helpers/object");
@@ -10,7 +12,7 @@ var _function = require("../../helpers/function");
 var _array = require("../../helpers/array");
 var _base = require("../base");
 var _translations = require("../../translations");
-var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
+var _hooks = require("../../core/hooks");
 var _columnStatesManager = require("./columnStatesManager");
 var _shortcutContexts = require("../../shortcutContexts");
 var _utils = require("./utils");
@@ -18,7 +20,6 @@ var _domHelpers = require("./domHelpers");
 var _rootComparator = require("./rootComparator");
 var _sortService = require("./sortService");
 var _a11y = require("../../helpers/a11y");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -31,8 +32,8 @@ const APPEND_COLUMN_CONFIG_STRATEGY = exports.APPEND_COLUMN_CONFIG_STRATEGY = 'a
 const REPLACE_COLUMN_CONFIG_STRATEGY = exports.REPLACE_COLUMN_CONFIG_STRATEGY = 'replace';
 const SHORTCUTS_GROUP = PLUGIN_KEY;
 (0, _sortService.registerRootComparator)(PLUGIN_KEY, _rootComparator.rootComparator);
-_pluginHooks.default.getSingleton().register('beforeColumnSort');
-_pluginHooks.default.getSingleton().register('afterColumnSort');
+_hooks.Hooks.getSingleton().register('beforeColumnSort');
+_hooks.Hooks.getSingleton().register('afterColumnSort');
 
 // DIFF - MultiColumnSorting & ColumnSorting: changed configuration documentation.
 /**

package/plugins/columnSorting/columnSorting.mjs

@@ -1,5 +1,7 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.every.js";
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -13,7 +15,7 @@ import { isFunction } from "../../helpers/function.mjs";
 import { arrayMap } from "../../helpers/array.mjs";
 import { BasePlugin } from "../base/index.mjs";
 import { IndexesSequence, PhysicalIndexToValueMap as IndexToValueMap } from "../../translations/index.mjs";
-import Hooks from "../../pluginHooks.mjs";
+import { Hooks } from "../../core/hooks/index.mjs";
 import { ColumnStatesManager } from "./columnStatesManager.mjs";
 import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 import { HEADER_SPAN_CLASS, getNextSortOrder, areValidSortStates, getHeaderSpanElement, isFirstLevelColumnHeader, wasHeaderClickedProperly } from "./utils.mjs";

package/plugins/columnSorting/columnStatesManager.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _object = require("../../helpers/object");
 var _translations = require("../../translations");
 var _mixed = require("../../helpers/mixed");

package/plugins/columnSorting/columnStatesManager.mjs

@@ -1,4 +1,5 @@
 import "core-js/modules/es.error.cause.js";
+import "core-js/modules/esnext.iterator.map.js";
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }

package/plugins/columnSorting/utils.js

@@ -14,6 +14,9 @@ require("core-js/modules/es.set.is-subset-of.v2.js");
 require("core-js/modules/es.set.is-superset-of.v2.js");
 require("core-js/modules/es.set.symmetric-difference.v2.js");
 require("core-js/modules/es.set.union.v2.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.some.js");
 var _moment = _interopRequireDefault(require("moment"));
 var _object = require("../../helpers/object");
 var _event = require("../../helpers/dom/event");

package/plugins/columnSorting/utils.mjs

@@ -5,6 +5,9 @@ import "core-js/modules/es.set.is-subset-of.v2.js";
 import "core-js/modules/es.set.is-superset-of.v2.js";
 import "core-js/modules/es.set.symmetric-difference.v2.js";
 import "core-js/modules/es.set.union.v2.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
+import "core-js/modules/esnext.iterator.some.js";
 import moment from 'moment';
 import { isObject } from "../../helpers/object.mjs";
 import { isRightClick } from "../../helpers/dom/event.mjs";

package/plugins/columnSummary/endpoints.js

@@ -3,6 +3,9 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.some.js");
 var _array = require("../../helpers/array");
 var _console = require("../../helpers/console");
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }

package/plugins/columnSummary/endpoints.mjs

@@ -1,5 +1,8 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
+import "core-js/modules/esnext.iterator.some.js";
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }

package/plugins/comments/commentEditor.js

@@ -241,6 +241,15 @@ class CommentEditor {
     return _classPrivateFieldGet(_editor, this).querySelector(`.${CommentEditor.CLASS_INPUT}`);
   }
 
+  /**
+   * Get the editor element.
+   *
+   * @returns {HTMLElement} The editor element.
+   */
+  getEditorElement() {
+    return _classPrivateFieldGet(_editor, this);
+  }
+
   /**
    * Destroy the comments editor.
    */

package/plugins/comments/commentEditor.mjs

@@ -237,6 +237,15 @@ class CommentEditor {
     return _classPrivateFieldGet(_editor, this).querySelector(`.${CommentEditor.CLASS_INPUT}`);
   }
 
+  /**
+   * Get the editor element.
+   *
+   * @returns {HTMLElement} The editor element.
+   */
+  getEditorElement() {
+    return _classPrivateFieldGet(_editor, this);
+  }
+
   /**
    * Destroy the comments editor.
    */

package/plugins/comments/comments.js

@@ -194,6 +194,11 @@ class Comments extends _base.BasePlugin {
   static get PLUGIN_PRIORITY() {
     return PLUGIN_PRIORITY;
   }
+  static get DEFAULT_SETTINGS() {
+    return {
+      displayDelay: 250
+    };
+  }
   /**
    * Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
    * hook and if it returns `true` then the {@link Comments#enablePlugin} method is called.
@@ -222,13 +227,19 @@ class Comments extends _base.BasePlugin {
       });
     }
     if (!_classPrivateFieldGet(_displaySwitch, this)) {
-      _classPrivateFieldSet(_displaySwitch, this, new _displaySwitch2.default(this.getDisplayDelaySetting()));
+      _classPrivateFieldSet(_displaySwitch, this, new _displaySwitch2.default(this.getSetting('displayDelay')));
     }
     this.addHook('afterContextMenuDefaultOptions', options => this.addToContextMenu(options));
     this.addHook('afterRenderer', (TD, row, col, prop, value, cellProperties) => _assertClassBrand(_Comments_brand, this, _onAfterRenderer).call(this, TD, cellProperties));
     this.addHook('afterScroll', () => _assertClassBrand(_Comments_brand, this, _onAfterScroll).call(this));
     this.addHook('afterBeginEditing', () => this.hide());
     this.addHook('afterDocumentKeyDown', event => _assertClassBrand(_Comments_brand, this, _onAfterDocumentKeyDown).call(this, event));
+    this.addHook('afterSetTheme', function () {
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+      return _assertClassBrand(_Comments_brand, _this, _updateEditorThemeClassName).call(_this, ...args);
+    });
     _classPrivateFieldGet(_displaySwitch, this).addLocalHook('hide', () => this.hide());
     _classPrivateFieldGet(_displaySwitch, this).addLocalHook('show', (row, col) => this.showAtCell(row, col));
     this.registerShortcuts();
@@ -243,7 +254,7 @@ class Comments extends _base.BasePlugin {
    *   - [`comments`](@/api/options.md#comments)
    */
   updatePlugin() {
-    _classPrivateFieldGet(_displaySwitch, this).updateDelay(this.getDisplayDelaySetting());
+    _classPrivateFieldGet(_displaySwitch, this).updateDelay(this.getSetting('displayDelay'));
     super.updatePlugin();
   }
 
@@ -282,7 +293,7 @@ class Comments extends _base.BasePlugin {
       stopPropagation: true,
       runOnlyIf: () => {
         var _this$hot$getSelected;
-        return ((_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isCell()) && !_classPrivateFieldGet(_editor, this).isVisible();
+        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isCell();
       },
       group: SHORTCUTS_GROUP
     });
@@ -570,7 +581,7 @@ class Comments extends _base.BasePlugin {
     } else {
       _classPrivateFieldGet(_editor, this).resetSize();
     }
-    const lastColWidth = isBeforeRenderedColumns ? 0 : wtTable.getStretchedColumnWidth(renderableColumn);
+    const lastColWidth = isBeforeRenderedColumns ? 0 : wtTable.getColumnWidth(renderableColumn);
     const lastRowHeight = targetingPreviousRow && !isBeforeRenderedRows ? (0, _element.outerHeight)(TD) : 0;
     const {
       left,
@@ -660,19 +671,6 @@ class Comments extends _base.BasePlugin {
     }, (0, _addEditComment.default)(this), (0, _removeComment.default)(this), (0, _readOnlyComment.default)(this));
   }
 
-  /**
-   * Get `displayDelay` setting of comment plugin.
-   *
-   * @private
-   * @returns {number|undefined}
-   */
-  getDisplayDelaySetting() {
-    const commentSetting = this.hot.getSettings()[PLUGIN_KEY];
-    if ((0, _object.isObject)(commentSetting)) {
-      return commentSetting.displayDelay;
-    }
-  }
-
   /**
    * Gets the editors input element.
    *
@@ -785,7 +783,7 @@ function _onEditorResize(width, height) {
  * @param {Event} event The keydown event.
  */
 function _onAfterDocumentKeyDown(event) {
-  if (_classPrivateFieldGet(_editor, this).isVisible()) {
+  if (_classPrivateFieldGet(_editor, this).isFocused()) {
     (0, _event.stopImmediatePropagation)(event);
   }
 }
@@ -796,4 +794,12 @@ function _onAfterScroll() {
   if (!_classPrivateFieldGet(_preventEditorHiding, this)) {
     this.hide();
   }
+}
+/**
+ * Updates the editor theme class name.
+ */
+function _updateEditorThemeClassName() {
+  const editorElement = _classPrivateFieldGet(_editor, this).getEditorElement();
+  (0, _element.removeClass)(editorElement, /ht-theme-.*/g);
+  (0, _element.addClass)(editorElement, this.hot.getCurrentThemeName());
 }

package/plugins/comments/comments.mjs

@@ -9,9 +9,9 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
-import { addClass, closest, isChildOf, hasClass, outerHeight } from "../../helpers/dom/element.mjs";
+import { addClass, removeClass, closest, isChildOf, hasClass, outerHeight } from "../../helpers/dom/element.mjs";
 import { stopImmediatePropagation } from "../../helpers/dom/event.mjs";
-import { deepClone, deepExtend, isObject } from "../../helpers/object.mjs";
+import { deepClone, deepExtend } from "../../helpers/object.mjs";
 import { BasePlugin } from "../base/index.mjs";
 import CommentEditor from "./commentEditor.mjs";
 import DisplaySwitch from "./displaySwitch.mjs";
@@ -190,6 +190,11 @@ export class Comments extends BasePlugin {
   static get PLUGIN_PRIORITY() {
     return PLUGIN_PRIORITY;
   }
+  static get DEFAULT_SETTINGS() {
+    return {
+      displayDelay: 250
+    };
+  }
   /**
    * Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
    * hook and if it returns `true` then the {@link Comments#enablePlugin} method is called.
@@ -218,13 +223,19 @@ export class Comments extends BasePlugin {
       });
     }
     if (!_classPrivateFieldGet(_displaySwitch, this)) {
-      _classPrivateFieldSet(_displaySwitch, this, new DisplaySwitch(this.getDisplayDelaySetting()));
+      _classPrivateFieldSet(_displaySwitch, this, new DisplaySwitch(this.getSetting('displayDelay')));
     }
     this.addHook('afterContextMenuDefaultOptions', options => this.addToContextMenu(options));
     this.addHook('afterRenderer', (TD, row, col, prop, value, cellProperties) => _assertClassBrand(_Comments_brand, this, _onAfterRenderer).call(this, TD, cellProperties));
     this.addHook('afterScroll', () => _assertClassBrand(_Comments_brand, this, _onAfterScroll).call(this));
     this.addHook('afterBeginEditing', () => this.hide());
     this.addHook('afterDocumentKeyDown', event => _assertClassBrand(_Comments_brand, this, _onAfterDocumentKeyDown).call(this, event));
+    this.addHook('afterSetTheme', function () {
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+      return _assertClassBrand(_Comments_brand, _this, _updateEditorThemeClassName).call(_this, ...args);
+    });
     _classPrivateFieldGet(_displaySwitch, this).addLocalHook('hide', () => this.hide());
     _classPrivateFieldGet(_displaySwitch, this).addLocalHook('show', (row, col) => this.showAtCell(row, col));
     this.registerShortcuts();
@@ -239,7 +250,7 @@ export class Comments extends BasePlugin {
    *   - [`comments`](@/api/options.md#comments)
    */
   updatePlugin() {
-    _classPrivateFieldGet(_displaySwitch, this).updateDelay(this.getDisplayDelaySetting());
+    _classPrivateFieldGet(_displaySwitch, this).updateDelay(this.getSetting('displayDelay'));
     super.updatePlugin();
   }
 
@@ -278,7 +289,7 @@ export class Comments extends BasePlugin {
       stopPropagation: true,
       runOnlyIf: () => {
         var _this$hot$getSelected;
-        return ((_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isCell()) && !_classPrivateFieldGet(_editor, this).isVisible();
+        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isCell();
       },
       group: SHORTCUTS_GROUP
     });
@@ -566,7 +577,7 @@ export class Comments extends BasePlugin {
     } else {
       _classPrivateFieldGet(_editor, this).resetSize();
     }
-    const lastColWidth = isBeforeRenderedColumns ? 0 : wtTable.getStretchedColumnWidth(renderableColumn);
+    const lastColWidth = isBeforeRenderedColumns ? 0 : wtTable.getColumnWidth(renderableColumn);
     const lastRowHeight = targetingPreviousRow && !isBeforeRenderedRows ? outerHeight(TD) : 0;
     const {
       left,
@@ -656,19 +667,6 @@ export class Comments extends BasePlugin {
     }, addEditCommentItem(this), removeCommentItem(this), readOnlyCommentItem(this));
   }
 
-  /**
-   * Get `displayDelay` setting of comment plugin.
-   *
-   * @private
-   * @returns {number|undefined}
-   */
-  getDisplayDelaySetting() {
-    const commentSetting = this.hot.getSettings()[PLUGIN_KEY];
-    if (isObject(commentSetting)) {
-      return commentSetting.displayDelay;
-    }
-  }
-
   /**
    * Gets the editors input element.
    *
@@ -780,7 +778,7 @@ function _onEditorResize(width, height) {
  * @param {Event} event The keydown event.
  */
 function _onAfterDocumentKeyDown(event) {
-  if (_classPrivateFieldGet(_editor, this).isVisible()) {
+  if (_classPrivateFieldGet(_editor, this).isFocused()) {
     stopImmediatePropagation(event);
   }
 }
@@ -791,4 +789,12 @@ function _onAfterScroll() {
   if (!_classPrivateFieldGet(_preventEditorHiding, this)) {
     this.hide();
   }
+}
+/**
+ * Updates the editor theme class name.
+ */
+function _updateEditorThemeClassName() {
+  const editorElement = _classPrivateFieldGet(_editor, this).getEditorElement();
+  removeClass(editorElement, /ht-theme-.*/g);
+  addClass(editorElement, this.hot.getCurrentThemeName());
 }

package/plugins/comments/editorResizeObserver.js

@@ -2,6 +2,8 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 var _object = require("../../helpers/object");
 var _localHooks = _interopRequireDefault(require("../../mixins/localHooks"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/plugins/comments/editorResizeObserver.mjs

@@ -1,4 +1,6 @@
 import "core-js/modules/es.error.cause.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }

package/plugins/contextMenu/contextMenu.d.ts

@@ -49,7 +49,8 @@ export interface SubmenuItemConfig extends Omit<MenuItemConfig, "key"> {
 
 export interface DetailedSettings {
   callback?: (key: string, selection: Selection[], clickEvent: MouseEvent) => void;
-  items: PredefinedMenuItemKey[] | MenuConfig;
+  uiContainer?: HTMLElement,
+  items?: PredefinedMenuItemKey[] | MenuConfig;
 }
 
 export type Settings = boolean | PredefinedMenuItemKey[] | DetailedSettings;

package/plugins/contextMenu/contextMenu.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 var _base = require("../base");
-var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
+var _hooks = require("../../core/hooks");
 var _array = require("../../helpers/array");
 var _object = require("../../helpers/object");
 var _commandExecutor = require("./commandExecutor");
@@ -12,7 +12,6 @@ var _menu = require("./menu");
 var _utils = require("./utils");
 var _element = require("../../helpers/dom/element");
 var _predefinedItems = require("./predefinedItems");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -22,11 +21,11 @@ function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.h
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'contextMenu';
 const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 70;
 const SHORTCUTS_GROUP = PLUGIN_KEY;
-_pluginHooks.default.getSingleton().register('afterContextMenuDefaultOptions');
-_pluginHooks.default.getSingleton().register('beforeContextMenuShow');
-_pluginHooks.default.getSingleton().register('afterContextMenuShow');
-_pluginHooks.default.getSingleton().register('afterContextMenuHide');
-_pluginHooks.default.getSingleton().register('afterContextMenuExecute');
+_hooks.Hooks.getSingleton().register('afterContextMenuDefaultOptions');
+_hooks.Hooks.getSingleton().register('beforeContextMenuShow');
+_hooks.Hooks.getSingleton().register('afterContextMenuShow');
+_hooks.Hooks.getSingleton().register('afterContextMenuHide');
+_hooks.Hooks.getSingleton().register('afterContextMenuExecute');
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 /**

package/plugins/contextMenu/contextMenu.mjs

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import { BasePlugin } from "../base/index.mjs";
-import Hooks from "../../pluginHooks.mjs";
+import { Hooks } from "../../core/hooks/index.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
 import { objectEach } from "../../helpers/object.mjs";
 import { CommandExecutor } from "./commandExecutor.mjs";

package/plugins/contextMenu/menu/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 exports.__esModule = true;
 var _menu = require("./menu");
 Object.keys(_menu).forEach(function (key) {

package/plugins/contextMenu/menu/menu.js

@@ -57,7 +57,7 @@ class Menu {
    */
   get tableBorderWidth() {
     if (_classPrivateFieldGet(_tableBorderWidth, this) === undefined && this.hotMenu) {
-      _classPrivateFieldSet(_tableBorderWidth, this, parseInt((0, _element.getComputedStyle)(this.hotMenu.view._wt.wtTable.TABLE).borderWidth, 10));
+      _classPrivateFieldSet(_tableBorderWidth, this, parseInt(this.hotMenu.rootWindow.getComputedStyle(this.hotMenu.view._wt.wtTable.TABLE).borderWidth, 10));
     }
     return _classPrivateFieldGet(_tableBorderWidth, this);
   }
@@ -162,6 +162,12 @@ class Menu {
         return _this.parentMenu.runLocalHooks('afterSelectionChange', ...args);
       });
     }
+    this.hot.addHook('afterSetTheme', (themeName, firstRun) => {
+      if (!firstRun) {
+        var _this$hotMenu;
+        (_this$hotMenu = this.hotMenu) === null || _this$hotMenu === void 0 || _this$hotMenu.useTheme(themeName);
+      }
+    });
   }
 
   /**
@@ -286,6 +292,7 @@ class Menu {
       disableVisualSelection: 'area',
       layoutDirection: this.hot.isRtl() ? 'rtl' : 'ltr',
       ariaTags: false,
+      themeName: this.hot.getCurrentThemeName(),
       beforeOnCellMouseOver: (event, coords) => {
         _classPrivateFieldGet(_navigator, this).setCurrentPage(coords.row);
       },
@@ -579,10 +586,8 @@ class Menu {
       const currentRowHeight = itemCell ? (0, _element.outerHeight)(this.hotMenu.getCell(index, 0)) : 0;
       return accumulator + (value.name === _predefinedItems.SEPARATOR ? 1 : currentRowHeight);
     }, 0);
-
-    // Additional 3px to menu's size because of additional border around its `table.htCore`.
-    holderStyle.width = `${currentHiderWidth + 3}px`;
-    holderStyle.height = `${realHeight + 3}px`;
+    holderStyle.width = `${currentHiderWidth}px`;
+    holderStyle.height = `${realHeight}px`;
     hiderStyle.height = holderStyle.height;
   }