update button_group keyExpr + generate additional files

dmlvr · dmlvr · commit 128a088c6ec3 · 2026-04-16T14:16:30.000+03:00
diff --git a/packages/devextreme-angular/src/ui/button-group/index.ts b/packages/devextreme-angular/src/ui/button-group/index.ts
@@ -23,7 +23,7 @@ import {
 
 
 import type { dxButtonGroupItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/button_group';
-import type { SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';
+import type { template, SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';
 
 import DxButtonGroup from 'devextreme/ui/button_group';
 
@@ -207,10 +207,10 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
     
      */
     @Input()
-    get keyExpr(): any {
+    get keyExpr(): ((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | Function, text: string, type: any | string, visible: boolean }) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: any) {
+    set keyExpr(value: ((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | Function, text: string, type: any | string, visible: boolean }) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
@@ -441,7 +441,7 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() keyExprChange: EventEmitter<any>;
+    @Output() keyExprChange: EventEmitter<((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | Function, text: string, type: any | string, visible: boolean }) => any) | string>;
 
     /**
     
diff --git a/packages/devextreme-angular/src/ui/card-view/nested/tab-panel-options.ts b/packages/devextreme-angular/src/ui/card-view/nested/tab-panel-options.ts
@@ -176,10 +176,10 @@ export class DxoCardViewTabPanelOptionsComponent extends NestedOption implements
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/chat/nested/suggestions.ts b/packages/devextreme-angular/src/ui/chat/nested/suggestions.ts
@@ -19,7 +19,7 @@ import {
 
 
 import type { dxButtonGroupItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/button_group';
-import type { SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';
+import type { template, SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';
 
 import {
     DxIntegrationModule,
@@ -126,10 +126,10 @@ export class DxoChatSuggestionsComponent extends NestedOption implements OnDestr
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | Function, text: string, type: any | string, visible: boolean }) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | Function, text: string, type: any | string, visible: boolean }) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/tab-panel-options.ts b/packages/devextreme-angular/src/ui/data-grid/nested/tab-panel-options.ts
@@ -176,10 +176,10 @@ export class DxoDataGridTabPanelOptionsComponent extends NestedOption implements
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/form/nested/tab-panel-options.ts b/packages/devextreme-angular/src/ui/form/nested/tab-panel-options.ts
@@ -176,10 +176,10 @@ export class DxoFormTabPanelOptionsComponent extends NestedOption implements OnD
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/scheduler/nested/options.ts b/packages/devextreme-angular/src/ui/scheduler/nested/options.ts
@@ -20,7 +20,7 @@ import {
 
 import type { dxButtonGroupItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/button_group';
 import type { SchedulerPredefinedDateNavigatorItem } from 'devextreme/ui/scheduler';
-import type { SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';
+import type { template, SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';
 
 import {
     DxIntegrationModule,
@@ -127,10 +127,10 @@ export class DxoSchedulerOptionsComponent extends NestedOption implements OnDest
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | Function, text: string, type: any | string, visible: boolean }) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | Function, text: string, type: any | string, visible: boolean }) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/scheduler/nested/tab-panel-options.ts b/packages/devextreme-angular/src/ui/scheduler/nested/tab-panel-options.ts
@@ -176,10 +176,10 @@ export class DxoSchedulerTabPanelOptionsComponent extends NestedOption implement
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/tab-panel-options.ts b/packages/devextreme-angular/src/ui/tree-list/nested/tab-panel-options.ts
@@ -176,10 +176,10 @@ export class DxoTreeListTabPanelOptionsComponent extends NestedOption implements
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
diff --git a/packages/devextreme-react/src/chat.ts b/packages/devextreme-react/src/chat.ts
@@ -528,7 +528,7 @@ type ISuggestionsProps = React.PropsWithChildren<{
   hint?: string | undefined;
   hoverStateEnabled?: boolean;
   items?: Array<dxButtonGroupItem>;
-  keyExpr?: any;
+  keyExpr?: ((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | (() => void), text: string, type: any | string, visible: boolean }) => any) | string;
   onContentReady?: ((e: ButtonGroupContentReadyEvent) => void);
   onDisposing?: ((e: ButtonGroupDisposingEvent) => void);
   onInitialized?: ((e: ButtonGroupInitializedEvent) => void);
diff --git a/packages/devextreme-react/src/scheduler.ts b/packages/devextreme-react/src/scheduler.ts
@@ -809,7 +809,7 @@ type IOptionsProps = React.PropsWithChildren<{
   hint?: string | undefined;
   hoverStateEnabled?: boolean;
   items?: Array<dxButtonGroupItem | SchedulerPredefinedDateNavigatorItem>;
-  keyExpr?: any;
+  keyExpr?: ((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | (() => void), text: string, type: any | string, visible: boolean }) => any) | string;
   onContentReady?: ((e: ButtonGroupContentReadyEvent) => void);
   onDisposing?: ((e: ButtonGroupDisposingEvent) => void);
   onInitialized?: ((e: ButtonGroupInitializedEvent) => void);
diff --git a/packages/devextreme-vue/src/button-group.ts b/packages/devextreme-vue/src/button-group.ts
@@ -12,6 +12,7 @@ import {
  SelectionChangedEvent,
 } from "devextreme/ui/button_group";
 import {
+ template,
  SingleMultipleOrNone,
  ButtonStyle,
  ButtonType,
@@ -62,7 +63,7 @@ const componentConfig = {
     hint: String,
     hoverStateEnabled: Boolean,
     items: Array as PropType<Array<dxButtonGroupItem>>,
-    keyExpr: {},
+    keyExpr: [Function, String] as PropType<(((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | (() => void), text: string, type: any | string, visible: boolean }) => any)) | string>,
     onContentReady: Function as PropType<((e: ContentReadyEvent) => void)>,
     onDisposing: Function as PropType<((e: DisposingEvent) => void)>,
     onInitialized: Function as PropType<((e: InitializedEvent) => void)>,
diff --git a/packages/devextreme-vue/src/chat.ts b/packages/devextreme-vue/src/chat.ts
@@ -42,6 +42,7 @@ import {
  ValidationStatus,
  ButtonType,
  ButtonStyle,
+ template,
  SingleMultipleOrNone,
 } from "devextreme/common";
 import {
@@ -825,7 +826,7 @@ const DxSuggestionsConfig = {
     hint: String,
     hoverStateEnabled: Boolean,
     items: Array as PropType<Array<dxButtonGroupItem>>,
-    keyExpr: {},
+    keyExpr: [Function, String] as PropType<(((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | (() => void), text: string, type: any | string, visible: boolean }) => any)) | string>,
     onContentReady: Function as PropType<((e: ButtonGroupContentReadyEvent) => void)>,
     onDisposing: Function as PropType<((e: ButtonGroupDisposingEvent) => void)>,
     onInitialized: Function as PropType<((e: ButtonGroupInitializedEvent) => void)>,
diff --git a/packages/devextreme-vue/src/scheduler.ts b/packages/devextreme-vue/src/scheduler.ts
@@ -56,6 +56,7 @@ import {
  Mode,
  ToolbarItemLocation,
  ToolbarItemComponent,
+ template,
  SingleMultipleOrNone,
  ScrollMode,
  TabsIconPosition,
@@ -1135,7 +1136,7 @@ const DxOptionsConfig = {
     hint: String,
     hoverStateEnabled: Boolean,
     items: Array as PropType<Array<dxButtonGroupItem | SchedulerPredefinedDateNavigatorItem>>,
-    keyExpr: {},
+    keyExpr: [Function, String] as PropType<(((item: any | { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template | (() => void), text: string, type: any | string, visible: boolean }) => any)) | string>,
     onContentReady: Function as PropType<((e: ButtonGroupContentReadyEvent) => void)>,
     onDisposing: Function as PropType<((e: ButtonGroupDisposingEvent) => void)>,
     onInitialized: Function as PropType<((e: ButtonGroupInitializedEvent) => void)>,
diff --git a/packages/devextreme-vue/src/tree-list.ts b/packages/devextreme-vue/src/tree-list.ts
@@ -3862,7 +3862,7 @@ const DxTabPanelOptionsConfig = {
     items: Array as PropType<Array<any | dxTabPanelItem | string>>,
     itemTemplate: {},
     itemTitleTemplate: {},
-    keyExpr: [Function, String] as PropType<((() => void)) | string>,
+    keyExpr: [Function, String] as PropType<(((item: any) => any)) | string>,
     loop: Boolean,
     noDataText: String,
     onContentReady: Function as PropType<((e: TabPanelContentReadyEvent) => void)>,
diff --git a/packages/devextreme/js/ui/button_group.d.ts b/packages/devextreme/js/ui/button_group.d.ts
@@ -119,7 +119,7 @@ export interface dxButtonGroupOptions extends WidgetOptions<dxButtonGroup> {
      * @default 'text'
      * @public
      */
-    keyExpr?: CollectionWidgetOptions<any, Item, any>['keyExpr']
+    keyExpr?: string | ((item: Item) => any);
     /**
      * @docid
      * @default null
diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts
@@ -9939,11 +9939,7 @@ declare module DevExpress.ui {
     /**
      * [descr:dxButtonGroupOptions.keyExpr]
      */
-    keyExpr?: CollectionWidgetOptions<
-      any,
-      DevExpress.ui.dxButtonGroup.Item,
-      any
-    >['keyExpr'];
+    keyExpr?: string | ((item: DevExpress.ui.dxButtonGroup.Item) => any);
     /**
      * [descr:dxButtonGroupOptions.onItemClick]
      */

Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,10 @@ export class DxoCardViewTabPanelOptionsComponent extends NestedOption implements`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`@Input()`
`179`		`- get keyExpr(): Function \| string {`
	`179`	`+ get keyExpr(): ((item: any) => any) \| string {`
`180`	`180`	`return this._getOption('keyExpr');`
`181`	`181`	`}`
`182`		`- set keyExpr(value: Function \| string) {`
	`182`	`+ set keyExpr(value: ((item: any) => any) \| string) {`
`183`	`183`	`this._setOption('keyExpr', value);`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import {`
`19`	`19`
`20`	`20`
`21`	`21`	`import type { dxButtonGroupItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/button_group';`
`22`		`-import type { SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';`
	`22`	`+import type { template, SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';`
`23`	`23`
`24`	`24`	`import {`
`25`	`25`	`DxIntegrationModule,`
`@@ -126,10 +126,10 @@ export class DxoChatSuggestionsComponent extends NestedOption implements OnDestr`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@Input()`
`129`		`- get keyExpr(): Function \| string {`
	`129`	`+ get keyExpr(): ((item: any \| { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template \| Function, text: string, type: any \| string, visible: boolean }) => any) \| string {`
`130`	`130`	`return this._getOption('keyExpr');`
`131`	`131`	`}`
`132`		`- set keyExpr(value: Function \| string) {`
	`132`	`+ set keyExpr(value: ((item: any \| { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template \| Function, text: string, type: any \| string, visible: boolean }) => any) \| string) {`
`133`	`133`	`this._setOption('keyExpr', value);`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,10 @@ export class DxoDataGridTabPanelOptionsComponent extends NestedOption implements`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`@Input()`
`179`		`- get keyExpr(): Function \| string {`
	`179`	`+ get keyExpr(): ((item: any) => any) \| string {`
`180`	`180`	`return this._getOption('keyExpr');`
`181`	`181`	`}`
`182`		`- set keyExpr(value: Function \| string) {`
	`182`	`+ set keyExpr(value: ((item: any) => any) \| string) {`
`183`	`183`	`this._setOption('keyExpr', value);`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,10 @@ export class DxoFormTabPanelOptionsComponent extends NestedOption implements OnD`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`@Input()`
`179`		`- get keyExpr(): Function \| string {`
	`179`	`+ get keyExpr(): ((item: any) => any) \| string {`
`180`	`180`	`return this._getOption('keyExpr');`
`181`	`181`	`}`
`182`		`- set keyExpr(value: Function \| string) {`
	`182`	`+ set keyExpr(value: ((item: any) => any) \| string) {`
`183`	`183`	`this._setOption('keyExpr', value);`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import {`
`20`	`20`
`21`	`21`	`import type { dxButtonGroupItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/button_group';`
`22`	`22`	`import type { SchedulerPredefinedDateNavigatorItem } from 'devextreme/ui/scheduler';`
`23`		`-import type { SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';`
	`23`	`+import type { template, SingleMultipleOrNone, ButtonStyle } from 'devextreme/common';`
`24`	`24`
`25`	`25`	`import {`
`26`	`26`	`DxIntegrationModule,`
`@@ -127,10 +127,10 @@ export class DxoSchedulerOptionsComponent extends NestedOption implements OnDest`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`@Input()`
`130`		`- get keyExpr(): Function \| string {`
	`130`	`+ get keyExpr(): ((item: any \| { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template \| Function, text: string, type: any \| string, visible: boolean }) => any) \| string {`
`131`	`131`	`return this._getOption('keyExpr');`
`132`	`132`	`}`
`133`		`- set keyExpr(value: Function \| string) {`
	`133`	`+ set keyExpr(value: ((item: any \| { disabled: boolean, elementAttr: Record<string, any>, hint: string, html: string, icon: string, template: template \| Function, text: string, type: any \| string, visible: boolean }) => any) \| string) {`
`134`	`134`	`this._setOption('keyExpr', value);`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,10 @@ export class DxoSchedulerTabPanelOptionsComponent extends NestedOption implement`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`@Input()`
`179`		`- get keyExpr(): Function \| string {`
	`179`	`+ get keyExpr(): ((item: any) => any) \| string {`
`180`	`180`	`return this._getOption('keyExpr');`
`181`	`181`	`}`
`182`		`- set keyExpr(value: Function \| string) {`
	`182`	`+ set keyExpr(value: ((item: any) => any) \| string) {`
`183`	`183`	`this._setOption('keyExpr', value);`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,10 @@ export class DxoTreeListTabPanelOptionsComponent extends NestedOption implements`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`@Input()`
`179`		`- get keyExpr(): Function \| string {`
	`179`	`+ get keyExpr(): ((item: any) => any) \| string {`
`180`	`180`	`return this._getOption('keyExpr');`
`181`	`181`	`}`
`182`		`- set keyExpr(value: Function \| string) {`
	`182`	`+ set keyExpr(value: ((item: any) => any) \| string) {`
`183`	`183`	`this._setOption('keyExpr', value);`
`184`	`184`	`}`
`185`	`185`