handsontable 14.0.0-next-c080457-20231107 → 14.0.0-next-bfad250-20231108
Sign up to get free protection for your applications and to get access to all the features.
- package/3rdparty/SheetClip/SheetClip.js +2 -2
- package/3rdparty/SheetClip/SheetClip.mjs +2 -2
- package/3rdparty/autoResize/autoResize.js +2 -2
- package/3rdparty/autoResize/autoResize.mjs +2 -2
- package/3rdparty/walkontable/src/calculator/viewportColumns.js +108 -85
- package/3rdparty/walkontable/src/calculator/viewportColumns.mjs +108 -85
- package/3rdparty/walkontable/src/calculator/viewportRows.js +60 -52
- package/3rdparty/walkontable/src/calculator/viewportRows.mjs +60 -52
- package/3rdparty/walkontable/src/cell/coords.js +7 -5
- package/3rdparty/walkontable/src/cell/coords.mjs +7 -5
- package/3rdparty/walkontable/src/core/clone.js +6 -0
- package/3rdparty/walkontable/src/core/clone.mjs +6 -0
- package/3rdparty/walkontable/src/event.js +125 -74
- package/3rdparty/walkontable/src/event.mjs +125 -74
- package/3rdparty/walkontable/src/filter/column.js +16 -0
- package/3rdparty/walkontable/src/filter/column.mjs +16 -0
- package/3rdparty/walkontable/src/filter/row.js +16 -0
- package/3rdparty/walkontable/src/filter/row.mjs +16 -0
- package/3rdparty/walkontable/src/overlay/bottom.js +1 -1
- package/3rdparty/walkontable/src/overlay/bottom.mjs +1 -1
- package/3rdparty/walkontable/src/overlay/top.js +1 -1
- package/3rdparty/walkontable/src/overlay/top.mjs +1 -1
- package/3rdparty/walkontable/src/renderer/_base.js +12 -5
- package/3rdparty/walkontable/src/renderer/_base.mjs +12 -5
- package/3rdparty/walkontable/src/renderer/cells.js +6 -2
- package/3rdparty/walkontable/src/renderer/cells.mjs +6 -2
- package/3rdparty/walkontable/src/renderer/rowHeaders.js +6 -2
- package/3rdparty/walkontable/src/renderer/rowHeaders.mjs +6 -2
- package/3rdparty/walkontable/src/renderer/rows.js +5 -0
- package/3rdparty/walkontable/src/renderer/rows.mjs +5 -0
- package/3rdparty/walkontable/src/renderer/table.js +24 -17
- package/3rdparty/walkontable/src/renderer/table.mjs +24 -17
- package/3rdparty/walkontable/src/scroll.js +2 -2
- package/3rdparty/walkontable/src/scroll.mjs +2 -2
- package/3rdparty/walkontable/src/selection/border/border.js +1 -1
- package/3rdparty/walkontable/src/selection/border/border.mjs +1 -1
- package/3rdparty/walkontable/src/settings.js +10 -10
- package/3rdparty/walkontable/src/settings.mjs +10 -10
- package/3rdparty/walkontable/src/table.js +3 -3
- package/3rdparty/walkontable/src/table.mjs +3 -3
- package/3rdparty/walkontable/src/utils/column.js +19 -4
- package/3rdparty/walkontable/src/utils/column.mjs +19 -4
- package/3rdparty/walkontable/src/utils/nodesPool.js +5 -0
- package/3rdparty/walkontable/src/utils/nodesPool.mjs +5 -0
- package/3rdparty/walkontable/src/utils/orderView/view.js +13 -6
- package/3rdparty/walkontable/src/utils/orderView/view.mjs +13 -6
- package/3rdparty/walkontable/src/utils/orderView/viewSize.js +9 -6
- package/3rdparty/walkontable/src/utils/orderView/viewSize.mjs +9 -6
- package/3rdparty/walkontable/src/utils/orderView/viewSizeSet.js +7 -4
- package/3rdparty/walkontable/src/utils/orderView/viewSizeSet.mjs +7 -4
- package/3rdparty/walkontable/src/utils/row.js +14 -2
- package/3rdparty/walkontable/src/utils/row.mjs +14 -2
- package/3rdparty/walkontable/src/viewport.js +9 -9
- package/3rdparty/walkontable/src/viewport.mjs +9 -9
- package/base.js +2 -2
- package/base.mjs +2 -2
- package/core.js +25 -25
- package/core.mjs +25 -25
- package/dataMap/dataMap.js +99 -90
- package/dataMap/dataMap.mjs +99 -90
- package/dataMap/dataSource.js +14 -8
- package/dataMap/dataSource.mjs +14 -8
- package/dataMap/metaManager/lazyFactoryMap.js +19 -7
- package/dataMap/metaManager/lazyFactoryMap.mjs +19 -7
- package/dataMap/metaManager/metaLayers/cellMeta.js +8 -3
- package/dataMap/metaManager/metaLayers/cellMeta.mjs +8 -3
- package/dataMap/metaManager/metaLayers/columnMeta.js +7 -1
- package/dataMap/metaManager/metaLayers/columnMeta.mjs +7 -1
- package/dataMap/metaManager/metaLayers/globalMeta.js +6 -1
- package/dataMap/metaManager/metaLayers/globalMeta.mjs +6 -1
- package/dataMap/metaManager/metaLayers/tableMeta.js +6 -2
- package/dataMap/metaManager/metaLayers/tableMeta.mjs +6 -2
- package/dataMap/metaManager/metaSchema.js +55 -55
- package/dataMap/metaManager/metaSchema.mjs +55 -55
- package/dataMap/metaManager/mods/dynamicCellMeta.js +7 -2
- package/dataMap/metaManager/mods/dynamicCellMeta.mjs +7 -2
- package/dataMap/metaManager/mods/extendMetaProperties.js +8 -4
- package/dataMap/metaManager/mods/extendMetaProperties.mjs +8 -4
- package/dataMap/metaManager/utils.js +2 -2
- package/dataMap/metaManager/utils.mjs +2 -2
- package/dist/handsontable.css +2 -2
- package/dist/handsontable.full.css +2 -2
- package/dist/handsontable.full.js +7337 -6389
- package/dist/handsontable.full.min.css +2 -2
- package/dist/handsontable.full.min.js +154 -154
- package/dist/handsontable.js +7336 -6388
- package/dist/handsontable.min.css +2 -2
- package/dist/handsontable.min.js +28 -28
- package/editorManager.js +105 -95
- package/editorManager.mjs +105 -95
- package/editors/autocompleteEditor/autocompleteEditor.js +47 -46
- package/editors/autocompleteEditor/autocompleteEditor.mjs +46 -45
- package/editors/baseEditor/baseEditor.js +23 -26
- package/editors/baseEditor/baseEditor.mjs +23 -26
- package/editors/dateEditor/dateEditor.js +24 -15
- package/editors/dateEditor/dateEditor.mjs +24 -15
- package/editors/dropdownEditor/dropdownEditor.js +1 -1
- package/editors/dropdownEditor/dropdownEditor.mjs +1 -1
- package/editors/handsontableEditor/handsontableEditor.js +4 -4
- package/editors/handsontableEditor/handsontableEditor.mjs +4 -4
- package/editors/textEditor/textEditor.js +23 -17
- package/editors/textEditor/textEditor.mjs +24 -18
- package/eventManager.js +8 -0
- package/eventManager.mjs +8 -0
- package/helpers/array.js +2 -2
- package/helpers/array.mjs +2 -2
- package/helpers/dom/element.js +7 -7
- package/helpers/dom/element.mjs +7 -7
- package/helpers/function.js +1 -1
- package/helpers/function.mjs +1 -1
- package/helpers/mixed.js +1 -1
- package/helpers/mixed.mjs +1 -1
- package/helpers/object.js +4 -4
- package/helpers/object.mjs +4 -4
- package/helpers/string.js +1 -1
- package/helpers/string.mjs +1 -1
- package/package.json +1 -1
- package/pluginHooks.d.ts +0 -2
- package/pluginHooks.js +12 -3
- package/pluginHooks.mjs +12 -3
- package/plugins/autoColumnSize/autoColumnSize.js +141 -130
- package/plugins/autoColumnSize/autoColumnSize.mjs +140 -129
- package/plugins/autoRowSize/autoRowSize.js +112 -125
- package/plugins/autoRowSize/autoRowSize.mjs +110 -123
- package/plugins/autofill/autofill.d.ts +0 -1
- package/plugins/autofill/autofill.js +98 -102
- package/plugins/autofill/autofill.mjs +97 -101
- package/plugins/base/base.js +61 -28
- package/plugins/base/base.mjs +60 -28
- package/plugins/bindRowsWithHeaders/bindRowsWithHeaders.js +29 -24
- package/plugins/bindRowsWithHeaders/bindRowsWithHeaders.mjs +28 -23
- package/plugins/collapsibleColumns/collapsibleColumns.js +104 -107
- package/plugins/collapsibleColumns/collapsibleColumns.mjs +102 -104
- package/plugins/columnSorting/columnSorting.js +107 -99
- package/plugins/columnSorting/columnSorting.mjs +106 -98
- package/plugins/columnSorting/columnStatesManager.js +12 -6
- package/plugins/columnSorting/columnStatesManager.mjs +12 -6
- package/plugins/columnSummary/columnSummary.js +71 -58
- package/plugins/columnSummary/columnSummary.mjs +70 -57
- package/plugins/columnSummary/endpoints.js +20 -14
- package/plugins/columnSummary/endpoints.mjs +20 -14
- package/plugins/comments/commentEditor.js +30 -2
- package/plugins/comments/commentEditor.mjs +30 -2
- package/plugins/comments/comments.js +158 -169
- package/plugins/comments/comments.mjs +157 -168
- package/plugins/comments/displaySwitch.js +7 -3
- package/plugins/comments/displaySwitch.mjs +7 -3
- package/plugins/contextMenu/commandExecutor.js +15 -2
- package/plugins/contextMenu/commandExecutor.mjs +15 -2
- package/plugins/contextMenu/contextMenu.js +96 -102
- package/plugins/contextMenu/contextMenu.mjs +95 -101
- package/plugins/contextMenu/itemsFactory.js +19 -4
- package/plugins/contextMenu/itemsFactory.mjs +19 -4
- package/plugins/contextMenu/menu/cursor.js +36 -0
- package/plugins/contextMenu/menu/cursor.mjs +36 -0
- package/plugins/contextMenu/menu/menu.js +57 -5
- package/plugins/contextMenu/menu/menu.mjs +57 -5
- package/plugins/contextMenu/predefinedItems/removeColumn.js +1 -1
- package/plugins/contextMenu/predefinedItems/removeColumn.mjs +1 -1
- package/plugins/contextMenu/predefinedItems/removeRow.js +1 -1
- package/plugins/contextMenu/predefinedItems/removeRow.mjs +1 -1
- package/plugins/copyPaste/copyPaste.js +74 -75
- package/plugins/copyPaste/copyPaste.mjs +74 -75
- package/plugins/customBorders/customBorders.js +57 -50
- package/plugins/customBorders/customBorders.mjs +56 -49
- package/plugins/dragToScroll/dragToScroll.js +50 -54
- package/plugins/dragToScroll/dragToScroll.mjs +49 -52
- package/plugins/dropdownMenu/dropdownMenu.js +136 -131
- package/plugins/dropdownMenu/dropdownMenu.mjs +136 -131
- package/plugins/exportFile/dataProvider.js +7 -2
- package/plugins/exportFile/dataProvider.mjs +7 -2
- package/plugins/exportFile/exportFile.js +1 -1
- package/plugins/exportFile/exportFile.mjs +1 -1
- package/plugins/exportFile/types/_base.js +14 -6
- package/plugins/exportFile/types/_base.mjs +14 -6
- package/plugins/filters/component/actionBar.js +9 -0
- package/plugins/filters/component/actionBar.mjs +9 -0
- package/plugins/filters/component/condition.js +13 -0
- package/plugins/filters/component/condition.mjs +13 -0
- package/plugins/filters/component/operators.js +9 -0
- package/plugins/filters/component/operators.mjs +9 -0
- package/plugins/filters/component/value.js +9 -0
- package/plugins/filters/component/value.mjs +9 -0
- package/plugins/filters/conditionCollection.js +9 -4
- package/plugins/filters/conditionCollection.mjs +9 -4
- package/plugins/filters/conditionUpdateObserver.js +53 -42
- package/plugins/filters/conditionUpdateObserver.mjs +53 -42
- package/plugins/filters/dataFilter.js +9 -3
- package/plugins/filters/dataFilter.mjs +9 -3
- package/plugins/filters/filters.js +184 -189
- package/plugins/filters/filters.mjs +182 -187
- package/plugins/filters/ui/_base.js +1 -1
- package/plugins/filters/ui/_base.mjs +1 -1
- package/plugins/filters/utils.js +1 -1
- package/plugins/filters/utils.mjs +1 -1
- package/plugins/formulas/engine/settings.js +1 -1
- package/plugins/formulas/engine/settings.mjs +1 -1
- package/plugins/formulas/formulas.js +684 -602
- package/plugins/formulas/formulas.mjs +682 -600
- package/plugins/hiddenColumns/hiddenColumns.js +174 -169
- package/plugins/hiddenColumns/hiddenColumns.mjs +173 -168
- package/plugins/hiddenRows/hiddenRows.js +170 -165
- package/plugins/hiddenRows/hiddenRows.mjs +169 -164
- package/plugins/manualColumnFreeze/contextMenuItem/freezeColumn.js +1 -1
- package/plugins/manualColumnFreeze/contextMenuItem/freezeColumn.mjs +1 -1
- package/plugins/manualColumnFreeze/contextMenuItem/unfreezeColumn.js +1 -1
- package/plugins/manualColumnFreeze/contextMenuItem/unfreezeColumn.mjs +1 -1
- package/plugins/manualColumnFreeze/manualColumnFreeze.js +66 -53
- package/plugins/manualColumnFreeze/manualColumnFreeze.mjs +64 -51
- package/plugins/manualColumnMove/manualColumnMove.js +287 -232
- package/plugins/manualColumnMove/manualColumnMove.mjs +286 -231
- package/plugins/manualColumnMove/ui/_base.js +9 -3
- package/plugins/manualColumnMove/ui/_base.mjs +9 -3
- package/plugins/manualColumnResize/manualColumnResize.js +291 -246
- package/plugins/manualColumnResize/manualColumnResize.mjs +290 -244
- package/plugins/manualRowMove/manualRowMove.js +223 -208
- package/plugins/manualRowMove/manualRowMove.mjs +222 -207
- package/plugins/manualRowMove/ui/_base.js +10 -5
- package/plugins/manualRowMove/ui/_base.mjs +10 -5
- package/plugins/manualRowResize/manualRowResize.js +254 -209
- package/plugins/manualRowResize/manualRowResize.mjs +253 -207
- package/plugins/mergeCells/calculations/autofill.js +9 -3
- package/plugins/mergeCells/calculations/autofill.mjs +9 -3
- package/plugins/mergeCells/calculations/selection.js +10 -4
- package/plugins/mergeCells/calculations/selection.mjs +10 -4
- package/plugins/mergeCells/cellCoords.js +16 -6
- package/plugins/mergeCells/cellCoords.mjs +16 -6
- package/plugins/mergeCells/cellsCollection.js +10 -4
- package/plugins/mergeCells/cellsCollection.mjs +10 -4
- package/plugins/mergeCells/mergeCells.js +582 -502
- package/plugins/mergeCells/mergeCells.mjs +580 -500
- package/plugins/multiColumnSorting/multiColumnSorting.js +15 -11
- package/plugins/multiColumnSorting/multiColumnSorting.mjs +15 -11
- package/plugins/multipleSelectionHandles/multipleSelectionHandles.js +16 -28
- package/plugins/multipleSelectionHandles/multipleSelectionHandles.mjs +16 -27
- package/plugins/nestedHeaders/nestedHeaders.js +542 -499
- package/plugins/nestedHeaders/nestedHeaders.mjs +554 -511
- package/plugins/nestedHeaders/stateManager/index.js +1 -1
- package/plugins/nestedHeaders/stateManager/index.mjs +1 -1
- package/plugins/nestedRows/data/dataManager.js +21 -15
- package/plugins/nestedRows/data/dataManager.mjs +21 -15
- package/plugins/nestedRows/nestedRows.js +335 -279
- package/plugins/nestedRows/nestedRows.mjs +334 -278
- package/plugins/nestedRows/ui/_base.js +7 -1
- package/plugins/nestedRows/ui/_base.mjs +7 -1
- package/plugins/nestedRows/ui/collapsing.js +2 -2
- package/plugins/nestedRows/ui/collapsing.mjs +2 -2
- package/plugins/nestedRows/ui/contextMenu.js +28 -18
- package/plugins/nestedRows/ui/contextMenu.mjs +28 -18
- package/plugins/nestedRows/utils/rowMoveController.js +12 -4
- package/plugins/nestedRows/utils/rowMoveController.mjs +12 -4
- package/plugins/persistentState/persistentState.js +14 -11
- package/plugins/persistentState/persistentState.mjs +14 -11
- package/plugins/persistentState/storage.js +11 -6
- package/plugins/persistentState/storage.mjs +11 -6
- package/plugins/registry.js +2 -2
- package/plugins/registry.mjs +2 -2
- package/plugins/search/search.js +57 -46
- package/plugins/search/search.mjs +56 -45
- package/plugins/touchScroll/touchScroll.js +102 -100
- package/plugins/touchScroll/touchScroll.mjs +100 -98
- package/plugins/trimRows/trimRows.js +33 -28
- package/plugins/trimRows/trimRows.mjs +32 -27
- package/plugins/undoRedo/undoRedo.js +2 -2
- package/plugins/undoRedo/undoRedo.mjs +2 -2
- package/renderers/autocompleteRenderer/autocompleteRenderer.js +11 -11
- package/renderers/autocompleteRenderer/autocompleteRenderer.mjs +11 -11
- package/renderers/baseRenderer/baseRenderer.js +2 -2
- package/renderers/baseRenderer/baseRenderer.mjs +2 -2
- package/renderers/checkboxRenderer/checkboxRenderer.js +23 -23
- package/renderers/checkboxRenderer/checkboxRenderer.mjs +23 -23
- package/renderers/dateRenderer/dateRenderer.js +4 -4
- package/renderers/dateRenderer/dateRenderer.mjs +4 -4
- package/renderers/handsontableRenderer/handsontableRenderer.js +4 -4
- package/renderers/handsontableRenderer/handsontableRenderer.mjs +4 -4
- package/renderers/htmlRenderer/htmlRenderer.js +4 -4
- package/renderers/htmlRenderer/htmlRenderer.mjs +4 -4
- package/renderers/numericRenderer/numericRenderer.js +3 -3
- package/renderers/numericRenderer/numericRenderer.mjs +3 -3
- package/renderers/passwordRenderer/passwordRenderer.js +3 -3
- package/renderers/passwordRenderer/passwordRenderer.mjs +3 -3
- package/renderers/selectRenderer/selectRenderer.js +4 -4
- package/renderers/selectRenderer/selectRenderer.mjs +4 -4
- package/renderers/textRenderer/textRenderer.js +5 -5
- package/renderers/textRenderer/textRenderer.mjs +5 -5
- package/renderers/timeRenderer/timeRenderer.js +3 -3
- package/renderers/timeRenderer/timeRenderer.mjs +3 -3
- package/selection/range.js +12 -2
- package/selection/range.mjs +12 -2
- package/selection/selection.js +28 -10
- package/selection/selection.mjs +28 -10
- package/selection/utils.js +24 -14
- package/selection/utils.mjs +25 -15
- package/shortcuts/manager.js +1 -1
- package/shortcuts/manager.mjs +1 -1
- package/tableView.js +208 -200
- package/tableView.mjs +208 -200
- package/translations/changesObservable/utils.js +2 -2
- package/translations/changesObservable/utils.mjs +2 -2
- package/translations/indexMapper.js +25 -22
- package/translations/indexMapper.mjs +25 -22
- package/translations/mapCollections/aggregatedCollection.js +8 -2
- package/translations/mapCollections/aggregatedCollection.mjs +8 -2
- package/translations/mapCollections/mapCollection.js +5 -2
- package/translations/mapCollections/mapCollection.mjs +5 -2
- package/translations/maps/indexMap.js +6 -1
- package/translations/maps/indexMap.mjs +6 -1
- package/translations/maps/utils/physicallyIndexed.js +2 -2
- package/translations/maps/utils/physicallyIndexed.mjs +2 -2
- package/utils/dataStructures/linkedList.js +10 -6
- package/utils/dataStructures/linkedList.mjs +10 -6
- package/utils/dataStructures/queue.js +1 -1
- package/utils/dataStructures/queue.mjs +1 -1
- package/utils/dataStructures/stack.js +1 -1
- package/utils/dataStructures/stack.mjs +1 -1
- package/utils/ghostTable.js +2 -2
- package/utils/ghostTable.mjs +2 -2
- package/utils/interval.js +73 -36
- package/utils/interval.mjs +73 -36
- package/utils/parseTable.js +1 -1
- package/utils/parseTable.mjs +1 -1
- package/validators/autocompleteValidator/autocompleteValidator.js +1 -1
- package/validators/autocompleteValidator/autocompleteValidator.mjs +1 -1
- package/validators/dateValidator/dateValidator.js +1 -1
- package/validators/dateValidator/dateValidator.mjs +1 -1
- package/validators/numericValidator/numericValidator.js +1 -1
- package/validators/numericValidator/numericValidator.mjs +1 -1
@@ -1,10 +1,17 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
3
|
exports.__esModule = true;
|
4
|
+
require("core-js/modules/es.error.cause.js");
|
4
5
|
var _base = require("../base");
|
5
6
|
var _looseBindsMap = _interopRequireDefault(require("./maps/looseBindsMap"));
|
6
7
|
var _strictBindsMap = _interopRequireDefault(require("./maps/strictBindsMap"));
|
7
8
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
9
|
+
function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
|
10
|
+
function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
|
11
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
12
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
13
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
14
|
+
function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
|
8
15
|
const PLUGIN_KEY = exports.PLUGIN_KEY = 'bindRowsWithHeaders';
|
9
16
|
const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 210;
|
10
17
|
const DEFAULT_BIND = 'loose';
|
@@ -42,24 +49,31 @@ const bindTypeToMapStrategy = new Map([['loose', _looseBindsMap.default], ['stri
|
|
42
49
|
* ```
|
43
50
|
* :::
|
44
51
|
*/
|
52
|
+
var _onModifyRowHeader = /*#__PURE__*/new WeakSet();
|
45
53
|
class BindRowsWithHeaders extends _base.BasePlugin {
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
+
constructor() {
|
55
|
+
super(...arguments);
|
56
|
+
/**
|
57
|
+
* On modify row header listener.
|
58
|
+
*
|
59
|
+
* @param {number} row Row index.
|
60
|
+
* @returns {number}
|
61
|
+
*/
|
62
|
+
_classPrivateMethodInitSpec(this, _onModifyRowHeader);
|
54
63
|
/**
|
55
64
|
* Plugin indexes cache.
|
56
65
|
*
|
57
66
|
* @private
|
58
67
|
* @type {null|IndexMap}
|
59
68
|
*/
|
60
|
-
this
|
69
|
+
_defineProperty(this, "headerIndexes", null);
|
70
|
+
}
|
71
|
+
static get PLUGIN_KEY() {
|
72
|
+
return PLUGIN_KEY;
|
73
|
+
}
|
74
|
+
static get PLUGIN_PRIORITY() {
|
75
|
+
return PLUGIN_PRIORITY;
|
61
76
|
}
|
62
|
-
|
63
77
|
/**
|
64
78
|
* Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
|
65
79
|
* hook and if it returns `true` then the {@link BindRowsWithHeaders#enablePlugin} method is called.
|
@@ -83,7 +97,7 @@ class BindRowsWithHeaders extends _base.BasePlugin {
|
|
83
97
|
}
|
84
98
|
const MapStrategy = bindTypeToMapStrategy.get(bindType);
|
85
99
|
this.headerIndexes = this.hot.rowIndexMapper.registerMap('bindRowsWithHeaders', new MapStrategy());
|
86
|
-
this.addHook('modifyRowHeader', row => this.
|
100
|
+
this.addHook('modifyRowHeader', row => _classPrivateMethodGet(this, _onModifyRowHeader, _onModifyRowHeader2).call(this, row));
|
87
101
|
super.enablePlugin();
|
88
102
|
}
|
89
103
|
|
@@ -94,18 +108,6 @@ class BindRowsWithHeaders extends _base.BasePlugin {
|
|
94
108
|
this.hot.rowIndexMapper.unregisterMap('bindRowsWithHeaders');
|
95
109
|
super.disablePlugin();
|
96
110
|
}
|
97
|
-
|
98
|
-
/**
|
99
|
-
* On modify row header listener.
|
100
|
-
*
|
101
|
-
* @private
|
102
|
-
* @param {number} row Row index.
|
103
|
-
* @returns {number}
|
104
|
-
*/
|
105
|
-
onModifyRowHeader(row) {
|
106
|
-
return this.headerIndexes.getValueAtIndex(this.hot.toPhysicalRow(row));
|
107
|
-
}
|
108
|
-
|
109
111
|
/**
|
110
112
|
* Destroys the plugin instance.
|
111
113
|
*/
|
@@ -113,4 +115,7 @@ class BindRowsWithHeaders extends _base.BasePlugin {
|
|
113
115
|
super.destroy();
|
114
116
|
}
|
115
117
|
}
|
116
|
-
exports.BindRowsWithHeaders = BindRowsWithHeaders;
|
118
|
+
exports.BindRowsWithHeaders = BindRowsWithHeaders;
|
119
|
+
function _onModifyRowHeader2(row) {
|
120
|
+
return this.headerIndexes.getValueAtIndex(this.hot.toPhysicalRow(row));
|
121
|
+
}
|
@@ -1,3 +1,10 @@
|
|
1
|
+
import "core-js/modules/es.error.cause.js";
|
2
|
+
function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
|
3
|
+
function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
|
4
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
5
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
6
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
7
|
+
function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
|
1
8
|
import { BasePlugin } from "../base/index.mjs";
|
2
9
|
import LooseBindsMap from "./maps/looseBindsMap.mjs";
|
3
10
|
import StrictBindsMap from "./maps/strictBindsMap.mjs";
|
@@ -38,24 +45,31 @@ const bindTypeToMapStrategy = new Map([['loose', LooseBindsMap], ['strict', Stri
|
|
38
45
|
* ```
|
39
46
|
* :::
|
40
47
|
*/
|
48
|
+
var _onModifyRowHeader = /*#__PURE__*/new WeakSet();
|
41
49
|
export class BindRowsWithHeaders extends BasePlugin {
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
+
constructor() {
|
51
|
+
super(...arguments);
|
52
|
+
/**
|
53
|
+
* On modify row header listener.
|
54
|
+
*
|
55
|
+
* @param {number} row Row index.
|
56
|
+
* @returns {number}
|
57
|
+
*/
|
58
|
+
_classPrivateMethodInitSpec(this, _onModifyRowHeader);
|
50
59
|
/**
|
51
60
|
* Plugin indexes cache.
|
52
61
|
*
|
53
62
|
* @private
|
54
63
|
* @type {null|IndexMap}
|
55
64
|
*/
|
56
|
-
this
|
65
|
+
_defineProperty(this, "headerIndexes", null);
|
66
|
+
}
|
67
|
+
static get PLUGIN_KEY() {
|
68
|
+
return PLUGIN_KEY;
|
69
|
+
}
|
70
|
+
static get PLUGIN_PRIORITY() {
|
71
|
+
return PLUGIN_PRIORITY;
|
57
72
|
}
|
58
|
-
|
59
73
|
/**
|
60
74
|
* Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
|
61
75
|
* hook and if it returns `true` then the {@link BindRowsWithHeaders#enablePlugin} method is called.
|
@@ -79,7 +93,7 @@ export class BindRowsWithHeaders extends BasePlugin {
|
|
79
93
|
}
|
80
94
|
const MapStrategy = bindTypeToMapStrategy.get(bindType);
|
81
95
|
this.headerIndexes = this.hot.rowIndexMapper.registerMap('bindRowsWithHeaders', new MapStrategy());
|
82
|
-
this.addHook('modifyRowHeader', row => this.
|
96
|
+
this.addHook('modifyRowHeader', row => _classPrivateMethodGet(this, _onModifyRowHeader, _onModifyRowHeader2).call(this, row));
|
83
97
|
super.enablePlugin();
|
84
98
|
}
|
85
99
|
|
@@ -90,22 +104,13 @@ export class BindRowsWithHeaders extends BasePlugin {
|
|
90
104
|
this.hot.rowIndexMapper.unregisterMap('bindRowsWithHeaders');
|
91
105
|
super.disablePlugin();
|
92
106
|
}
|
93
|
-
|
94
|
-
/**
|
95
|
-
* On modify row header listener.
|
96
|
-
*
|
97
|
-
* @private
|
98
|
-
* @param {number} row Row index.
|
99
|
-
* @returns {number}
|
100
|
-
*/
|
101
|
-
onModifyRowHeader(row) {
|
102
|
-
return this.headerIndexes.getValueAtIndex(this.hot.toPhysicalRow(row));
|
103
|
-
}
|
104
|
-
|
105
107
|
/**
|
106
108
|
* Destroys the plugin instance.
|
107
109
|
*/
|
108
110
|
destroy() {
|
109
111
|
super.destroy();
|
110
112
|
}
|
113
|
+
}
|
114
|
+
function _onModifyRowHeader2(row) {
|
115
|
+
return this.headerIndexes.getValueAtIndex(this.hot.toPhysicalRow(row));
|
111
116
|
}
|
@@ -8,11 +8,10 @@ var _array = require("../../helpers/array");
|
|
8
8
|
var _number = require("../../helpers/number");
|
9
9
|
var _console = require("../../helpers/console");
|
10
10
|
var _element = require("../../helpers/dom/element");
|
11
|
-
var _eventManager = _interopRequireDefault(require("../../eventManager"));
|
12
11
|
var _event = require("../../helpers/dom/event");
|
13
12
|
var _a11y = require("../../helpers/a11y");
|
14
13
|
var _constants = require("../../i18n/constants");
|
15
|
-
function
|
14
|
+
function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
|
16
15
|
function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
|
17
16
|
function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
|
18
17
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
@@ -20,6 +19,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
|
|
20
19
|
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
21
20
|
function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
|
22
21
|
function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
|
22
|
+
function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
|
23
23
|
function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
|
24
24
|
function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
|
25
25
|
function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
|
@@ -110,23 +110,48 @@ const actionDictionary = new Map([['collapse', {
|
|
110
110
|
* :::
|
111
111
|
*/
|
112
112
|
var _collapsedColumnsMap = /*#__PURE__*/new WeakMap();
|
113
|
+
var _onAfterGetColHeader = /*#__PURE__*/new WeakSet();
|
114
|
+
var _onBeforeOnCellMouseDown = /*#__PURE__*/new WeakSet();
|
115
|
+
var _onInit = /*#__PURE__*/new WeakSet();
|
116
|
+
var _onAfterLoadData = /*#__PURE__*/new WeakSet();
|
113
117
|
class CollapsibleColumns extends _base.BasePlugin {
|
114
118
|
constructor() {
|
115
119
|
super(...arguments);
|
116
120
|
/**
|
117
|
-
*
|
121
|
+
* Updates the plugin state after new dataset load.
|
118
122
|
*
|
119
|
-
* @
|
120
|
-
* @
|
123
|
+
* @param {Array[]} sourceData Array of arrays or array of objects containing data.
|
124
|
+
* @param {boolean} initialLoad Flag that determines whether the data has been loaded
|
125
|
+
* during the initialization.
|
121
126
|
*/
|
122
|
-
|
127
|
+
_classPrivateMethodInitSpec(this, _onAfterLoadData);
|
128
|
+
/**
|
129
|
+
* Updates the plugin state after HoT initialization.
|
130
|
+
*/
|
131
|
+
_classPrivateMethodInitSpec(this, _onInit);
|
132
|
+
/**
|
133
|
+
* Indicator mouse event callback.
|
134
|
+
*
|
135
|
+
* @param {object} event Mouse event.
|
136
|
+
* @param {object} coords Event coordinates.
|
137
|
+
*/
|
138
|
+
_classPrivateMethodInitSpec(this, _onBeforeOnCellMouseDown);
|
123
139
|
/**
|
124
|
-
*
|
140
|
+
* Adds the indicator to the headers.
|
141
|
+
*
|
142
|
+
* @param {number} column Column index.
|
143
|
+
* @param {HTMLElement} TH TH element.
|
144
|
+
* @param {number} headerLevel The index of header level counting from the top (positive
|
145
|
+
* values counting from 0 to N).
|
146
|
+
*/
|
147
|
+
_classPrivateMethodInitSpec(this, _onAfterGetColHeader);
|
148
|
+
/**
|
149
|
+
* Cached reference to the NestedHeaders plugin.
|
125
150
|
*
|
126
151
|
* @private
|
127
|
-
* @type {
|
152
|
+
* @type {NestedHeaders}
|
128
153
|
*/
|
129
|
-
_defineProperty(this, "
|
154
|
+
_defineProperty(this, "nestedHeadersPlugin", null);
|
130
155
|
/**
|
131
156
|
* The NestedHeaders plugin StateManager instance.
|
132
157
|
*
|
@@ -184,14 +209,20 @@ class CollapsibleColumns extends _base.BasePlugin {
|
|
184
209
|
_classPrivateFieldSet(this, _collapsedColumnsMap, this.hot.columnIndexMapper.createAndRegisterIndexMap(this.pluginName, 'hiding'));
|
185
210
|
this.nestedHeadersPlugin = this.hot.getPlugin('nestedHeaders');
|
186
211
|
this.headerStateManager = this.nestedHeadersPlugin.getStateManager();
|
187
|
-
this.addHook('init', () => this.
|
212
|
+
this.addHook('init', () => _classPrivateMethodGet(this, _onInit, _onInit2).call(this));
|
188
213
|
this.addHook('afterLoadData', function () {
|
189
|
-
|
214
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
215
|
+
args[_key] = arguments[_key];
|
216
|
+
}
|
217
|
+
return _classPrivateMethodGet(_this, _onAfterLoadData, _onAfterLoadData2).call(_this, ...args);
|
190
218
|
});
|
191
219
|
this.addHook('afterGetColHeader', function () {
|
192
|
-
|
220
|
+
for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
221
|
+
args[_key2] = arguments[_key2];
|
222
|
+
}
|
223
|
+
return _classPrivateMethodGet(_this, _onAfterGetColHeader, _onAfterGetColHeader2).call(_this, ...args);
|
193
224
|
});
|
194
|
-
this.addHook('beforeOnCellMouseDown', (event, coords, TD) => this.
|
225
|
+
this.addHook('beforeOnCellMouseDown', (event, coords, TD) => _classPrivateMethodGet(this, _onBeforeOnCellMouseDown, _onBeforeOnCellMouseDown2).call(this, event, coords, TD));
|
195
226
|
this.registerShortcuts();
|
196
227
|
super.enablePlugin();
|
197
228
|
// @TODO: Workaround for broken plugin initialization abstraction (#6806).
|
@@ -485,110 +516,76 @@ class CollapsibleColumns extends _base.BasePlugin {
|
|
485
516
|
getCollapsedColumns() {
|
486
517
|
return _classPrivateFieldGet(this, _collapsedColumnsMap).getHiddenIndexes();
|
487
518
|
}
|
488
|
-
|
489
519
|
/**
|
490
|
-
*
|
491
|
-
*
|
492
|
-
* @private
|
493
|
-
* @param {number} column Column index.
|
494
|
-
* @param {HTMLElement} TH TH element.
|
495
|
-
* @param {number} headerLevel The index of header level counting from the top (positive
|
496
|
-
* values counting from 0 to N).
|
520
|
+
* Destroys the plugin instance.
|
497
521
|
*/
|
498
|
-
|
499
|
-
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
|
515
|
-
|
516
|
-
|
517
|
-
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
|
522
|
-
|
523
|
-
|
524
|
-
|
525
|
-
(0, _element.addClass)(collapsibleElement, 'expanded');
|
526
|
-
(0, _element.fastInnerText)(collapsibleElement, '-');
|
522
|
+
destroy() {
|
523
|
+
_classPrivateFieldSet(this, _collapsedColumnsMap, null);
|
524
|
+
super.destroy();
|
525
|
+
}
|
526
|
+
}
|
527
|
+
exports.CollapsibleColumns = CollapsibleColumns;
|
528
|
+
function _onAfterGetColHeader2(column, TH, headerLevel) {
|
529
|
+
var _this$headerStateMana3;
|
530
|
+
const {
|
531
|
+
collapsible,
|
532
|
+
origColspan,
|
533
|
+
isCollapsed
|
534
|
+
} = (_this$headerStateMana3 = this.headerStateManager.getHeaderSettings(headerLevel, column)) !== null && _this$headerStateMana3 !== void 0 ? _this$headerStateMana3 : {};
|
535
|
+
const isNodeCollapsible = collapsible && origColspan > 1 && column >= this.hot.getSettings().fixedColumnsStart;
|
536
|
+
const isAriaTagsEnabled = this.hot.getSettings().ariaTags;
|
537
|
+
let collapsibleElement = TH.querySelector(`.${COLLAPSIBLE_ELEMENT_CLASS}`);
|
538
|
+
(0, _element.removeAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)('')[0]]);
|
539
|
+
if (isNodeCollapsible) {
|
540
|
+
if (!collapsibleElement) {
|
541
|
+
collapsibleElement = this.hot.rootDocument.createElement('div');
|
542
|
+
(0, _element.addClass)(collapsibleElement, COLLAPSIBLE_ELEMENT_CLASS);
|
543
|
+
TH.querySelector('div:first-child').appendChild(collapsibleElement);
|
544
|
+
}
|
545
|
+
(0, _element.removeClass)(collapsibleElement, ['collapsed', 'expanded']);
|
546
|
+
if (isCollapsed) {
|
547
|
+
(0, _element.addClass)(collapsibleElement, 'collapsed');
|
548
|
+
(0, _element.fastInnerText)(collapsibleElement, '+');
|
527
549
|
|
528
|
-
|
529
|
-
if (isAriaTagsEnabled) {
|
530
|
-
(0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(true), (0, _a11y.A11Y_DESCRIPTION)(this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_DESCRIPTION_COLLAPSE_COLUMN))]);
|
531
|
-
}
|
532
|
-
}
|
550
|
+
// Add ARIA tags
|
533
551
|
if (isAriaTagsEnabled) {
|
534
|
-
(0, _element.setAttribute)(
|
552
|
+
(0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(false), (0, _a11y.A11Y_DESCRIPTION)(this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_DESCRIPTION_EXPAND_COLUMN))]);
|
535
553
|
}
|
536
554
|
} else {
|
537
|
-
|
538
|
-
(
|
539
|
-
}
|
540
|
-
}
|
555
|
+
(0, _element.addClass)(collapsibleElement, 'expanded');
|
556
|
+
(0, _element.fastInnerText)(collapsibleElement, '-');
|
541
557
|
|
542
|
-
|
543
|
-
|
544
|
-
|
545
|
-
* @private
|
546
|
-
* @param {object} event Mouse event.
|
547
|
-
* @param {object} coords Event coordinates.
|
548
|
-
*/
|
549
|
-
onBeforeOnCellMouseDown(event, coords) {
|
550
|
-
if ((0, _element.hasClass)(event.target, COLLAPSIBLE_ELEMENT_CLASS)) {
|
551
|
-
if ((0, _element.hasClass)(event.target, 'expanded')) {
|
552
|
-
this.eventManager.fireEvent(event.target, 'mouseup');
|
553
|
-
this.toggleCollapsibleSection([coords], 'collapse');
|
554
|
-
} else if ((0, _element.hasClass)(event.target, 'collapsed')) {
|
555
|
-
this.eventManager.fireEvent(event.target, 'mouseup');
|
556
|
-
this.toggleCollapsibleSection([coords], 'expand');
|
558
|
+
// Add ARIA tags
|
559
|
+
if (isAriaTagsEnabled) {
|
560
|
+
(0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(true), (0, _a11y.A11Y_DESCRIPTION)(this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_DESCRIPTION_COLLAPSE_COLUMN))]);
|
557
561
|
}
|
558
|
-
(0, _event.stopImmediatePropagation)(event);
|
559
562
|
}
|
560
|
-
|
561
|
-
|
562
|
-
/**
|
563
|
-
* Updates the plugin state after HoT initialization.
|
564
|
-
*
|
565
|
-
* @private
|
566
|
-
*/
|
567
|
-
onInit() {
|
568
|
-
// @TODO: Workaround for broken plugin initialization abstraction (#6806).
|
569
|
-
this.updatePlugin();
|
570
|
-
}
|
571
|
-
|
572
|
-
/**
|
573
|
-
* Updates the plugin state after new dataset load.
|
574
|
-
*
|
575
|
-
* @private
|
576
|
-
* @param {Array[]} sourceData Array of arrays or array of objects containing data.
|
577
|
-
* @param {boolean} initialLoad Flag that determines whether the data has been loaded
|
578
|
-
* during the initialization.
|
579
|
-
*/
|
580
|
-
onAfterLoadData(sourceData, initialLoad) {
|
581
|
-
if (!initialLoad) {
|
582
|
-
this.updatePlugin();
|
563
|
+
if (isAriaTagsEnabled) {
|
564
|
+
(0, _element.setAttribute)(collapsibleElement, ...(0, _a11y.A11Y_HIDDEN)());
|
583
565
|
}
|
566
|
+
} else {
|
567
|
+
var _collapsibleElement;
|
568
|
+
(_collapsibleElement = collapsibleElement) === null || _collapsibleElement === void 0 || _collapsibleElement.remove();
|
584
569
|
}
|
585
|
-
|
586
|
-
|
587
|
-
|
588
|
-
|
589
|
-
|
590
|
-
|
591
|
-
|
570
|
+
}
|
571
|
+
function _onBeforeOnCellMouseDown2(event, coords) {
|
572
|
+
if ((0, _element.hasClass)(event.target, COLLAPSIBLE_ELEMENT_CLASS)) {
|
573
|
+
if ((0, _element.hasClass)(event.target, 'expanded')) {
|
574
|
+
this.eventManager.fireEvent(event.target, 'mouseup');
|
575
|
+
this.toggleCollapsibleSection([coords], 'collapse');
|
576
|
+
} else if ((0, _element.hasClass)(event.target, 'collapsed')) {
|
577
|
+
this.eventManager.fireEvent(event.target, 'mouseup');
|
578
|
+
this.toggleCollapsibleSection([coords], 'expand');
|
579
|
+
}
|
580
|
+
(0, _event.stopImmediatePropagation)(event);
|
592
581
|
}
|
593
582
|
}
|
594
|
-
|
583
|
+
function _onInit2() {
|
584
|
+
// @TODO: Workaround for broken plugin initialization abstraction (#6806).
|
585
|
+
this.updatePlugin();
|
586
|
+
}
|
587
|
+
function _onAfterLoadData2(sourceData, initialLoad) {
|
588
|
+
if (!initialLoad) {
|
589
|
+
this.updatePlugin();
|
590
|
+
}
|
591
|
+
}
|