diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts index 6330206edd52..d4bfc9b16e17 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts @@ -48,10 +48,10 @@ export class DxiDataGridFieldComponent extends CollectionNestedOption { } @Input() - get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) { + get customizeText(): ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string) { return this._getOption('customizeText'); } - set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) { + set customizeText(value: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)) { this._setOption('customizeText', value); } diff --git a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts index ffb2e61c6519..0aee7cc7c7a6 100644 --- a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts @@ -48,10 +48,10 @@ export class DxiFilterBuilderFieldComponent extends CollectionNestedOption { } @Input() - get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) { + get customizeText(): ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string) { return this._getOption('customizeText'); } - set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) { + set customizeText(value: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)) { this._setOption('customizeText', value); } diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts index 97d502327ad1..11c3752577cd 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts @@ -48,10 +48,10 @@ export class DxiTreeListFieldComponent extends CollectionNestedOption { } @Input() - get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) { + get customizeText(): ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string) { return this._getOption('customizeText'); } - set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) { + set customizeText(value: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)) { this._setOption('customizeText', value); } diff --git a/packages/devextreme-react/src/common/data/custom-store.ts b/packages/devextreme-react/src/common/data/custom-store.ts deleted file mode 100644 index 8b01da88d434..000000000000 --- a/packages/devextreme-react/src/common/data/custom-store.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { - GroupItem, - isGroupItemsArray, - isItemsArray, - isLoadResultObject, - LoadResult, - LoadResultObject, -} from "devextreme/common/data/custom-store"; diff --git a/packages/devextreme-react/src/data-grid.ts b/packages/devextreme-react/src/data-grid.ts index d283d9e883a8..553e5dfbb344 100644 --- a/packages/devextreme-react/src/data-grid.ts +++ b/packages/devextreme-react/src/data-grid.ts @@ -1142,7 +1142,7 @@ const ExportTexts = Object.assign string | (() => any) | Array); caption?: string | undefined; - customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string); + customizeText?: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string); dataField?: string | undefined; dataType?: DataType; editorOptions?: any; diff --git a/packages/devextreme-react/src/filter-builder.ts b/packages/devextreme-react/src/filter-builder.ts index 6b63a51e089e..ba98f39fdb27 100644 --- a/packages/devextreme-react/src/filter-builder.ts +++ b/packages/devextreme-react/src/filter-builder.ts @@ -118,7 +118,7 @@ const CustomOperation = Object.assign string | (() => any) | Array); caption?: string | undefined; - customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string); + customizeText?: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string); dataField?: string | undefined; dataType?: DataType; editorOptions?: any; diff --git a/packages/devextreme-react/src/tree-list.ts b/packages/devextreme-react/src/tree-list.ts index c4452d2b9b50..85b0e2c4aad9 100644 --- a/packages/devextreme-react/src/tree-list.ts +++ b/packages/devextreme-react/src/tree-list.ts @@ -951,7 +951,7 @@ const EmailRule = Object.assign type IFieldProps = React.PropsWithChildren<{ calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array); caption?: string | undefined; - customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string); + customizeText?: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string); dataField?: string | undefined; dataType?: DataType; editorOptions?: any; diff --git a/packages/devextreme-vue/src/common/data/custom-store.ts b/packages/devextreme-vue/src/common/data/custom-store.ts deleted file mode 100644 index 8b01da88d434..000000000000 --- a/packages/devextreme-vue/src/common/data/custom-store.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { - GroupItem, - isGroupItemsArray, - isItemsArray, - isLoadResultObject, - LoadResult, - LoadResultObject, -} from "devextreme/common/data/custom-store"; diff --git a/packages/devextreme-vue/src/data-grid.ts b/packages/devextreme-vue/src/data-grid.ts index 030dadff5ab2..2a738bf6852b 100644 --- a/packages/devextreme-vue/src/data-grid.ts +++ b/packages/devextreme-vue/src/data-grid.ts @@ -1577,7 +1577,7 @@ const DxFieldConfig = { props: { calculateFilterExpression: Function as PropType<((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array)>, caption: String, - customizeText: Function as PropType<((fieldInfo: { value: string | number | Date, valueText: string }) => string)>, + customizeText: Function as PropType<((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)>, dataField: String, dataType: String as PropType, editorOptions: {}, diff --git a/packages/devextreme-vue/src/filter-builder.ts b/packages/devextreme-vue/src/filter-builder.ts index 9b22d162e1b0..3f2cee956f49 100644 --- a/packages/devextreme-vue/src/filter-builder.ts +++ b/packages/devextreme-vue/src/filter-builder.ts @@ -200,7 +200,7 @@ const DxFieldConfig = { props: { calculateFilterExpression: Function as PropType<((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array)>, caption: String, - customizeText: Function as PropType<((fieldInfo: { value: string | number | Date, valueText: string }) => string)>, + customizeText: Function as PropType<((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)>, dataField: String, dataType: String as PropType, editorOptions: {}, diff --git a/packages/devextreme-vue/src/tree-list.ts b/packages/devextreme-vue/src/tree-list.ts index 275e10f965dc..e5d7499d12f3 100644 --- a/packages/devextreme-vue/src/tree-list.ts +++ b/packages/devextreme-vue/src/tree-list.ts @@ -1395,7 +1395,7 @@ const DxFieldConfig = { props: { calculateFilterExpression: Function as PropType<((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array)>, caption: String, - customizeText: Function as PropType<((fieldInfo: { value: string | number | Date, valueText: string }) => string)>, + customizeText: Function as PropType<((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)>, dataField: String, dataType: String as PropType, editorOptions: {}, diff --git a/packages/devextreme/js/ui/filter_builder.d.ts b/packages/devextreme/js/ui/filter_builder.d.ts index 067ba0a33a85..471149d8026c 100644 --- a/packages/devextreme/js/ui/filter_builder.d.ts +++ b/packages/devextreme/js/ui/filter_builder.d.ts @@ -363,6 +363,7 @@ export type CustomOperation = dxFilterBuilderCustomOperation; export type FieldInfo = { value?: string | number | Date; valueText?: string; + field?: Field; }; /** * @namespace DevExpress.ui @@ -386,7 +387,7 @@ export interface dxFilterBuilderCustomOperation { * @docid * @public */ - customizeText?: ((fieldInfo: FieldInfo) => string); + customizeText?: (fieldInfo: FieldInfo) => string; /** * @docid * @default undefined @@ -452,7 +453,7 @@ export interface dxFilterBuilderField { * @docid * @public */ - customizeText?: ((fieldInfo: FieldInfo) => string); + customizeText?: (fieldInfo: FieldInfo) => string; /** * @docid * @default undefined diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index b6edf489a989..1922aa0a251e 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -16814,6 +16814,7 @@ declare module DevExpress.ui { export type FieldInfo = { value?: string | number | Date; valueText?: string; + field?: Field; }; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -29692,8 +29693,8 @@ declare module DevExpress.ui { }; export type TreeListCommandColumnType = 'adaptive' | 'buttons' | 'drag'; export type TreeListEditingOptions = { - readonly component?: dxTreeList; - readonly row?: Row; + component?: dxTreeList; + row?: Row; }; export type TreeListFilterMode = | 'fullBranch'