@highcharts/grid-pro 2.1.1 → 2.2.0

package/es-modules/Grid/Core/Table/Cell.js

@@ -2,11 +2,11 @@
  *
  *  Grid Cell abstract class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula
@@ -106,6 +106,8 @@ class Cell {
      *
      * @param e
      * Keyboard event object.
+     *
+     * @internal
      */
     onKeyDown(e) {
         const { row, column } = this;

package/es-modules/Grid/Core/Table/CellContent/CellContent.js

@@ -2,11 +2,11 @@
  *
  *  Cell Content abstract class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/CellContent/TextContent.js

@@ -2,11 +2,11 @@
  *
  *  Text Cell Content class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula
@@ -97,7 +97,7 @@ class TextContent extends CellContent {
  * */
 TextContent.defaultFormatsForDataTypes = {
     string: '{value}',
-    number: '{value}',
+    number: '{value:,.f}',
     'boolean': '{value}',
     datetime: '{value:%Y-%m-%d %H:%M:%S}'
 };

package/es-modules/Grid/Core/Table/Column.d.ts

@@ -35,7 +35,7 @@ export declare class Column {
      * The options of the column as a proxy that provides merged access to
      * original options and defaults if not defined in the individual options.
      */
-    readonly options: NoIdColumnOptions;
+    options: NoIdColumnOptions;
     /**
      * The index of the column in the viewport.
      */

package/es-modules/Grid/Core/Table/Column.js

@@ -2,11 +2,11 @@
  *
  *  Grid Column class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/ColumnResizing/AdjacentResizingMode.js

@@ -2,11 +2,11 @@
  *
  *  Adjacent Resizing Mode class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/ColumnResizing/ColumnResizing.js

@@ -2,11 +2,11 @@
  *
  *  Column Resizing namespace
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/ColumnResizing/DistributedResizingMode.js

@@ -2,11 +2,11 @@
  *
  *  Distributed Resizing Mode class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/ColumnResizing/IndependentResizingMode.js

@@ -2,11 +2,11 @@
  *
  *  Independent Resizing Mode class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/ColumnResizing/ResizingMode.js

@@ -2,11 +2,11 @@
  *
  *  Resizing Mode abstract class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/ColumnToolbar.js

@@ -2,11 +2,11 @@
  *
  *  Grid Header Cell Toolbar class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula
@@ -51,7 +51,9 @@ class HeaderCellToolbar {
      */
     renderFull() {
         const columnOptions = this.column.options;
-        if (columnOptions.sorting?.sortable) {
+        const sortingEnabled = columnOptions.sorting?.enabled ??
+            columnOptions.sorting?.sortable;
+        if (sortingEnabled) {
             new SortToolbarButton().add(this);
         }
         if (columnOptions.filtering?.enabled &&
@@ -61,7 +63,9 @@ class HeaderCellToolbar {
     }
     renderMinimized() {
         const columnOptions = this.column.options;
-        if (columnOptions.sorting?.sortable || (columnOptions.filtering?.enabled &&
+        const sortingEnabled = columnOptions.sorting?.enabled ??
+            columnOptions.sorting?.sortable;
+        if (sortingEnabled || (columnOptions.filtering?.enabled &&
             !columnOptions.filtering.inline)) {
             new MenuToolbarButton().add(this);
         }
@@ -127,6 +131,11 @@ class HeaderCellToolbar {
             }
         }
         if (!shouldBeMinimized) {
+            // Ensure we reset any "minimized only" header state. This can
+            // happen if the grid was initialized in a hidden container
+            // (e.g. display:none) where widths measure as 0. (#24002)
+            this.isMenuCentered = void 0;
+            this.column.header?.container?.classList.remove(Globals.getClassName('noWidth'));
             return;
         }
         const parent = this.column.header?.htmlElement;

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/FilterPopup.js

@@ -2,11 +2,11 @@
  *
  *  Grid Filter Popup class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/MenuButtons/FilterMenuButton.js

@@ -2,11 +2,11 @@
  *
  *  Grid Filter Context Menu Button class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/MenuButtons/SortMenuButton.d.ts

@@ -4,8 +4,17 @@ import ContextMenuButton from '../../../../UI/ContextMenuButton.js';
 declare class SortMenuButton extends ContextMenuButton {
     contextMenu?: MenuPopup;
     private direction;
+    private baseLabel;
     constructor(langOptions: LangOptions, direction: typeof SortMenuButton.prototype.direction);
     protected refreshState(): void;
+    /**
+     * Updates the label to include the sort priority when multi-column
+     * sorting is active.
+     *
+     * @param column
+     * The column to get the priority from, or undefined to reset the label.
+     */
+    private updateLabelWithPriority;
     protected addEventListeners(): void;
     protected clickHandler(event: MouseEvent): void;
 }

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/MenuButtons/SortMenuButton.js

@@ -2,11 +2,11 @@
  *
  *  Grid Sort Context Menu Button class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula
@@ -31,7 +31,8 @@ class SortMenuButton extends ContextMenuButton {
     constructor(langOptions, direction) {
         super({ icon: direction === 'asc' ? 'sortAsc' : 'sortDesc' });
         this.direction = direction;
-        this.options.label = langOptions[direction === 'asc' ? 'sortAscending' : 'sortDescending'];
+        this.baseLabel = langOptions[direction === 'asc' ? 'sortAscending' : 'sortDescending'] || '';
+        this.options.label = this.baseLabel;
     }
     /* *
      *
@@ -43,7 +44,35 @@ class SortMenuButton extends ContextMenuButton {
         if (!column) {
             return;
         }
-        this.setActive(StateHelpers.isSorted(column, this.direction));
+        const isSorted = StateHelpers.isSorted(column, this.direction);
+        this.setActive(isSorted);
+        // Update label with priority if multi-column sorting is active
+        this.updateLabelWithPriority(isSorted ? column : void 0);
+    }
+    /**
+     * Updates the label to include the sort priority when multi-column
+     * sorting is active.
+     *
+     * @param column
+     * The column to get the priority from, or undefined to reset the label.
+     */
+    updateLabelWithPriority(column) {
+        if (!column) {
+            this.setLabel(this.baseLabel);
+            return;
+        }
+        const { currentSortings } = column.viewport.grid.querying.sorting;
+        const sortings = currentSortings || [];
+        const sortIndex = sortings.findIndex((sorting) => sorting.columnId === column.id);
+        const priority = (sortings.length > 1 && sortIndex !== -1 ?
+            sortIndex + 1 :
+            void 0);
+        if (priority) {
+            this.setLabel(`${this.baseLabel} (${priority})`);
+        }
+        else {
+            this.setLabel(this.baseLabel);
+        }
     }
     addEventListeners() {
         super.addEventListeners();
@@ -60,7 +89,7 @@ class SortMenuButton extends ContextMenuButton {
         if (!sorting) {
             return;
         }
-        void sorting.setOrder(this.isActive ? null : this.direction);
+        void sorting.setOrder(this.isActive ? null : this.direction, !!event?.shiftKey);
     }
 }
 /* *

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/MenuPopup.js

@@ -2,11 +2,11 @@
  *
  *  Grid Menu Popup class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula
@@ -44,7 +44,8 @@ class MenuPopup extends ContextMenu {
         const columnOptions = this.button.toolbar?.column.options || {};
         const filteringEnabled = (columnOptions.filtering?.enabled &&
             !columnOptions.filtering.inline);
-        const sortingEnabled = columnOptions.sorting?.sortable;
+        const sortingEnabled = columnOptions.sorting?.enabled ??
+            columnOptions.sorting?.sortable;
         this.addHeader(this.button.toolbar?.column.header?.value || '', lang.column);
         if (sortingEnabled) {
             new SortMenuButton(lang, 'desc').add(this);

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/StateHelpers.js

@@ -2,11 +2,11 @@
  *
  *  Grid Header Cell State Helpers namespace
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula
@@ -44,13 +44,17 @@ export function isFiltered(column) {
  * only if the column is sorted in the provided order.
  */
 export function isSorted(column, order) {
-    const { currentSorting } = column.viewport.grid.querying.sorting || {};
-    if (currentSorting?.columnId !== column.id) {
+    const { currentSorting, currentSortings } = column.viewport.grid.querying.sorting || {};
+    const columnSorting = (currentSortings?.find((sorting) => sorting.columnId === column.id) ||
+        (currentSorting?.columnId === column.id ?
+            currentSorting :
+            void 0));
+    if (!columnSorting?.order) {
         return false;
     }
     return order ?
-        currentSorting?.order === order :
-        !!currentSorting?.order;
+        columnSorting.order === order :
+        !!columnSorting.order;
 }
 /* *
  *

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/ToolbarButtons/FilterToolbarButton.js

@@ -2,11 +2,11 @@
  *
  *  Grid Filter Toolbar Button class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/ToolbarButtons/MenuToolbarButton.js

@@ -2,11 +2,11 @@
  *
  *  Grid Menu Toolbar Button class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/ToolbarButtons/SortToolbarButton.d.ts

@@ -2,10 +2,14 @@ import type ColumnToolbar from '../ColumnToolbar.js';
 import ToolbarButton from '../../../../UI/ToolbarButton.js';
 declare class SortToolbarButton extends ToolbarButton {
     toolbar?: ColumnToolbar;
+    private sortPriorityIndicator?;
+    private getColumnLabel;
+    private updateA11yLabel;
     constructor();
     protected clickHandler(event: MouseEvent): void;
+    private renderSortPriorityIndicator;
     refreshState(): void;
     protected addEventListeners(): void;
-    protected renderActiveIndicator(): void;
+    protected renderActiveIndicator(render: boolean): void;
 }
 export default SortToolbarButton;

package/es-modules/Grid/Core/Table/Header/ColumnToolbar/ToolbarButtons/SortToolbarButton.js

@@ -2,11 +2,11 @@
  *
  *  Grid Sort Toolbar Button class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula
@@ -14,8 +14,11 @@
  * */
 'use strict';
 import ToolbarButton from '../../../../UI/ToolbarButton.js';
+import GridUtils from '../../../../GridUtils.js';
+import Globals from '../../../../Globals.js';
 import StateHelpers from '../StateHelpers.js';
 import U from '../../../../../../Core/Utilities.js';
+const { formatText } = GridUtils;
 const { addEvent } = U;
 /* *
  *
@@ -23,6 +26,48 @@ const { addEvent } = U;
  *
  * */
 class SortToolbarButton extends ToolbarButton {
+    getColumnLabel() {
+        const column = this.toolbar?.column;
+        const label = (column?.header?.headerContent?.textContent ||
+            column?.header?.value ||
+            column?.id ||
+            '').trim();
+        return label || column?.id || '';
+    }
+    updateA11yLabel(order, priority) {
+        const button = this.wrapper?.querySelector('button');
+        if (!button) {
+            return;
+        }
+        const column = this.toolbar?.column;
+        const lang = column?.viewport.grid.options?.lang;
+        const sortingLang = lang?.accessibility?.sorting;
+        const announcements = sortingLang?.announcements;
+        const columnLabel = this.getColumnLabel();
+        const labelParts = [];
+        if (columnLabel) {
+            labelParts.push(columnLabel);
+        }
+        let stateLabel;
+        if (order === 'asc') {
+            stateLabel = announcements?.ascending;
+        }
+        else if (order === 'desc') {
+            stateLabel = announcements?.descending;
+        }
+        else {
+            stateLabel = announcements?.none;
+        }
+        if (stateLabel) {
+            labelParts.push(stateLabel);
+        }
+        if (priority) {
+            labelParts.push(formatText(sortingLang?.priority ?? 'Priority {priority}.', { priority: String(priority) }));
+        }
+        if (labelParts.length) {
+            button.setAttribute('aria-label', labelParts.join(' '));
+        }
+    }
     /* *
      *
      *  Constructor
@@ -44,21 +89,56 @@ class SortToolbarButton extends ToolbarButton {
      * */
     clickHandler(event) {
         super.clickHandler(event);
-        this.toolbar?.column.sorting?.toggle();
+        this.toolbar?.column.sorting?.toggle(event);
+    }
+    renderSortPriorityIndicator(priority) {
+        const wrapper = this.wrapper;
+        if (!wrapper) {
+            return;
+        }
+        const button = wrapper.querySelector('button');
+        if (!button) {
+            return;
+        }
+        if (!priority) {
+            this.sortPriorityIndicator?.remove();
+            delete this.sortPriorityIndicator;
+            return;
+        }
+        if (!this.sortPriorityIndicator) {
+            this.sortPriorityIndicator = document.createElement('span');
+            this.sortPriorityIndicator.className = Globals.getClassName('sortPriorityIndicator');
+        }
+        // Ensure the indicator is rendered to the right of the icon.
+        button.appendChild(this.sortPriorityIndicator);
+        this.sortPriorityIndicator.textContent = String(priority);
     }
     refreshState() {
         const column = this.toolbar?.column;
         if (!column) {
             return;
         }
-        if (!StateHelpers.isSorted(column)) {
+        const { currentSortings, currentSorting } = column.viewport.grid.querying.sorting;
+        const sortings = currentSortings || [];
+        const columnSorting = (sortings.find((sorting) => sorting.columnId === column.id) ||
+            (currentSorting?.columnId === column.id ?
+                currentSorting :
+                void 0));
+        if (!StateHelpers.isSorted(column) || !columnSorting?.order) {
             this.setActive(false);
             this.setIcon('upDownArrows');
+            this.renderSortPriorityIndicator();
+            this.updateA11yLabel(null);
             return;
         }
-        const { currentSorting } = column.viewport.grid.querying.sorting;
         this.setActive(true);
-        this.setIcon(currentSorting?.order === 'asc' ? 'sortAsc' : 'sortDesc');
+        this.setIcon(columnSorting.order === 'asc' ? 'sortAsc' : 'sortDesc');
+        const sortIndex = sortings.findIndex((sorting) => sorting.columnId === column.id);
+        const priority = (sortings.length > 1 && sortIndex !== -1 ?
+            sortIndex + 1 :
+            void 0);
+        this.renderSortPriorityIndicator(priority);
+        this.updateA11yLabel(columnSorting.order, priority);
     }
     addEventListeners() {
         super.addEventListeners();
@@ -69,8 +149,11 @@ class SortToolbarButton extends ToolbarButton {
         // If this grid is currently sorted, update the state
         this.eventListenerDestroyers.push(addEvent(column.viewport.grid, 'afterSort', () => this.refreshState()));
     }
-    renderActiveIndicator() {
-        // Do nothing
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    renderActiveIndicator(render) {
+        // Sorting uses directional icons + priority indicators
+        // (for multi-sort), not the generic active dot indicator
+        // (reserved for filtering).
     }
 }
 /* *

package/es-modules/Grid/Core/Table/Header/HeaderCell.d.ts

@@ -55,8 +55,8 @@ declare class HeaderCell extends Cell {
      */
     render(): void;
     reflow(): void;
-    protected onKeyDown(e: KeyboardEvent): void;
-    protected onClick(e: MouseEvent): void;
+    onKeyDown(e: KeyboardEvent): void;
+    onClick(e: MouseEvent): void;
     /**
      * Add sorting option to the column.
      */

package/es-modules/Grid/Core/Table/Header/HeaderCell.js

@@ -2,11 +2,11 @@
  *
  *  Grid HeaderCell class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula
@@ -106,8 +106,8 @@ class HeaderCell extends Cell {
         const { column } = this;
         const options = createOptionsProxy(this.superColumnOptions, column?.options);
         const headerCellOptions = options.header || {};
-        if (headerCellOptions.formatter) {
-            this.value = headerCellOptions.formatter.call(this).toString();
+        if (column && headerCellOptions.formatter) {
+            this.value = headerCellOptions.formatter.call(column).toString();
         }
         else if (isString(headerCellOptions.format)) {
             this.value = column ?
@@ -184,8 +184,9 @@ class HeaderCell extends Cell {
             e.target !== column.header?.headerContent) || column.viewport.columnsResizer?.isResizing) {
             return;
         }
-        if (column.options.sorting?.sortable) {
-            column.sorting?.toggle();
+        if ((column.options.sorting?.enabled ??
+            column.options.sorting?.sortable)) {
+            column.sorting?.toggle(e);
         }
         fireEvent(this, 'click', {
             originalEvent: e,

package/es-modules/Grid/Core/Table/Header/HeaderRow.js

@@ -2,11 +2,11 @@
  *
  *  Grid HeaderRow class
  *
- *  (c) 2020-2025 Highsoft AS
+ *  (c) 2020-2026 Highsoft AS
  *
- *  License: www.highcharts.com/license
+ *  A commercial license may be required depending on use.
+ *  See www.highcharts.com/license
  *
- *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  *  Authors:
  *  - Dawid Dragula