handsontable 0.0.0-next-9059914-20231025 → 0.0.0-next-cecf979-20231026

package/plugins/copyPaste/copyPaste.mjs

@@ -6,9 +6,9 @@ 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(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
 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 _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; } }
@@ -17,16 +17,17 @@ import Hooks from "../../pluginHooks.mjs";
 import { stringify, parse } from "../../3rdparty/SheetClip/index.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
 import { sanitize } from "../../helpers/string.mjs";
-import { getSelectionText } from "../../helpers/dom/element.mjs";
+import { removeContentEditableFromElementAndDeselect, runWithSelectedContendEditableElement, makeElementContentEditableAndSelectItsContent } from "../../helpers/dom/element.mjs";
+import { isSafari } from "../../helpers/browser.mjs";
 import copyItem from "./contextMenuItem/copy.mjs";
 import copyColumnHeadersOnlyItem from "./contextMenuItem/copyColumnHeadersOnly.mjs";
 import copyWithColumnGroupHeadersItem from "./contextMenuItem/copyWithColumnGroupHeaders.mjs";
 import copyWithColumnHeadersItem from "./contextMenuItem/copyWithColumnHeaders.mjs";
 import cutItem from "./contextMenuItem/cut.mjs";
 import PasteEvent from "./pasteEvent.mjs";
-import { createElement, destroyElement } from "./focusableElement.mjs";
 import { CopyableRangesFactory, normalizeRanges } from "./copyableRanges.mjs";
 import { _dataToHTML, htmlToGridSettings } from "../../utils/parseTable.mjs";
+import EventManager from "../../eventManager.mjs";
 Hooks.getSingleton().register('afterCopyLimit');
 Hooks.getSingleton().register('modifyCopyableRange');
 Hooks.getSingleton().register('beforeCut');
@@ -82,10 +83,21 @@ var _copyMode = /*#__PURE__*/new WeakMap();
 var _isTriggeredByCopy = /*#__PURE__*/new WeakMap();
 var _isTriggeredByCut = /*#__PURE__*/new WeakMap();
 var _copyableRangesFactory = /*#__PURE__*/new WeakMap();
+var _ensureClipboardEventsGetTriggered = /*#__PURE__*/new WeakSet();
 var _countCopiedHeaders = /*#__PURE__*/new WeakSet();
+var _addContentEditableToHighlightedCell = /*#__PURE__*/new WeakSet();
+var _removeContentEditableFromHighlightedCell = /*#__PURE__*/new WeakSet();
 export class CopyPaste extends BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Remove the `contenteditable` attribute from the highlighted cell and deselect its content.
+     */
+    _classPrivateMethodInitSpec(this, _removeContentEditableFromHighlightedCell);
+    /**
+     * Add the `contenteditable` attribute to the highlighted cell and select its content.
+     */
+    _classPrivateMethodInitSpec(this, _addContentEditableToHighlightedCell);
     /**
      * Counts how many column headers will be copied based on the passed range.
      *
@@ -95,6 +107,12 @@ export class CopyPaste extends BasePlugin {
      *                                           information with the number of copied headers.
      */
     _classPrivateMethodInitSpec(this, _countCopiedHeaders);
+    /**
+     * Ensure that the `copy`/`cut` events get triggered properly in Safari.
+     *
+     * @param {string} eventName Name of the event to get triggered.
+     */
+    _classPrivateMethodInitSpec(this, _ensureClipboardEventsGetTriggered);
     /**
      * The maximum number of columns than can be copied to the clipboard.
      *
@@ -212,13 +230,6 @@ export class CopyPaste extends BasePlugin {
      * @type {Array<{startRow: number, startCol: number, endRow: number, endCol: number}>}
      */
     _defineProperty(this, "copyableRanges", []);
-    /**
-     * Provides focusable element to support IME and copy/paste/cut actions.
-     *
-     * @private
-     * @type {FocusableWrapper}
-     */
-    _defineProperty(this, "focusableElement", void 0);
   }
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
@@ -245,6 +256,7 @@ export class CopyPaste extends BasePlugin {
    * Enables the [`CopyPaste`](#copypaste) plugin for your Handsontable instance.
    */
   enablePlugin() {
+    var _this = this;
     if (this.enabled) {
       return;
     }
@@ -262,11 +274,28 @@ export class CopyPaste extends BasePlugin {
       this.uiContainer = (_settings$uiContainer = settings.uiContainer) !== null && _settings$uiContainer !== void 0 ? _settings$uiContainer : this.uiContainer;
     }
     this.addHook('afterContextMenuDefaultOptions', options => this.onAfterContextMenuDefaultOptions(options));
-    this.addHook('afterOnCellMouseUp', () => this.onAfterOnCellMouseUp());
     this.addHook('afterSelectionEnd', () => this.onAfterSelectionEnd());
-    this.addHook('beforeKeyDown', () => this.onBeforeKeyDown());
-    this.focusableElement = createElement(this.uiContainer);
-    this.focusableElement.addLocalHook('copy', event => this.onCopy(event)).addLocalHook('cut', event => this.onCut(event)).addLocalHook('paste', event => this.onPaste(event));
+    this.eventManager = new EventManager(this);
+    this.eventManager.addEventListener(this.hot.rootDocument, 'copy', function () {
+      return _this.onCopy(...arguments);
+    });
+    this.eventManager.addEventListener(this.hot.rootDocument, 'cut', function () {
+      return _this.onCut(...arguments);
+    });
+    this.eventManager.addEventListener(this.hot.rootDocument, 'paste', function () {
+      return _this.onPaste(...arguments);
+    });
+
+    // Without this workaround Safari (tested on Safari@16.5.2) does allow copying/cutting from the browser menu.
+    if (isSafari()) {
+      this.eventManager.addEventListener(this.hot.rootDocument.body, 'mouseenter', function () {
+        return _this.onSafariMouseEnter(...arguments);
+      });
+      this.eventManager.addEventListener(this.hot.rootDocument.body, 'mouseleave', function () {
+        return _this.onSafariMouseLeave(...arguments);
+      });
+      this.addHook('afterSelection', () => this.onSafariAfterSelection());
+    }
     super.enablePlugin();
   }
 
@@ -281,7 +310,6 @@ export class CopyPaste extends BasePlugin {
   updatePlugin() {
     this.disablePlugin();
     this.enablePlugin();
-    this.getOrCreateFocusableElement();
     super.updatePlugin();
   }
 
@@ -289,9 +317,6 @@ export class CopyPaste extends BasePlugin {
    * Disables the [`CopyPaste`](#copypaste) plugin for your Handsontable instance.
    */
   disablePlugin() {
-    if (this.focusableElement) {
-      destroyElement(this.focusableElement);
-    }
     super.disablePlugin();
   }
 
@@ -313,9 +338,7 @@ export class CopyPaste extends BasePlugin {
     let copyMode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'cells-only';
     _classPrivateFieldSet(this, _copyMode, copyMode);
     _classPrivateFieldSet(this, _isTriggeredByCopy, true);
-    this.getOrCreateFocusableElement();
-    this.focusableElement.focus();
-    this.hot.rootDocument.execCommand('copy');
+    _classPrivateMethodGet(this, _ensureClipboardEventsGetTriggered, _ensureClipboardEventsGetTriggered2).call(this, 'copy');
   }
 
   /**
@@ -348,9 +371,7 @@ export class CopyPaste extends BasePlugin {
    */
   cut() {
     _classPrivateFieldSet(this, _isTriggeredByCut, true);
-    this.getOrCreateFocusableElement();
-    this.focusableElement.focus();
-    this.hot.rootDocument.execCommand('cut');
+    _classPrivateMethodGet(this, _ensureClipboardEventsGetTriggered, _ensureClipboardEventsGetTriggered2).call(this, 'cut');
   }
 
   /**
@@ -413,7 +434,6 @@ export class CopyPaste extends BasePlugin {
     if (pastableHtml) {
       pasteData.clipboardData.setData('text/html', pastableHtml);
     }
-    this.getOrCreateFocusableElement();
     this.onPaste(pasteData);
   }
 
@@ -425,6 +445,10 @@ export class CopyPaste extends BasePlugin {
     if (!selectionRange) {
       return;
     }
+    if (selectionRange.isSingleHeader()) {
+      this.copyableRanges = [];
+      return;
+    }
     _classPrivateFieldGet(this, _copyableRangesFactory).setSelectedRange(selectionRange);
     const groupedRanges = new Map([['headers', null], ['cells', null]]);
     if (_classPrivateFieldGet(this, _copyMode) === 'column-headers-only') {
@@ -464,21 +488,6 @@ export class CopyPaste extends BasePlugin {
     }
   }
 
-  /**
-   * Force focus on editable element.
-   *
-   * @private
-   */
-  getOrCreateFocusableElement() {
-    var _this$hot$getActiveEd;
-    const editableElement = (_this$hot$getActiveEd = this.hot.getActiveEditor()) === null || _this$hot$getActiveEd === void 0 ? void 0 : _this$hot$getActiveEd.TEXTAREA;
-    if (editableElement) {
-      this.focusableElement.setFocusableElement(editableElement);
-    } else {
-      this.focusableElement.useSecondaryElement();
-    }
-  }
-
   /**
    * Verifies if editor exists and is open.
    *
@@ -486,8 +495,8 @@ export class CopyPaste extends BasePlugin {
    * @returns {boolean}
    */
   isEditorOpened() {
-    var _this$hot$getActiveEd2;
-    return (_this$hot$getActiveEd2 = this.hot.getActiveEditor()) === null || _this$hot$getActiveEd2 === void 0 ? void 0 : _this$hot$getActiveEd2.isOpened();
+    var _this$hot$getActiveEd;
+    return (_this$hot$getActiveEd = this.hot.getActiveEditor()) === null || _this$hot$getActiveEd === void 0 ? void 0 : _this$hot$getActiveEd.isOpened();
   }
   /**
    * Prepares new values to populate them into datasource.
@@ -554,7 +563,6 @@ export class CopyPaste extends BasePlugin {
     this.hot.populateFromArray(startRow, startColumn, newRows, void 0, void 0, 'CopyPaste.paste', this.pasteMode);
     return [startRow, startColumn, lastVisualRow, lastVisualColumn];
   }
-
   /**
    * `copy` event callback on textarea element.
    *
@@ -621,7 +629,7 @@ export class CopyPaste extends BasePlugin {
    * @private
    */
   onPaste(event) {
-    if (!this.hot.isListening() || this.isEditorOpened()) {
+    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected()) {
       return;
     }
     if (event && event.preventDefault) {
@@ -646,7 +654,7 @@ export class CopyPaste extends BasePlugin {
     if (typeof pastedData === 'string') {
       pastedData = parse(pastedData);
     }
-    if (pastedData && pastedData.length === 0) {
+    if (pastedData === void 0 || pastedData && pastedData.length === 0) {
       return;
     }
     if (this.hot.runHooks('beforePaste', pastedData, this.copyableRanges) === false) {
@@ -679,21 +687,6 @@ export class CopyPaste extends BasePlugin {
     options.items.push(cutItem(this));
   }
 
-  /**
-   * Force focus on focusableElement.
-   *
-   * @private
-   */
-  onAfterOnCellMouseUp() {
-    // Changing focused element will remove current selection. It's unnecessary in case when we give possibility
-    // for fragment selection
-    if (!this.hot.isListening() || this.isEditorOpened() || this.hot.getSettings().fragmentSelection) {
-      return;
-    }
-    this.getOrCreateFocusableElement();
-    this.focusableElement.focus();
-  }
-
   /**
    * Force focus on focusableElement after end of the selection.
    *
@@ -703,43 +696,68 @@ export class CopyPaste extends BasePlugin {
     if (this.isEditorOpened()) {
       return;
     }
-    this.getOrCreateFocusableElement();
-    if (this.hot.getSettings().fragmentSelection && this.focusableElement.getFocusableElement() !== this.hot.rootDocument.activeElement && getSelectionText()) {
+    if (this.hot.getSettings().fragmentSelection) {
       return;
     }
     this.setCopyableText();
-    this.focusableElement.focus();
   }
 
   /**
-   * `beforeKeyDown` listener to force focus of focusableElement.
+   * `document.body` `mouseenter` callback used to work around a Safari's problem with copying/cutting from the
+   * browser's menu.
    *
    * @private
    */
-  onBeforeKeyDown() {
-    if (!this.hot.isListening() || this.isEditorOpened()) {
-      return;
-    }
-    const activeElement = this.hot.rootDocument.activeElement;
-    const activeEditor = this.hot.getActiveEditor();
-    if (!activeEditor || activeElement !== this.focusableElement.getFocusableElement() && activeElement !== activeEditor.select) {
-      return;
-    }
-    this.getOrCreateFocusableElement();
-    this.focusableElement.focus();
+  onSafariMouseEnter() {
+    _classPrivateMethodGet(this, _removeContentEditableFromHighlightedCell, _removeContentEditableFromHighlightedCell2).call(this);
+  }
+
+  /**
+   * `document.body` `mouseleave` callback used to work around a Safari's problem with copying/cutting from the
+   * browser's menu.
+   *
+   * @private
+   */
+  onSafariMouseLeave() {
+    _classPrivateMethodGet(this, _addContentEditableToHighlightedCell, _addContentEditableToHighlightedCell2).call(this);
+  }
+
+  /**
+   * `afterSelection` hook callback triggered only on Safari.
+   *
+   * @private
+   */
+  onSafariAfterSelection() {
+    _classPrivateMethodGet(this, _removeContentEditableFromHighlightedCell, _removeContentEditableFromHighlightedCell2).call(this);
   }
 
   /**
    * Destroys the `CopyPaste` plugin instance.
    */
   destroy() {
-    if (this.focusableElement) {
-      destroyElement(this.focusableElement);
-      this.focusableElement = null;
-    }
     super.destroy();
   }
 }
+function _ensureClipboardEventsGetTriggered2(eventName) {
+  // Without this workaround Safari (tested on Safari@16.5.2) does not trigger the 'copy' event.
+  if (isSafari()) {
+    const lastSelectedRange = this.hot.getSelectedRangeLast();
+    if (lastSelectedRange) {
+      const {
+        row: highlightRow,
+        col: highlightColumn
+      } = lastSelectedRange.highlight;
+      const currentlySelectedCell = this.hot.getCell(highlightRow, highlightColumn, true);
+      if (currentlySelectedCell) {
+        runWithSelectedContendEditableElement(currentlySelectedCell, () => {
+          this.hot.rootDocument.execCommand(eventName);
+        });
+      }
+    }
+  } else {
+    this.hot.rootDocument.execCommand(eventName);
+  }
+}
 function _countCopiedHeaders2(ranges) {
   const {
     rows
@@ -754,4 +772,35 @@ function _countCopiedHeaders2(ranges) {
   return {
     columnHeadersCount
   };
+}
+function _addContentEditableToHighlightedCell2() {
+  if (this.hot.isListening()) {
+    const lastSelectedRange = this.hot.getSelectedRangeLast();
+    if (lastSelectedRange) {
+      const {
+        row: highlightRow,
+        col: highlightColumn
+      } = lastSelectedRange.highlight;
+      const currentlySelectedCell = this.hot.getCell(highlightRow, highlightColumn, true);
+      if (currentlySelectedCell) {
+        makeElementContentEditableAndSelectItsContent(currentlySelectedCell);
+      }
+    }
+  }
+}
+function _removeContentEditableFromHighlightedCell2() {
+  // If the instance is not listening, the workaround is not needed.
+  if (this.hot.isListening()) {
+    const lastSelectedRange = this.hot.getSelectedRangeLast();
+    if (lastSelectedRange) {
+      const {
+        row: highlightRow,
+        col: highlightColumn
+      } = lastSelectedRange.highlight;
+      const currentlySelectedCell = this.hot.getCell(highlightRow, highlightColumn, true);
+      if (currentlySelectedCell !== null && currentlySelectedCell !== void 0 && currentlySelectedCell.hasAttribute('contenteditable')) {
+        removeContentEditableFromElementAndDeselect(currentlySelectedCell);
+      }
+    }
+  }
 }

package/plugins/customBorders/customBorders.js

@@ -167,14 +167,11 @@ class CustomBorders extends _base.BasePlugin {
     const selectionType = (0, _selection.detectSelectionType)(selectionRanges);
     const selectionSchemaNormalizer = (0, _selection.normalizeSelectionFactory)(selectionType);
     (0, _array.arrayEach)(selectionRanges, selection => {
-      const [rowStart, columnStart, rowEnd, columnEnd] = selectionSchemaNormalizer(selection);
-      for (let row = rowStart; row <= rowEnd; row += 1) {
-        for (let col = columnStart; col <= columnEnd; col += 1) {
-          (0, _array.arrayEach)(borderKeys, borderKey => {
-            this.prepareBorderFromCustomAdded(row, col, normBorder, (0, _utils.toInlinePropName)(borderKey));
-          });
-        }
-      }
+      selectionSchemaNormalizer(selection).forAll((row, col) => {
+        (0, _array.arrayEach)(borderKeys, borderKey => {
+          this.prepareBorderFromCustomAdded(row, col, normBorder, (0, _utils.toInlinePropName)(borderKey));
+        });
+      });
     });
 
     /*
@@ -214,16 +211,13 @@ class CustomBorders extends _base.BasePlugin {
     const selectionSchemaNormalizer = (0, _selection.normalizeSelectionFactory)(selectionType);
     const selectedBorders = [];
     (0, _array.arrayEach)(selectionRanges, selection => {
-      const [rowStart, columnStart, rowEnd, columnEnd] = selectionSchemaNormalizer(selection);
-      for (let row = rowStart; row <= rowEnd; row += 1) {
-        for (let col = columnStart; col <= columnEnd; col += 1) {
-          (0, _array.arrayEach)(this.savedBorders, border => {
-            if (border.row === row && border.col === col) {
-              selectedBorders.push((0, _utils.denormalizeBorder)(border));
-            }
-          });
-        }
-      }
+      selectionSchemaNormalizer(selection).forAll((row, col) => {
+        (0, _array.arrayEach)(this.savedBorders, border => {
+          if (border.row === row && border.col === col) {
+            selectedBorders.push((0, _utils.denormalizeBorder)(border));
+          }
+        });
+      });
     });
     return selectedBorders;
   }
@@ -614,7 +608,8 @@ class CustomBorders extends _base.BasePlugin {
     let check = false;
     (0, _array.arrayEach)(this.hot.selection.highlight.customSelections, customSelection => {
       if (border.id === customSelection.settings.id) {
-        (0, _object.objectEach)(customSelection.instanceBorders, borderObject => {
+        const borders = this.hot.view._wt.selectionManager.getBorderInstances(customSelection);
+        (0, _array.arrayEach)(borders, borderObject => {
           borderObject.toggleHiddenClass(place, remove); // TODO this also bad?
         });
 
@@ -648,7 +643,8 @@ class CustomBorders extends _base.BasePlugin {
           customSelection.visualCellRange = cellRange;
           customSelection.commit();
           if (place) {
-            (0, _object.objectEach)(customSelection.instanceBorders, borderObject => {
+            const borders = this.hot.view._wt.selectionManager.getBorderInstances(customSelection);
+            (0, _array.arrayEach)(borders, borderObject => {
               borderObject.changeBorderStyle(place, border);
             });
           }
@@ -716,6 +712,13 @@ class CustomBorders extends _base.BasePlugin {
         return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_BORDERS);
       },
       disabled() {
+        const range = this.getSelectedRangeLast();
+        if (!range) {
+          return true;
+        }
+        if (range.isSingleHeader()) {
+          return true;
+        }
         return this.selection.isSelectedByCorner();
       },
       submenu: {

package/plugins/customBorders/customBorders.mjs

@@ -4,7 +4,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { BasePlugin } from "../base/index.mjs";
-import { hasOwnProperty, objectEach, deepClone } from "../../helpers/object.mjs";
+import { hasOwnProperty, deepClone } from "../../helpers/object.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayReduce, arrayMap } from "../../helpers/array.mjs";
 import * as C from "../../i18n/constants.mjs";
@@ -160,14 +160,11 @@ export class CustomBorders extends BasePlugin {
     const selectionType = detectSelectionType(selectionRanges);
     const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
     arrayEach(selectionRanges, selection => {
-      const [rowStart, columnStart, rowEnd, columnEnd] = selectionSchemaNormalizer(selection);
-      for (let row = rowStart; row <= rowEnd; row += 1) {
-        for (let col = columnStart; col <= columnEnd; col += 1) {
-          arrayEach(borderKeys, borderKey => {
-            this.prepareBorderFromCustomAdded(row, col, normBorder, toInlinePropName(borderKey));
-          });
-        }
-      }
+      selectionSchemaNormalizer(selection).forAll((row, col) => {
+        arrayEach(borderKeys, borderKey => {
+          this.prepareBorderFromCustomAdded(row, col, normBorder, toInlinePropName(borderKey));
+        });
+      });
     });
 
     /*
@@ -207,16 +204,13 @@ export class CustomBorders extends BasePlugin {
     const selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
     const selectedBorders = [];
     arrayEach(selectionRanges, selection => {
-      const [rowStart, columnStart, rowEnd, columnEnd] = selectionSchemaNormalizer(selection);
-      for (let row = rowStart; row <= rowEnd; row += 1) {
-        for (let col = columnStart; col <= columnEnd; col += 1) {
-          arrayEach(this.savedBorders, border => {
-            if (border.row === row && border.col === col) {
-              selectedBorders.push(denormalizeBorder(border));
-            }
-          });
-        }
-      }
+      selectionSchemaNormalizer(selection).forAll((row, col) => {
+        arrayEach(this.savedBorders, border => {
+          if (border.row === row && border.col === col) {
+            selectedBorders.push(denormalizeBorder(border));
+          }
+        });
+      });
     });
     return selectedBorders;
   }
@@ -607,7 +601,8 @@ export class CustomBorders extends BasePlugin {
     let check = false;
     arrayEach(this.hot.selection.highlight.customSelections, customSelection => {
       if (border.id === customSelection.settings.id) {
-        objectEach(customSelection.instanceBorders, borderObject => {
+        const borders = this.hot.view._wt.selectionManager.getBorderInstances(customSelection);
+        arrayEach(borders, borderObject => {
           borderObject.toggleHiddenClass(place, remove); // TODO this also bad?
         });
 
@@ -641,7 +636,8 @@ export class CustomBorders extends BasePlugin {
           customSelection.visualCellRange = cellRange;
           customSelection.commit();
           if (place) {
-            objectEach(customSelection.instanceBorders, borderObject => {
+            const borders = this.hot.view._wt.selectionManager.getBorderInstances(customSelection);
+            arrayEach(borders, borderObject => {
               borderObject.changeBorderStyle(place, border);
             });
           }
@@ -709,6 +705,13 @@ export class CustomBorders extends BasePlugin {
         return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_BORDERS);
       },
       disabled() {
+        const range = this.getSelectedRangeLast();
+        if (!range) {
+          return true;
+        }
+        if (range.isSingleHeader()) {
+          return true;
+        }
         return this.selection.isSelectedByCorner();
       },
       submenu: {

package/plugins/dropdownMenu/dropdownMenu.d.ts

@@ -18,7 +18,7 @@ export class DropdownMenu extends BasePlugin {
 
   constructor(hotInstance: Core);
   isEnabled(): boolean;
-  open(event: Event): void;
+  open(position: { left: number, top: number } | Event, offset?: { above?: number, below?: number, left?: number, right?: number }): void;
   close(): void;
   executeCommand(commandName: string, ...params: any): void;
 }