handsontable 0.0.0-next-ee5ee21-20241202 → 0.0.0-next-e3ad397-20241203

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of handsontable might be problematic. Click here for more details.

Files changed (114) hide show
  1. package/3rdparty/walkontable/src/calculator/index.js +1 -2
  2. package/3rdparty/walkontable/src/calculator/index.mjs +2 -2
  3. package/3rdparty/walkontable/src/calculator/viewportRows.js +3 -3
  4. package/3rdparty/walkontable/src/calculator/viewportRows.mjs +3 -3
  5. package/3rdparty/walkontable/src/core/_base.js +3 -0
  6. package/3rdparty/walkontable/src/core/_base.mjs +3 -0
  7. package/3rdparty/walkontable/src/core/clone.js +1 -0
  8. package/3rdparty/walkontable/src/core/clone.mjs +1 -0
  9. package/3rdparty/walkontable/src/core/core.js +2 -0
  10. package/3rdparty/walkontable/src/core/core.mjs +2 -0
  11. package/3rdparty/walkontable/src/facade/core.js +3 -0
  12. package/3rdparty/walkontable/src/facade/core.mjs +3 -0
  13. package/3rdparty/walkontable/src/index.js +0 -1
  14. package/3rdparty/walkontable/src/index.mjs +2 -2
  15. package/3rdparty/walkontable/src/overlay/_base.js +3 -1
  16. package/3rdparty/walkontable/src/overlay/_base.mjs +3 -1
  17. package/3rdparty/walkontable/src/overlay/bottom.js +2 -2
  18. package/3rdparty/walkontable/src/overlay/bottom.mjs +2 -2
  19. package/3rdparty/walkontable/src/overlay/inlineStart.js +2 -1
  20. package/3rdparty/walkontable/src/overlay/inlineStart.mjs +3 -2
  21. package/3rdparty/walkontable/src/overlay/top.js +3 -2
  22. package/3rdparty/walkontable/src/overlay/top.mjs +4 -3
  23. package/3rdparty/walkontable/src/renderer/index.js +4 -2
  24. package/3rdparty/walkontable/src/renderer/index.mjs +4 -2
  25. package/3rdparty/walkontable/src/renderer/table.js +12 -3
  26. package/3rdparty/walkontable/src/renderer/table.mjs +12 -3
  27. package/3rdparty/walkontable/src/selection/border/border.js +19 -13
  28. package/3rdparty/walkontable/src/selection/border/border.mjs +19 -13
  29. package/3rdparty/walkontable/src/selection/border/utils.js +26 -0
  30. package/3rdparty/walkontable/src/selection/border/utils.mjs +22 -0
  31. package/3rdparty/walkontable/src/selection/index.js +4 -4
  32. package/3rdparty/walkontable/src/selection/index.mjs +1 -1
  33. package/3rdparty/walkontable/src/settings.js +0 -2
  34. package/3rdparty/walkontable/src/settings.mjs +0 -2
  35. package/3rdparty/walkontable/src/table.js +17 -9
  36. package/3rdparty/walkontable/src/table.mjs +17 -9
  37. package/3rdparty/walkontable/src/types.js +1 -0
  38. package/3rdparty/walkontable/src/types.mjs +1 -0
  39. package/3rdparty/walkontable/src/utils/column.js +1 -1
  40. package/3rdparty/walkontable/src/utils/column.mjs +1 -1
  41. package/3rdparty/walkontable/src/utils/stylesHandler.js +295 -0
  42. package/3rdparty/walkontable/src/utils/stylesHandler.mjs +291 -0
  43. package/3rdparty/walkontable/src/viewport.js +1 -0
  44. package/3rdparty/walkontable/src/viewport.mjs +1 -0
  45. package/base.js +2 -2
  46. package/base.mjs +2 -2
  47. package/core/hooks/constants.js +9 -0
  48. package/core/hooks/constants.mjs +9 -0
  49. package/core/hooks/index.d.ts +1 -0
  50. package/core.d.ts +2 -0
  51. package/core.js +51 -2
  52. package/core.mjs +51 -2
  53. package/dataMap/metaManager/metaSchema.js +23 -3
  54. package/dataMap/metaManager/metaSchema.mjs +23 -3
  55. package/dist/handsontable.css +84 -72
  56. package/dist/handsontable.full.css +317 -304
  57. package/dist/handsontable.full.js +5889 -5728
  58. package/dist/handsontable.full.min.css +15 -10
  59. package/dist/handsontable.full.min.js +54 -53
  60. package/dist/handsontable.js +4338 -3945
  61. package/dist/handsontable.min.css +10 -6
  62. package/dist/handsontable.min.js +23 -23
  63. package/editors/autocompleteEditor/autocompleteEditor.js +1 -1
  64. package/editors/autocompleteEditor/autocompleteEditor.mjs +1 -1
  65. package/editors/baseEditor/baseEditor.js +1 -1
  66. package/editors/baseEditor/baseEditor.mjs +1 -1
  67. package/editors/dateEditor/dateEditor.js +9 -0
  68. package/editors/dateEditor/dateEditor.mjs +10 -1
  69. package/editors/handsontableEditor/handsontableEditor.js +7 -1
  70. package/editors/handsontableEditor/handsontableEditor.mjs +7 -1
  71. package/editors/selectEditor/selectEditor.js +20 -9
  72. package/editors/selectEditor/selectEditor.mjs +20 -9
  73. package/editors/textEditor/textEditor.js +4 -11
  74. package/editors/textEditor/textEditor.mjs +4 -11
  75. package/helpers/dom/element.js +32 -1
  76. package/helpers/dom/element.mjs +31 -1
  77. package/helpers/mixed.js +2 -2
  78. package/helpers/mixed.mjs +2 -2
  79. package/helpers/themes.js +17 -0
  80. package/helpers/themes.mjs +13 -0
  81. package/package.json +12 -3
  82. package/plugins/comments/commentEditor.js +9 -0
  83. package/plugins/comments/commentEditor.mjs +9 -0
  84. package/plugins/comments/comments.js +14 -0
  85. package/plugins/comments/comments.mjs +15 -1
  86. package/plugins/contextMenu/menu/menu.js +9 -4
  87. package/plugins/contextMenu/menu/menu.mjs +9 -4
  88. package/plugins/filters/ui/multipleSelect.js +6 -0
  89. package/plugins/filters/ui/multipleSelect.mjs +6 -0
  90. package/plugins/manualRowMove/manualRowMove.js +1 -1
  91. package/plugins/manualRowMove/manualRowMove.mjs +1 -1
  92. package/plugins/manualRowResize/manualRowResize.js +1 -2
  93. package/plugins/manualRowResize/manualRowResize.mjs +2 -3
  94. package/plugins/mergeCells/mergeCells.js +1 -1
  95. package/plugins/mergeCells/mergeCells.mjs +1 -1
  96. package/plugins/nestedRows/ui/headers.js +7 -1
  97. package/plugins/nestedRows/ui/headers.mjs +7 -1
  98. package/plugins/stretchColumns/calculator.js +2 -1
  99. package/plugins/stretchColumns/calculator.mjs +3 -2
  100. package/settings.d.ts +1 -0
  101. package/styles/handsontable.css +2307 -0
  102. package/styles/handsontable.min.css +30 -0
  103. package/styles/ht-theme-horizon.css +607 -0
  104. package/styles/ht-theme-horizon.min.css +30 -0
  105. package/styles/ht-theme-main.css +613 -0
  106. package/styles/ht-theme-main.min.css +30 -0
  107. package/tableView.js +67 -0
  108. package/tableView.mjs +68 -1
  109. package/utils/autoResize.js +4 -1
  110. package/utils/autoResize.mjs +4 -1
  111. package/utils/ghostTable.js +5 -3
  112. package/utils/ghostTable.mjs +5 -3
  113. package/3rdparty/walkontable/src/selection/border/constants.js +0 -15
  114. package/3rdparty/walkontable/src/selection/border/constants.mjs +0 -12
@@ -21,5 +21,4 @@ var _viewportColumns = require("./viewportColumns");
21
21
  exports.ViewportColumnsCalculator = _viewportColumns.ViewportColumnsCalculator;
22
22
  exports.DEFAULT_COLUMN_WIDTH = _viewportColumns.DEFAULT_WIDTH;
23
23
  var _viewportRows = require("./viewportRows");
24
- exports.ViewportRowsCalculator = _viewportRows.ViewportRowsCalculator;
25
- exports.DEFAULT_ROW_HEIGHT = _viewportRows.DEFAULT_HEIGHT;
24
+ exports.ViewportRowsCalculator = _viewportRows.ViewportRowsCalculator;
@@ -7,5 +7,5 @@ import { RenderedAllRowsCalculationType } from "./calculationType/renderedAllRow
7
7
  import { RenderedColumnsCalculationType } from "./calculationType/renderedColumns.mjs";
8
8
  import { RenderedRowsCalculationType } from "./calculationType/renderedRows.mjs";
9
9
  import { ViewportColumnsCalculator, DEFAULT_WIDTH } from "./viewportColumns.mjs";
10
- import { ViewportRowsCalculator, DEFAULT_HEIGHT } from "./viewportRows.mjs";
11
- export { DEFAULT_HEIGHT as DEFAULT_ROW_HEIGHT, DEFAULT_WIDTH as DEFAULT_COLUMN_WIDTH, FullyVisibleColumnsCalculationType, FullyVisibleRowsCalculationType, PartiallyVisibleColumnsCalculationType, PartiallyVisibleRowsCalculationType, RenderedAllColumnsCalculationType, RenderedAllRowsCalculationType, RenderedColumnsCalculationType, RenderedRowsCalculationType, ViewportColumnsCalculator, ViewportRowsCalculator };
10
+ import { ViewportRowsCalculator } from "./viewportRows.mjs";
11
+ export { DEFAULT_WIDTH as DEFAULT_COLUMN_WIDTH, FullyVisibleColumnsCalculationType, FullyVisibleRowsCalculationType, PartiallyVisibleColumnsCalculationType, PartiallyVisibleRowsCalculationType, RenderedAllColumnsCalculationType, RenderedAllRowsCalculationType, RenderedColumnsCalculationType, RenderedRowsCalculationType, ViewportColumnsCalculator, ViewportRowsCalculator };
@@ -7,8 +7,6 @@ var _viewportBase = require("./viewportBase");
7
7
  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; }
8
8
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
9
9
  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); }
10
- const DEFAULT_HEIGHT = exports.DEFAULT_HEIGHT = 23;
11
-
12
10
  /**
13
11
  * @typedef {object} ViewportRowsCalculatorOptions
14
12
  * @property {Map<string, ViewportBaseCalculator>} calculationTypes The calculation types to be performed.
@@ -34,6 +32,7 @@ class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
34
32
  viewportHeight,
35
33
  scrollOffset,
36
34
  totalRows,
35
+ defaultRowHeight,
37
36
  rowHeightFn,
38
37
  overrideFn,
39
38
  horizontalScrollbarHeight
@@ -51,6 +50,7 @@ class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
51
50
  _defineProperty(this, "totalCalculatedHeight", 0);
52
51
  _defineProperty(this, "startPositions", []);
53
52
  _defineProperty(this, "needReverse", true);
53
+ this.defaultHeight = defaultRowHeight;
54
54
  this.viewportHeight = viewportHeight;
55
55
  this.scrollOffset = scrollOffset;
56
56
  this.zeroBasedScrollOffset = Math.max(scrollOffset, 0);
@@ -89,7 +89,7 @@ class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
89
89
  getRowHeight(row) {
90
90
  const rowHeight = this.rowHeightFn(row);
91
91
  if (isNaN(rowHeight)) {
92
- return DEFAULT_HEIGHT;
92
+ return this.defaultHeight;
93
93
  }
94
94
  return rowHeight;
95
95
  }
@@ -4,8 +4,6 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
4
4
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
5
5
  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); }
6
6
  import { ViewportBaseCalculator } from "./viewportBase.mjs";
7
- export const DEFAULT_HEIGHT = 23;
8
-
9
7
  /**
10
8
  * @typedef {object} ViewportRowsCalculatorOptions
11
9
  * @property {Map<string, ViewportBaseCalculator>} calculationTypes The calculation types to be performed.
@@ -31,6 +29,7 @@ export class ViewportRowsCalculator extends ViewportBaseCalculator {
31
29
  viewportHeight,
32
30
  scrollOffset,
33
31
  totalRows,
32
+ defaultRowHeight,
34
33
  rowHeightFn,
35
34
  overrideFn,
36
35
  horizontalScrollbarHeight
@@ -48,6 +47,7 @@ export class ViewportRowsCalculator extends ViewportBaseCalculator {
48
47
  _defineProperty(this, "totalCalculatedHeight", 0);
49
48
  _defineProperty(this, "startPositions", []);
50
49
  _defineProperty(this, "needReverse", true);
50
+ this.defaultHeight = defaultRowHeight;
51
51
  this.viewportHeight = viewportHeight;
52
52
  this.scrollOffset = scrollOffset;
53
53
  this.zeroBasedScrollOffset = Math.max(scrollOffset, 0);
@@ -86,7 +86,7 @@ export class ViewportRowsCalculator extends ViewportBaseCalculator {
86
86
  getRowHeight(row) {
87
87
  const rowHeight = this.rowHeightFn(row);
88
88
  if (isNaN(rowHeight)) {
89
- return DEFAULT_HEIGHT;
89
+ return this.defaultHeight;
90
90
  }
91
91
  return rowHeight;
92
92
  }
@@ -305,6 +305,9 @@ class CoreAbstract {
305
305
  get selectionManager() {
306
306
  return wot.selectionManager; // TODO refactoring: move outside dao, use IOC
307
307
  },
308
+ get stylesHandler() {
309
+ return wot.stylesHandler;
310
+ },
308
311
  get drawn() {
309
312
  return wot.drawn;
310
313
  },
@@ -301,6 +301,9 @@ export default class CoreAbstract {
301
301
  get selectionManager() {
302
302
  return wot.selectionManager; // TODO refactoring: move outside dao, use IOC
303
303
  },
304
+ get stylesHandler() {
305
+ return wot.stylesHandler;
306
+ },
304
307
  get drawn() {
305
308
  return wot.drawn;
306
309
  },
@@ -30,6 +30,7 @@ class Clone extends _base.default {
30
30
  const facadeGetter = this.wtSettings.getSetting('facade', this);
31
31
  this.cloneSource = clone.source;
32
32
  this.cloneOverlay = clone.overlay;
33
+ this.stylesHandler = clone.stylesHandler;
33
34
  this.wtTable = this.cloneOverlay.createTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
34
35
  this.wtViewport = clone.viewport;
35
36
  this.selectionManager = clone.selectionManager;
@@ -26,6 +26,7 @@ export default class Clone extends CoreAbstract {
26
26
  const facadeGetter = this.wtSettings.getSetting('facade', this);
27
27
  this.cloneSource = clone.source;
28
28
  this.cloneOverlay = clone.overlay;
29
+ this.stylesHandler = clone.stylesHandler;
29
30
  this.wtTable = this.cloneOverlay.createTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
30
31
  this.wtViewport = clone.viewport;
31
32
  this.selectionManager = clone.selectionManager;
@@ -12,6 +12,7 @@ var _base = _interopRequireDefault(require("./_base"));
12
12
  var _manager = require("../selection/manager");
13
13
  var _object = require("../../../../helpers/object");
14
14
  var _element = require("../../../../helpers/dom/element");
15
+ var _stylesHandler = require("../utils/stylesHandler");
15
16
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
16
17
  /**
17
18
  * @class Walkontable
@@ -23,6 +24,7 @@ class Walkontable extends _base.default {
23
24
  */
24
25
  constructor(table, settings) {
25
26
  super(table, new _settings.default(settings));
27
+ this.stylesHandler = new _stylesHandler.StylesHandler(this.domBindings);
26
28
  const facadeGetter = this.wtSettings.getSetting('facade', this); // todo rethink. I would like to have no access to facade from the internal scope.
27
29
 
28
30
  this.wtTable = new _master.default(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
@@ -9,6 +9,7 @@ import CoreAbstract from "./_base.mjs";
9
9
  import { SelectionManager } from "../selection/manager.mjs";
10
10
  import { objectEach } from "../../../../helpers/object.mjs";
11
11
  import { addClass, removeClass } from "../../../../helpers/dom/element.mjs";
12
+ import { StylesHandler } from "../utils/stylesHandler.mjs";
12
13
  /**
13
14
  * @class Walkontable
14
15
  */
@@ -19,6 +20,7 @@ export default class Walkontable extends CoreAbstract {
19
20
  */
20
21
  constructor(table, settings) {
21
22
  super(table, new Settings(settings));
23
+ this.stylesHandler = new StylesHandler(this.domBindings);
22
24
  const facadeGetter = this.wtSettings.getSetting('facade', this); // todo rethink. I would like to have no access to facade from the internal scope.
23
25
 
24
26
  this.wtTable = new MasterTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
@@ -110,6 +110,9 @@ class WalkontableFacade {
110
110
  get eventManager() {
111
111
  return this._wot.eventManager;
112
112
  }
113
+ get stylesHandler() {
114
+ return this._wot.stylesHandler;
115
+ }
113
116
  createCellCoords(row, column) {
114
117
  return this._wot.createCellCoords(row, column);
115
118
  }
@@ -106,6 +106,9 @@ export default class WalkontableFacade {
106
106
  get eventManager() {
107
107
  return this._wot.eventManager;
108
108
  }
109
+ get stylesHandler() {
110
+ return this._wot.stylesHandler;
111
+ }
109
112
  createCellCoords(row, column) {
110
113
  return this._wot.createCellCoords(row, column);
111
114
  }
@@ -4,7 +4,6 @@ exports.__esModule = true;
4
4
  var _calculator = require("./calculator");
5
5
  exports.ViewportColumnsCalculator = _calculator.ViewportColumnsCalculator;
6
6
  exports.ViewportRowsCalculator = _calculator.ViewportRowsCalculator;
7
- exports.DEFAULT_ROW_HEIGHT = _calculator.DEFAULT_ROW_HEIGHT;
8
7
  exports.DEFAULT_COLUMN_WIDTH = _calculator.DEFAULT_COLUMN_WIDTH;
9
8
  var _coords = _interopRequireDefault(require("./cell/coords"));
10
9
  exports.CellCoords = _coords.default;
@@ -1,4 +1,4 @@
1
- import { ViewportColumnsCalculator, ViewportRowsCalculator, DEFAULT_ROW_HEIGHT, DEFAULT_COLUMN_WIDTH } from "./calculator/index.mjs";
1
+ import { ViewportColumnsCalculator, ViewportRowsCalculator, DEFAULT_COLUMN_WIDTH } from "./calculator/index.mjs";
2
2
  import CellCoords from "./cell/coords.mjs";
3
3
  import CellRange from "./cell/range.mjs";
4
4
  import Walkontable from "./facade/core.mjs";
@@ -6,4 +6,4 @@ import { Selection, ACTIVE_HEADER_TYPE, AREA_TYPE, FOCUS_TYPE, FILL_TYPE, HEADER
6
6
  import * as Renderer from "./renderer/index.mjs";
7
7
  import { OrderView, SharedOrderView } from "./utils/orderView/index.mjs";
8
8
  import { getListenersCounter } from "../../../eventManager.mjs";
9
- export { DEFAULT_ROW_HEIGHT, DEFAULT_COLUMN_WIDTH, ViewportColumnsCalculator, ViewportRowsCalculator, CellCoords, CellRange, Walkontable as default, Walkontable as Core, Selection, ACTIVE_HEADER_TYPE as HIGHLIGHT_ACTIVE_HEADER_TYPE, AREA_TYPE as HIGHLIGHT_AREA_TYPE, FOCUS_TYPE as HIGHLIGHT_FOCUS_TYPE, FILL_TYPE as HIGHLIGHT_FILL_TYPE, HEADER_TYPE as HIGHLIGHT_HEADER_TYPE, ROW_TYPE as HIGHLIGHT_ROW_TYPE, COLUMN_TYPE as HIGHLIGHT_COLUMN_TYPE, CUSTOM_SELECTION_TYPE as HIGHLIGHT_CUSTOM_SELECTION_TYPE, Renderer, OrderView, SharedOrderView, getListenersCounter };
9
+ export { DEFAULT_COLUMN_WIDTH, ViewportColumnsCalculator, ViewportRowsCalculator, CellCoords, CellRange, Walkontable as default, Walkontable as Core, Selection, ACTIVE_HEADER_TYPE as HIGHLIGHT_ACTIVE_HEADER_TYPE, AREA_TYPE as HIGHLIGHT_AREA_TYPE, FOCUS_TYPE as HIGHLIGHT_FOCUS_TYPE, FILL_TYPE as HIGHLIGHT_FILL_TYPE, HEADER_TYPE as HIGHLIGHT_HEADER_TYPE, ROW_TYPE as HIGHLIGHT_ROW_TYPE, COLUMN_TYPE as HIGHLIGHT_COLUMN_TYPE, CUSTOM_SELECTION_TYPE as HIGHLIGHT_CUSTOM_SELECTION_TYPE, Renderer, OrderView, SharedOrderView, getListenersCounter };
@@ -304,7 +304,9 @@ class Overlay {
304
304
  // todo ioc , or factor func if used only here
305
305
  event: this.wot.wtEvent,
306
306
  // todo ioc , or factory func if used only here
307
- selectionManager: this.wot.selectionManager // todo ioc , or factory func if used only here
307
+ selectionManager: this.wot.selectionManager,
308
+ // todo ioc , or factory func if used only here
309
+ stylesHandler: this.wot.stylesHandler
308
310
  });
309
311
  }
310
312
 
@@ -300,7 +300,9 @@ export class Overlay {
300
300
  // todo ioc , or factor func if used only here
301
301
  event: this.wot.wtEvent,
302
302
  // todo ioc , or factory func if used only here
303
- selectionManager: this.wot.selectionManager // todo ioc , or factory func if used only here
303
+ selectionManager: this.wot.selectionManager,
304
+ // todo ioc , or factory func if used only here
305
+ stylesHandler: this.wot.stylesHandler
304
306
  });
305
307
  }
306
308
 
@@ -144,9 +144,9 @@ class BottomOverlay extends _base.Overlay {
144
144
  sumCellSizes(from, to) {
145
145
  const {
146
146
  wtTable,
147
- wtSettings
147
+ stylesHandler
148
148
  } = this.wot;
149
- const defaultRowHeight = wtSettings.getSetting('defaultRowHeight');
149
+ const defaultRowHeight = stylesHandler.getDefaultRowHeight();
150
150
  let row = from;
151
151
  let sum = 0;
152
152
  while (row < to) {
@@ -140,9 +140,9 @@ export class BottomOverlay extends Overlay {
140
140
  sumCellSizes(from, to) {
141
141
  const {
142
142
  wtTable,
143
- wtSettings
143
+ stylesHandler
144
144
  } = this.wot;
145
- const defaultRowHeight = wtSettings.getSetting('defaultRowHeight');
145
+ const defaultRowHeight = stylesHandler.getDefaultRowHeight();
146
146
  let row = from;
147
147
  let sum = 0;
148
148
  while (row < to) {
@@ -173,7 +173,8 @@ class InlineStartOverlay extends _base.Overlay {
173
173
  const {
174
174
  holder
175
175
  } = this.clone.wtTable;
176
- const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(_selection.CORNER_DEFAULT_STYLE.width, 10) / 2 : 0;
176
+ const cornerStyle = (0, _selection.getCornerStyle)(this.wot);
177
+ const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(cornerStyle.width, 10) / 2 : 0;
177
178
  this.clone.wtTable.hider.style.height = this.hider.style.height;
178
179
  holder.style.height = holder.parentNode.style.height;
179
180
  // Add selection corner protruding part to the holder total width to make sure that
@@ -2,7 +2,7 @@ import "core-js/modules/es.error.cause.js";
2
2
  import { addClass, getScrollbarWidth, getScrollLeft, getMaximumScrollLeft, getWindowScrollTop, hasClass, outerWidth, removeClass, setOverlayPosition, resetCssTransform } from "../../../../helpers/dom/element.mjs";
3
3
  import InlineStartOverlayTable from "../table/inlineStart.mjs";
4
4
  import { Overlay } from "./_base.mjs";
5
- import { CORNER_DEFAULT_STYLE } from "../selection/index.mjs";
5
+ import { getCornerStyle } from "../selection/index.mjs";
6
6
  import { CLONE_INLINE_START } from "./constants.mjs";
7
7
  /**
8
8
  * @class InlineStartOverlay
@@ -169,7 +169,8 @@ export class InlineStartOverlay extends Overlay {
169
169
  const {
170
170
  holder
171
171
  } = this.clone.wtTable;
172
- const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(CORNER_DEFAULT_STYLE.width, 10) / 2 : 0;
172
+ const cornerStyle = getCornerStyle(this.wot);
173
+ const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(cornerStyle.width, 10) / 2 : 0;
173
174
  this.clone.wtTable.hider.style.height = this.hider.style.height;
174
175
  holder.style.height = holder.parentNode.style.height;
175
176
  // Add selection corner protruding part to the holder total width to make sure that
@@ -138,7 +138,7 @@ class TopOverlay extends _base.Overlay {
138
138
  * @returns {number} Height sum.
139
139
  */
140
140
  sumCellSizes(from, to) {
141
- const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
141
+ const defaultRowHeight = this.wot.stylesHandler.getDefaultRowHeight();
142
142
  let row = from;
143
143
  let sum = 0;
144
144
  while (row < to) {
@@ -200,7 +200,8 @@ class TopOverlay extends _base.Overlay {
200
200
  const {
201
201
  holder
202
202
  } = this.clone.wtTable;
203
- const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(_selection.CORNER_DEFAULT_STYLE.height, 10) / 2 : 0;
203
+ const cornerStyle = (0, _selection.getCornerStyle)(this.wot);
204
+ const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(cornerStyle.height, 10) / 2 : 0;
204
205
  this.clone.wtTable.hider.style.width = this.hider.style.width;
205
206
  holder.style.width = holder.parentNode.style.width;
206
207
  // Add selection corner protruding part to the holder total height to make sure that
@@ -5,7 +5,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
5
5
  import { addClass, getMaximumScrollTop, getScrollbarWidth, getScrollTop, getWindowScrollLeft, hasClass, outerHeight, removeClass, setOverlayPosition, resetCssTransform } from "../../../../helpers/dom/element.mjs";
6
6
  import TopOverlayTable from "./../table/top.mjs";
7
7
  import { Overlay } from "./_base.mjs";
8
- import { CORNER_DEFAULT_STYLE } from "../selection/index.mjs";
8
+ import { getCornerStyle } from "../selection/index.mjs";
9
9
  import { CLONE_TOP } from "./constants.mjs";
10
10
  /**
11
11
  * @class TopOverlay
@@ -134,7 +134,7 @@ export class TopOverlay extends Overlay {
134
134
  * @returns {number} Height sum.
135
135
  */
136
136
  sumCellSizes(from, to) {
137
- const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
137
+ const defaultRowHeight = this.wot.stylesHandler.getDefaultRowHeight();
138
138
  let row = from;
139
139
  let sum = 0;
140
140
  while (row < to) {
@@ -196,7 +196,8 @@ export class TopOverlay extends Overlay {
196
196
  const {
197
197
  holder
198
198
  } = this.clone.wtTable;
199
- const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(CORNER_DEFAULT_STYLE.height, 10) / 2 : 0;
199
+ const cornerStyle = getCornerStyle(this.wot);
200
+ const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(cornerStyle.height, 10) / 2 : 0;
200
201
  this.clone.wtTable.hider.style.width = this.hider.style.width;
201
202
  holder.style.width = holder.parentNode.style.width;
202
203
  // Add selection corner protruding part to the holder total height to make sure that
@@ -28,7 +28,8 @@ class Renderer {
28
28
  TBODY,
29
29
  rowUtils,
30
30
  columnUtils,
31
- cellRenderer
31
+ cellRenderer,
32
+ stylesHandler
32
33
  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
33
34
  /**
34
35
  * General renderer class used to render Walkontable content on screen.
@@ -36,7 +37,8 @@ class Renderer {
36
37
  * @type {TableRenderer}
37
38
  */
38
39
  this.renderer = new _table.default(TABLE, {
39
- cellRenderer
40
+ cellRenderer,
41
+ stylesHandler
40
42
  });
41
43
  this.renderer.setRenderers({
42
44
  rowHeaders: new _rowHeaders.default(),
@@ -18,7 +18,8 @@ class Renderer {
18
18
  TBODY,
19
19
  rowUtils,
20
20
  columnUtils,
21
- cellRenderer
21
+ cellRenderer,
22
+ stylesHandler
22
23
  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
23
24
  /**
24
25
  * General renderer class used to render Walkontable content on screen.
@@ -26,7 +27,8 @@ class Renderer {
26
27
  * @type {TableRenderer}
27
28
  */
28
29
  this.renderer = new TableRenderer(TABLE, {
29
- cellRenderer
30
+ cellRenderer,
31
+ stylesHandler
30
32
  });
31
33
  this.renderer.setRenderers({
32
34
  rowHeaders: new RowHeadersRenderer(),
@@ -52,7 +52,8 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
52
52
  class TableRenderer {
53
53
  constructor(rootNode) {
54
54
  let {
55
- cellRenderer
55
+ cellRenderer,
56
+ stylesHandler
56
57
  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
57
58
  /**
58
59
  * Table element which will be used to render the children element.
@@ -168,9 +169,14 @@ class TableRenderer {
168
169
  * @type {'inline_start'|'top'|'top_inline_start_corner'|'bottom'|'bottom_inline_start_corner'|'master'}
169
170
  */
170
171
  _defineProperty(this, "activeOverlayName", void 0);
172
+ /**
173
+ * Styles handler instance.
174
+ */
175
+ _defineProperty(this, "stylesHandler", void 0);
171
176
  this.rootNode = rootNode;
172
177
  this.rootDocument = this.rootNode.ownerDocument;
173
178
  this.cellRenderer = cellRenderer;
179
+ this.stylesHandler = stylesHandler;
174
180
  }
175
181
 
176
182
  /**
@@ -313,12 +319,15 @@ class TableRenderer {
313
319
  // Fix for multi-line content and for supporting `rowHeights` option.
314
320
  for (let visibleRowIndex = 0; visibleRowIndex < rowsToRender; visibleRowIndex++) {
315
321
  const TR = rows.getRenderedNode(visibleRowIndex);
322
+ const rowUtils = this.rowUtils;
316
323
  if (TR.firstChild) {
317
324
  const sourceRowIndex = this.renderedRowToSource(visibleRowIndex);
318
- const rowHeight = this.rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
325
+ const rowHeight = rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
326
+ const isBorderBoxSizing = this.stylesHandler.areCellsBorderBox();
327
+ const borderCompensation = isBorderBoxSizing ? 0 : 1;
319
328
  if (rowHeight) {
320
329
  // Decrease height. 1 pixel will be "replaced" by 1px border top
321
- TR.firstChild.style.height = `${rowHeight - 1}px`;
330
+ TR.firstChild.style.height = `${rowHeight - borderCompensation}px`;
322
331
  } else {
323
332
  TR.firstChild.style.height = '';
324
333
  }
@@ -49,7 +49,8 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
49
49
  export default class TableRenderer {
50
50
  constructor(rootNode) {
51
51
  let {
52
- cellRenderer
52
+ cellRenderer,
53
+ stylesHandler
53
54
  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
54
55
  /**
55
56
  * Table element which will be used to render the children element.
@@ -165,9 +166,14 @@ export default class TableRenderer {
165
166
  * @type {'inline_start'|'top'|'top_inline_start_corner'|'bottom'|'bottom_inline_start_corner'|'master'}
166
167
  */
167
168
  _defineProperty(this, "activeOverlayName", void 0);
169
+ /**
170
+ * Styles handler instance.
171
+ */
172
+ _defineProperty(this, "stylesHandler", void 0);
168
173
  this.rootNode = rootNode;
169
174
  this.rootDocument = this.rootNode.ownerDocument;
170
175
  this.cellRenderer = cellRenderer;
176
+ this.stylesHandler = stylesHandler;
171
177
  }
172
178
 
173
179
  /**
@@ -310,12 +316,15 @@ export default class TableRenderer {
310
316
  // Fix for multi-line content and for supporting `rowHeights` option.
311
317
  for (let visibleRowIndex = 0; visibleRowIndex < rowsToRender; visibleRowIndex++) {
312
318
  const TR = rows.getRenderedNode(visibleRowIndex);
319
+ const rowUtils = this.rowUtils;
313
320
  if (TR.firstChild) {
314
321
  const sourceRowIndex = this.renderedRowToSource(visibleRowIndex);
315
- const rowHeight = this.rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
322
+ const rowHeight = rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
323
+ const isBorderBoxSizing = this.stylesHandler.areCellsBorderBox();
324
+ const borderCompensation = isBorderBoxSizing ? 0 : 1;
316
325
  if (rowHeight) {
317
326
  // Decrease height. 1 pixel will be "replaced" by 1px border top
318
- TR.firstChild.style.height = `${rowHeight - 1}px`;
327
+ TR.firstChild.style.height = `${rowHeight - borderCompensation}px`;
319
328
  } else {
320
329
  TR.firstChild.style.height = '';
321
330
  }
@@ -5,7 +5,7 @@ var _element = require("../../../../../helpers/dom/element");
5
5
  var _event = require("../../../../../helpers/dom/event");
6
6
  var _object = require("../../../../../helpers/object");
7
7
  var _browser = require("../../../../../helpers/browser");
8
- var _constants = require("./constants");
8
+ var _utils = require("./utils");
9
9
  /**
10
10
  *
11
11
  */
@@ -35,9 +35,9 @@ class Border {
35
35
  this.bottomStyle = null;
36
36
  this.startStyle = null;
37
37
  this.endStyle = null;
38
- this.cornerDefaultStyle = _constants.CORNER_DEFAULT_STYLE;
38
+ this.cornerDefaultStyle = (0, _utils.getCornerStyle)(this.instance);
39
39
  // Offset to moving the corner to be centered relative to the grid.
40
- this.cornerCenterPointOffset = -(parseInt(this.cornerDefaultStyle.width, 10) / 2);
40
+ this.cornerCenterPointOffset = -Math.ceil(parseInt(this.cornerDefaultStyle.width, 10) / 2);
41
41
  this.corner = null;
42
42
  this.cornerStyle = null;
43
43
  this.createBorders(settings);
@@ -166,9 +166,9 @@ class Border {
166
166
  this.corner = this.main.childNodes[4];
167
167
  this.corner.className += ' corner';
168
168
  this.cornerStyle = this.corner.style;
169
- this.cornerStyle.width = this.cornerDefaultStyle.width;
170
- this.cornerStyle.height = this.cornerDefaultStyle.height;
171
- this.cornerStyle.border = [this.cornerDefaultStyle.borderWidth, this.cornerDefaultStyle.borderStyle, this.cornerDefaultStyle.borderColor].join(' ');
169
+ this.cornerStyle.width = `${this.cornerDefaultStyle.width}px`;
170
+ this.cornerStyle.height = `${this.cornerDefaultStyle.height}px`;
171
+ this.cornerStyle.border = [`${this.cornerDefaultStyle.borderWidth}px`, this.cornerDefaultStyle.borderStyle, this.cornerDefaultStyle.borderColor].join(' ');
172
172
  if ((0, _browser.isMobileBrowser)() && this.instance.getSetting('isDataViewInstance')) {
173
173
  this.createMultipleSelectorHandles();
174
174
  }
@@ -437,9 +437,11 @@ class Border {
437
437
  if ((0, _browser.isMobileBrowser)() || !cornerVisibleSetting || this.isPartRange(checkRow, checkCol)) {
438
438
  this.cornerStyle.display = 'none';
439
439
  } else {
440
- this.cornerStyle.top = `${top + height + this.cornerCenterPointOffset - 1}px`;
441
- this.cornerStyle[inlinePosProperty] = `${inlineStartPos + width + this.cornerCenterPointOffset - 1}px`;
442
- this.cornerStyle.borderRightWidth = this.cornerDefaultStyle.borderWidth;
440
+ this.cornerStyle.top = `${top + height + this.cornerCenterPointOffset - this.cornerDefaultStyle.borderWidth}px`;
441
+ this.cornerStyle[inlinePosProperty] = `${inlineStartPos + width + this.cornerCenterPointOffset - this.cornerDefaultStyle.borderWidth}px`;
442
+ this.cornerStyle.borderRightWidth = `${this.cornerDefaultStyle.borderWidth}px`;
443
+ this.cornerStyle.borderLeftWidth = `${this.cornerDefaultStyle.borderWidth}px`;
444
+ this.cornerStyle.borderBottomWidth = `${this.cornerDefaultStyle.borderWidth}px`;
443
445
  this.cornerStyle.width = this.cornerDefaultStyle.width;
444
446
 
445
447
  // Hide the fill handle, so the possible further adjustments won't force unneeded scrollbars.
@@ -449,8 +451,12 @@ class Border {
449
451
  if (trimToWindow) {
450
452
  trimmingContainer = rootDocument.documentElement;
451
453
  }
452
- const cornerHalfWidth = parseInt(this.cornerDefaultStyle.width, 10) / 2;
453
- const cornerHalfHeight = parseInt(this.cornerDefaultStyle.height, 10) / 2;
454
+
455
+ // -1 was initially removed from the base position to compansate for the table border. We need to exclude it from
456
+ // the corner width.
457
+ const cornerBorderCompensation = parseInt(this.cornerDefaultStyle.borderWidth, 10) - 1;
458
+ const cornerHalfWidth = Math.ceil(parseInt(this.cornerDefaultStyle.width, 10) / 2);
459
+ const cornerHalfHeight = Math.ceil(parseInt(this.cornerDefaultStyle.height, 10) / 2);
454
460
  if (toColumn === this.wot.getSetting('totalColumns') - 1) {
455
461
  const toTdOffsetLeft = trimToWindow ? toTD.getBoundingClientRect().left : toTD.offsetLeft;
456
462
  let cornerOverlappingContainer = false;
@@ -463,7 +469,7 @@ class Border {
463
469
  cornerOverlappingContainer = cornerEdge >= (0, _element.innerWidth)(trimmingContainer);
464
470
  }
465
471
  if (cornerOverlappingContainer) {
466
- this.cornerStyle[inlinePosProperty] = `${Math.floor(inlineStartPos + width + this.cornerCenterPointOffset - cornerHalfWidth)}px`;
472
+ this.cornerStyle[inlinePosProperty] = `${Math.floor(inlineStartPos + width + this.cornerCenterPointOffset - cornerHalfWidth - cornerBorderCompensation)}px`;
467
473
  this.cornerStyle[isRtl ? 'borderLeftWidth' : 'borderRightWidth'] = 0;
468
474
  }
469
475
  }
@@ -472,7 +478,7 @@ class Border {
472
478
  const cornerBottomEdge = toTdOffsetTop + (0, _element.outerHeight)(toTD) + parseInt(this.cornerDefaultStyle.height, 10) / 2;
473
479
  const cornerOverlappingContainer = cornerBottomEdge >= (0, _element.innerHeight)(trimmingContainer);
474
480
  if (cornerOverlappingContainer) {
475
- this.cornerStyle.top = `${Math.floor(top + height + this.cornerCenterPointOffset - cornerHalfHeight)}px`;
481
+ this.cornerStyle.top = `${Math.floor(top + height + this.cornerCenterPointOffset - cornerHalfHeight - cornerBorderCompensation)}px`;
476
482
  this.cornerStyle.borderBottomWidth = 0;
477
483
  }
478
484
  }
@@ -2,7 +2,7 @@ import { addClass, hasClass, removeClass, getTrimmingContainer, innerWidth, inne
2
2
  import { stopImmediatePropagation } from "../../../../../helpers/dom/event.mjs";
3
3
  import { objectEach } from "../../../../../helpers/object.mjs";
4
4
  import { isMobileBrowser } from "../../../../../helpers/browser.mjs";
5
- import { CORNER_DEFAULT_STYLE } from "./constants.mjs";
5
+ import { getCornerStyle } from "./utils.mjs";
6
6
  /**
7
7
  *
8
8
  */
@@ -32,9 +32,9 @@ class Border {
32
32
  this.bottomStyle = null;
33
33
  this.startStyle = null;
34
34
  this.endStyle = null;
35
- this.cornerDefaultStyle = CORNER_DEFAULT_STYLE;
35
+ this.cornerDefaultStyle = getCornerStyle(this.instance);
36
36
  // Offset to moving the corner to be centered relative to the grid.
37
- this.cornerCenterPointOffset = -(parseInt(this.cornerDefaultStyle.width, 10) / 2);
37
+ this.cornerCenterPointOffset = -Math.ceil(parseInt(this.cornerDefaultStyle.width, 10) / 2);
38
38
  this.corner = null;
39
39
  this.cornerStyle = null;
40
40
  this.createBorders(settings);
@@ -163,9 +163,9 @@ class Border {
163
163
  this.corner = this.main.childNodes[4];
164
164
  this.corner.className += ' corner';
165
165
  this.cornerStyle = this.corner.style;
166
- this.cornerStyle.width = this.cornerDefaultStyle.width;
167
- this.cornerStyle.height = this.cornerDefaultStyle.height;
168
- this.cornerStyle.border = [this.cornerDefaultStyle.borderWidth, this.cornerDefaultStyle.borderStyle, this.cornerDefaultStyle.borderColor].join(' ');
166
+ this.cornerStyle.width = `${this.cornerDefaultStyle.width}px`;
167
+ this.cornerStyle.height = `${this.cornerDefaultStyle.height}px`;
168
+ this.cornerStyle.border = [`${this.cornerDefaultStyle.borderWidth}px`, this.cornerDefaultStyle.borderStyle, this.cornerDefaultStyle.borderColor].join(' ');
169
169
  if (isMobileBrowser() && this.instance.getSetting('isDataViewInstance')) {
170
170
  this.createMultipleSelectorHandles();
171
171
  }
@@ -434,9 +434,11 @@ class Border {
434
434
  if (isMobileBrowser() || !cornerVisibleSetting || this.isPartRange(checkRow, checkCol)) {
435
435
  this.cornerStyle.display = 'none';
436
436
  } else {
437
- this.cornerStyle.top = `${top + height + this.cornerCenterPointOffset - 1}px`;
438
- this.cornerStyle[inlinePosProperty] = `${inlineStartPos + width + this.cornerCenterPointOffset - 1}px`;
439
- this.cornerStyle.borderRightWidth = this.cornerDefaultStyle.borderWidth;
437
+ this.cornerStyle.top = `${top + height + this.cornerCenterPointOffset - this.cornerDefaultStyle.borderWidth}px`;
438
+ this.cornerStyle[inlinePosProperty] = `${inlineStartPos + width + this.cornerCenterPointOffset - this.cornerDefaultStyle.borderWidth}px`;
439
+ this.cornerStyle.borderRightWidth = `${this.cornerDefaultStyle.borderWidth}px`;
440
+ this.cornerStyle.borderLeftWidth = `${this.cornerDefaultStyle.borderWidth}px`;
441
+ this.cornerStyle.borderBottomWidth = `${this.cornerDefaultStyle.borderWidth}px`;
440
442
  this.cornerStyle.width = this.cornerDefaultStyle.width;
441
443
 
442
444
  // Hide the fill handle, so the possible further adjustments won't force unneeded scrollbars.
@@ -446,8 +448,12 @@ class Border {
446
448
  if (trimToWindow) {
447
449
  trimmingContainer = rootDocument.documentElement;
448
450
  }
449
- const cornerHalfWidth = parseInt(this.cornerDefaultStyle.width, 10) / 2;
450
- const cornerHalfHeight = parseInt(this.cornerDefaultStyle.height, 10) / 2;
451
+
452
+ // -1 was initially removed from the base position to compansate for the table border. We need to exclude it from
453
+ // the corner width.
454
+ const cornerBorderCompensation = parseInt(this.cornerDefaultStyle.borderWidth, 10) - 1;
455
+ const cornerHalfWidth = Math.ceil(parseInt(this.cornerDefaultStyle.width, 10) / 2);
456
+ const cornerHalfHeight = Math.ceil(parseInt(this.cornerDefaultStyle.height, 10) / 2);
451
457
  if (toColumn === this.wot.getSetting('totalColumns') - 1) {
452
458
  const toTdOffsetLeft = trimToWindow ? toTD.getBoundingClientRect().left : toTD.offsetLeft;
453
459
  let cornerOverlappingContainer = false;
@@ -460,7 +466,7 @@ class Border {
460
466
  cornerOverlappingContainer = cornerEdge >= innerWidth(trimmingContainer);
461
467
  }
462
468
  if (cornerOverlappingContainer) {
463
- this.cornerStyle[inlinePosProperty] = `${Math.floor(inlineStartPos + width + this.cornerCenterPointOffset - cornerHalfWidth)}px`;
469
+ this.cornerStyle[inlinePosProperty] = `${Math.floor(inlineStartPos + width + this.cornerCenterPointOffset - cornerHalfWidth - cornerBorderCompensation)}px`;
464
470
  this.cornerStyle[isRtl ? 'borderLeftWidth' : 'borderRightWidth'] = 0;
465
471
  }
466
472
  }
@@ -469,7 +475,7 @@ class Border {
469
475
  const cornerBottomEdge = toTdOffsetTop + outerHeight(toTD) + parseInt(this.cornerDefaultStyle.height, 10) / 2;
470
476
  const cornerOverlappingContainer = cornerBottomEdge >= innerHeight(trimmingContainer);
471
477
  if (cornerOverlappingContainer) {
472
- this.cornerStyle.top = `${Math.floor(top + height + this.cornerCenterPointOffset - cornerHalfHeight)}px`;
478
+ this.cornerStyle.top = `${Math.floor(top + height + this.cornerCenterPointOffset - cornerHalfHeight - cornerBorderCompensation)}px`;
473
479
  this.cornerStyle.borderBottomWidth = 0;
474
480
  }
475
481
  }