handsontable 0.0.0-next-08765b9-20230809 → 0.0.0-next-7e1ba35-20230821

package/plugins/contextMenu/predefinedItems/rowBelow.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.default = rowBelowItem;
+var _utils = require("../utils");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -22,11 +23,8 @@ function rowBelowItem() {
       this.alter('insert_row_below', latestSelection.row, 1, 'ContextMenu.rowBelow');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
+      const selected = (0, _utils.getValidSelection)(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/predefinedItems/rowBelow.mjs

@@ -1,3 +1,4 @@
+import { getValidSelection } from "../utils.mjs";
 import * as C from "../../../i18n/constants.mjs";
 export const KEY = 'row_below';
 
@@ -15,11 +16,8 @@ export default function rowBelowItem() {
       this.alter('insert_row_below', latestSelection.row, 1, 'ContextMenu.rowBelow');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
+      const selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/utils.js

@@ -5,7 +5,7 @@ exports.align = align;
 exports.checkSelectionConsistency = checkSelectionConsistency;
 exports.filterSeparators = filterSeparators;
 exports.getAlignmentClasses = getAlignmentClasses;
-exports.getDocumentOffsetByElement = getDocumentOffsetByElement;
+exports.getValidSelection = getValidSelection;
 exports.hasSubMenu = hasSubMenu;
 exports.isDisabled = isDisabled;
 exports.isItemHidden = isItemHidden;
@@ -62,6 +62,21 @@ function isSelectionDisabled(cell) {
   return (0, _element.hasClass)(cell, 'htSelectionDisabled');
 }
 
+/**
+ * @param {Core} hot The Handsontable instance.
+ * @returns {Array[]|null}
+ */
+function getValidSelection(hot) {
+  const selected = hot.getSelected();
+  if (!selected) {
+    return null;
+  }
+  if (selected[0] < 0) {
+    return null;
+  }
+  return selected;
+}
+
 /**
  * @param {string} className The full element class name to process.
  * @param {string} alignment The slignment class name to compare with.
@@ -252,31 +267,4 @@ function filterSeparators(items) {
   result = popSeparators(result, separator);
   result = removeDuplicatedSeparators(result);
   return result;
-}
-
-/**
- * Returns document offset based on the passed element. If the document objects between element and the
- * base document are not the same the offset as top and left properties will be returned.
- *
- * @param {Element} elementToCheck The element to compare with Document object.
- * @param {Document} baseDocument The base Document object.
- * @returns {{ top: number, left: number }}
- */
-function getDocumentOffsetByElement(elementToCheck, baseDocument) {
-  const offset = {
-    top: 0,
-    left: 0
-  };
-  if (baseDocument !== elementToCheck.ownerDocument) {
-    const {
-      frameElement
-    } = baseDocument.defaultView;
-    const {
-      top,
-      left
-    } = frameElement.getBoundingClientRect();
-    offset.top = top;
-    offset.left = left;
-  }
-  return offset;
 }

package/plugins/contextMenu/utils.mjs

@@ -45,6 +45,21 @@ export function isSelectionDisabled(cell) {
   return hasClass(cell, 'htSelectionDisabled');
 }
 
+/**
+ * @param {Core} hot The Handsontable instance.
+ * @returns {Array[]|null}
+ */
+export function getValidSelection(hot) {
+  const selected = hot.getSelected();
+  if (!selected) {
+    return null;
+  }
+  if (selected[0] < 0) {
+    return null;
+  }
+  return selected;
+}
+
 /**
  * @param {string} className The full element class name to process.
  * @param {string} alignment The slignment class name to compare with.
@@ -235,31 +250,4 @@ export function filterSeparators(items) {
   result = popSeparators(result, separator);
   result = removeDuplicatedSeparators(result);
   return result;
-}
-
-/**
- * Returns document offset based on the passed element. If the document objects between element and the
- * base document are not the same the offset as top and left properties will be returned.
- *
- * @param {Element} elementToCheck The element to compare with Document object.
- * @param {Document} baseDocument The base Document object.
- * @returns {{ top: number, left: number }}
- */
-export function getDocumentOffsetByElement(elementToCheck, baseDocument) {
-  const offset = {
-    top: 0,
-    left: 0
-  };
-  if (baseDocument !== elementToCheck.ownerDocument) {
-    const {
-      frameElement
-    } = baseDocument.defaultView;
-    const {
-      top,
-      left
-    } = frameElement.getBoundingClientRect();
-    offset.top = top;
-    offset.left = left;
-  }
-  return offset;
 }

package/plugins/copyPaste/contextMenuItem/copy.js

@@ -20,13 +20,6 @@ function copyItem(copyPastePlugin) {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiguous selection.

package/plugins/copyPaste/contextMenuItem/copy.mjs

@@ -16,13 +16,6 @@ export default function copyItem(copyPastePlugin) {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiguous selection.

package/plugins/copyPaste/contextMenuItem/copyColumnHeadersOnly.js

@@ -3,7 +3,6 @@
 exports.__esModule = true;
 exports.default = copyColumnHeadersOnlyItem;
 var _constants = require("../../../i18n/constants");
-var _number = require("../../../helpers/number");
 /**
  * @param {CopyPaste} copyPastePlugin The plugin instance.
  * @returns {object}
@@ -13,7 +12,7 @@ function copyColumnHeadersOnlyItem(copyPastePlugin) {
     key: 'copy_column_headers_only',
     name() {
       const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? (0, _number.clamp)(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const nounForm = selectedRange ? Math.min(selectedRange.getWidth() - 1, 1) : 0;
       return this.getTranslatedPhrase(_constants.CONTEXTMENU_ITEMS_COPY_COLUMN_HEADERS_ONLY, nounForm);
     },
     callback() {
@@ -23,13 +22,6 @@ function copyColumnHeadersOnlyItem(copyPastePlugin) {
       if (!this.hasColHeaders()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiguous selection.

package/plugins/copyPaste/contextMenuItem/copyColumnHeadersOnly.mjs

@@ -1,5 +1,4 @@
 import { CONTEXTMENU_ITEMS_COPY_COLUMN_HEADERS_ONLY } from "../../../i18n/constants.mjs";
-import { clamp } from "../../../helpers/number.mjs";
 /**
  * @param {CopyPaste} copyPastePlugin The plugin instance.
  * @returns {object}
@@ -9,7 +8,7 @@ export default function copyColumnHeadersOnlyItem(copyPastePlugin) {
     key: 'copy_column_headers_only',
     name() {
       const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? clamp(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const nounForm = selectedRange ? Math.min(selectedRange.getWidth() - 1, 1) : 0;
       return this.getTranslatedPhrase(CONTEXTMENU_ITEMS_COPY_COLUMN_HEADERS_ONLY, nounForm);
     },
     callback() {
@@ -19,13 +18,6 @@ export default function copyColumnHeadersOnlyItem(copyPastePlugin) {
       if (!this.hasColHeaders()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiguous selection.

package/plugins/copyPaste/contextMenuItem/copyWithColumnGroupHeaders.js

@@ -3,7 +3,6 @@
 exports.__esModule = true;
 exports.default = copyWithColumnGroupHeadersItem;
 var _constants = require("../../../i18n/constants");
-var _number = require("../../../helpers/number");
 /**
  * @param {CopyPaste} copyPastePlugin The plugin instance.
  * @returns {object}
@@ -13,7 +12,7 @@ function copyWithColumnGroupHeadersItem(copyPastePlugin) {
     key: 'copy_with_column_group_headers',
     name() {
       const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? (0, _number.clamp)(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const nounForm = selectedRange ? Math.min(selectedRange.getWidth() - 1, 1) : 0;
       return this.getTranslatedPhrase(_constants.CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_GROUP_HEADERS, nounForm);
     },
     callback() {
@@ -23,13 +22,6 @@ function copyWithColumnGroupHeadersItem(copyPastePlugin) {
       if (!this.hasColHeaders() || !this.getSettings().nestedHeaders) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiguous selection.

package/plugins/copyPaste/contextMenuItem/copyWithColumnGroupHeaders.mjs

@@ -1,5 +1,4 @@
 import { CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_GROUP_HEADERS } from "../../../i18n/constants.mjs";
-import { clamp } from "../../../helpers/number.mjs";
 /**
  * @param {CopyPaste} copyPastePlugin The plugin instance.
  * @returns {object}
@@ -9,7 +8,7 @@ export default function copyWithColumnGroupHeadersItem(copyPastePlugin) {
     key: 'copy_with_column_group_headers',
     name() {
       const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? clamp(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const nounForm = selectedRange ? Math.min(selectedRange.getWidth() - 1, 1) : 0;
       return this.getTranslatedPhrase(CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_GROUP_HEADERS, nounForm);
     },
     callback() {
@@ -19,13 +18,6 @@ export default function copyWithColumnGroupHeadersItem(copyPastePlugin) {
       if (!this.hasColHeaders() || !this.getSettings().nestedHeaders) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiguous selection.

package/plugins/copyPaste/contextMenuItem/copyWithColumnHeaders.js

@@ -3,7 +3,6 @@
 exports.__esModule = true;
 exports.default = copyWithColumnHeadersItem;
 var _constants = require("../../../i18n/constants");
-var _number = require("../../../helpers/number");
 /**
  * @param {CopyPaste} copyPastePlugin The plugin instance.
  * @returns {object}
@@ -13,7 +12,7 @@ function copyWithColumnHeadersItem(copyPastePlugin) {
     key: 'copy_with_column_headers',
     name() {
       const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? (0, _number.clamp)(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const nounForm = selectedRange ? Math.min(selectedRange.getWidth() - 1, 1) : 0;
       return this.getTranslatedPhrase(_constants.CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_HEADERS, nounForm);
     },
     callback() {
@@ -23,13 +22,6 @@ function copyWithColumnHeadersItem(copyPastePlugin) {
       if (!this.hasColHeaders()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiguous selection.

package/plugins/copyPaste/contextMenuItem/copyWithColumnHeaders.mjs

@@ -1,5 +1,4 @@
 import { CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_HEADERS } from "../../../i18n/constants.mjs";
-import { clamp } from "../../../helpers/number.mjs";
 /**
  * @param {CopyPaste} copyPastePlugin The plugin instance.
  * @returns {object}
@@ -9,7 +8,7 @@ export default function copyWithColumnHeadersItem(copyPastePlugin) {
     key: 'copy_with_column_headers',
     name() {
       const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? clamp(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const nounForm = selectedRange ? Math.min(selectedRange.getWidth() - 1, 1) : 0;
       return this.getTranslatedPhrase(CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_HEADERS, nounForm);
     },
     callback() {
@@ -19,13 +18,6 @@ export default function copyWithColumnHeadersItem(copyPastePlugin) {
       if (!this.hasColHeaders()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiguous selection.

package/plugins/copyPaste/contextMenuItem/cut.js

@@ -22,13 +22,6 @@ function cutItem(copyPastePlugin) {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiquous selection.

package/plugins/copyPaste/contextMenuItem/cut.mjs

@@ -16,13 +16,6 @@ export default function cutItem(copyPastePlugin) {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       const selected = this.getSelected();
 
       // Disable for no selection or for non-contiquous selection.

package/plugins/copyPaste/copyPaste.js

@@ -168,10 +168,10 @@ class CopyPaste extends _base.BasePlugin {
      * Defines the data range to copy. Possible values:
      *  * `'cells-only'` Copy selected cells only;
      *  * `'column-headers-only'` Copy column headers only;
-     *  * `'with-all-column-headers'` Copy cells with all column headers;
+     *  * `'with-column-group-headers'` Copy cells with all column headers;
      *  * `'with-column-headers'` Copy cells with column headers;
      *
-     * @type {'cells-only' | 'column-headers-only' | 'with-all-column-headers' | 'with-column-headers'}
+     * @type {'cells-only' | 'column-headers-only' | 'with-column-group-headers' | 'with-column-headers'}
      */
     _classPrivateFieldInitSpec(this, _copyMode, {
       writable: true,
@@ -306,12 +306,12 @@ class CopyPaste extends _base.BasePlugin {
    *
    * Takes an optional parameter (`copyMode`) that defines the scope of copying:
    *
-   * | `copyMode` value            | Description                                                     |
-   * | --------------------------- | --------------------------------------------------------------- |
-   * | `'cells-only'` (default)    | Copy the selected cells                                         |
-   * | `'with-column-headers'`     | - Copy the selected cells<br>- Copy the nearest column headers  |
-   * | `'with-all-column-headers'` | - Copy the selected cells<br>- Copy all related columns headers |
-   * | `'column-headers-only'`     | Copy the nearest column headers (without copying cells)         |
+   * | `copyMode` value              | Description                                                     |
+   * | ----------------------------- | --------------------------------------------------------------- |
+   * | `'cells-only'` (default)      | Copy the selected cells                                         |
+   * | `'with-column-headers'`       | - Copy the selected cells<br>- Copy the nearest column headers  |
+   * | `'with-column-group-headers'` | - Copy the selected cells<br>- Copy all related columns headers |
+   * | `'column-headers-only'`       | Copy the nearest column headers (without copying cells)         |
    *
    * @param {string} [copyMode='cells-only'] Copy mode.
    */
@@ -431,10 +431,6 @@ class CopyPaste extends _base.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') {
@@ -631,7 +627,7 @@ class CopyPaste extends _base.BasePlugin {
    * @private
    */
   onPaste(event) {
-    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected()) {
+    if (!this.hot.isListening() || this.isEditorOpened()) {
       return;
     }
     if (event && event.preventDefault) {
@@ -656,7 +652,7 @@ class CopyPaste extends _base.BasePlugin {
     if (typeof pastedData === 'string') {
       pastedData = (0, _SheetClip.parse)(pastedData);
     }
-    if (pastedData === void 0 || pastedData && pastedData.length === 0) {
+    if (pastedData && pastedData.length === 0) {
       return;
     }
     if (this.hot.runHooks('beforePaste', pastedData, this.copyableRanges) === false) {

package/plugins/copyPaste/copyPaste.mjs

@@ -162,10 +162,10 @@ export class CopyPaste extends BasePlugin {
      * Defines the data range to copy. Possible values:
      *  * `'cells-only'` Copy selected cells only;
      *  * `'column-headers-only'` Copy column headers only;
-     *  * `'with-all-column-headers'` Copy cells with all column headers;
+     *  * `'with-column-group-headers'` Copy cells with all column headers;
      *  * `'with-column-headers'` Copy cells with column headers;
      *
-     * @type {'cells-only' | 'column-headers-only' | 'with-all-column-headers' | 'with-column-headers'}
+     * @type {'cells-only' | 'column-headers-only' | 'with-column-group-headers' | 'with-column-headers'}
      */
     _classPrivateFieldInitSpec(this, _copyMode, {
       writable: true,
@@ -300,12 +300,12 @@ export class CopyPaste extends BasePlugin {
    *
    * Takes an optional parameter (`copyMode`) that defines the scope of copying:
    *
-   * | `copyMode` value            | Description                                                     |
-   * | --------------------------- | --------------------------------------------------------------- |
-   * | `'cells-only'` (default)    | Copy the selected cells                                         |
-   * | `'with-column-headers'`     | - Copy the selected cells<br>- Copy the nearest column headers  |
-   * | `'with-all-column-headers'` | - Copy the selected cells<br>- Copy all related columns headers |
-   * | `'column-headers-only'`     | Copy the nearest column headers (without copying cells)         |
+   * | `copyMode` value              | Description                                                     |
+   * | ----------------------------- | --------------------------------------------------------------- |
+   * | `'cells-only'` (default)      | Copy the selected cells                                         |
+   * | `'with-column-headers'`       | - Copy the selected cells<br>- Copy the nearest column headers  |
+   * | `'with-column-group-headers'` | - Copy the selected cells<br>- Copy all related columns headers |
+   * | `'column-headers-only'`       | Copy the nearest column headers (without copying cells)         |
    *
    * @param {string} [copyMode='cells-only'] Copy mode.
    */
@@ -425,10 +425,6 @@ 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') {
@@ -625,7 +621,7 @@ export class CopyPaste extends BasePlugin {
    * @private
    */
   onPaste(event) {
-    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected()) {
+    if (!this.hot.isListening() || this.isEditorOpened()) {
       return;
     }
     if (event && event.preventDefault) {
@@ -650,7 +646,7 @@ export class CopyPaste extends BasePlugin {
     if (typeof pastedData === 'string') {
       pastedData = parse(pastedData);
     }
-    if (pastedData === void 0 || pastedData && pastedData.length === 0) {
+    if (pastedData && pastedData.length === 0) {
       return;
     }
     if (this.hot.runHooks('beforePaste', pastedData, this.copyableRanges) === false) {

package/plugins/customBorders/customBorders.js

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