handsontable 0.0.0-next-bfb0e3a-20240403 → 0.0.0-next-5a535ed-20240403

package/plugins/contextMenu/contextMenu.mjs

@@ -4,7 +4,7 @@ function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollect
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(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); }
-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"); }
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 import { BasePlugin } from "../base/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
@@ -48,16 +48,31 @@ Hooks.getSingleton().register('afterContextMenuExecute');
  *
  * @plugin ContextMenu
  */
-var _ContextMenu_brand = /*#__PURE__*/new WeakSet();
+var _onAfterOnCellContextMenu = /*#__PURE__*/new WeakSet();
+var _onMenuBeforeOpen = /*#__PURE__*/new WeakSet();
+var _onMenuAfterOpen = /*#__PURE__*/new WeakSet();
+var _onMenuAfterClose = /*#__PURE__*/new WeakSet();
 export class ContextMenu extends BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * On menu after close listener.
+     */
+    _classPrivateMethodInitSpec(this, _onMenuAfterClose);
+    /**
+     * On menu after open listener.
+     */
+    _classPrivateMethodInitSpec(this, _onMenuAfterOpen);
+    /**
+     * On menu before open listener.
+     */
+    _classPrivateMethodInitSpec(this, _onMenuBeforeOpen);
     /**
      * On contextmenu listener.
      *
      * @param {Event} event The mouse event object.
      */
-    _classPrivateMethodInitSpec(this, _ContextMenu_brand);
+    _classPrivateMethodInitSpec(this, _onAfterOnCellContextMenu);
     /**
      * Instance of {@link CommandExecutor}.
      *
@@ -125,16 +140,16 @@ export class ContextMenu extends BasePlugin {
       keepInViewport: true,
       container: settings.uiContainer || this.hot.rootDocument.body
     });
-    this.menu.addLocalHook('beforeOpen', () => _assertClassBrand(_ContextMenu_brand, this, _onMenuBeforeOpen).call(this));
-    this.menu.addLocalHook('afterOpen', () => _assertClassBrand(_ContextMenu_brand, this, _onMenuAfterOpen).call(this));
-    this.menu.addLocalHook('afterClose', () => _assertClassBrand(_ContextMenu_brand, this, _onMenuAfterClose).call(this));
+    this.menu.addLocalHook('beforeOpen', () => _classPrivateMethodGet(this, _onMenuBeforeOpen, _onMenuBeforeOpen2).call(this));
+    this.menu.addLocalHook('afterOpen', () => _classPrivateMethodGet(this, _onMenuAfterOpen, _onMenuAfterOpen2).call(this));
+    this.menu.addLocalHook('afterClose', () => _classPrivateMethodGet(this, _onMenuAfterClose, _onMenuAfterClose2).call(this));
     this.menu.addLocalHook('executeCommand', function () {
       for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
         params[_key] = arguments[_key];
       }
       return _this.executeCommand.call(_this, ...params);
     });
-    this.addHook('afterOnCellContextMenu', event => _assertClassBrand(_ContextMenu_brand, this, _onAfterOnCellContextMenu).call(this, event));
+    this.addHook('afterOnCellContextMenu', event => _classPrivateMethodGet(this, _onAfterOnCellContextMenu, _onAfterOnCellContextMenu2).call(this, event));
     this.registerShortcuts();
     super.enablePlugin();
   }
@@ -321,7 +336,7 @@ export class ContextMenu extends BasePlugin {
     super.destroy();
   }
 }
-function _onAfterOnCellContextMenu(event) {
+function _onAfterOnCellContextMenu2(event) {
   const settings = this.hot.getSettings();
   const showRowHeaders = settings.rowHeaders;
   const showColHeaders = settings.colHeaders;
@@ -352,22 +367,13 @@ function _onAfterOnCellContextMenu(event) {
     left: event.clientX + offset.left
   });
 }
-/**
- * On menu before open listener.
- */
-function _onMenuBeforeOpen() {
+function _onMenuBeforeOpen2() {
   this.hot.runHooks('beforeContextMenuShow', this);
 }
-/**
- * On menu after open listener.
- */
-function _onMenuAfterOpen() {
+function _onMenuAfterOpen2() {
   this.hot.runHooks('afterContextMenuShow', this);
 }
-/**
- * On menu after close listener.
- */
-function _onMenuAfterClose() {
+function _onMenuAfterClose2() {
   this.hot.listen();
   this.hot.runHooks('afterContextMenuHide', this);
 }

package/plugins/contextMenu/itemsFactory.js

@@ -1,8 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.error.cause.js");
 var _object = require("../../helpers/object");
 var _array = require("../../helpers/array");
 var _predefinedItems = require("./predefinedItems");

package/plugins/contextMenu/itemsFactory.mjs

@@ -1,5 +1,5 @@
-import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.error.cause.js";
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(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/contextMenu/menu/defaultShortcutsList.js

@@ -9,26 +9,10 @@ exports.createDefaultShortcutsList = createDefaultShortcutsList;
  * @returns {KeyboardShortcut[]}
  */
 function createDefaultShortcutsList(menu) {
-  const {
-    hot,
-    hotMenu
-  } = menu;
   return [{
-    keys: [['Control/Meta', 'A']],
-    forwardToContext: hot.getShortcutManager().getContext('grid'),
+    keys: [['Tab'], ['Shift', 'Tab'], ['Control/Meta', 'A']],
+    forwardToContext: menu.hot.getShortcutManager().getContext('grid'),
     callback: () => menu.close(true)
-  }, {
-    keys: [['Tab'], ['Shift', 'Tab']],
-    callback: (event, keys) => {
-      const settings = hot.getSettings();
-      const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-      if (keys.includes('shift')) {
-        hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
-      } else {
-        hot.selection.transformStart(tabMoves.row, tabMoves.col);
-      }
-      menu.close(true);
-    }
   }, {
     keys: [['Escape']],
     callback: () => menu.close()
@@ -41,7 +25,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['ArrowRight']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (selection) {
         const subMenu = menu.openSubMenu(selection[0]);
         if (subMenu) {
@@ -52,7 +36,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['ArrowLeft']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (selection && menu.isSubMenu()) {
         menu.close();
         if (menu.isSubMenu()) {
@@ -69,11 +53,11 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['Enter'], ['Space']],
     callback: event => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (!selection) {
         return;
       }
-      if (hotMenu.getSourceDataAtRow(selection[0]).submenu) {
+      if (menu.hotMenu.getSourceDataAtRow(selection[0]).submenu) {
         menu.openSubMenu(selection[0]).getNavigator().toFirstItem();
       } else {
         menu.executeCommand(event);
@@ -83,9 +67,9 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageUp']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (selection) {
-        hotMenu.selection.transformStart(-hotMenu.countVisibleRows(), 0);
+        menu.hotMenu.selection.transformStart(-menu.hotMenu.countVisibleRows(), 0);
       } else {
         menu.getNavigator().toFirstItem();
       }
@@ -93,9 +77,9 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageDown']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (selection) {
-        hotMenu.selection.transformStart(hotMenu.countVisibleRows(), 0);
+        menu.hotMenu.selection.transformStart(menu.hotMenu.countVisibleRows(), 0);
       } else {
         menu.getNavigator().toLastItem();
       }

package/plugins/contextMenu/menu/defaultShortcutsList.mjs

@@ -5,26 +5,10 @@
  * @returns {KeyboardShortcut[]}
  */
 export function createDefaultShortcutsList(menu) {
-  const {
-    hot,
-    hotMenu
-  } = menu;
   return [{
-    keys: [['Control/Meta', 'A']],
-    forwardToContext: hot.getShortcutManager().getContext('grid'),
+    keys: [['Tab'], ['Shift', 'Tab'], ['Control/Meta', 'A']],
+    forwardToContext: menu.hot.getShortcutManager().getContext('grid'),
     callback: () => menu.close(true)
-  }, {
-    keys: [['Tab'], ['Shift', 'Tab']],
-    callback: (event, keys) => {
-      const settings = hot.getSettings();
-      const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-      if (keys.includes('shift')) {
-        hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
-      } else {
-        hot.selection.transformStart(tabMoves.row, tabMoves.col);
-      }
-      menu.close(true);
-    }
   }, {
     keys: [['Escape']],
     callback: () => menu.close()
@@ -37,7 +21,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['ArrowRight']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (selection) {
         const subMenu = menu.openSubMenu(selection[0]);
         if (subMenu) {
@@ -48,7 +32,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['ArrowLeft']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (selection && menu.isSubMenu()) {
         menu.close();
         if (menu.isSubMenu()) {
@@ -65,11 +49,11 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['Enter'], ['Space']],
     callback: event => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (!selection) {
         return;
       }
-      if (hotMenu.getSourceDataAtRow(selection[0]).submenu) {
+      if (menu.hotMenu.getSourceDataAtRow(selection[0]).submenu) {
         menu.openSubMenu(selection[0]).getNavigator().toFirstItem();
       } else {
         menu.executeCommand(event);
@@ -79,9 +63,9 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageUp']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (selection) {
-        hotMenu.selection.transformStart(-hotMenu.countVisibleRows(), 0);
+        menu.hotMenu.selection.transformStart(-menu.hotMenu.countVisibleRows(), 0);
       } else {
         menu.getNavigator().toFirstItem();
       }
@@ -89,9 +73,9 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageDown']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = menu.hotMenu.getSelectedLast();
       if (selection) {
-        hotMenu.selection.transformStart(hotMenu.countVisibleRows(), 0);
+        menu.hotMenu.selection.transformStart(menu.hotMenu.countVisibleRows(), 0);
       } else {
         menu.getNavigator().toLastItem();
       }

package/plugins/contextMenu/menu/menu.js

@@ -1,7 +1,7 @@
 "use strict";
 
-exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
+exports.__esModule = true;
 require("core-js/modules/es.array.push.js");
 var _positioner = require("./positioner");
 var _navigator2 = require("./navigator");
@@ -25,9 +25,11 @@ function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollect
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(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); }
-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"); }
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 const MIN_WIDTH = 215;
 
 /**
@@ -113,13 +115,19 @@ class Menu {
      *
      * @type {Paginator}
      */
-    _classPrivateFieldInitSpec(this, _navigator, void 0);
+    _classPrivateFieldInitSpec(this, _navigator, {
+      writable: true,
+      value: void 0
+    });
     /**
      * The controller module that allows extending the keyboard shortcuts for the menu.
      *
      * @type {KeyboardShortcutsMenuController}
      */
-    _classPrivateFieldInitSpec(this, _shortcutsCtrl, void 0);
+    _classPrivateFieldInitSpec(this, _shortcutsCtrl, {
+      writable: true,
+      value: void 0
+    });
     this.hot = hotInstance;
     this.options = options || {
       parent: null,
@@ -173,7 +181,7 @@ class Menu {
    * @returns {Paginator | undefined}
    */
   getNavigator() {
-    return _classPrivateFieldGet(_navigator, this);
+    return _classPrivateFieldGet(this, _navigator);
   }
 
   /**
@@ -182,7 +190,7 @@ class Menu {
    * @returns {KeyboardShortcutsMenuController | undefined}
    */
   getKeyboardShortcutsCtrl() {
-    return _classPrivateFieldGet(_shortcutsCtrl, this);
+    return _classPrivateFieldGet(this, _shortcutsCtrl);
   }
 
   /**
@@ -266,7 +274,7 @@ class Menu {
       layoutDirection: this.hot.isRtl() ? 'rtl' : 'ltr',
       ariaTags: false,
       beforeOnCellMouseOver: (event, coords) => {
-        _classPrivateFieldGet(_navigator, this).setCurrentPage(coords.row);
+        _classPrivateFieldGet(this, _navigator).setCurrentPage(coords.row);
       },
       afterOnCellMouseOver: (event, coords) => {
         if (this.isAllSubMenusClosed()) {
@@ -328,9 +336,9 @@ class Menu {
     this.hotMenu = new this.hot.constructor(this.container, settings);
     this.hotMenu.addHook('afterInit', () => this.onAfterInit());
     this.hotMenu.init();
-    _classPrivateFieldSet(_navigator, this, (0, _navigator2.createMenuNavigator)(this.hotMenu));
-    _classPrivateFieldSet(_shortcutsCtrl, this, (0, _shortcuts.createKeyboardShortcutsCtrl)(this));
-    _classPrivateFieldGet(_shortcutsCtrl, this).listen();
+    _classPrivateFieldSet(this, _navigator, (0, _navigator2.createMenuNavigator)(this.hotMenu));
+    _classPrivateFieldSet(this, _shortcutsCtrl, (0, _shortcuts.createKeyboardShortcutsCtrl)(this));
+    _classPrivateFieldGet(this, _shortcutsCtrl).listen();
     this.focus();
     if (this.isSubMenu()) {
       this.addLocalHook('afterOpen', () => this.parentMenu.runLocalHooks('afterSubmenuOpen', this));
@@ -351,7 +359,7 @@ class Menu {
     if (closeParent && this.isSubMenu()) {
       this.parentMenu.close();
     } else {
-      _classPrivateFieldGet(_navigator, this).clear();
+      _classPrivateFieldGet(this, _navigator).clear();
       this.closeAllSubMenus();
       this.container.style.display = 'none';
       this.hotMenu.destroy();

package/plugins/contextMenu/menu/menu.mjs

@@ -1,13 +1,15 @@
-import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.error.cause.js";
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(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); }
-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"); }
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 import { Positioner } from "./positioner.mjs";
 import { createMenuNavigator } from "./navigator.mjs";
 import { createKeyboardShortcutsCtrl } from "./shortcuts.mjs";
@@ -109,13 +111,19 @@ export class Menu {
      *
      * @type {Paginator}
      */
-    _classPrivateFieldInitSpec(this, _navigator, void 0);
+    _classPrivateFieldInitSpec(this, _navigator, {
+      writable: true,
+      value: void 0
+    });
     /**
      * The controller module that allows extending the keyboard shortcuts for the menu.
      *
      * @type {KeyboardShortcutsMenuController}
      */
-    _classPrivateFieldInitSpec(this, _shortcutsCtrl, void 0);
+    _classPrivateFieldInitSpec(this, _shortcutsCtrl, {
+      writable: true,
+      value: void 0
+    });
     this.hot = hotInstance;
     this.options = options || {
       parent: null,
@@ -169,7 +177,7 @@ export class Menu {
    * @returns {Paginator | undefined}
    */
   getNavigator() {
-    return _classPrivateFieldGet(_navigator, this);
+    return _classPrivateFieldGet(this, _navigator);
   }
 
   /**
@@ -178,7 +186,7 @@ export class Menu {
    * @returns {KeyboardShortcutsMenuController | undefined}
    */
   getKeyboardShortcutsCtrl() {
-    return _classPrivateFieldGet(_shortcutsCtrl, this);
+    return _classPrivateFieldGet(this, _shortcutsCtrl);
   }
 
   /**
@@ -262,7 +270,7 @@ export class Menu {
       layoutDirection: this.hot.isRtl() ? 'rtl' : 'ltr',
       ariaTags: false,
       beforeOnCellMouseOver: (event, coords) => {
-        _classPrivateFieldGet(_navigator, this).setCurrentPage(coords.row);
+        _classPrivateFieldGet(this, _navigator).setCurrentPage(coords.row);
       },
       afterOnCellMouseOver: (event, coords) => {
         if (this.isAllSubMenusClosed()) {
@@ -324,9 +332,9 @@ export class Menu {
     this.hotMenu = new this.hot.constructor(this.container, settings);
     this.hotMenu.addHook('afterInit', () => this.onAfterInit());
     this.hotMenu.init();
-    _classPrivateFieldSet(_navigator, this, createMenuNavigator(this.hotMenu));
-    _classPrivateFieldSet(_shortcutsCtrl, this, createKeyboardShortcutsCtrl(this));
-    _classPrivateFieldGet(_shortcutsCtrl, this).listen();
+    _classPrivateFieldSet(this, _navigator, createMenuNavigator(this.hotMenu));
+    _classPrivateFieldSet(this, _shortcutsCtrl, createKeyboardShortcutsCtrl(this));
+    _classPrivateFieldGet(this, _shortcutsCtrl).listen();
     this.focus();
     if (this.isSubMenu()) {
       this.addLocalHook('afterOpen', () => this.parentMenu.runLocalHooks('afterSubmenuOpen', this));
@@ -347,7 +355,7 @@ export class Menu {
     if (closeParent && this.isSubMenu()) {
       this.parentMenu.close();
     } else {
-      _classPrivateFieldGet(_navigator, this).clear();
+      _classPrivateFieldGet(this, _navigator).clear();
       this.closeAllSubMenus();
       this.container.style.display = 'none';
       this.hotMenu.destroy();