handsontable 17.1.0 → 18.0.0-rc2

package/plugins/columnSorting/columnSorting.js

@@ -34,7 +34,7 @@ const _base = require("../base");
 const _translations = require("../../translations");
 const _hooks = require("../../core/hooks");
 const _columnStatesManager = require("./columnStatesManager");
-const _shortcutContexts = require("../../shortcutContexts");
+const _contexts = require("../../shortcuts/contexts");
 const _utils = require("./utils");
 const _domHelpers = require("./domHelpers");
 const _rootComparator = require("./rootComparator");
@@ -80,16 +80,6 @@ function _class_private_field_set(receiver, privateMap, value) {
     _class_apply_descriptor_set(receiver, descriptor, value);
     return value;
 }
-function _class_private_method_get(receiver, privateSet, fn) {
-    if (!privateSet.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return fn;
-}
-function _class_private_method_init(obj, privateSet) {
-    _check_private_redeclaration(obj, privateSet);
-    privateSet.add(obj);
-}
 const PLUGIN_KEY = 'columnSorting';
 const PLUGIN_PRIORITY = 50;
 const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
@@ -104,22 +94,17 @@ _hooks.Hooks.getSingleton().register('afterColumnSort');
  * the other should remain disabled even if it's set to `true`.
  */ const pluginConflictsState = new WeakMap();
 var /**
-   * Load saved settings or sort by predefined plugin configuration.
-   */ _loadOrSortBySettings = /*#__PURE__*/ new WeakSet(), /**
+   * Sort by predefined plugin configuration.
+   */ _loadOrSortBySettings = /*#__PURE__*/ new WeakMap(), /**
    * Callback for the `onAfterGetColHeader` hook. Adds column sorting CSS classes.
    *
    * @param {number} column Visual column index.
    * @param {Element} TH TH HTML element.
-   */ _onAfterGetColHeader = /*#__PURE__*/ new WeakSet(), /**
+   */ _onAfterGetColHeader = /*#__PURE__*/ new WeakMap(), /**
    * Callback for the `afterLoadData` hook.
    *
    * @param {boolean} initialLoad Flag that determines whether the data has been loaded during the initialization.
-   */ _onAfterLoadData = /*#__PURE__*/ new WeakSet(), /**
-   * Callback for the `afterDataProviderFetch` hook.
-   * Keeps header sort state in sync with query `sort` after server-backed `loadData` (same timing as Pagination).
-   *
-   * @param {object} result [[Hooks#afterDataProviderFetch]] payload; reads `columnSortConfig` only.
-   */ _onAfterDataProviderFetch = /*#__PURE__*/ new WeakMap(), /**
+   */ _onAfterLoadData = /*#__PURE__*/ new WeakMap(), _onAfterDataProviderFetch = /*#__PURE__*/ new WeakMap(), /**
    * Changes the behavior of selection / dragging.
    *
    * @param {MouseEvent} event The `mousedown` event.
@@ -127,12 +112,16 @@ var /**
    * @param {HTMLElement} TD The cell element.
    * @param {object} controller An object with properties `row`, `column` and `cell`. Each property contains
    *                            a boolean value that allows or disallows changing the selection for that particular area.
-   */ _onBeforeOnCellMouseDown = /*#__PURE__*/ new WeakSet();
+   */ _onBeforeOnCellMouseDown = /*#__PURE__*/ new WeakMap();
 class ColumnSorting extends _base.BasePlugin {
-    static get PLUGIN_KEY() {
+    /**
+   * Returns the plugin key used to identify this plugin in Handsontable settings.
+   */ static get PLUGIN_KEY() {
         return PLUGIN_KEY;
     }
-    static get PLUGIN_PRIORITY() {
+    /**
+   * Returns the priority order used to determine the order in which plugins are initialized.
+   */ static get PLUGIN_PRIORITY() {
         return PLUGIN_PRIORITY;
     }
     /**
@@ -166,15 +155,15 @@ class ColumnSorting extends _base.BasePlugin {
             return this.getMergedPluginSettings(visualIndex);
         });
         this.hot.columnIndexMapper.registerMap(`${this.pluginKey}.columnMeta`, this.columnMetaCache);
-        this.addHook('afterGetColHeader', (column, TH)=>_class_private_method_get(this, _onAfterGetColHeader, onAfterGetColHeader).call(this, column, TH));
-        this.addHook('beforeOnCellMouseDown', (...args)=>_class_private_method_get(this, _onBeforeOnCellMouseDown, onBeforeOnCellMouseDown).call(this, ...args));
+        this.addHook('afterGetColHeader', _class_private_field_get(this, _onAfterGetColHeader));
+        this.addHook('beforeOnCellMouseDown', _class_private_field_get(this, _onBeforeOnCellMouseDown));
         this.addHook('afterOnCellMouseDown', (event, target)=>this.onAfterOnCellMouseDown(event, target));
-        this.addHook('afterInit', ()=>_class_private_method_get(this, _loadOrSortBySettings, loadOrSortBySettings).call(this));
-        this.addHook('afterLoadData', (...args)=>_class_private_method_get(this, _onAfterLoadData, onAfterLoadData).call(this, ...args));
-        this.addHook('afterDataProviderFetch', (...args)=>_class_private_field_get(this, _onAfterDataProviderFetch).call(this, ...args), -1);
+        this.addHook('afterInit', _class_private_field_get(this, _loadOrSortBySettings));
+        this.addHook('afterLoadData', _class_private_field_get(this, _onAfterLoadData));
+        this.addHook('afterDataProviderFetch', _class_private_field_get(this, _onAfterDataProviderFetch), -1);
         // TODO: Workaround? It should be refactored / described.
         if (this.hot.view) {
-            _class_private_method_get(this, _loadOrSortBySettings, loadOrSortBySettings).call(this);
+            _class_private_field_get(this, _loadOrSortBySettings).call(this);
         }
         this.registerShortcuts();
         super.enablePlugin();
@@ -203,7 +192,7 @@ class ColumnSorting extends _base.BasePlugin {
             }
         }, true);
         this.hot.columnIndexMapper.unregisterMap(`${this.pluginKey}.columnMeta`);
-        this.columnStatesManager.destroy();
+        this.columnStatesManager?.destroy();
         this.columnMetaCache = null;
         this.columnStatesManager = null;
         this.unregisterShortcuts();
@@ -214,24 +203,28 @@ class ColumnSorting extends _base.BasePlugin {
    *
    * @private
    */ registerShortcuts() {
-        this.hot.getShortcutManager().getContext('grid').addShortcut({
+        this.hot.getShortcutManager().getContext('grid')?.addShortcut({
             keys: [
                 [
                     'Enter'
                 ]
             ],
             callback: ()=>{
-                const { highlight } = this.hot.getSelectedRangeActive();
-                this.sort(this.getColumnNextConfig(highlight.col));
+                const activeRange = this.hot.getSelectedRangeActive();
+                if (!activeRange) {
+                    return false;
+                }
+                const { highlight } = activeRange;
+                this.sort(this.getColumnNextConfig(highlight.col ?? 0));
                 // prevent default Enter behavior (move to the next row within a selection range)
                 return false;
             },
             runOnlyIf: ()=>{
                 const highlight = this.hot.getSelectedRangeActive()?.highlight;
-                const highlightedHeaderElement = highlight ? this.hot.getCell(highlight.row, highlight.col, true) : null;
-                return highlight && this.hot.getSelectedRangeActive()?.isSingle() && this.hot.selection.isCellVisible(highlight) && highlight.row < 0 && highlight.col >= 0 && (0, _element.isBottomMostColumnHeader)(highlightedHeaderElement);
+                const highlightedHeaderElement = highlight && highlight.row !== null && highlight.col !== null ? this.hot.getCell(highlight.row, highlight.col, true) : null;
+                return !!(highlight && this.hot.getSelectedRangeActive()?.isSingle() && this.hot.selection.isCellVisible(highlight) && highlight.row !== null && highlight.row < 0 && highlight.col !== null && highlight.col >= 0 && highlightedHeaderElement && (0, _element.isBottomMostColumnHeader)(highlightedHeaderElement));
             },
-            relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+            relativeToGroup: _contexts.EDITOR_EDIT_GROUP,
             position: 'before',
             group: SHORTCUTS_GROUP
         });
@@ -241,7 +234,7 @@ class ColumnSorting extends _base.BasePlugin {
    *
    * @private
    */ unregisterShortcuts() {
-        this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+        this.hot.getShortcutManager().getContext('grid')?.removeShortcutsByGroup(SHORTCUTS_GROUP);
     }
     // DIFF - MultiColumnSorting & ColumnSorting: changed function documentation.
     /**
@@ -261,7 +254,7 @@ class ColumnSorting extends _base.BasePlugin {
    * @fires Hooks#beforeColumnSort
    * @fires Hooks#afterColumnSort
    */ sort(sortConfig) {
-        const currentSortConfig = this.getSortConfig();
+        const currentSortConfig = this.columnStatesManager.getSortStates();
         // We always pass configs defined as an array to `beforeColumnSort` and `afterColumnSort` hooks.
         const destinationSortConfigs = this.getNormalizedSortConfigs(sortConfig);
         const sortPossible = this.areValidSortConfigs(destinationSortConfigs);
@@ -274,7 +267,7 @@ class ColumnSorting extends _base.BasePlugin {
             this.indexesSequenceCache.setValues(this.hot.rowIndexMapper.getIndexesSequence());
         }
         if (sortPossible) {
-            this.columnStatesManager.setSortStates(destinationSortConfigs);
+            this.columnStatesManager?.setSortStates(destinationSortConfigs);
             this.sortByPresetSortStates(destinationSortConfigs);
         }
         this.hot.runHooks('afterColumnSort', currentSortConfig, sortPossible ? destinationSortConfigs : currentSortConfig, sortPossible);
@@ -292,7 +285,7 @@ class ColumnSorting extends _base.BasePlugin {
    *
    * @returns {boolean}
    */ isSorted() {
-        return this.enabled && !this.columnStatesManager.isListOfSortedColumnsEmpty();
+        return this.enabled && !this.columnStatesManager?.isListOfSortedColumnsEmpty();
     }
     /**
    * Get sort configuration for particular column or for all sorted columns. Objects contain `column` and `sortOrder` properties.
@@ -302,10 +295,10 @@ class ColumnSorting extends _base.BasePlugin {
    * @param {number} [column] Visual column index.
    * @returns {undefined|object|Array}
    */ getSortConfig(column) {
-        if ((0, _mixed.isDefined)(column)) {
-            return this.columnStatesManager.getColumnSortState(column);
+        if (column !== undefined) {
+            return this.columnStatesManager?.getColumnSortState(column);
         }
-        return this.columnStatesManager.getSortStates();
+        return this.columnStatesManager?.getSortStates();
     }
     /**
    * @description
@@ -334,7 +327,7 @@ class ColumnSorting extends _base.BasePlugin {
         // We always set configs defined as an array.
         const destinationSortConfigs = this.getNormalizedSortConfigs(sortConfig);
         if (this.areValidSortConfigs(destinationSortConfigs)) {
-            this.columnStatesManager.setSortStates(destinationSortConfigs);
+            this.columnStatesManager?.setSortStates(destinationSortConfigs);
         }
     }
     /**
@@ -373,10 +366,10 @@ class ColumnSorting extends _base.BasePlugin {
    * @param {number} column Visual column index.
    * @returns {undefined|object}
    */ getColumnNextConfig(column) {
-        const sortOrder = this.columnStatesManager.getSortOrderOfColumn(column);
+        const sortOrder = this.columnStatesManager?.getSortOrderOfColumn(column);
         if ((0, _mixed.isDefined)(sortOrder)) {
             const nextSortOrder = (0, _utils.getNextSortOrder)(sortOrder);
-            if ((0, _mixed.isDefined)(nextSortOrder)) {
+            if (nextSortOrder !== undefined) {
                 return {
                     column,
                     sortOrder: nextSortOrder
@@ -388,7 +381,7 @@ class ColumnSorting extends _base.BasePlugin {
         if (Number.isInteger(column) && column >= 0 && column < nrOfColumns) {
             return {
                 column,
-                sortOrder: (0, _utils.getNextSortOrder)()
+                sortOrder: (0, _utils.getNextSortOrder)() ?? 'asc'
             };
         }
     }
@@ -407,7 +400,7 @@ class ColumnSorting extends _base.BasePlugin {
    */ getNextSortConfig(columnToChange, strategyId = APPEND_COLUMN_CONFIG_STRATEGY) {
         const indexOfColumnToChange = this.columnStatesManager.getIndexOfColumnInSortQueue(columnToChange);
         const isColumnSorted = indexOfColumnToChange !== -1;
-        const currentSortConfig = this.getSortConfig();
+        const currentSortConfig = this.columnStatesManager.getSortStates();
         const nextColumnConfig = this.getColumnNextConfig(columnToChange);
         if (isColumnSorted) {
             if ((0, _mixed.isUndefined)(nextColumnConfig)) {
@@ -430,7 +423,7 @@ class ColumnSorting extends _base.BasePlugin {
                 ];
             }
         }
-        if ((0, _mixed.isDefined)(nextColumnConfig)) {
+        if (nextColumnConfig !== undefined) {
             return currentSortConfig.concat(nextColumnConfig);
         }
         return currentSortConfig;
@@ -458,13 +451,14 @@ class ColumnSorting extends _base.BasePlugin {
    * @returns {object}
    */ getMergedPluginSettings(column) {
         const pluginMainSettings = this.hot.getSettings()[this.pluginKey];
-        const storedColumnProperties = this.columnStatesManager.getAllColumnsProperties();
+        const storedColumnProperties = this.columnStatesManager?.getAllColumnsProperties() ?? {};
         const cellMeta = this.hot.getCellMeta(0, column);
         const columnMeta = Object.getPrototypeOf(cellMeta);
         if (Array.isArray(columnMeta.columns)) {
             return Object.assign(storedColumnProperties, pluginMainSettings, this.getPluginColumnConfig(columnMeta.columns[column]));
         } else if ((0, _function.isFunction)(columnMeta.columns)) {
-            return Object.assign(storedColumnProperties, pluginMainSettings, this.getPluginColumnConfig(columnMeta.columns(column)));
+            const columnConfig = columnMeta.columns(column);
+            return Object.assign(storedColumnProperties, pluginMainSettings, this.getPluginColumnConfig(columnConfig));
         }
         return Object.assign(storedColumnProperties, pluginMainSettings);
     }
@@ -479,7 +473,7 @@ class ColumnSorting extends _base.BasePlugin {
     getFirstCellSettings(column) {
         const cellMeta = this.hot.getCellMeta(0, column);
         const cellMetaCopy = Object.create(cellMeta);
-        cellMetaCopy[this.pluginKey] = this.columnMetaCache.getValueAtIndex(this.hot.toPhysicalColumn(column));
+        cellMetaCopy[this.pluginKey] = this.columnMetaCache?.getValueAtIndex(this.hot.toPhysicalColumn(column));
         return cellMetaCopy;
     }
     /**
@@ -490,11 +484,14 @@ class ColumnSorting extends _base.BasePlugin {
    * @returns {number}
    */ getNumberOfRowsToSort(numberOfRows) {
         const settings = this.hot.getSettings();
+        const fixedRowsBottom = settings.fixedRowsBottom || 0;
         // `maxRows` option doesn't take into account `minSpareRows` option in this case.
-        if (settings.maxRows <= numberOfRows) {
-            return settings.maxRows;
+        // `fixedRowsBottom` is excluded from the sort range so footer rows (e.g. SUM formulas)
+        // stay pinned and keep their absolute-address references intact.
+        if ((settings.maxRows ?? Infinity) <= numberOfRows) {
+            return Math.max(0, (settings.maxRows ?? 0) - fixedRowsBottom);
         }
-        return numberOfRows - settings.minSpareRows;
+        return Math.max(0, numberOfRows - (settings.minSpareRows ?? 0) - fixedRowsBottom);
     }
     /**
    * Performs the sorting using a stable sort function basing on internal state of sorting.
@@ -508,19 +505,24 @@ class ColumnSorting extends _base.BasePlugin {
         }
         const indexesWithData = [];
         const numberOfRows = this.hot.countRows();
+        const settings = this.hot.getSettings();
+        const fixedRowsTop = settings.fixedRowsTop || 0;
+        const upperBound = this.getNumberOfRowsToSort(numberOfRows);
         const getDataForSortedColumns = (visualRowIndex)=>(0, _array.arrayMap)(sortConfigs, (sortConfig)=>this.hot.getDataAtCell(visualRowIndex, sortConfig.column));
-        for(let visualRowIndex = 0; visualRowIndex < this.getNumberOfRowsToSort(numberOfRows); visualRowIndex += 1){
+        for(let visualRowIndex = fixedRowsTop; visualRowIndex < upperBound; visualRowIndex += 1){
             indexesWithData.push([
-                this.hot.toPhysicalRow(visualRowIndex)
-            ].concat(getDataForSortedColumns(visualRowIndex)));
+                this.hot.toPhysicalRow(visualRowIndex),
+                ...getDataForSortedColumns(visualRowIndex)
+            ]);
         }
         const indexesBefore = (0, _array.arrayMap)(indexesWithData, (indexWithData)=>indexWithData[0]);
         (0, _sortService.sort)(indexesWithData, this.pluginKey, (0, _array.arrayMap)(sortConfigs, (sortConfig)=>sortConfig.sortOrder), (0, _array.arrayMap)(sortConfigs, (sortConfig)=>this.getFirstCellSettings(sortConfig.column)));
-        // Append spareRows
-        for(let visualRowIndex = indexesWithData.length; visualRowIndex < numberOfRows; visualRowIndex += 1){
+        // Append fixedRowsBottom + spareRows (everything between upperBound and numberOfRows)
+        for(let visualRowIndex = upperBound; visualRowIndex < numberOfRows; visualRowIndex += 1){
             indexesWithData.push([
-                visualRowIndex
-            ].concat(getDataForSortedColumns(visualRowIndex)));
+                visualRowIndex,
+                ...getDataForSortedColumns(visualRowIndex)
+            ]);
         }
         const indexesAfter = (0, _array.arrayMap)(indexesWithData, (indexWithData)=>indexWithData[0]);
         const indexMapping = new Map((0, _array.arrayMap)(indexesBefore, (indexBefore, indexInsideArray)=>[
@@ -528,10 +530,7 @@ class ColumnSorting extends _base.BasePlugin {
                 indexesAfter[indexInsideArray]
             ]));
         const newIndexesSequence = (0, _array.arrayMap)(this.hot.rowIndexMapper.getIndexesSequence(), (physicalIndex)=>{
-            if (indexMapping.has(physicalIndex)) {
-                return indexMapping.get(physicalIndex);
-            }
-            return physicalIndex;
+            return indexMapping.get(physicalIndex) ?? physicalIndex;
         });
         this.hot.rowIndexMapper.setIndexesSequence(newIndexesSequence);
     }
@@ -542,10 +541,10 @@ class ColumnSorting extends _base.BasePlugin {
    * @param {object} allSortSettings All sort config settings. Object may contain `initialConfig`, `indicator`,
    * `sortEmptyCells`, `headerAction` and `compareFunctionFactory` properties.
    */ sortBySettings(allSortSettings) {
-        if ((0, _object.isObject)(allSortSettings)) {
+        if ((0, _object.isPlainObject)(allSortSettings)) {
             this.columnStatesManager.updateAllColumnsProperties(allSortSettings);
-            const initialConfig = allSortSettings.initialConfig;
-            if (Array.isArray(initialConfig) || (0, _object.isObject)(initialConfig)) {
+            const { initialConfig } = allSortSettings;
+            if (Array.isArray(initialConfig) || (0, _object.isPlainObject)(initialConfig)) {
                 this.sort(initialConfig);
             }
         } else {
@@ -559,10 +558,10 @@ class ColumnSorting extends _base.BasePlugin {
    * @private
    * @param {HTMLElement} headerSpanElement Header span element.
    * @param {...*} args Extra arguments for helpers.
-   */ updateHeaderClasses(headerSpanElement, ...args) {
+   */ updateHeaderClasses(headerSpanElement, columnStatesManager, column, showSortIndicator, headerActionEnabled) {
         (0, _element.removeClass)(headerSpanElement, (0, _domHelpers.getClassesToRemove)(headerSpanElement));
-        if (this.enabled !== false) {
-            (0, _element.addClass)(headerSpanElement, (0, _domHelpers.getClassesToAdd)(...args));
+        if (this.enabled !== false && columnStatesManager !== undefined && column !== undefined) {
+            (0, _element.addClass)(headerSpanElement, (0, _domHelpers.getClassesToAdd)(columnStatesManager, column, showSortIndicator ?? false, headerActionEnabled ?? false));
         }
     }
     /**
@@ -577,8 +576,9 @@ class ColumnSorting extends _base.BasePlugin {
             // Column meta cache base on settings, thus we should re-init the map.
             this.columnMetaCache.init(this.hot.columnIndexMapper.getNumberOfIndexes());
         }
-        if ((0, _mixed.isDefined)(newSettings[this.pluginKey])) {
-            this.sortBySettings(newSettings[this.pluginKey]);
+        const pluginSettings = newSettings[this.pluginKey];
+        if ((0, _mixed.isDefined)(pluginSettings)) {
+            this.sortBySettings(pluginSettings);
         }
     }
     /**
@@ -589,9 +589,10 @@ class ColumnSorting extends _base.BasePlugin {
    * @param {number} column Visual column index.
    * @returns {boolean}
    */ wasClickableHeaderClicked(event, column) {
-        const pluginSettingsForColumn = this.getFirstCellSettings(column)[this.pluginKey];
+        const columnSettings = this.getFirstCellSettings(column);
+        const pluginSettingsForColumn = columnSettings[this.pluginKey];
         const headerActionEnabled = pluginSettingsForColumn.headerAction;
-        return headerActionEnabled && (0, _element.hasClass)(event.target, _utils.HEADER_SPAN_CLASS);
+        return headerActionEnabled && (0, _element.hasClass)((0, _element.eventTargetEl)(event), _utils.HEADER_SPAN_CLASS);
     }
     /**
    * Callback for the `onAfterOnCellMouseDown` hook.
@@ -629,7 +630,24 @@ class ColumnSorting extends _base.BasePlugin {
         super.destroy();
     }
     constructor(...args){
-        super(...args), _class_private_method_init(this, _loadOrSortBySettings), _class_private_method_init(this, _onAfterGetColHeader), _class_private_method_init(this, _onAfterLoadData), _class_private_method_init(this, _onBeforeOnCellMouseDown), _class_private_field_init(this, _onAfterDataProviderFetch, {
+        super(...args), _class_private_field_init(this, _loadOrSortBySettings, {
+            writable: true,
+            value: void 0
+        }), _class_private_field_init(this, _onAfterGetColHeader, {
+            writable: true,
+            value: void 0
+        }), _class_private_field_init(this, _onAfterLoadData, {
+            writable: true,
+            value: void 0
+        }), /**
+   * Callback for the `afterDataProviderFetch` hook.
+   * Keeps header sort state in sync with query `sort` after server-backed `loadData` (same timing as Pagination).
+   *
+   * @param {object} result [[Hooks#afterDataProviderFetch]] payload; reads `columnSortConfig` only.
+   */ _class_private_field_init(this, _onAfterDataProviderFetch, {
+            writable: true,
+            value: void 0
+        }), _class_private_field_init(this, _onBeforeOnCellMouseDown, {
             writable: true,
             value: void 0
         }), /**
@@ -652,42 +670,39 @@ class ColumnSorting extends _base.BasePlugin {
    *
    * @private
    * @type {null|IndexesSequence}
-   */ this.indexesSequenceCache = null, _class_private_field_set(this, _onAfterDataProviderFetch, (result)=>{
+   */ this.indexesSequenceCache = null, _class_private_field_set(this, _loadOrSortBySettings, ()=>{
+            const allSortSettings = this.hot.getSettings()[this.pluginKey];
+            this.sortBySettings(allSortSettings);
+        }), _class_private_field_set(this, _onAfterGetColHeader, (column, TH)=>{
+            const headerSpanElement = (0, _utils.getHeaderSpanElement)(TH);
+            if ((0, _utils.isFirstLevelColumnHeader)(column, TH) === false || headerSpanElement === null) {
+                return;
+            }
+            const columnSettings = this.getFirstCellSettings(column);
+            const pluginSettingsForColumn = columnSettings[this.pluginKey];
+            const showSortIndicator = pluginSettingsForColumn.indicator;
+            const headerActionEnabled = pluginSettingsForColumn.headerAction;
+            this.updateHeaderClasses(headerSpanElement, this.columnStatesManager ?? undefined, column, showSortIndicator, headerActionEnabled);
+            if (this.hot.getSettings().ariaTags) {
+                const currentSortState = this.columnStatesManager?.getSortOrderOfColumn(column);
+                (0, _element.setAttribute)(TH, ...(0, _a11y.A11Y_SORT)(currentSortState ? `${currentSortState}ending` : 'none'));
+            }
+        }), _class_private_field_set(this, _onAfterLoadData, (initialLoad)=>{
+            if (initialLoad === true) {
+                // TODO: Workaround? It should be refactored / described.
+                if (this.hot.view) {
+                    _class_private_field_get(this, _loadOrSortBySettings).call(this);
+                }
+            }
+        }), _class_private_field_set(this, _onAfterDataProviderFetch, (result)=>{
             this.setSortConfig(result?.columnSortConfig ?? []);
+        }), _class_private_field_set(this, _onBeforeOnCellMouseDown, (event, coords, TD, controller)=>{
+            if ((0, _utils.wasHeaderClickedProperly)(coords.row, coords.col, event) === false) {
+                return;
+            }
+            if (this.wasClickableHeaderClicked(event, coords.col) && this.hot.getShortcutManager().isCtrlPressed()) {
+                controller.column = true;
+            }
         });
     }
 }
-function loadOrSortBySettings() {
-    const allSortSettings = this.hot.getSettings()[this.pluginKey];
-    this.sortBySettings(allSortSettings);
-}
-function onAfterGetColHeader(column, TH) {
-    const headerSpanElement = (0, _utils.getHeaderSpanElement)(TH);
-    if ((0, _utils.isFirstLevelColumnHeader)(column, TH) === false || headerSpanElement === null) {
-        return;
-    }
-    const pluginSettingsForColumn = this.getFirstCellSettings(column)[this.pluginKey];
-    const showSortIndicator = pluginSettingsForColumn.indicator;
-    const headerActionEnabled = pluginSettingsForColumn.headerAction;
-    this.updateHeaderClasses(headerSpanElement, this.columnStatesManager, column, showSortIndicator, headerActionEnabled);
-    if (this.hot.getSettings().ariaTags) {
-        const currentSortState = this.columnStatesManager.getSortOrderOfColumn(column);
-        (0, _element.setAttribute)(TH, ...(0, _a11y.A11Y_SORT)(currentSortState ? `${currentSortState}ending` : 'none'));
-    }
-}
-function onAfterLoadData(initialLoad) {
-    if (initialLoad === true) {
-        // TODO: Workaround? It should be refactored / described.
-        if (this.hot.view) {
-            _class_private_method_get(this, _loadOrSortBySettings, loadOrSortBySettings).call(this);
-        }
-    }
-}
-function onBeforeOnCellMouseDown(event, coords, TD, controller) {
-    if ((0, _utils.wasHeaderClickedProperly)(coords.row, coords.col, event) === false) {
-        return;
-    }
-    if (this.wasClickableHeaderClicked(event, coords.col) && this.hot.getShortcutManager().isCtrlPressed()) {
-        controller.column = true;
-    }
-}