Merge branch '25_2' into 25_2_demos_rehype_parse_version_fix

Author: GoodDayForSurf

e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false.png

@@ -281,3 +281,80 @@ test('DataGrid - Group row content is scrolled if repaintChangesOnly is enabled
     autoExpandAll: false,
   },
 }));
+
+[false, true].forEach((rtlEnabled) => {
+  // T1284612
+  safeSizeTest(`DataGrid - Group summaries are shown over sticky columns on a horizontal scroll (rtl=${rtlEnabled})`, async (t) => {
+    const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+    const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
+
+    await t.expect(dataGrid.isReady()).ok();
+
+    await dataGrid.scrollTo(t, { x: rtlEnabled ? 100 : 250 });
+    await takeScreenshot(`grouping-scroll-total_summary_intersection-rtl=${rtlEnabled}.png`, dataGrid.element);
+
+    await dataGrid.apiOption('summary.totalItems', [{
+      column: 'SaleAmount',
+      summaryType: 'max',
+      valueFormat: 'currency',
+    }]);
+    await dataGrid.scrollTo(t, { x: 0 });
+    await dataGrid.scrollTo(t, { x: rtlEnabled ? 100 : 250 });
+
+    await takeScreenshot(`grouping-scroll-total_summary-rtl=${rtlEnabled}.png`, dataGrid.element);
+
+    await t
+      .expect(compareResults.isValid())
+      .ok(compareResults.errorMessages());
+  }, [900, 800]).before(async () => createWidget('dxDataGrid', {
+    ...defaultConfig,
+    rtlEnabled,
+    customizeColumns(columns) {
+      columns[2].groupIndex = 0;
+    },
+    summary: {
+      groupItems: [{
+        column: 'OrderNumber',
+        summaryType: 'count',
+        displayFormat: '{0} orders',
+      }, {
+        column: 'City',
+        summaryType: 'max',
+        valueFormat: 'currency',
+        showInGroupFooter: false,
+        alignByColumn: true,
+      }, {
+        column: 'TotalAmount',
+        summaryType: 'max',
+        valueFormat: 'currency',
+        showInGroupFooter: false,
+        alignByColumn: true,
+      }, {
+        column: 'TotalAmount',
+        summaryType: 'sum',
+        valueFormat: 'currency',
+        displayFormat: 'Total: {0}',
+        showInGroupFooter: true,
+      }],
+      totalItems: [{
+        column: 'OrderNumber',
+        summaryType: 'count',
+        displayFormat: '{0} orders',
+      }, {
+        column: 'SaleAmount',
+        summaryType: 'max',
+        valueFormat: 'currency',
+      }, {
+        column: 'TotalAmount',
+        summaryType: 'max',
+        valueFormat: 'currency',
+      }, {
+        column: 'TotalAmount',
+        summaryType: 'sum',
+        valueFormat: 'currency',
+        displayFormat: 'Total: {0}',
+      }],
+    },
+  }));
+});

e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true.png

@@ -172,6 +172,14 @@ export class DxoCardViewTabPanelOptionsComponent extends NestedOption implements
         this._setOption('itemTitleTemplate', value);
     }
 
+    @Input()
+    get keyExpr(): Function | string {
+        return this._getOption('keyExpr');
+    }
+    set keyExpr(value: Function | string) {
+        this._setOption('keyExpr', value);
+    }
+
     @Input()
     get loop(): boolean {
         return this._getOption('loop');

e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false.png

@@ -172,6 +172,14 @@ export class DxoFormTabPanelOptionsComponent extends NestedOption implements OnD
         this._setOption('itemTitleTemplate', value);
     }
 
+    @Input()
+    get keyExpr(): Function | string {
+        return this._getOption('keyExpr');
+    }
+    set keyExpr(value: Function | string) {
+        this._setOption('keyExpr', value);
+    }
+
     @Input()
     get loop(): boolean {
         return this._getOption('loop');

e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true.png

@@ -126,6 +126,13 @@ export abstract class DxoTabPanelOptions extends NestedOption {
         this._setOption('itemTitleTemplate', value);
     }
 
+    get keyExpr(): Function | string {
+        return this._getOption('keyExpr');
+    }
+    set keyExpr(value: Function | string) {
+        this._setOption('keyExpr', value);
+    }
+
     get loop(): boolean {
         return this._getOption('loop');
     }

e2e/testcafe-devextreme/tests/dataGrid/sticky/common/withGrouping.ts

@@ -52,6 +52,7 @@ import { DxiItemComponent } from './item-dxi';
         'items',
         'itemTemplate',
         'itemTitleTemplate',
+        'keyExpr',
         'loop',
         'noDataText',
         'onContentReady',

packages/devextreme-angular/src/ui/card-view/nested/tab-panel-options.ts

@@ -279,6 +279,19 @@ export class DxTabPanelComponent<TItem = any, TKey = any> extends DxComponent im
     }
 
 
+    /**
+     * [descr:dxTabPanelOptions.keyExpr]
+    
+     */
+    @Input()
+    get keyExpr(): Function | string {
+        return this._getOption('keyExpr');
+    }
+    set keyExpr(value: Function | string) {
+        this._setOption('keyExpr', value);
+    }
+
+
     /**
      * [descr:dxMultiViewOptions.loop]
     
@@ -689,6 +702,13 @@ export class DxTabPanelComponent<TItem = any, TKey = any> extends DxComponent im
      */
     @Output() itemTitleTemplateChange: EventEmitter<any>;
 
+    /**
+    
+     * This member supports the internal infrastructure and is not intended to be used directly from your code.
+    
+     */
+    @Output() keyExprChange: EventEmitter<Function | string>;
+
     /**
     
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
@@ -856,6 +876,7 @@ export class DxTabPanelComponent<TItem = any, TKey = any> extends DxComponent im
             { emit: 'itemsChange' },
             { emit: 'itemTemplateChange' },
             { emit: 'itemTitleTemplateChange' },
+            { emit: 'keyExprChange' },
             { emit: 'loopChange' },
             { emit: 'noDataTextChange' },
             { emit: 'repaintChangesOnlyChange' },