handsontable 0.0.0-next-8f0d419-20241118 → 0.0.0-next-988bf1e-20241120
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.
- package/3rdparty/walkontable/src/calculator/index.js +2 -1
- package/3rdparty/walkontable/src/calculator/index.mjs +2 -2
- package/3rdparty/walkontable/src/calculator/viewportRows.js +3 -3
- package/3rdparty/walkontable/src/calculator/viewportRows.mjs +3 -3
- package/3rdparty/walkontable/src/core/_base.js +0 -3
- package/3rdparty/walkontable/src/core/_base.mjs +0 -3
- package/3rdparty/walkontable/src/core/clone.js +0 -1
- package/3rdparty/walkontable/src/core/clone.mjs +0 -1
- package/3rdparty/walkontable/src/core/core.js +0 -2
- package/3rdparty/walkontable/src/core/core.mjs +0 -2
- package/3rdparty/walkontable/src/facade/core.js +0 -3
- package/3rdparty/walkontable/src/facade/core.mjs +0 -3
- package/3rdparty/walkontable/src/index.js +1 -0
- package/3rdparty/walkontable/src/index.mjs +2 -2
- package/3rdparty/walkontable/src/overlay/_base.js +1 -3
- package/3rdparty/walkontable/src/overlay/_base.mjs +1 -3
- package/3rdparty/walkontable/src/overlay/bottom.js +2 -2
- package/3rdparty/walkontable/src/overlay/bottom.mjs +2 -2
- package/3rdparty/walkontable/src/overlay/top.js +1 -1
- package/3rdparty/walkontable/src/overlay/top.mjs +1 -1
- package/3rdparty/walkontable/src/renderer/index.js +2 -4
- package/3rdparty/walkontable/src/renderer/index.mjs +2 -4
- package/3rdparty/walkontable/src/renderer/table.js +3 -12
- package/3rdparty/walkontable/src/renderer/table.mjs +3 -12
- package/3rdparty/walkontable/src/settings.js +2 -0
- package/3rdparty/walkontable/src/settings.mjs +2 -0
- package/3rdparty/walkontable/src/table.js +9 -17
- package/3rdparty/walkontable/src/table.mjs +9 -17
- package/3rdparty/walkontable/src/types.js +0 -1
- package/3rdparty/walkontable/src/types.mjs +0 -1
- package/3rdparty/walkontable/src/utils/column.js +1 -1
- package/3rdparty/walkontable/src/utils/column.mjs +1 -1
- package/3rdparty/walkontable/src/viewport.js +0 -1
- package/3rdparty/walkontable/src/viewport.mjs +0 -1
- package/base.js +2 -2
- package/base.mjs +2 -2
- package/core/hooks/constants.js +0 -9
- package/core/hooks/constants.mjs +0 -9
- package/core/hooks/index.d.ts +0 -1
- package/core.d.ts +0 -2
- package/core.js +0 -47
- package/core.mjs +0 -47
- package/dataMap/metaManager/metaSchema.js +3 -23
- package/dataMap/metaManager/metaSchema.mjs +3 -23
- package/dist/handsontable.css +9 -17
- package/dist/handsontable.full.css +240 -249
- package/dist/handsontable.full.js +4218 -4552
- package/dist/handsontable.full.min.css +9 -11
- package/dist/handsontable.full.min.js +53 -53
- package/dist/handsontable.js +3919 -4259
- package/dist/handsontable.min.css +4 -5
- package/dist/handsontable.min.js +24 -24
- package/editors/autocompleteEditor/autocompleteEditor.js +1 -1
- package/editors/autocompleteEditor/autocompleteEditor.mjs +1 -1
- package/editors/baseEditor/baseEditor.js +1 -1
- package/editors/baseEditor/baseEditor.mjs +1 -1
- package/editors/dateEditor/dateEditor.js +0 -9
- package/editors/dateEditor/dateEditor.mjs +1 -10
- package/editors/handsontableEditor/handsontableEditor.js +1 -7
- package/editors/handsontableEditor/handsontableEditor.mjs +1 -7
- package/editors/selectEditor/selectEditor.js +9 -20
- package/editors/selectEditor/selectEditor.mjs +9 -20
- package/editors/textEditor/textEditor.js +11 -4
- package/editors/textEditor/textEditor.mjs +11 -4
- package/helpers/dom/element.js +1 -32
- package/helpers/dom/element.mjs +1 -31
- package/helpers/mixed.js +2 -2
- package/helpers/mixed.mjs +2 -2
- package/package.json +3 -10
- package/plugins/comments/commentEditor.js +0 -9
- package/plugins/comments/commentEditor.mjs +0 -9
- package/plugins/comments/comments.js +0 -14
- package/plugins/comments/comments.mjs +1 -15
- package/plugins/contextMenu/menu/menu.js +4 -9
- package/plugins/contextMenu/menu/menu.mjs +4 -9
- package/plugins/filters/ui/multipleSelect.js +0 -6
- package/plugins/filters/ui/multipleSelect.mjs +0 -6
- package/plugins/manualRowMove/manualRowMove.js +1 -1
- package/plugins/manualRowMove/manualRowMove.mjs +1 -1
- package/plugins/manualRowResize/manualRowResize.js +2 -1
- package/plugins/manualRowResize/manualRowResize.mjs +3 -2
- package/plugins/mergeCells/mergeCells.js +1 -1
- package/plugins/mergeCells/mergeCells.mjs +1 -1
- package/plugins/nestedRows/ui/headers.js +1 -7
- package/plugins/nestedRows/ui/headers.mjs +1 -7
- package/plugins/stretchColumns/calculator.js +1 -2
- package/plugins/stretchColumns/calculator.mjs +2 -3
- package/renderers/checkboxRenderer/checkboxRenderer.js +8 -5
- package/renderers/checkboxRenderer/checkboxRenderer.mjs +8 -5
- package/settings.d.ts +0 -1
- package/tableView.js +0 -46
- package/tableView.mjs +1 -47
- package/utils/autoResize.js +1 -4
- package/utils/autoResize.mjs +1 -4
- package/utils/ghostTable.js +3 -5
- package/utils/ghostTable.mjs +3 -5
- package/3rdparty/walkontable/src/utils/stylesHandler.js +0 -287
- package/3rdparty/walkontable/src/utils/stylesHandler.mjs +0 -283
- package/helpers/themes.js +0 -17
- package/helpers/themes.mjs +0 -13
- package/styles/handsontable.css +0 -2166
- package/styles/handsontable.min.css +0 -30
- package/styles/ht-theme-horizon.css +0 -607
- package/styles/ht-theme-horizon.min.css +0 -30
- package/styles/ht-theme-main.css +0 -613
- package/styles/ht-theme-main.min.css +0 -30
@@ -21,4 +21,5 @@ 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;
|
24
|
+
exports.ViewportRowsCalculator = _viewportRows.ViewportRowsCalculator;
|
25
|
+
exports.DEFAULT_ROW_HEIGHT = _viewportRows.DEFAULT_HEIGHT;
|
@@ -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 } from "./viewportRows.mjs";
|
11
|
-
export { DEFAULT_WIDTH as DEFAULT_COLUMN_WIDTH, FullyVisibleColumnsCalculationType, FullyVisibleRowsCalculationType, PartiallyVisibleColumnsCalculationType, PartiallyVisibleRowsCalculationType, RenderedAllColumnsCalculationType, RenderedAllRowsCalculationType, RenderedColumnsCalculationType, RenderedRowsCalculationType, ViewportColumnsCalculator, ViewportRowsCalculator };
|
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 };
|
@@ -7,6 +7,8 @@ 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
|
+
|
10
12
|
/**
|
11
13
|
* @typedef {object} ViewportRowsCalculatorOptions
|
12
14
|
* @property {Map<string, ViewportBaseCalculator>} calculationTypes The calculation types to be performed.
|
@@ -32,7 +34,6 @@ class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
|
|
32
34
|
viewportHeight,
|
33
35
|
scrollOffset,
|
34
36
|
totalRows,
|
35
|
-
defaultRowHeight,
|
36
37
|
rowHeightFn,
|
37
38
|
overrideFn,
|
38
39
|
horizontalScrollbarHeight
|
@@ -50,7 +51,6 @@ class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
|
|
50
51
|
_defineProperty(this, "totalCalculatedHeight", 0);
|
51
52
|
_defineProperty(this, "startPositions", []);
|
52
53
|
_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
|
92
|
+
return DEFAULT_HEIGHT;
|
93
93
|
}
|
94
94
|
return rowHeight;
|
95
95
|
}
|
@@ -4,6 +4,8 @@ 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
|
+
|
7
9
|
/**
|
8
10
|
* @typedef {object} ViewportRowsCalculatorOptions
|
9
11
|
* @property {Map<string, ViewportBaseCalculator>} calculationTypes The calculation types to be performed.
|
@@ -29,7 +31,6 @@ export class ViewportRowsCalculator extends ViewportBaseCalculator {
|
|
29
31
|
viewportHeight,
|
30
32
|
scrollOffset,
|
31
33
|
totalRows,
|
32
|
-
defaultRowHeight,
|
33
34
|
rowHeightFn,
|
34
35
|
overrideFn,
|
35
36
|
horizontalScrollbarHeight
|
@@ -47,7 +48,6 @@ export class ViewportRowsCalculator extends ViewportBaseCalculator {
|
|
47
48
|
_defineProperty(this, "totalCalculatedHeight", 0);
|
48
49
|
_defineProperty(this, "startPositions", []);
|
49
50
|
_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
|
89
|
+
return DEFAULT_HEIGHT;
|
90
90
|
}
|
91
91
|
return rowHeight;
|
92
92
|
}
|
@@ -305,9 +305,6 @@ export default 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
|
-
},
|
311
308
|
get drawn() {
|
312
309
|
return wot.drawn;
|
313
310
|
},
|
@@ -30,7 +30,6 @@ 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;
|
34
33
|
this.wtTable = this.cloneOverlay.createTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
|
35
34
|
this.wtViewport = clone.viewport;
|
36
35
|
this.selectionManager = clone.selectionManager;
|
@@ -26,7 +26,6 @@ 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;
|
30
29
|
this.wtTable = this.cloneOverlay.createTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
|
31
30
|
this.wtViewport = clone.viewport;
|
32
31
|
this.selectionManager = clone.selectionManager;
|
@@ -12,7 +12,6 @@ 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");
|
16
15
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
17
16
|
/**
|
18
17
|
* @class Walkontable
|
@@ -24,7 +23,6 @@ class Walkontable extends _base.default {
|
|
24
23
|
*/
|
25
24
|
constructor(table, settings) {
|
26
25
|
super(table, new _settings.default(settings));
|
27
|
-
this.stylesHandler = new _stylesHandler.StylesHandler(this.domBindings);
|
28
26
|
const facadeGetter = this.wtSettings.getSetting('facade', this); // todo rethink. I would like to have no access to facade from the internal scope.
|
29
27
|
|
30
28
|
this.wtTable = new _master.default(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
|
@@ -9,7 +9,6 @@ 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";
|
13
12
|
/**
|
14
13
|
* @class Walkontable
|
15
14
|
*/
|
@@ -20,7 +19,6 @@ export default class Walkontable extends CoreAbstract {
|
|
20
19
|
*/
|
21
20
|
constructor(table, settings) {
|
22
21
|
super(table, new Settings(settings));
|
23
|
-
this.stylesHandler = new StylesHandler(this.domBindings);
|
24
22
|
const facadeGetter = this.wtSettings.getSetting('facade', this); // todo rethink. I would like to have no access to facade from the internal scope.
|
25
23
|
|
26
24
|
this.wtTable = new MasterTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
|
@@ -110,9 +110,6 @@ class WalkontableFacade {
|
|
110
110
|
get eventManager() {
|
111
111
|
return this._wot.eventManager;
|
112
112
|
}
|
113
|
-
get stylesHandler() {
|
114
|
-
return this._wot.stylesHandler;
|
115
|
-
}
|
116
113
|
createCellCoords(row, column) {
|
117
114
|
return this._wot.createCellCoords(row, column);
|
118
115
|
}
|
@@ -106,9 +106,6 @@ 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
|
-
}
|
112
109
|
createCellCoords(row, column) {
|
113
110
|
return this._wot.createCellCoords(row, column);
|
114
111
|
}
|
@@ -4,6 +4,7 @@ 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;
|
7
8
|
exports.DEFAULT_COLUMN_WIDTH = _calculator.DEFAULT_COLUMN_WIDTH;
|
8
9
|
var _coords = _interopRequireDefault(require("./cell/coords"));
|
9
10
|
exports.CellCoords = _coords.default;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { ViewportColumnsCalculator, ViewportRowsCalculator, DEFAULT_COLUMN_WIDTH } from "./calculator/index.mjs";
|
1
|
+
import { ViewportColumnsCalculator, ViewportRowsCalculator, DEFAULT_ROW_HEIGHT, 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_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_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 };
|
@@ -304,9 +304,7 @@ 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,
|
308
|
-
// todo ioc , or factory func if used only here
|
309
|
-
stylesHandler: this.wot.stylesHandler
|
307
|
+
selectionManager: this.wot.selectionManager // todo ioc , or factory func if used only here
|
310
308
|
});
|
311
309
|
}
|
312
310
|
|
@@ -300,9 +300,7 @@ 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,
|
304
|
-
// todo ioc , or factory func if used only here
|
305
|
-
stylesHandler: this.wot.stylesHandler
|
303
|
+
selectionManager: this.wot.selectionManager // todo ioc , or factory func if used only here
|
306
304
|
});
|
307
305
|
}
|
308
306
|
|
@@ -144,9 +144,9 @@ class BottomOverlay extends _base.Overlay {
|
|
144
144
|
sumCellSizes(from, to) {
|
145
145
|
const {
|
146
146
|
wtTable,
|
147
|
-
|
147
|
+
wtSettings
|
148
148
|
} = this.wot;
|
149
|
-
const defaultRowHeight =
|
149
|
+
const defaultRowHeight = wtSettings.getSetting('defaultRowHeight');
|
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
|
-
|
143
|
+
wtSettings
|
144
144
|
} = this.wot;
|
145
|
-
const defaultRowHeight =
|
145
|
+
const defaultRowHeight = wtSettings.getSetting('defaultRowHeight');
|
146
146
|
let row = from;
|
147
147
|
let sum = 0;
|
148
148
|
while (row < to) {
|
@@ -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.
|
141
|
+
const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
|
142
142
|
let row = from;
|
143
143
|
let sum = 0;
|
144
144
|
while (row < to) {
|
@@ -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.
|
137
|
+
const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
|
138
138
|
let row = from;
|
139
139
|
let sum = 0;
|
140
140
|
while (row < to) {
|
@@ -28,8 +28,7 @@ class Renderer {
|
|
28
28
|
TBODY,
|
29
29
|
rowUtils,
|
30
30
|
columnUtils,
|
31
|
-
cellRenderer
|
32
|
-
stylesHandler
|
31
|
+
cellRenderer
|
33
32
|
} = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
34
33
|
/**
|
35
34
|
* General renderer class used to render Walkontable content on screen.
|
@@ -37,8 +36,7 @@ class Renderer {
|
|
37
36
|
* @type {TableRenderer}
|
38
37
|
*/
|
39
38
|
this.renderer = new _table.default(TABLE, {
|
40
|
-
cellRenderer
|
41
|
-
stylesHandler
|
39
|
+
cellRenderer
|
42
40
|
});
|
43
41
|
this.renderer.setRenderers({
|
44
42
|
rowHeaders: new _rowHeaders.default(),
|
@@ -18,8 +18,7 @@ class Renderer {
|
|
18
18
|
TBODY,
|
19
19
|
rowUtils,
|
20
20
|
columnUtils,
|
21
|
-
cellRenderer
|
22
|
-
stylesHandler
|
21
|
+
cellRenderer
|
23
22
|
} = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
24
23
|
/**
|
25
24
|
* General renderer class used to render Walkontable content on screen.
|
@@ -27,8 +26,7 @@ class Renderer {
|
|
27
26
|
* @type {TableRenderer}
|
28
27
|
*/
|
29
28
|
this.renderer = new TableRenderer(TABLE, {
|
30
|
-
cellRenderer
|
31
|
-
stylesHandler
|
29
|
+
cellRenderer
|
32
30
|
});
|
33
31
|
this.renderer.setRenderers({
|
34
32
|
rowHeaders: new RowHeadersRenderer(),
|
@@ -52,8 +52,7 @@ 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
|
56
|
-
stylesHandler
|
55
|
+
cellRenderer
|
57
56
|
} = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
58
57
|
/**
|
59
58
|
* Table element which will be used to render the children element.
|
@@ -169,14 +168,9 @@ class TableRenderer {
|
|
169
168
|
* @type {'inline_start'|'top'|'top_inline_start_corner'|'bottom'|'bottom_inline_start_corner'|'master'}
|
170
169
|
*/
|
171
170
|
_defineProperty(this, "activeOverlayName", void 0);
|
172
|
-
/**
|
173
|
-
* Styles handler instance.
|
174
|
-
*/
|
175
|
-
_defineProperty(this, "stylesHandler", void 0);
|
176
171
|
this.rootNode = rootNode;
|
177
172
|
this.rootDocument = this.rootNode.ownerDocument;
|
178
173
|
this.cellRenderer = cellRenderer;
|
179
|
-
this.stylesHandler = stylesHandler;
|
180
174
|
}
|
181
175
|
|
182
176
|
/**
|
@@ -319,15 +313,12 @@ class TableRenderer {
|
|
319
313
|
// Fix for multi-line content and for supporting `rowHeights` option.
|
320
314
|
for (let visibleRowIndex = 0; visibleRowIndex < rowsToRender; visibleRowIndex++) {
|
321
315
|
const TR = rows.getRenderedNode(visibleRowIndex);
|
322
|
-
const rowUtils = this.rowUtils;
|
323
316
|
if (TR.firstChild) {
|
324
317
|
const sourceRowIndex = this.renderedRowToSource(visibleRowIndex);
|
325
|
-
const rowHeight = rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
|
326
|
-
const isBorderBoxSizing = this.stylesHandler.areCellsBorderBox();
|
327
|
-
const borderCompensation = isBorderBoxSizing ? 0 : 1;
|
318
|
+
const rowHeight = this.rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
|
328
319
|
if (rowHeight) {
|
329
320
|
// Decrease height. 1 pixel will be "replaced" by 1px border top
|
330
|
-
TR.firstChild.style.height = `${rowHeight -
|
321
|
+
TR.firstChild.style.height = `${rowHeight - 1}px`;
|
331
322
|
} else {
|
332
323
|
TR.firstChild.style.height = '';
|
333
324
|
}
|
@@ -49,8 +49,7 @@ 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
|
53
|
-
stylesHandler
|
52
|
+
cellRenderer
|
54
53
|
} = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
55
54
|
/**
|
56
55
|
* Table element which will be used to render the children element.
|
@@ -166,14 +165,9 @@ export default class TableRenderer {
|
|
166
165
|
* @type {'inline_start'|'top'|'top_inline_start_corner'|'bottom'|'bottom_inline_start_corner'|'master'}
|
167
166
|
*/
|
168
167
|
_defineProperty(this, "activeOverlayName", void 0);
|
169
|
-
/**
|
170
|
-
* Styles handler instance.
|
171
|
-
*/
|
172
|
-
_defineProperty(this, "stylesHandler", void 0);
|
173
168
|
this.rootNode = rootNode;
|
174
169
|
this.rootDocument = this.rootNode.ownerDocument;
|
175
170
|
this.cellRenderer = cellRenderer;
|
176
|
-
this.stylesHandler = stylesHandler;
|
177
171
|
}
|
178
172
|
|
179
173
|
/**
|
@@ -316,15 +310,12 @@ export default class TableRenderer {
|
|
316
310
|
// Fix for multi-line content and for supporting `rowHeights` option.
|
317
311
|
for (let visibleRowIndex = 0; visibleRowIndex < rowsToRender; visibleRowIndex++) {
|
318
312
|
const TR = rows.getRenderedNode(visibleRowIndex);
|
319
|
-
const rowUtils = this.rowUtils;
|
320
313
|
if (TR.firstChild) {
|
321
314
|
const sourceRowIndex = this.renderedRowToSource(visibleRowIndex);
|
322
|
-
const rowHeight = rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
|
323
|
-
const isBorderBoxSizing = this.stylesHandler.areCellsBorderBox();
|
324
|
-
const borderCompensation = isBorderBoxSizing ? 0 : 1;
|
315
|
+
const rowHeight = this.rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
|
325
316
|
if (rowHeight) {
|
326
317
|
// Decrease height. 1 pixel will be "replaced" by 1px border top
|
327
|
-
TR.firstChild.style.height = `${rowHeight -
|
318
|
+
TR.firstChild.style.height = `${rowHeight - 1}px`;
|
328
319
|
} else {
|
329
320
|
TR.firstChild.style.height = '';
|
330
321
|
}
|
@@ -19,6 +19,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
|
|
19
19
|
* @property {Option} currentRowClassName Option `currentRowClassName`.
|
20
20
|
* @property {Option} data Option `data`.
|
21
21
|
* @property {Option} defaultColumnWidth Option `defaultColumnWidth`.
|
22
|
+
* @property {Option} defaultRowHeight Option `defaultRowHeight`.
|
22
23
|
* @property {Option} externalRowCalculator Option `externalRowCalculator`.
|
23
24
|
* @property {Option} fixedColumnsStart Option `fixedColumnsStart`.
|
24
25
|
* @property {Option} fixedRowsBottom Option `fixedRowsBottom`.
|
@@ -184,6 +185,7 @@ class Settings {
|
|
184
185
|
rowHeightByOverlayName() {
|
185
186
|
// return undefined means use default size for the rendered cell content
|
186
187
|
},
|
188
|
+
defaultRowHeight: 23,
|
187
189
|
defaultColumnWidth: 50,
|
188
190
|
selections: null,
|
189
191
|
hideBorderOnMouseDownOver: false,
|
@@ -16,6 +16,7 @@ import { objectEach } from "../../../helpers/object.mjs";
|
|
16
16
|
* @property {Option} currentRowClassName Option `currentRowClassName`.
|
17
17
|
* @property {Option} data Option `data`.
|
18
18
|
* @property {Option} defaultColumnWidth Option `defaultColumnWidth`.
|
19
|
+
* @property {Option} defaultRowHeight Option `defaultRowHeight`.
|
19
20
|
* @property {Option} externalRowCalculator Option `externalRowCalculator`.
|
20
21
|
* @property {Option} fixedColumnsStart Option `fixedColumnsStart`.
|
21
22
|
* @property {Option} fixedRowsBottom Option `fixedRowsBottom`.
|
@@ -179,6 +180,7 @@ export default class Settings {
|
|
179
180
|
rowHeightByOverlayName() {
|
180
181
|
// return undefined means use default size for the rendered cell content
|
181
182
|
},
|
183
|
+
defaultRowHeight: 23,
|
182
184
|
defaultColumnWidth: 50,
|
183
185
|
selections: null,
|
184
186
|
hideBorderOnMouseDownOver: false,
|
@@ -117,8 +117,7 @@ class Table {
|
|
117
117
|
TBODY: this.TBODY,
|
118
118
|
rowUtils: this.rowUtils,
|
119
119
|
columnUtils: this.columnUtils,
|
120
|
-
cellRenderer: this.wtSettings.getSettingPure('cellRenderer')
|
121
|
-
stylesHandler: this.dataAccessObject.stylesHandler
|
120
|
+
cellRenderer: this.wtSettings.getSettingPure('cellRenderer')
|
122
121
|
});
|
123
122
|
}
|
124
123
|
|
@@ -354,7 +353,7 @@ class Table {
|
|
354
353
|
markIfOversizedColumnHeader(col) {
|
355
354
|
const sourceColIndex = this.columnFilter.renderedToSource(col);
|
356
355
|
let level = this.wtSettings.getSetting('columnHeaders').length;
|
357
|
-
const defaultRowHeight = this.
|
356
|
+
const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
|
358
357
|
let previousColHeaderHeight;
|
359
358
|
let currentHeader;
|
360
359
|
let currentHeaderHeight;
|
@@ -632,14 +631,10 @@ class Table {
|
|
632
631
|
return;
|
633
632
|
}
|
634
633
|
let rowCount = this.TBODY.childNodes.length;
|
635
|
-
const expectedTableHeight = rowCount * this.
|
634
|
+
const expectedTableHeight = rowCount * this.wtSettings.getSetting('defaultRowHeight');
|
636
635
|
const actualTableHeight = (0, _element.innerHeight)(this.TBODY) - 1;
|
637
|
-
const borderBoxSizing = this.wot.stylesHandler.areCellsBorderBox();
|
638
|
-
const rowHeightFn = borderBoxSizing ? _element.outerHeight : _element.innerHeight;
|
639
|
-
const borderCompensation = borderBoxSizing ? 0 : 1;
|
640
|
-
const firstRowBorderCompensation = borderBoxSizing ? 1 : 0;
|
641
636
|
let previousRowHeight;
|
642
|
-
let
|
637
|
+
let rowInnerHeight;
|
643
638
|
let sourceRowIndex;
|
644
639
|
let currentTr;
|
645
640
|
let rowHeader;
|
@@ -653,17 +648,14 @@ class Table {
|
|
653
648
|
previousRowHeight = this.getRowHeight(sourceRowIndex);
|
654
649
|
currentTr = this.getTrForRow(sourceRowIndex);
|
655
650
|
rowHeader = currentTr.querySelector('th');
|
656
|
-
const topBorderCompensation = sourceRowIndex === 0 ? firstRowBorderCompensation : 0;
|
657
651
|
if (rowHeader) {
|
658
|
-
|
652
|
+
rowInnerHeight = (0, _element.innerHeight)(rowHeader);
|
659
653
|
} else {
|
660
|
-
|
654
|
+
rowInnerHeight = (0, _element.innerHeight)(currentTr) - 1;
|
661
655
|
}
|
662
|
-
if (!previousRowHeight && this.
|
663
|
-
|
664
|
-
|
665
|
-
}
|
666
|
-
this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowCurrentHeight;
|
656
|
+
if (!previousRowHeight && this.wtSettings.getSetting('defaultRowHeight') < rowInnerHeight || previousRowHeight < rowInnerHeight) {
|
657
|
+
rowInnerHeight += 1;
|
658
|
+
this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowInnerHeight;
|
667
659
|
}
|
668
660
|
}
|
669
661
|
}
|
@@ -113,8 +113,7 @@ class Table {
|
|
113
113
|
TBODY: this.TBODY,
|
114
114
|
rowUtils: this.rowUtils,
|
115
115
|
columnUtils: this.columnUtils,
|
116
|
-
cellRenderer: this.wtSettings.getSettingPure('cellRenderer')
|
117
|
-
stylesHandler: this.dataAccessObject.stylesHandler
|
116
|
+
cellRenderer: this.wtSettings.getSettingPure('cellRenderer')
|
118
117
|
});
|
119
118
|
}
|
120
119
|
|
@@ -350,7 +349,7 @@ class Table {
|
|
350
349
|
markIfOversizedColumnHeader(col) {
|
351
350
|
const sourceColIndex = this.columnFilter.renderedToSource(col);
|
352
351
|
let level = this.wtSettings.getSetting('columnHeaders').length;
|
353
|
-
const defaultRowHeight = this.
|
352
|
+
const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
|
354
353
|
let previousColHeaderHeight;
|
355
354
|
let currentHeader;
|
356
355
|
let currentHeaderHeight;
|
@@ -628,14 +627,10 @@ class Table {
|
|
628
627
|
return;
|
629
628
|
}
|
630
629
|
let rowCount = this.TBODY.childNodes.length;
|
631
|
-
const expectedTableHeight = rowCount * this.
|
630
|
+
const expectedTableHeight = rowCount * this.wtSettings.getSetting('defaultRowHeight');
|
632
631
|
const actualTableHeight = innerHeight(this.TBODY) - 1;
|
633
|
-
const borderBoxSizing = this.wot.stylesHandler.areCellsBorderBox();
|
634
|
-
const rowHeightFn = borderBoxSizing ? outerHeight : innerHeight;
|
635
|
-
const borderCompensation = borderBoxSizing ? 0 : 1;
|
636
|
-
const firstRowBorderCompensation = borderBoxSizing ? 1 : 0;
|
637
632
|
let previousRowHeight;
|
638
|
-
let
|
633
|
+
let rowInnerHeight;
|
639
634
|
let sourceRowIndex;
|
640
635
|
let currentTr;
|
641
636
|
let rowHeader;
|
@@ -649,17 +644,14 @@ class Table {
|
|
649
644
|
previousRowHeight = this.getRowHeight(sourceRowIndex);
|
650
645
|
currentTr = this.getTrForRow(sourceRowIndex);
|
651
646
|
rowHeader = currentTr.querySelector('th');
|
652
|
-
const topBorderCompensation = sourceRowIndex === 0 ? firstRowBorderCompensation : 0;
|
653
647
|
if (rowHeader) {
|
654
|
-
|
648
|
+
rowInnerHeight = innerHeight(rowHeader);
|
655
649
|
} else {
|
656
|
-
|
650
|
+
rowInnerHeight = innerHeight(currentTr) - 1;
|
657
651
|
}
|
658
|
-
if (!previousRowHeight && this.
|
659
|
-
|
660
|
-
|
661
|
-
}
|
662
|
-
this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowCurrentHeight;
|
652
|
+
if (!previousRowHeight && this.wtSettings.getSetting('defaultRowHeight') < rowInnerHeight || previousRowHeight < rowInnerHeight) {
|
653
|
+
rowInnerHeight += 1;
|
654
|
+
this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowInnerHeight;
|
663
655
|
}
|
664
656
|
}
|
665
657
|
}
|
@@ -66,7 +66,6 @@
|
|
66
66
|
* @property {Walkontable} cloneSource CloneSource.
|
67
67
|
* @property {Walkontable} wot Wot.
|
68
68
|
* @property {number} parentTableOffset ParentTableOffset.
|
69
|
-
* @property {StylesHandler} stylesHandler StylesHandler.
|
70
69
|
* @property {number|null} startColumnRendered StartColumnRendered.
|
71
70
|
* @property {number|null} startColumnVisible StartColumnVisible.
|
72
71
|
* @property {number|null} endColumnRendered EndColumnRendered.
|
@@ -66,7 +66,6 @@
|
|
66
66
|
* @property {Walkontable} cloneSource CloneSource.
|
67
67
|
* @property {Walkontable} wot Wot.
|
68
68
|
* @property {number} parentTableOffset ParentTableOffset.
|
69
|
-
* @property {StylesHandler} stylesHandler StylesHandler.
|
70
69
|
* @property {number|null} startColumnRendered StartColumnRendered.
|
71
70
|
* @property {number|null} startColumnVisible StartColumnVisible.
|
72
71
|
* @property {number|null} endColumnRendered EndColumnRendered.
|
@@ -50,7 +50,7 @@ class ColumnUtils {
|
|
50
50
|
* @returns {number}
|
51
51
|
*/
|
52
52
|
getHeaderHeight(level) {
|
53
|
-
let height = this.
|
53
|
+
let height = this.wtSettings.getSetting('defaultRowHeight');
|
54
54
|
const oversizedHeight = this.dataAccessObject.wtViewport.oversizedColumnHeaders[level];
|
55
55
|
if (oversizedHeight !== undefined) {
|
56
56
|
height = height ? Math.max(height, oversizedHeight) : oversizedHeight;
|
@@ -47,7 +47,7 @@ export default class ColumnUtils {
|
|
47
47
|
* @returns {number}
|
48
48
|
*/
|
49
49
|
getHeaderHeight(level) {
|
50
|
-
let height = this.
|
50
|
+
let height = this.wtSettings.getSetting('defaultRowHeight');
|
51
51
|
const oversizedHeight = this.dataAccessObject.wtViewport.oversizedColumnHeaders[level];
|
52
52
|
if (oversizedHeight !== undefined) {
|
53
53
|
height = height ? Math.max(height, oversizedHeight) : oversizedHeight;
|
@@ -264,7 +264,6 @@ class Viewport {
|
|
264
264
|
viewportHeight: height,
|
265
265
|
scrollOffset: pos,
|
266
266
|
totalRows: wtSettings.getSetting('totalRows'),
|
267
|
-
defaultRowHeight: this.instance.stylesHandler.getDefaultRowHeight(),
|
268
267
|
rowHeightFn: sourceRow => wtTable.getRowHeight(sourceRow),
|
269
268
|
overrideFn: wtSettings.getSettingPure('viewportRowCalculatorOverride'),
|
270
269
|
horizontalScrollbarHeight: scrollbarHeight
|
@@ -261,7 +261,6 @@ class Viewport {
|
|
261
261
|
viewportHeight: height,
|
262
262
|
scrollOffset: pos,
|
263
263
|
totalRows: wtSettings.getSetting('totalRows'),
|
264
|
-
defaultRowHeight: this.instance.stylesHandler.getDefaultRowHeight(),
|
265
264
|
rowHeightFn: sourceRow => wtTable.getRowHeight(sourceRow),
|
266
265
|
overrideFn: wtSettings.getSettingPure('viewportRowCalculatorOverride'),
|
267
266
|
horizontalScrollbarHeight: scrollbarHeight
|
package/base.js
CHANGED
@@ -45,8 +45,8 @@ Handsontable.hooks = _hooks.Hooks.getSingleton();
|
|
45
45
|
Handsontable.CellCoords = _src.CellCoords;
|
46
46
|
Handsontable.CellRange = _src.CellRange;
|
47
47
|
Handsontable.packageName = 'handsontable';
|
48
|
-
Handsontable.buildDate = "
|
49
|
-
Handsontable.version = "0.0.0-next-
|
48
|
+
Handsontable.buildDate = "20/11/2024 10:20:23";
|
49
|
+
Handsontable.version = "0.0.0-next-988bf1e-20241120";
|
50
50
|
Handsontable.languages = {
|
51
51
|
dictionaryKeys: _registry.dictionaryKeys,
|
52
52
|
getLanguageDictionary: _registry.getLanguageDictionary,
|
package/base.mjs
CHANGED
@@ -35,8 +35,8 @@ Handsontable.hooks = Hooks.getSingleton();
|
|
35
35
|
Handsontable.CellCoords = CellCoords;
|
36
36
|
Handsontable.CellRange = CellRange;
|
37
37
|
Handsontable.packageName = 'handsontable';
|
38
|
-
Handsontable.buildDate = "
|
39
|
-
Handsontable.version = "0.0.0-next-
|
38
|
+
Handsontable.buildDate = "20/11/2024 10:20:29";
|
39
|
+
Handsontable.version = "0.0.0-next-988bf1e-20241120";
|
40
40
|
Handsontable.languages = {
|
41
41
|
dictionaryKeys,
|
42
42
|
getLanguageDictionary,
|