@gooddata/sdk-ui-pivot 11.65.1 → 11.66.0-alpha.1

package/esm/CorePivotTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CorePivotTable.d.ts","sourceRoot":"","sources":["../src/CorePivotTable.tsx"],"names":[],"mappings":"AAyEA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AA2E7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8GG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,2CA6+B/D;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,oBAAoB,2CAQzD"}
+{"version":3,"file":"CorePivotTable.d.ts","sourceRoot":"","sources":["../src/CorePivotTable.tsx"],"names":[],"mappings":"AAyEA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AA2E7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8GG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,2CA2+B/D;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,oBAAoB,2CAQzD"}

package/esm/CorePivotTable.js

@@ -29,7 +29,7 @@ import { HeightCalculationManager } from "./impl/height/heightCalculationManager
 import { StickyRowManager } from "./impl/stickyRow/stickyRowManager.js";
 import { TableFacadeInitializer } from "./impl/tableFacadeInitializer.js";
 import { ComponentUpdateAnalyzer } from "./impl/updates/componentUpdateAnalyzer.js";
-import { getTotalsForColumnsBucket, sanitizeDefTotals } from "./impl/utils.js";
+import { getTotalsForAttributeBucket, getTotalsForColumnsBucket } from "./impl/utils.js";
 import { InternalTableState } from "./tableState.js";
 // Register all Community features
 ModuleRegistry.registerModules([AllCommunityModule]);
@@ -192,7 +192,7 @@ export function CorePivotTableAgImpl(props) {
         const { execution, config } = resolvedProps;
         return {
             readyToRender: false,
-            columnTotals: cloneDeep(sanitizeDefTotals(execution.definition)),
+            columnTotals: cloneDeep(getTotalsForAttributeBucket(execution.definition)),
             rowTotals: getTotalsForColumnsBucket(execution.definition),
             desiredHeight: config.maxHeight,
             resized: false,
@@ -594,13 +594,12 @@ export function CorePivotTableAgImpl(props) {
             }),
             sortingEventHandlers: new SortingEventHandlers({
                 internal,
-                getExecutionDefinition,
+                getColumnTotals,
                 pushDataGuard,
                 setState,
             }),
             aggregationEventHandlers: new AggregationEventHandlers({
                 internal,
-                getExecutionDefinition,
                 getColumnTotals,
                 getRowTotals,
                 pushDataGuard,
@@ -617,7 +616,6 @@ export function CorePivotTableAgImpl(props) {
     }, [
         autoresizeColumns,
         getColumnTotals,
-        getExecutionDefinition,
         getGroupRows,
         getLastSortedColId,
         getResizingConfig,
@@ -728,7 +726,7 @@ export function CorePivotTableAgImpl(props) {
     const reinitialize = useCallback((execution) => {
         setState({
             readyToRender: false,
-            columnTotals: cloneDeep(sanitizeDefTotals(execution.definition)),
+            columnTotals: cloneDeep(getTotalsForAttributeBucket(execution.definition)),
             rowTotals: getTotalsForColumnsBucket(execution.definition),
             error: undefined,
             desiredHeight: propsRef.current.config.maxHeight,

package/esm/impl/eventHandlers/aggregationEventHandlers.d.ts

@@ -1,10 +1,9 @@
-import { type IExecutionDefinition, type ITotal } from "@gooddata/sdk-model";
+import { type ITotal } from "@gooddata/sdk-model";
 import { type IPushData } from "@gooddata/sdk-ui";
 import { type InternalTableState } from "../../tableState.js";
 import { type IMenuAggregationClickConfig } from "../privateTypes.js";
 export interface IAggregationEventHandlerContext {
     internal: InternalTableState;
-    getExecutionDefinition: () => IExecutionDefinition;
     getColumnTotals: () => ITotal[];
     getRowTotals: () => ITotal[];
     pushDataGuard: (data: IPushData) => void;

package/esm/impl/eventHandlers/aggregationEventHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregationEventHandlers.d.ts","sourceRoot":"","sources":["../../../src/impl/eventHandlers/aggregationEventHandlers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAItE,MAAM,WAAW,+BAA+B;IAC5C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;IACnD,eAAe,EAAE,MAAM,MAAM,EAAE,CAAC;IAChC,YAAY,EAAE,MAAM,MAAM,EAAE,CAAC;IAC7B,aAAa,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IACzC,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACzD;AAED,qBAAa,wBAAwB;IACrB,OAAO,CAAC,OAAO;IAA3B,YAAoB,OAAO,EAAE,+BAA+B,EAAI;IAEzD,sBAAsB,+BAAgC,2BAA2B,KAAG,IAAI,CAsC7F;CACL"}
+{"version":3,"file":"aggregationEventHandlers.d.ts","sourceRoot":"","sources":["../../../src/impl/eventHandlers/aggregationEventHandlers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAGtE,MAAM,WAAW,+BAA+B;IAC5C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,eAAe,EAAE,MAAM,MAAM,EAAE,CAAC;IAChC,YAAY,EAAE,MAAM,MAAM,EAAE,CAAC;IAC7B,aAAa,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IACzC,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACzD;AAED,qBAAa,wBAAwB;IACrB,OAAO,CAAC,OAAO;IAA3B,YAAoB,OAAO,EAAE,+BAA+B,EAAI;IAEzD,sBAAsB,+BAAgC,2BAA2B,KAAG,IAAI,CAmC7F;CACL"}

package/esm/impl/eventHandlers/aggregationEventHandlers.js

@@ -1,17 +1,16 @@
+// (C) 2007-2026 GoodData Corporation
 import { BucketNames } from "@gooddata/sdk-ui";
 import { getUpdatedColumnOrRowTotals } from "../structure/headers/aggregationsMenuHelper.js";
-import { sanitizeDefTotals } from "../utils.js";
 export class AggregationEventHandlers {
     context;
     constructor(context) {
         this.context = context;
     }
     onMenuAggregationClick = (menuAggregationClickConfig) => {
-        const { internal, getExecutionDefinition, getColumnTotals, getRowTotals, pushDataGuard, setState } = this.context;
-        const sortItems = internal.table?.getSortItems();
+        const { internal, getColumnTotals, getRowTotals, pushDataGuard, setState } = this.context;
         const { isColumn } = menuAggregationClickConfig;
         if (isColumn) {
-            const newColumnTotals = sanitizeDefTotals(getExecutionDefinition(), sortItems, getUpdatedColumnOrRowTotals(getColumnTotals(), menuAggregationClickConfig));
+            const newColumnTotals = getUpdatedColumnOrRowTotals(getColumnTotals(), menuAggregationClickConfig);
             pushDataGuard({
                 properties: {
                     totals: newColumnTotals,

package/esm/impl/eventHandlers/sortingEventHandlers.d.ts

@@ -1,10 +1,10 @@
 import { type SortChangedEvent } from "ag-grid-community";
-import { type IExecutionDefinition } from "@gooddata/sdk-model";
+import { type ITotal } from "@gooddata/sdk-model";
 import { type IPushData } from "@gooddata/sdk-ui";
 import { type InternalTableState } from "../../tableState.js";
 export interface ISortingEventHandlerContext {
     internal: InternalTableState;
-    getExecutionDefinition: () => IExecutionDefinition;
+    getColumnTotals: () => ITotal[];
     pushDataGuard: (data: IPushData) => void;
     setState: (state: any, callback?: () => void) => void;
 }

package/esm/impl/eventHandlers/sortingEventHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sortingEventHandlers.d.ts","sourceRoot":"","sources":["../../../src/impl/eventHandlers/sortingEventHandlers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,MAAM,WAAW,2BAA2B;IACxC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;IACnD,aAAa,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IACzC,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACzD;AAED,qBAAa,oBAAoB;IACjB,OAAO,CAAC,OAAO;IAA3B,YAAoB,OAAO,EAAE,2BAA2B,EAAI;IAErD,aAAa,UAAW,gBAAgB,KAAG,IAAI,CA6BpD;CACL"}
+{"version":3,"file":"sortingEventHandlers.d.ts","sourceRoot":"","sources":["../../../src/impl/eventHandlers/sortingEventHandlers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,WAAW,2BAA2B;IACxC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,eAAe,EAAE,MAAM,MAAM,EAAE,CAAC;IAChC,aAAa,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IACzC,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACzD;AAED,qBAAa,oBAAoB;IACjB,OAAO,CAAC,OAAO;IAA3B,YAAoB,OAAO,EAAE,2BAA2B,EAAI;IAErD,aAAa,UAAW,gBAAgB,KAAG,IAAI,CA2BpD;CACL"}

package/esm/impl/eventHandlers/sortingEventHandlers.js

@@ -1,22 +1,19 @@
 // (C) 2007-2026 GoodData Corporation
 import { BucketNames } from "@gooddata/sdk-ui";
-import { sanitizeDefTotals } from "../utils.js";
 export class SortingEventHandlers {
     context;
     constructor(context) {
         this.context = context;
     }
     onSortChanged = (event) => {
-        const { internal, getExecutionDefinition, pushDataGuard, setState } = this.context;
+        const { internal, getColumnTotals, pushDataGuard, setState } = this.context;
         if (!internal.table) {
             console.warn("changing sorts without prior execution cannot work");
             return;
         }
         const sortItems = internal.table.createSortItems(event.api.getAllGridColumns());
-        // Changing sort may cause subtotals to no longer be reasonably placed - remove them if that is the case
-        // This applies only to totals in ATTRIBUTE bucket, column totals are not affected by sorting
-        const executionDefinition = getExecutionDefinition();
-        const totals = sanitizeDefTotals(executionDefinition, sortItems);
+        // Sorting changes subtotal visibility, but must preserve the current selection.
+        const totals = getColumnTotals();
         // oxlint-disable-next-line eslint-js/no-console
         console.debug("onSortChanged", sortItems);
         pushDataGuard({

package/esm/impl/gridOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gridOptions.d.ts","sourceRoot":"","sources":["../../src/impl/gridOptions.ts"],"names":[],"mappings":"AAmBA,OAAO,EACH,KAAK,4BAA4B,EACjC,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EAC1B,MAAM,mBAAmB,CAAC;AAe3B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AASpD,wBAAgB,iBAAiB,CAC7B,KAAK,EAAE,WAAW,EAClB,YAAY,EAAE,oBAAoB,GAAG,oBAAoB,GAAG,kBAAkB,EAC9E,KAAK,EAAE,QAAQ,CAAC,4BAA4B,CAAC,GAC9C,kBAAkB,CA6IpB"}
+{"version":3,"file":"gridOptions.d.ts","sourceRoot":"","sources":["../../src/impl/gridOptions.ts"],"names":[],"mappings":"AAmBA,OAAO,EACH,KAAK,4BAA4B,EACjC,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EAC1B,MAAM,mBAAmB,CAAC;AAe3B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AASpD,wBAAgB,iBAAiB,CAC7B,KAAK,EAAE,WAAW,EAClB,YAAY,EAAE,oBAAoB,GAAG,oBAAoB,GAAG,kBAAkB,EAC9E,KAAK,EAAE,QAAQ,CAAC,4BAA4B,CAAC,GAC9C,kBAAkB,CA8IpB"}

package/esm/impl/gridOptions.js

@@ -38,6 +38,7 @@ export function createGridOptions(table, tableMethods, props) {
         onMenuAggregationClick: tableMethods.onMenuAggregationClick,
         getTableDescriptor: () => table.tableDescriptor,
         getExecutionDefinition: tableMethods.getExecutionDefinition,
+        getSortItems: table.getSortItems,
         getColumnTotals: tableMethods.getColumnTotals,
         getRowTotals: tableMethods.getRowTotals,
         intl: props.intl,

package/esm/impl/structure/headers/AggregationsMenu.d.ts

@@ -1,5 +1,5 @@
 import { type IntlShape } from "react-intl";
-import { type IExecutionDefinition, type ITheme, type ITotal, type TotalType } from "@gooddata/sdk-model";
+import { type IExecutionDefinition, type ISortItem, type ITheme, type ITotal, type TotalType } from "@gooddata/sdk-model";
 import { type IOnOpenedChangeParams } from "@gooddata/sdk-ui-kit";
 import { type IMenuAggregationClickConfig } from "../../privateTypes.js";
 import { type TableDescriptor } from "../tableDescriptor.js";
@@ -13,11 +13,12 @@ export interface IAggregationsMenuProps {
     colId: string;
     getTableDescriptor: () => TableDescriptor;
     getExecutionDefinition: () => IExecutionDefinition;
+    getSortItems?: () => ISortItem[];
     getColumnTotals?: () => ITotal[];
     getRowTotals?: () => ITotal[];
     onAggregationSelect: (clickConfig: IMenuAggregationClickConfig) => void;
     onMenuOpenedChange: ({ opened, source }: IOnOpenedChangeParams) => void;
     theme?: ITheme;
 }
-export declare function AggregationsMenu({ intl, colId, getTableDescriptor, isMenuOpened, onMenuOpenedChange, showColumnsSubMenu, isMenuButtonVisible, getColumnTotals, getRowTotals, getExecutionDefinition, onAggregationSelect, showSubmenu, availableTotalTypes, }: IAggregationsMenuProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function AggregationsMenu({ intl, colId, getTableDescriptor, isMenuOpened, onMenuOpenedChange, showColumnsSubMenu, isMenuButtonVisible, getColumnTotals, getRowTotals, getExecutionDefinition, getSortItems, onAggregationSelect, showSubmenu, availableTotalTypes, }: IAggregationsMenuProps): import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=AggregationsMenu.d.ts.map

package/esm/impl/structure/headers/AggregationsMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AggregationsMenu.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/AggregationsMenu.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAEH,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,SAAS,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIH,KAAK,qBAAqB,EAK7B,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAyB7D,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,SAAS,EAAE,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,MAAM,eAAe,CAAC;IAC1C,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;IACnD,eAAe,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IAC9B,mBAAmB,EAAE,CAAC,WAAW,EAAE,2BAA2B,KAAK,IAAI,CAAC;IACxE,kBAAkB,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAYD,wBAAgB,gBAAgB,CAAC,EAC7B,IAAI,EACJ,KAAK,EACL,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,sBAAsB,EACtB,mBAAmB,EACnB,WAAW,EACX,mBAAmB,GACtB,EAAE,sBAAsB,kDA4NxB"}
+{"version":3,"file":"AggregationsMenu.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/AggregationsMenu.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAEH,KAAK,oBAAoB,EACzB,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,SAAS,EAKjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIH,KAAK,qBAAqB,EAK7B,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAyB7D,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,SAAS,EAAE,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,MAAM,eAAe,CAAC;IAC1C,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;IACnD,YAAY,CAAC,EAAE,MAAM,SAAS,EAAE,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IAC9B,mBAAmB,EAAE,CAAC,WAAW,EAAE,2BAA2B,KAAK,IAAI,CAAC;IACxE,kBAAkB,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAYD,wBAAgB,gBAAgB,CAAC,EAC7B,IAAI,EACJ,KAAK,EACL,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,sBAAsB,EACtB,YAAY,EACZ,mBAAmB,EACnB,WAAW,EACX,mBAAmB,GACtB,EAAE,sBAAsB,kDAqOxB"}

package/esm/impl/structure/headers/AggregationsMenu.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // (C) 2019-2026 GoodData Corporation
 import { useCallback } from "react";
 import cx from "classnames";
-import { hasMeasureValueFilterConditions, isMeasureValueFilter, isRankingFilter, } from "@gooddata/sdk-model";
+import { hasMeasureValueFilterConditions, isMeasureSort, isMeasureValueFilter, isRankingFilter, } from "@gooddata/sdk-model";
 import { Bubble, BubbleHoverTrigger, Header, IconBurgerMenu, Item, ItemsWrapper, Menu, } from "@gooddata/sdk-ui-kit";
 import { useTheme } from "@gooddata/sdk-ui-theme-provider";
 import { messages } from "../../../locales.js";
@@ -20,7 +20,11 @@ function MenuToggler() {
     const theme = useTheme();
     return (_jsx("div", { className: "menu-icon", children: _jsx(IconBurgerMenu, { color: theme?.palette?.complementary?.c8 }) }));
 }
-export function AggregationsMenu({ intl, colId, getTableDescriptor, isMenuOpened, onMenuOpenedChange, showColumnsSubMenu, isMenuButtonVisible, getColumnTotals, getRowTotals, getExecutionDefinition, onAggregationSelect, showSubmenu, availableTotalTypes, }) {
+export function AggregationsMenu({ intl, colId, getTableDescriptor, isMenuOpened, onMenuOpenedChange, showColumnsSubMenu, isMenuButtonVisible, getColumnTotals, getRowTotals, getExecutionDefinition, getSortItems, onAggregationSelect, showSubmenu, availableTotalTypes, }) {
+    const isMetricSorted = (getSortItems?.() ?? getExecutionDefinition().sortBy).some(isMeasureSort);
+    const rowSubtotalTooltip = isMetricSorted
+        ? intl.formatMessage(messages["disabled.measureSort"])
+        : undefined;
     const getColumnTotalsWrapper = (measureLocalIdentifiers, isGroupedHeader, ignoreMeasures) => {
         const columnTotals = getColumnTotals?.() ?? [];
         if (isGroupedHeader) {
@@ -73,10 +77,12 @@ export function AggregationsMenu({ intl, colId, getTableDescriptor, isMenuOpened
             const tooltipMessage = disabled ? intl.formatMessage(cause) : undefined;
             const renderSubmenu = !disabled && showSubmenu;
             const toggler = renderMenuItemContent(totalType, isSelected, renderSubmenu, disabled, tooltipMessage);
-            return (_jsx("div", { className: itemClassNames, children: renderSubmenu ? (_jsx(AggregationsSubMenu, { intl: intl, totalType: totalType, rowAttributeDescriptors: rowAttributeDescriptors, columnAttributeDescriptors: columnAttributeDescriptors, columnTotals: columnTotals, rowTotals: rowTotals, measureLocalIdentifiers: measureLocalIdentifiers, onAggregationSelect: onAggregationSelect, toggler: toggler, showColumnsSubMenu: showColumnsSubMenu })) : (toggler) }, totalType));
+            return (_jsx("div", { className: itemClassNames, children: renderSubmenu ? (_jsx(AggregationsSubMenu, { intl: intl, totalType: totalType, rowAttributeDescriptors: rowAttributeDescriptors, columnAttributeDescriptors: columnAttributeDescriptors, columnTotals: columnTotals, rowSubtotalTooltip: rowSubtotalTooltip, existingRowTotals: getColumnTotals?.(), rowTotals: rowTotals, measureLocalIdentifiers: measureLocalIdentifiers, onAggregationSelect: onAggregationSelect, toggler: toggler, showColumnsSubMenu: showColumnsSubMenu })) : (toggler) }, totalType));
         });
     }, [
         availableTotalTypes,
+        rowSubtotalTooltip,
+        getColumnTotals,
         getItemClassNames,
         intl,
         isTableFilteredByMeasureValue,

package/esm/impl/structure/headers/AggregationsSubMenu.d.ts

@@ -1,6 +1,6 @@
 import { type ReactElement } from "react";
 import { type IntlShape } from "react-intl";
-import { type IAttributeDescriptor, type TotalType } from "@gooddata/sdk-model";
+import { type IAttributeDescriptor, type ITotal, type TotalType } from "@gooddata/sdk-model";
 import { type IMenuAggregationClickConfig } from "../../privateTypes.js";
 import { type IColumnTotal } from "./aggregationsMenuTypes.js";
 export interface IAggregationsSubMenuProps {
@@ -12,9 +12,11 @@ export interface IAggregationsSubMenuProps {
     columnAttributeDescriptors: IAttributeDescriptor[];
     measureLocalIdentifiers: string[];
     columnTotals: IColumnTotal[];
+    rowSubtotalTooltip?: string;
+    existingRowTotals?: ITotal[];
     rowTotals: IColumnTotal[];
     showColumnsSubMenu: boolean;
     onAggregationSelect: (clickConfig: IMenuAggregationClickConfig) => void;
 }
-export declare function AggregationsSubMenu({ intl, totalType, toggler, isMenuOpened, rowAttributeDescriptors, columnAttributeDescriptors, measureLocalIdentifiers, columnTotals, rowTotals, showColumnsSubMenu, onAggregationSelect, }: IAggregationsSubMenuProps): import("react/jsx-runtime").JSX.Element;
+export declare function AggregationsSubMenu({ intl, totalType, toggler, isMenuOpened, rowAttributeDescriptors, columnAttributeDescriptors, measureLocalIdentifiers, columnTotals, rowSubtotalTooltip, existingRowTotals, rowTotals, showColumnsSubMenu, onAggregationSelect, }: IAggregationsSubMenuProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=AggregationsSubMenu.d.ts.map

package/esm/impl/structure/headers/AggregationsSubMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AggregationsSubMenu.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/AggregationsSubMenu.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhF,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAGzE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAO/D,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,YAAY,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,oBAAoB,EAAE,CAAC;IAChD,0BAA0B,EAAE,oBAAoB,EAAE,CAAC;IACnD,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAClC,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,CAAC,WAAW,EAAE,2BAA2B,KAAK,IAAI,CAAC;CAC3E;AAED,wBAAgB,mBAAmB,CAAC,EAChC,IAAI,EACJ,SAAS,EACT,OAAO,EACP,YAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC1B,uBAAuB,EACvB,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,mBAAmB,GACtB,EAAE,yBAAyB,2CAmD3B"}
+{"version":3,"file":"AggregationsSubMenu.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/AggregationsSubMenu.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAG7F,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAGzE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAO/D,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,YAAY,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,oBAAoB,EAAE,CAAC;IAChD,0BAA0B,EAAE,oBAAoB,EAAE,CAAC;IACnD,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAClC,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,CAAC,WAAW,EAAE,2BAA2B,KAAK,IAAI,CAAC;CAC3E;AAED,wBAAgB,mBAAmB,CAAC,EAChC,IAAI,EACJ,SAAS,EACT,OAAO,EACP,YAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC1B,uBAAuB,EACvB,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,SAAS,EACT,kBAAkB,EAClB,mBAAmB,GACtB,EAAE,yBAAyB,2CAqD3B"}

package/esm/impl/structure/headers/AggregationsSubMenu.js

@@ -6,12 +6,12 @@ import { AggregationsSubMenuItems } from "./AggregationsSubMenuItems.js";
 import { ColumnsHeaderIcon } from "./subMenuIcons/ColumnsIcon.js";
 import { RowsHeaderIcon } from "./subMenuIcons/RowsIcon.js";
 const MENU_HEADER_OFFSET = -36;
-export function AggregationsSubMenu({ intl, totalType, toggler, isMenuOpened = false, rowAttributeDescriptors, columnAttributeDescriptors, measureLocalIdentifiers, columnTotals, rowTotals, showColumnsSubMenu, onAggregationSelect, }) {
+export function AggregationsSubMenu({ intl, totalType, toggler, isMenuOpened = false, rowAttributeDescriptors, columnAttributeDescriptors, measureLocalIdentifiers, columnTotals, rowSubtotalTooltip, existingRowTotals, rowTotals, showColumnsSubMenu, onAggregationSelect, }) {
     const menuOpenedProp = isMenuOpened ? { opened: true } : {};
     const shouldRenderSeparator = tableHasRowAttributes(rowAttributeDescriptors) &&
         tableHasColumnAttributes(columnAttributeDescriptors) &&
         showColumnsSubMenu;
-    return (_jsx(SubMenu, { toggler: toggler, offset: MENU_HEADER_OFFSET, ...menuOpenedProp, children: _jsx(ItemsWrapper, { children: _jsxs("div", { className: "gd-aggregation-submenu s-table-header-submenu-content", children: [tableHasRowAttributes(rowAttributeDescriptors) ? (_jsx(AggregationsSubMenuItems, { intl: intl, attributeDescriptors: rowAttributeDescriptors, measureLocalIdentifiers: measureLocalIdentifiers, totalType: totalType, totals: columnTotals, isColumn: true, icon: _jsx(RowsHeaderIcon, {}), headerText: intl.formatMessage({
+    return (_jsx(SubMenu, { toggler: toggler, offset: MENU_HEADER_OFFSET, ...menuOpenedProp, children: _jsx(ItemsWrapper, { children: _jsxs("div", { className: "gd-aggregation-submenu s-table-header-submenu-content", children: [tableHasRowAttributes(rowAttributeDescriptors) ? (_jsx(AggregationsSubMenuItems, { intl: intl, attributeDescriptors: rowAttributeDescriptors, measureLocalIdentifiers: measureLocalIdentifiers, totalType: totalType, totals: columnTotals, subtotalTooltip: rowSubtotalTooltip, existingTotals: existingRowTotals, isColumn: true, icon: _jsx(RowsHeaderIcon, {}), headerText: intl.formatMessage({
                             id: "visualizations.menu.aggregations.rows",
                         }), onAggregationSelect: onAggregationSelect })) : null, _jsx("div", { className: cx("s-table-header-submenu-rows-separator", {
                             "gd-aggregation-submenu-rows-separator": shouldRenderSeparator,

package/esm/impl/structure/headers/AggregationsSubMenuItems.d.ts

@@ -1,6 +1,6 @@
 import { type ReactElement } from "react";
 import { type IntlShape } from "react-intl";
-import { type IAttributeDescriptor, type TotalType } from "@gooddata/sdk-model";
+import { type IAttributeDescriptor, type ITotal, type TotalType } from "@gooddata/sdk-model";
 import { type IMenuAggregationClickConfig } from "../../privateTypes.js";
 import { type IColumnTotal } from "./aggregationsMenuTypes.js";
 interface IAggregationsSubMenuItemsProps {
@@ -9,11 +9,13 @@ interface IAggregationsSubMenuItemsProps {
     totalType: TotalType;
     measureLocalIdentifiers: string[];
     totals: IColumnTotal[];
+    subtotalTooltip?: string;
+    existingTotals?: ITotal[];
     isColumn: boolean;
     icon: ReactElement;
     headerText: string;
     onAggregationSelect: (clickConfig: IMenuAggregationClickConfig) => void;
 }
-export declare function AggregationsSubMenuItems({ attributeDescriptors, measureLocalIdentifiers, intl, totalType, totals, isColumn, icon, headerText, onAggregationSelect, }: IAggregationsSubMenuItemsProps): import("react/jsx-runtime").JSX.Element;
+export declare function AggregationsSubMenuItems({ attributeDescriptors, measureLocalIdentifiers, intl, totalType, totals, subtotalTooltip, existingTotals, isColumn, icon, headerText, onAggregationSelect, }: IAggregationsSubMenuItemsProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=AggregationsSubMenuItems.d.ts.map

package/esm/impl/structure/headers/AggregationsSubMenuItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AggregationsSubMenuItems.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/AggregationsSubMenuItems.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACH,KAAK,oBAAoB,EACzB,KAAK,SAAS,EAGjB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAGzE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,UAAU,8BAA8B;IACpC,IAAI,EAAE,SAAS,CAAC;IAChB,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;IAC7C,SAAS,EAAE,SAAS,CAAC;IACrB,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAClC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,CAAC,WAAW,EAAE,2BAA2B,KAAK,IAAI,CAAC;CAC3E;AA+BD,wBAAgB,wBAAwB,CAAC,EACrC,oBAAoB,EACpB,uBAAuB,EACvB,IAAI,EACJ,SAAS,EACT,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,mBAAmB,GACtB,EAAE,8BAA8B,2CA8ChC"}
+{"version":3,"file":"AggregationsSubMenuItems.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/AggregationsSubMenuItems.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACH,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACX,KAAK,SAAS,EAGjB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAGzE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,UAAU,8BAA8B;IACpC,IAAI,EAAE,SAAS,CAAC;IAChB,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;IAC7C,SAAS,EAAE,SAAS,CAAC;IACrB,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAClC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,CAAC,WAAW,EAAE,2BAA2B,KAAK,IAAI,CAAC;CAC3E;AA+BD,wBAAgB,wBAAwB,CAAC,EACrC,oBAAoB,EACpB,uBAAuB,EACvB,IAAI,EACJ,SAAS,EACT,MAAM,EACN,eAAe,EACf,cAAc,EACd,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,mBAAmB,GACtB,EAAE,8BAA8B,2CAqEhC"}

package/esm/impl/structure/headers/AggregationsSubMenuItems.js

@@ -1,7 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import cx from "classnames";
 import { attributeDescriptorLocalId, attributeDescriptorName, } from "@gooddata/sdk-model";
-import { Header, Item } from "@gooddata/sdk-ui-kit";
+import { Bubble, BubbleHoverTrigger, Header, Item } from "@gooddata/sdk-ui-kit";
 import { isTotalEnabledForSubMenuAttribute } from "./aggregationsMenuHelper.js";
 const getPreviousAttributeName = (rowAttributeDescriptors, attributeHeaderIndex) => {
     return attributeDescriptorName(rowAttributeDescriptors[attributeHeaderIndex - 1]);
@@ -22,23 +22,35 @@ const getSubtotalNameTestClass = (attributeLocalIdentifier) => {
     const attributeClass = attributeLocalIdentifier.replace(/\./g, "-");
     return `s-aggregation-item-${attributeClass}`;
 };
-export function AggregationsSubMenuItems({ attributeDescriptors, measureLocalIdentifiers, intl, totalType, totals, isColumn, icon, headerText, onAggregationSelect, }) {
+export function AggregationsSubMenuItems({ attributeDescriptors, measureLocalIdentifiers, intl, totalType, totals, subtotalTooltip, existingTotals, isColumn, icon, headerText, onAggregationSelect, }) {
     const attributeItems = attributeDescriptors.map((_attributeDescriptor, headerIndex) => {
         const attributeLocalIdentifier = attributeDescriptorLocalId(attributeDescriptors[headerIndex]);
-        const isSelected = isTotalEnabledForSubMenuAttribute(attributeLocalIdentifier, totalType, totals);
-        const onClick = () => onAggregationSelect({
-            type: totalType,
-            measureIdentifiers: measureLocalIdentifiers,
-            include: !isSelected,
-            attributeIdentifier: attributeLocalIdentifier,
-            isColumn,
-        });
+        const tooltip = headerIndex > 0 ? subtotalTooltip : undefined;
+        const isSelected = tooltip
+            ? (existingTotals ?? []).some((total) => total.attributeIdentifier === attributeLocalIdentifier &&
+                total.type === totalType &&
+                measureLocalIdentifiers.includes(total.measureIdentifier))
+            : isTotalEnabledForSubMenuAttribute(attributeLocalIdentifier, totalType, totals);
+        const isDisabled = !!tooltip && !isSelected;
+        const onClick = () => {
+            if (isDisabled) {
+                return;
+            }
+            onAggregationSelect({
+                type: totalType,
+                measureIdentifiers: measureLocalIdentifiers,
+                include: !isSelected,
+                attributeIdentifier: attributeLocalIdentifier,
+                isColumn,
+            });
+        };
         const attributeName = getAttributeName(intl, attributeDescriptors, headerIndex, isColumn);
-        return (_jsx(Item, { checked: isSelected, children: _jsx("div", { onClick: onClick, className: cx("gd-aggregation-menu-item-inner", "s-menu-aggregation-inner", getSubtotalNameTestClass(attributeLocalIdentifier), {
+        const item = (_jsx(Item, { checked: isSelected, disabled: isDisabled, children: _jsx("div", { onClick: onClick, className: cx("gd-aggregation-menu-item-inner", "s-menu-aggregation-inner", getSubtotalNameTestClass(attributeLocalIdentifier), {
                     "s-menu-aggregation-inner-selected": isSelected,
                     "s-menu-aggregation-inner-column": !isColumn,
                     "s-menu-aggregation-inner-row": isColumn,
                 }), children: attributeName }) }, attributeLocalIdentifier));
+        return tooltip ? (_jsxs(BubbleHoverTrigger, { showDelay: 200, hideDelay: 0, children: [item, _jsx(Bubble, { className: "bubble-primary", alignPoints: [{ align: "bc tc" }], children: tooltip })] }, attributeLocalIdentifier)) : (item);
     });
     return (_jsxs(_Fragment, { children: [_jsxs(Header, { children: [icon, _jsx("span", { children: headerText })] }), attributeItems] }));
 }

package/esm/impl/structure/headers/ColumnGroupHeader.d.ts

@@ -4,5 +4,5 @@ import { type ICommonHeaderParams } from "./HeaderCell.js";
 export interface IProps extends ICommonHeaderParams, IHeaderGroupParams {
     menu?: () => IMenu;
 }
-export declare function ColumnGroupHeader({ menu, columnGroup, intl, getTableDescriptor, displayName, onMenuAggregationClick, getExecutionDefinition, getColumnTotals, getRowTotals, }: IProps): import("react/jsx-runtime").JSX.Element;
+export declare function ColumnGroupHeader({ menu, columnGroup, intl, getTableDescriptor, displayName, onMenuAggregationClick, getExecutionDefinition, getSortItems, getColumnTotals, getRowTotals, }: IProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ColumnGroupHeader.d.ts.map

package/esm/impl/structure/headers/ColumnGroupHeader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnGroupHeader.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/ColumnGroupHeader.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEnF,MAAM,WAAW,MAAO,SAAQ,mBAAmB,EAAE,kBAAkB;IACnE,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,EAC9B,IAAI,EACJ,WAAW,EACX,IAAI,EACJ,kBAAkB,EAClB,WAAW,EACX,sBAAsB,EACtB,sBAAsB,EACtB,eAAe,EACf,YAAY,GACf,EAAE,MAAM,2CA2BR"}
+{"version":3,"file":"ColumnGroupHeader.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/ColumnGroupHeader.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEnF,MAAM,WAAW,MAAO,SAAQ,mBAAmB,EAAE,kBAAkB;IACnE,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,EAC9B,IAAI,EACJ,WAAW,EACX,IAAI,EACJ,kBAAkB,EAClB,WAAW,EACX,sBAAsB,EACtB,sBAAsB,EACtB,YAAY,EACZ,eAAe,EACf,YAAY,GACf,EAAE,MAAM,2CA4BR"}

package/esm/impl/structure/headers/ColumnGroupHeader.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { agColId } from "../tableDescriptorTypes.js";
 import { ALIGN_LEFT, HeaderCell } from "./HeaderCell.js";
-export function ColumnGroupHeader({ menu, columnGroup, intl, getTableDescriptor, displayName, onMenuAggregationClick, getExecutionDefinition, getColumnTotals, getRowTotals, }) {
+export function ColumnGroupHeader({ menu, columnGroup, intl, getTableDescriptor, displayName, onMenuAggregationClick, getExecutionDefinition, getSortItems, getColumnTotals, getRowTotals, }) {
     const colGroupDef = columnGroup.getColGroupDef();
     const colId = agColId(colGroupDef);
     const parent = columnGroup.getParent();
@@ -9,5 +9,5 @@ export function ColumnGroupHeader({ menu, columnGroup, intl, getTableDescriptor,
     // and also do not show when table is transposed => handled in rows
     const isTransposed = getTableDescriptor().isTransposed();
     const showMenu = !!parent && !!colGroupDef.headerName && !isTransposed;
-    return (_jsx(HeaderCell, { className: "s-pivot-table-column-group-header", displayText: displayName, enableSorting: false, menuPosition: ALIGN_LEFT, textAlign: ALIGN_LEFT, menu: showMenu ? menu?.() : undefined, onMenuAggregationClick: onMenuAggregationClick, colId: colId, getTableDescriptor: getTableDescriptor, getExecutionDefinition: getExecutionDefinition, getColumnTotals: getColumnTotals, getRowTotals: getRowTotals, intl: intl }));
+    return (_jsx(HeaderCell, { className: "s-pivot-table-column-group-header", displayText: displayName, enableSorting: false, menuPosition: ALIGN_LEFT, textAlign: ALIGN_LEFT, menu: showMenu ? menu?.() : undefined, onMenuAggregationClick: onMenuAggregationClick, colId: colId, getTableDescriptor: getTableDescriptor, getExecutionDefinition: getExecutionDefinition, getSortItems: getSortItems, getColumnTotals: getColumnTotals, getRowTotals: getRowTotals, intl: intl }));
 }

package/esm/impl/structure/headers/ColumnHeader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnHeader.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/ColumnHeader.tsx"],"names":[],"mappings":"AAIA,OAAO,EAA6C,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlG,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AASrD,OAAO,EAAuC,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEhG,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB,EAAE,aAAa;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,CAAC,EAAE,aAAa,CAAC;CAC3B;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,kBAAkB,2CA4IrD"}
+{"version":3,"file":"ColumnHeader.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/ColumnHeader.tsx"],"names":[],"mappings":"AAIA,OAAO,EAA6C,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlG,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AASrD,OAAO,EAAuC,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEhG,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB,EAAE,aAAa;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,CAAC,EAAE,aAAa,CAAC;CAC3B;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,kBAAkB,2CA6IrD"}

package/esm/impl/structure/headers/ColumnHeader.js

@@ -95,5 +95,5 @@ export function ColumnHeader(props) {
     }, [eGridHeader, column, isSortingEnabled, setLastSortedColId, showMenu, onSortRequested]);
     const firstSortOrder = column.getColDef().sortingOrder?.[0];
     const defaultSortDirection = firstSortOrder === "asc" || firstSortOrder === "desc" ? firstSortOrder : undefined;
-    return (_jsx(HeaderCell, { className: cx("s-pivot-table-column-header", className), textAlign: textAlign, displayText: displayName, enableSorting: isSortingEnabled, sortDirection: sorting, defaultSortDirection: defaultSortDirection, onSortClick: onSortRequested, onMenuAggregationClick: props.onMenuAggregationClick, menu: showMenu ? menu?.() : undefined, colId: column.getColDef().field, getTableDescriptor: getTableDescriptor, getExecutionDefinition: props.getExecutionDefinition, getColumnTotals: props.getColumnTotals, getRowTotals: props.getRowTotals, intl: props.intl, isFocused: isFocused }));
+    return (_jsx(HeaderCell, { className: cx("s-pivot-table-column-header", className), textAlign: textAlign, displayText: displayName, enableSorting: isSortingEnabled, sortDirection: sorting, defaultSortDirection: defaultSortDirection, onSortClick: onSortRequested, onMenuAggregationClick: props.onMenuAggregationClick, menu: showMenu ? menu?.() : undefined, colId: column.getColDef().field, getTableDescriptor: getTableDescriptor, getExecutionDefinition: props.getExecutionDefinition, getSortItems: props.getSortItems, getColumnTotals: props.getColumnTotals, getRowTotals: props.getRowTotals, intl: props.intl, isFocused: isFocused }));
 }

package/esm/impl/structure/headers/ColumnTotalHeader.d.ts

@@ -4,5 +4,5 @@ import { type ICommonHeaderParams } from "./HeaderCell.js";
 export interface IColumnHeaderProps extends ICommonHeaderParams, IHeaderParams {
     menu?: () => IMenu;
 }
-export declare function ColumnTotalHeader({ getTableDescriptor, getExecutionDefinition, getColumnTotals, getRowTotals, displayName, column, intl, }: IColumnHeaderProps): import("react/jsx-runtime").JSX.Element;
+export declare function ColumnTotalHeader({ getTableDescriptor, getExecutionDefinition, getSortItems, getColumnTotals, getRowTotals, displayName, column, intl, }: IColumnHeaderProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ColumnTotalHeader.d.ts.map

package/esm/impl/structure/headers/ColumnTotalHeader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnTotalHeader.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/ColumnTotalHeader.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAuC,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEhG,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB,EAAE,aAAa;IAC1E,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,EAC9B,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,YAAY,EACZ,WAAW,EACX,MAAM,EACN,IAAI,GACP,EAAE,kBAAkB,2CAsBpB"}
+{"version":3,"file":"ColumnTotalHeader.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/ColumnTotalHeader.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAuC,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEhG,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB,EAAE,aAAa;IAC1E,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,EAC9B,kBAAkB,EAClB,sBAAsB,EACtB,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,WAAW,EACX,MAAM,EACN,IAAI,GACP,EAAE,kBAAkB,2CAuBpB"}

package/esm/impl/structure/headers/ColumnTotalHeader.js

@@ -3,11 +3,11 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useCallback } from "react";
 import { isEmptyScopeCol, isSliceCol } from "../tableDescriptorTypes.js";
 import { ALIGN_LEFT, ALIGN_RIGHT, HeaderCell } from "./HeaderCell.js";
-export function ColumnTotalHeader({ getTableDescriptor, getExecutionDefinition, getColumnTotals, getRowTotals, displayName, column, intl, }) {
+export function ColumnTotalHeader({ getTableDescriptor, getExecutionDefinition, getSortItems, getColumnTotals, getRowTotals, displayName, column, intl, }) {
     const getColDescriptor = useCallback(() => {
         return getTableDescriptor().getCol(column);
     }, [column, getTableDescriptor]);
     const col = getColDescriptor();
     const textAlign = isSliceCol(col) || isEmptyScopeCol(col) ? ALIGN_LEFT : ALIGN_RIGHT;
-    return (_jsx(HeaderCell, { className: "gd-pivot-table-column-total-header s-pivot-table-column-total-header", textAlign: textAlign, displayText: displayName, enableSorting: false, colId: column.getColDef().field, getTableDescriptor: getTableDescriptor, getExecutionDefinition: getExecutionDefinition, getColumnTotals: getColumnTotals, getRowTotals: getRowTotals, intl: intl }));
+    return (_jsx(HeaderCell, { className: "gd-pivot-table-column-total-header s-pivot-table-column-total-header", textAlign: textAlign, displayText: displayName, enableSorting: false, colId: column.getColDef().field, getTableDescriptor: getTableDescriptor, getExecutionDefinition: getExecutionDefinition, getSortItems: getSortItems, getColumnTotals: getColumnTotals, getRowTotals: getRowTotals, intl: intl }));
 }

package/esm/impl/structure/headers/HeaderCell.d.ts

@@ -1,5 +1,5 @@
 import { type IntlShape } from "react-intl";
-import { type IExecutionDefinition, type ITotal, type SortDirection } from "@gooddata/sdk-model";
+import { type IExecutionDefinition, type ISortItem, type ITotal, type SortDirection } from "@gooddata/sdk-model";
 import { type IMenu } from "../../../publicTypes.js";
 import { type IMenuAggregationClickConfig } from "../../privateTypes.js";
 import { type TableDescriptor } from "../tableDescriptor.js";
@@ -10,6 +10,7 @@ export interface ICommonHeaderParams {
     getTableDescriptor: () => TableDescriptor;
     onMenuAggregationClick?: (config: IMenuAggregationClickConfig) => void;
     getExecutionDefinition?: () => IExecutionDefinition;
+    getSortItems?: () => ISortItem[];
     getColumnTotals?: () => ITotal[];
     getRowTotals?: () => ITotal[];
     intl?: IntlShape;
@@ -28,5 +29,5 @@ export interface IHeaderCellProps extends ICommonHeaderParams {
     colId?: string;
     isFocused?: boolean;
 }
-export declare function HeaderCell({ sortDirection, textAlign, menuPosition, menu, enableSorting, onMenuAggregationClick, onSortClick, displayText, className, defaultSortDirection, intl, colId, getTableDescriptor, getExecutionDefinition, getColumnTotals, getRowTotals, isFocused, }: IHeaderCellProps): import("react/jsx-runtime").JSX.Element;
+export declare function HeaderCell({ sortDirection, textAlign, menuPosition, menu, enableSorting, onMenuAggregationClick, onSortClick, displayText, className, defaultSortDirection, intl, colId, getTableDescriptor, getExecutionDefinition, getSortItems, getColumnTotals, getRowTotals, isFocused, }: IHeaderCellProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=HeaderCell.d.ts.map

package/esm/impl/structure/headers/HeaderCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HeaderCell.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/HeaderCell.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGjG,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AACzD,eAAO,MAAM,UAAU,SAAS,CAAC;AACjC,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,MAAM,WAAW,mBAAmB;IAChC,kBAAkB,EAAE,MAAM,eAAe,CAAC;IAC1C,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,2BAA2B,KAAK,IAAI,CAAC;IACvE,sBAAsB,CAAC,EAAE,MAAM,oBAAoB,CAAC;IACpD,eAAe,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IAC9B,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CACvD;AAED,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IACzD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,aAAa,CAAC;IACrC,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,UAAU,CAAC,EACvB,aAAoB,EACpB,SAAsB,EACtB,YAAyB,EACzB,IAAW,EACX,aAAqB,EACrB,sBAAmC,EACnC,WAAwB,EACxB,WAAW,EACX,SAAS,EACT,oBAAoB,EACpB,IAAI,EACJ,KAAK,EACL,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,YAAY,EACZ,SAAS,GACZ,EAAE,gBAAgB,2CA6MlB"}
+{"version":3,"file":"HeaderCell.d.ts","sourceRoot":"","sources":["../../../../src/impl/structure/headers/HeaderCell.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACH,KAAK,oBAAoB,EACzB,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,aAAa,EACrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AACzD,eAAO,MAAM,UAAU,SAAS,CAAC;AACjC,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,MAAM,WAAW,mBAAmB;IAChC,kBAAkB,EAAE,MAAM,eAAe,CAAC;IAC1C,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,2BAA2B,KAAK,IAAI,CAAC;IACvE,sBAAsB,CAAC,EAAE,MAAM,oBAAoB,CAAC;IACpD,YAAY,CAAC,EAAE,MAAM,SAAS,EAAE,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IAC9B,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CACvD;AAED,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IACzD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,aAAa,CAAC;IACrC,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,UAAU,CAAC,EACvB,aAAoB,EACpB,SAAsB,EACtB,YAAyB,EACzB,IAAW,EACX,aAAqB,EACrB,sBAAmC,EACnC,WAAwB,EACxB,WAAW,EACX,SAAS,EACT,oBAAoB,EACpB,IAAI,EACJ,KAAK,EACL,kBAAkB,EAClB,sBAAsB,EACtB,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,SAAS,GACZ,EAAE,gBAAgB,2CA+MlB"}

package/esm/impl/structure/headers/HeaderCell.js

@@ -6,7 +6,7 @@ import { AVAILABLE_TOTALS, HEADER_LABEL_CLASS } from "../../base/constants.js";
 import { AggregationsMenu } from "./AggregationsMenu.js";
 export const ALIGN_LEFT = "left";
 export const ALIGN_RIGHT = "right";
-export function HeaderCell({ sortDirection = null, textAlign = ALIGN_LEFT, menuPosition = ALIGN_LEFT, menu = null, enableSorting = false, onMenuAggregationClick = () => null, onSortClick = () => null, displayText, className, defaultSortDirection, intl, colId, getTableDescriptor, getExecutionDefinition, getColumnTotals, getRowTotals, isFocused, }) {
+export function HeaderCell({ sortDirection = null, textAlign = ALIGN_LEFT, menuPosition = ALIGN_LEFT, menu = null, enableSorting = false, onMenuAggregationClick = () => null, onSortClick = () => null, displayText, className, defaultSortDirection, intl, colId, getTableDescriptor, getExecutionDefinition, getSortItems, getColumnTotals, getRowTotals, isFocused, }) {
     const [isMenuOpen, setIsMenuOpen] = useState(false);
     const [isMenuButtonVisible, setIsMenuButtonVisible] = useState(false);
     const [currentSortDirection, setCurrentSortDirection] = useState(null);
@@ -75,11 +75,12 @@ export function HeaderCell({ sortDirection = null, textAlign = ALIGN_LEFT, menuP
         if (!menu?.aggregations) {
             return null;
         }
-        return (_jsx(AggregationsMenu, { intl: intl, colId: colId, isMenuOpened: isMenuOpen, isMenuButtonVisible: isMenuButtonVisible, showSubmenu: menu.aggregations ?? false, showColumnsSubMenu: menu.aggregationsSubMenuForRows ?? false, availableTotalTypes: menu.aggregationTypes ?? AVAILABLE_TOTALS, getTableDescriptor: getTableDescriptor, getExecutionDefinition: getExecutionDefinition, getColumnTotals: getColumnTotals, getRowTotals: getRowTotals, onMenuOpenedChange: handleMenuOpenedChange, onAggregationSelect: menuItemClick }));
+        return (_jsx(AggregationsMenu, { intl: intl, colId: colId, isMenuOpened: isMenuOpen, isMenuButtonVisible: isMenuButtonVisible, showSubmenu: menu.aggregations ?? false, showColumnsSubMenu: menu.aggregationsSubMenuForRows ?? false, availableTotalTypes: menu.aggregationTypes ?? AVAILABLE_TOTALS, getTableDescriptor: getTableDescriptor, getExecutionDefinition: getExecutionDefinition, getSortItems: getSortItems, getColumnTotals: getColumnTotals, getRowTotals: getRowTotals, onMenuOpenedChange: handleMenuOpenedChange, onAggregationSelect: menuItemClick }));
     }, [
         colId,
         getColumnTotals,
         getExecutionDefinition,
+        getSortItems,
         getRowTotals,
         getTableDescriptor,
         handleMenuOpenedChange,

package/esm/impl/utils.d.ts

@@ -1,4 +1,4 @@
-import { type IAttributeDescriptor, type IExecutionDefinition, type ISortItem, type ITotal } from "@gooddata/sdk-model";
+import { type IAttributeDescriptor, type IExecutionDefinition, type ITotal } from "@gooddata/sdk-model";
 import { type DataViewFacade } from "@gooddata/sdk-ui";
 import { type ColumnWidthItem } from "../columnWidths.js";
 declare function getScrollbarWidthBody(): number;
@@ -9,14 +9,9 @@ declare function getScrollbarWidthBody(): number;
 export declare const getScrollbarWidth: typeof getScrollbarWidthBody;
 export declare function sleep(delay: number): Promise<void>;
 /**
- * Get only valid totals from an execution definition given a list of sort items
- * Use provided totals, if not given, use totals from ATTRIBUTE bucket
- *
- * @param definition - an execution definition to sanitize
- * @param sortItems - a specification of the sort, if not provided definition.sortBy will be used
- * @param totals - totals to be sanitized, if not provided ATTRIBUTE bucket totals will be used
+ * Get totals from an execution definition for the ATTRIBUTE bucket, independently of sorting.
  */
-export declare function sanitizeDefTotals(definition: IExecutionDefinition, sortItems?: ISortItem[], totals?: ITotal[]): ITotal[];
+export declare function getTotalsForAttributeBucket({ buckets }: IExecutionDefinition): ITotal[];
 /**
  * Get totals from an execution definition for COLUMNS bucket
  *

package/esm/impl/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/impl/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,SAAS,EACd,KAAK,MAAM,EAId,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACH,KAAK,eAAe,EAKvB,MAAM,oBAAoB,CAAC;AAE5B,iBAAS,qBAAqB,IAAI,MAAM,CAqBvC;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,8BAA8B,CAAC;AAE7D,wBAAsB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIxD;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC7B,UAAU,EAAE,oBAAoB,EAChC,SAAS,CAAC,EAAE,SAAS,EAAE,EACvB,MAAM,CAAC,EAAE,MAAM,EAAE,GAClB,MAAM,EAAE,CAMV;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,EAAE,OAAO,EAAE,EAAE,oBAAoB,GAAG,MAAM,EAAE,CAGrF;AAED,eAAO,MAAM,qBAAqB,kBAAmB,oBAAoB,EAAE,KAAG,OAClD,CAAC;AAE7B,eAAO,MAAM,wBAAwB,qBAAsB,oBAAoB,EAAE,KAAG,OACrD,CAAC;AAEhC,eAAO,MAAM,uBAAuB,SAAU,eAAe,iPAO5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,OAAQ,cAAc,sDAStD,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/impl/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,MAAM,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACH,KAAK,eAAe,EAKvB,MAAM,oBAAoB,CAAC;AAE5B,iBAAS,qBAAqB,IAAI,MAAM,CAqBvC;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,8BAA8B,CAAC;AAE7D,wBAAsB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIxD;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,EAAE,OAAO,EAAE,EAAE,oBAAoB,GAAG,MAAM,EAAE,CAGvF;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,EAAE,OAAO,EAAE,EAAE,oBAAoB,GAAG,MAAM,EAAE,CAGrF;AAED,eAAO,MAAM,qBAAqB,kBAAmB,oBAAoB,EAAE,KAAG,OAClD,CAAC;AAE7B,eAAO,MAAM,wBAAwB,qBAAsB,oBAAoB,EAAE,KAAG,OACrD,CAAC;AAEhC,eAAO,MAAM,uBAAuB,SAAU,eAAe,iPAO5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,OAAQ,cAAc,sDAStD,CAAC"}

package/esm/impl/utils.js

@@ -1,6 +1,6 @@
-// (C) 2007-2025 GoodData Corporation
+// (C) 2007-2026 GoodData Corporation
 import { once } from "lodash-es";
-import { bucketTotals, bucketsFind, sanitizeBucketTotals, } from "@gooddata/sdk-model";
+import { bucketTotals, bucketsFind, } from "@gooddata/sdk-model";
 import { BucketNames } from "@gooddata/sdk-ui";
 import { isAttributeColumnWidthItem, isMeasureColumnWidthItem, isMixedValuesColumnWidthItem, isSliceMeasureColumnWidthItem, } from "../columnWidths.js";
 function getScrollbarWidthBody() {
@@ -31,19 +31,11 @@ export async function sleep(delay) {
     });
 }
 /**
- * Get only valid totals from an execution definition given a list of sort items
- * Use provided totals, if not given, use totals from ATTRIBUTE bucket
- *
- * @param definition - an execution definition to sanitize
- * @param sortItems - a specification of the sort, if not provided definition.sortBy will be used
- * @param totals - totals to be sanitized, if not provided ATTRIBUTE bucket totals will be used
+ * Get totals from an execution definition for the ATTRIBUTE bucket, independently of sorting.
  */
-export function sanitizeDefTotals(definition, sortItems, totals) {
-    const { buckets, sortBy } = definition;
+export function getTotalsForAttributeBucket({ buckets }) {
     const attributeBucket = bucketsFind(buckets, BucketNames.ATTRIBUTE);
-    return attributeBucket
-        ? sanitizeBucketTotals(attributeBucket, sortItems ?? sortBy, totals ?? bucketTotals(attributeBucket))
-        : [];
+    return attributeBucket ? bucketTotals(attributeBucket) : [];
 }
 /**
  * Get totals from an execution definition for COLUMNS bucket

package/esm/locales.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../src/locales.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,YAAY,CAAC;AAEpE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGrD,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CA8CrD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,SAAS,EAAE,iBAAiB,CAOlE,CAAC"}
+{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../src/locales.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,YAAY,CAAC;AAEpE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGrD,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CA+CrD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,SAAS,EAAE,iBAAiB,CAOlE,CAAC"}

package/esm/locales.js

@@ -10,6 +10,7 @@ export const messages = defineMessages({
     med: { id: "visualizations.totals.dropdown.title.med" },
     "disabled.mvf": { id: "visualizations.totals.dropdown.tooltip.nat.disabled.mvf" },
     "disabled.ranking": { id: "visualizations.totals.dropdown.tooltip.nat.disabled.ranking" },
+    "disabled.measureSort": { id: "visualizations.totals.dropdown.tooltip.subtotal.disabled.measureSort" },
     // Total label rename action menu / popover
     totalLabelActions: { id: "visualizations.totals.labelActions.aria" },
     renameTotalLabel: { id: "visualizations.totals.renameLabel.action" },

package/esm/next/components/Header/HeaderCell/HeaderMenuComponents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HeaderMenuComponents.d.ts","sourceRoot":"","sources":["../../../../../src/next/components/Header/HeaderCell/HeaderMenuComponents.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,KAAK,SAAS,EAAW,MAAM,YAAY,CAAC;AAErD,OAAO,EAIH,KAAK,2BAA2B,EAChC,KAAK,WAAW,EAGnB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EACH,KAAK,qBAAqB,EAC1B,KAAK,wBAAwB,EAC7B,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC7B,MAAM,wBAAwB,CAAC;AAgDhC,KAAK,gBAAgB,GAAG;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,wBAAwB,GAAG;IACnC,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EACL,wBAAwB,GACxB,qBAAqB,GACrB,gBAAgB,GAChB,gBAAgB,GAChB,IAAI,CAAC;CACd,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,2BAA2B,CAAC,wBAAwB,CAAC,2CAejG;AAqKD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC5B,iBAAiB,EAAE,qBAAqB,EAAE,EAC1C,iBAAiB,EAAE,qBAAqB,EAAE,EAC1C,YAAY,EAAE,gBAAgB,EAAE,EAChC,IAAI,EAAE,SAAS,GAChB,KAAK,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC,CAM9C"}
+{"version":3,"file":"HeaderMenuComponents.d.ts","sourceRoot":"","sources":["../../../../../src/next/components/Header/HeaderCell/HeaderMenuComponents.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,KAAK,SAAS,EAAW,MAAM,YAAY,CAAC;AAErD,OAAO,EAIH,KAAK,2BAA2B,EAChC,KAAK,WAAW,EAGnB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EACH,KAAK,qBAAqB,EAC1B,KAAK,wBAAwB,EAC7B,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC7B,MAAM,wBAAwB,CAAC;AAgDhC,KAAK,gBAAgB,GAAG;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,wBAAwB,GAAG;IACnC,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EACL,wBAAwB,GACxB,qBAAqB,GACrB,gBAAgB,GAChB,gBAAgB,GAChB,IAAI,CAAC;CACd,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,2BAA2B,CAAC,wBAAwB,CAAC,2CAejG;AAuKD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC5B,iBAAiB,EAAE,qBAAqB,EAAE,EAC1C,iBAAiB,EAAE,qBAAqB,EAAE,EAC1C,YAAY,EAAE,gBAAgB,EAAE,EAChC,IAAI,EAAE,SAAS,GAChB,KAAK,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC,CAM9C"}

package/esm/next/components/Header/HeaderCell/HeaderMenuComponents.js

@@ -63,6 +63,8 @@ function buildUiAggregationMenuItems(aggregationsItems, intl) {
                     id: rowItem.id,
                     stringTitle: rowItem.title,
                     isSelected: rowItem.isActive,
+                    isDisabled: rowItem.isDisabled,
+                    tooltip: rowItem.disabledTooltip,
                     data: rowItem,
                 });
             });

package/esm/next/components/Header/utils/constructAggregationsMenuItems.d.ts

@@ -5,15 +5,17 @@ import { type IAggregationsMenuItem, type IMenu } from "../../../types/menu.js";
  * Creates aggregation menu items for specified measures on a cell.
  *
  * @param measureIdentifiers - The identifiers of the measures
- * @param availableTotalTypes - The available total types
  * @param currentRowTotals - The current row totals
  * @param currentColumnTotals - The current column totals
  * @param rows - The rows
  * @param columns - The columns
  * @param rowAttributeDescriptors - The row attribute descriptors
  * @param pivotAttributeDescriptors - The pivot attribute descriptors
+ * @param menu - The aggregation menu configuration
+ * @param intl - The localization formatter
  * @param disabledTooltip - The disabled tooltip
+ * @param disabledRowSubtotalTooltip - Explanation for unavailable, unselected row subtotals
  * @returns The aggregation menu items
  */
-export declare const constructAggregationsMenuItems: (measureIdentifiers: string[], currentRowTotals: ITotal[], currentColumnTotals: ITotal[], rows: IAttribute[], columns: IAttribute[], rowAttributeDescriptors: IAttributeDescriptor[], pivotAttributeDescriptors: IAttributeDescriptor[], menu: IMenu, intl: IntlShape, disabledTooltip?: string) => IAggregationsMenuItem[];
+export declare const constructAggregationsMenuItems: (measureIdentifiers: string[], currentRowTotals: ITotal[], currentColumnTotals: ITotal[], rows: IAttribute[], columns: IAttribute[], rowAttributeDescriptors: IAttributeDescriptor[], pivotAttributeDescriptors: IAttributeDescriptor[], menu: IMenu, intl: IntlShape, disabledTooltip?: string, disabledRowSubtotalTooltip?: string) => IAggregationsMenuItem[];
 //# sourceMappingURL=constructAggregationsMenuItems.d.ts.map

package/esm/next/components/Header/utils/constructAggregationsMenuItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constructAggregationsMenuItems.d.ts","sourceRoot":"","sources":["../../../../../src/next/components/Header/utils/constructAggregationsMenuItems.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACH,KAAK,UAAU,EACf,KAAK,oBAAoB,EACzB,KAAK,MAAM,EAGd,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACH,KAAK,qBAAqB,EAE1B,KAAK,KAAK,EACb,MAAM,wBAAwB,CAAC;AA+HhC;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,8BAA8B,uBACnB,MAAM,EAAE,oBACV,MAAM,EAAE,uBACL,MAAM,EAAE,QACvB,UAAU,EAAE,WACT,UAAU,EAAE,2BACI,oBAAoB,EAAE,6BACpB,oBAAoB,EAAE,QAC3C,KAAK,QACL,SAAS,oBACG,MAAM,KACzB,qBAAqB,EAkDvB,CAAC"}
+{"version":3,"file":"constructAggregationsMenuItems.d.ts","sourceRoot":"","sources":["../../../../../src/next/components/Header/utils/constructAggregationsMenuItems.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACH,KAAK,UAAU,EACf,KAAK,oBAAoB,EACzB,KAAK,MAAM,EAGd,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACH,KAAK,qBAAqB,EAE1B,KAAK,KAAK,EACb,MAAM,wBAAwB,CAAC;AA+HhC;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,8BAA8B,uBACnB,MAAM,EAAE,oBACV,MAAM,EAAE,uBACL,MAAM,EAAE,QACvB,UAAU,EAAE,WACT,UAAU,EAAE,2BACI,oBAAoB,EAAE,6BACpB,oBAAoB,EAAE,QAC3C,KAAK,QACL,SAAS,oBACG,MAAM,+BACK,MAAM,KACpC,qBAAqB,EAwEvB,CAAC"}

package/esm/next/components/Header/utils/constructAggregationsMenuItems.js

@@ -64,7 +64,7 @@ const createOtherAttributeTotalItems = (attributes, descriptors, totalType, meas
  * @param measureIdentifiers - The identifiers of the measures
  * @param currentTotals - The current totals
  * @param isColumn - Whether the total is for a column
- * @param disabledTooltip - The disabled tooltip
+ * @param intl - The localization formatter
  * @returns The aggregation menu items
  */
 const constructAggregationsSubMenuItems = (mainAttribute, otherAttributes, descriptors, totalType, measureIdentifiers, currentTotals, isColumn, intl) => {
@@ -77,17 +77,19 @@ const constructAggregationsSubMenuItems = (mainAttribute, otherAttributes, descr
  * Creates aggregation menu items for specified measures on a cell.
  *
  * @param measureIdentifiers - The identifiers of the measures
- * @param availableTotalTypes - The available total types
  * @param currentRowTotals - The current row totals
  * @param currentColumnTotals - The current column totals
  * @param rows - The rows
  * @param columns - The columns
  * @param rowAttributeDescriptors - The row attribute descriptors
  * @param pivotAttributeDescriptors - The pivot attribute descriptors
+ * @param menu - The aggregation menu configuration
+ * @param intl - The localization formatter
  * @param disabledTooltip - The disabled tooltip
+ * @param disabledRowSubtotalTooltip - Explanation for unavailable, unselected row subtotals
  * @returns The aggregation menu items
  */
-export const constructAggregationsMenuItems = (measureIdentifiers, currentRowTotals, currentColumnTotals, rows, columns, rowAttributeDescriptors, pivotAttributeDescriptors, menu, intl, disabledTooltip) => {
+export const constructAggregationsMenuItems = (measureIdentifiers, currentRowTotals, currentColumnTotals, rows, columns, rowAttributeDescriptors, pivotAttributeDescriptors, menu, intl, disabledTooltip, disabledRowSubtotalTooltip) => {
     // first row is the main row attribute
     const mainRowAttribute = rows.length > 0 ? rows[0] : undefined;
     const otherRowAttributes = rows.length > 0 ? rows.slice(1) : [];
@@ -98,7 +100,24 @@ export const constructAggregationsMenuItems = (measureIdentifiers, currentRowTot
     const includeSubtotals = Boolean(menu.aggregationsSubMenu);
     const includeColumns = Boolean(menu.aggregationsSubMenuForRows);
     return availableTotalTypes.flatMap((totalType) => {
-        const rowItems = constructAggregationsSubMenuItems(mainRowAttribute, includeSubtotals ? otherRowAttributes : [], rowAttributeDescriptors, totalType, measureIdentifiers, currentRowTotals, false, intl);
+        const rowItems = constructAggregationsSubMenuItems(mainRowAttribute, includeSubtotals ? otherRowAttributes : [], rowAttributeDescriptors, totalType, measureIdentifiers, currentRowTotals, false, intl).map((item) => {
+            // Grand totals remain available, and existing subtotals can always be removed.
+            const isSubtotal = item.totalDefinitions.some((total) => total.attributeIdentifier !== mainRowAttribute?.attribute.localIdentifier);
+            if (!isSubtotal || !disabledRowSubtotalTooltip) {
+                return item;
+            }
+            const existingDefinitions = item.totalDefinitions.filter((definition) => currentRowTotals.some((total) => areTotalsSameDefinition(total, definition)));
+            // A group can have subtotals for only some measures. Offer removal of those definitions
+            // instead of trying to add the missing ones while metric sorting prevents subtotals.
+            return existingDefinitions.length > 0
+                ? {
+                    ...item,
+                    isActive: true,
+                    totalDefinitions: existingDefinitions,
+                    disabledTooltip: disabledRowSubtotalTooltip,
+                }
+                : { ...item, isDisabled: true, disabledTooltip: disabledRowSubtotalTooltip };
+        });
         const columnItems = includeColumns
             ? constructAggregationsSubMenuItems(mainColumnAttribute, includeSubtotals ? otherColumnAttributes : [], pivotAttributeDescriptors, totalType, measureIdentifiers, currentColumnTotals, true, intl)
             : [];

package/esm/next/hooks/header/useHeaderMenuAggregations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useHeaderMenuAggregations.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/header/useHeaderMenuAggregations.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,KAAK,oBAAoB,EAO5B,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAGpE;;;;;;;GAOG;AACH,eAAO,MAAM,yBAAyB,uBACd,MAAM,EAAE,6BACD,oBAAoB,EAAE;;wCAwCN,wBAAwB;CAUtE,CAAC"}
+{"version":3,"file":"useHeaderMenuAggregations.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/header/useHeaderMenuAggregations.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,KAAK,oBAAoB,EAQ5B,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAGpE;;;;;;;GAOG;AACH,eAAO,MAAM,yBAAyB,uBACd,MAAM,EAAE,6BACD,oBAAoB,EAAE;;wCAyCN,wBAAwB;CAatE,CAAC"}

package/esm/next/hooks/header/useHeaderMenuAggregations.js

@@ -1,6 +1,6 @@
 // (C) 2025-2026 GoodData Corporation
 import { useIntl } from "react-intl";
-import { hasMeasureValueFilterConditions, isMeasureValueFilter, isRankingFilter, } from "@gooddata/sdk-model";
+import { hasMeasureValueFilterConditions, isMeasureSort, isMeasureValueFilter, isRankingFilter, } from "@gooddata/sdk-model";
 import { BucketNames, isAttributeColumnDefinition } from "@gooddata/sdk-ui";
 import { messages } from "../../../locales.js";
 import { constructAggregationsMenuItems } from "../../components/Header/utils/constructAggregationsMenuItems.js";
@@ -18,7 +18,7 @@ import { useUpdateTotals } from "../totals/useUpdateTotals.js";
 export const useHeaderMenuAggregations = (measureIdentifiers, pivotAttributeDescriptors) => {
     const intl = useIntl();
     const { currentDataView } = useCurrentDataView();
-    const { config, execution, rows, columns } = usePivotTableProps();
+    const { config, execution, rows, columns, sortBy } = usePivotTableProps();
     const { onUpdateTotals } = useUpdateTotals();
     const { rowTotals, columnTotals } = getTotalsFromExecutionDefinition(execution.definition);
     const tableData = currentDataView?.data().asTable();
@@ -33,9 +33,12 @@ export const useHeaderMenuAggregations = (measureIdentifiers, pivotAttributeDesc
             ? intl.formatMessage(messages["disabled.ranking"])
             : undefined;
     const aggregationsItems = config.menu?.aggregations
-        ? constructAggregationsMenuItems(measureIdentifiers, rowTotals, columnTotals, rows, columns, rowAttributeDescriptors, pivotAttributeDescriptors, config.menu, intl, disableRollupTotalTooltip)
+        ? constructAggregationsMenuItems(measureIdentifiers, rowTotals, columnTotals, rows, columns, rowAttributeDescriptors, pivotAttributeDescriptors, config.menu, intl, disableRollupTotalTooltip, sortBy.some(isMeasureSort) ? intl.formatMessage(messages["disabled.measureSort"]) : undefined)
         : [];
     const handleAggregationsItemClick = (item) => {
+        if (item.isDisabled) {
+            return;
+        }
         const currentTotals = item.isColumn ? columnTotals : rowTotals;
         onUpdateTotals(currentTotals, item.totalDefinitions, item.isActive, item.isColumn);
     };

package/esm/next/hooks/totals/useUpdateTotals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUpdateTotals.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/totals/useUpdateTotals.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAqC,MAAM,qBAAqB,CAAC;AAQrF;;;;;GAKG;AACH,wBAAgB,eAAe;oCAKP,MAAM,EAAE,oBAAoB,MAAM,EAAE,YAAY,OAAO,YAAY,OAAO;EAqDjG"}
+{"version":3,"file":"useUpdateTotals.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/totals/useUpdateTotals.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAQlD;;;;;GAKG;AACH,wBAAgB,eAAe;oCAKP,MAAM,EAAE,oBAAoB,MAAM,EAAE,YAAY,OAAO,YAAY,OAAO;EAoCjG"}

package/esm/next/hooks/totals/useUpdateTotals.js

@@ -1,7 +1,6 @@
 // (C) 2025-2026 GoodData Corporation
 import { useCallback } from "react";
 import { uniqWith } from "lodash-es";
-import { bucketsFind, sanitizeBucketTotals } from "@gooddata/sdk-model";
 import { BucketNames } from "@gooddata/sdk-ui";
 import { usePivotTableProps } from "../../context/PivotTablePropsContext.js";
 import { orderTotals } from "../../features/aggregations/ordering.js";
@@ -14,7 +13,7 @@ import { useIsTransposed } from "../shared/useIsTransposed.js";
  * @internal
  */
 export function useUpdateTotals() {
-    const { pushData, execution } = usePivotTableProps();
+    const { pushData } = usePivotTableProps();
     const isTransposed = useIsTransposed();
     const onUpdateTotals = useCallback((currentTotals, totalDefinitions, isActive, isColumn) => {
         if (!pushData) {
@@ -29,31 +28,14 @@ export function useUpdateTotals() {
             ], areTotalsSameDefinition);
         // Apply consistent ordering to ensure external consumers receive properly ordered totals
         const orderedTotals = orderTotals(updatedTotals);
-        if (isColumn) {
-            // Column totals (COLUMNS bucket) are not affected by sorting
-            pushData({
-                properties: {
-                    totals: orderedTotals,
-                    bucketType: BucketNames.COLUMNS,
-                },
-            });
-        }
-        else {
-            // Row totals (ATTRIBUTE bucket) need to be sanitized based on sorting.
-            // Changing sort may cause subtotals to no longer be reasonably placed - remove them if that is the case.
-            const { buckets, sortBy } = execution.definition;
-            const attributeBucket = bucketsFind(buckets, BucketNames.ATTRIBUTE);
-            const sanitizedTotals = attributeBucket
-                ? sanitizeBucketTotals(attributeBucket, sortBy, orderedTotals)
-                : orderedTotals;
-            pushData({
-                properties: {
-                    totals: sanitizedTotals,
-                    bucketType: BucketNames.ATTRIBUTE,
-                },
-            });
-        }
-    }, [pushData, execution, isTransposed]);
+        // Sorting determines subtotal placement in the execution result, not whether a total is valid.
+        pushData({
+            properties: {
+                totals: orderedTotals,
+                bucketType: isColumn ? BucketNames.COLUMNS : BucketNames.ATTRIBUTE,
+            },
+        });
+    }, [pushData, isTransposed]);
     return {
         onUpdateTotals,
     };

package/esm/next/types/menu.d.ts

@@ -86,6 +86,8 @@ export interface IAggregationsSubMenuItem {
     isActive: boolean;
     isColumn: boolean;
     totalDefinitions: ITotal[];
+    isDisabled?: boolean;
+    disabledTooltip?: string;
 }
 /**
  * Text wrapping menu item. Represents a single text wrapping option entry.

package/esm/next/types/menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../../../src/next/types/menu.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACnC;;OAEG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AAEF;;;;GAIG;AACH,MAAM,WAAW,KAAK;IAClB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAE/B;;;;;;OAMG;IACH,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAErC;;;;;;;OAOG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,qBAAqB;IAClC,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,wBAAwB,EAAE,CAAC;IACjC,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACpC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IAClC,IAAI,EAAE,cAAc,CAAC;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB"}
+{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../../../src/next/types/menu.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACnC;;OAEG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AAEF;;;;GAIG;AACH,MAAM,WAAW,KAAK;IAClB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAE/B;;;;;;OAMG;IACH,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAErC;;;;;;;OAOG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,qBAAqB;IAClC,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,wBAAwB,EAAE,CAAC;IACjC,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACpC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IAClC,IAAI,EAAE,cAAc,CAAC;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddata/sdk-ui-pivot",
-  "version": "11.65.1",
+  "version": "11.66.0-alpha.1",
   "description": "GoodData.UI SDK - Pivot Table",
   "license": "LicenseRef-LICENSE",
   "author": "GoodData Corporation",
@@ -43,12 +43,12 @@
     "ts-invariant": "0.10.3",
     "tslib": "2.8.1",
     "uuid": "11.1.1",
-    "@gooddata/sdk-model": "11.65.1",
-    "@gooddata/sdk-backend-spi": "11.65.1",
-    "@gooddata/sdk-ui": "11.65.1",
-    "@gooddata/sdk-ui-kit": "11.65.1",
-    "@gooddata/sdk-ui-theme-provider": "11.65.1",
-    "@gooddata/sdk-ui-vis-commons": "11.65.1"
+    "@gooddata/sdk-backend-spi": "11.66.0-alpha.1",
+    "@gooddata/sdk-model": "11.66.0-alpha.1",
+    "@gooddata/sdk-ui": "11.66.0-alpha.1",
+    "@gooddata/sdk-ui-theme-provider": "11.66.0-alpha.1",
+    "@gooddata/sdk-ui-kit": "11.66.0-alpha.1",
+    "@gooddata/sdk-ui-vis-commons": "11.66.0-alpha.1"
   },
   "devDependencies": {
     "@microsoft/api-documenter": "7.30.16",
@@ -86,12 +86,12 @@
     "stylelint": "16.26.1",
     "typescript": "7.0.2",
     "vitest": "5.0.4",
-    "@gooddata/eslint-config": "11.65.1",
-    "@gooddata/oxlint-config": "11.65.1",
-    "@gooddata/reference-workspace": "11.65.1",
-    "@gooddata/sdk-backend-base": "11.65.1",
-    "@gooddata/sdk-backend-mockingbird": "11.65.1",
-    "@gooddata/stylelint-config": "11.65.1"
+    "@gooddata/eslint-config": "11.66.0-alpha.1",
+    "@gooddata/oxlint-config": "11.66.0-alpha.1",
+    "@gooddata/sdk-backend-base": "11.66.0-alpha.1",
+    "@gooddata/stylelint-config": "11.66.0-alpha.1",
+    "@gooddata/sdk-backend-mockingbird": "11.66.0-alpha.1",
+    "@gooddata/reference-workspace": "11.66.0-alpha.1"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",