Skip to content

Commit b65e75f

Browse files
tongsonbarbspomahtrimpreyskurantov
authored
DataGrid Types - Extract types for the visible and disable callbacks in the buttons array (T1270796) (DevExpress#28853)
Co-authored-by: Roman Semenov <[email protected]> Co-authored-by: Mikhail Preyskurantov <[email protected]>
1 parent 30855fe commit b65e75f

File tree

15 files changed

+85
-45
lines changed

15 files changed

+85
-45
lines changed

‎packages/devextreme-angular/src/ui/data-grid/nested/custom-operation-dxi.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212

1313

1414

15-
import { dxFilterBuilderField } from 'devextreme/ui/filter_builder';
15+
import { dxFilterBuilderField, FieldInfo } from 'devextreme/ui/filter_builder';
1616
import { DataType } from 'devextreme/common';
1717

1818
import {
@@ -45,10 +45,10 @@ export class DxiDataGridCustomOperationComponent extends CollectionNestedOption
4545
}
4646

4747
@Input()
48-
get customizeText(): ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string) {
48+
get customizeText(): ((fieldInfo: FieldInfo) => string) {
4949
return this._getOption('customizeText');
5050
}
51-
set customizeText(value: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string)) {
51+
set customizeText(value: ((fieldInfo: FieldInfo) => string)) {
5252
this._setOption('customizeText', value);
5353
}
5454

‎packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212

1313

1414

15+
import { FieldInfo, FilterBuilderOperation } from 'devextreme/ui/filter_builder';
1516
import { DataType } from 'devextreme/common';
16-
import { FilterBuilderOperation } from 'devextreme/ui/filter_builder';
1717
import { Format } from 'devextreme/common/core/localization';
1818
import { DataSourceOptions } from 'devextreme/data/data_source';
1919
import { Store } from 'devextreme/data/store';
@@ -48,10 +48,10 @@ export class DxiDataGridFieldComponent extends CollectionNestedOption {
4848
}
4949

5050
@Input()
51-
get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) {
51+
get customizeText(): ((fieldInfo: FieldInfo) => string) {
5252
return this._getOption('customizeText');
5353
}
54-
set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) {
54+
set customizeText(value: ((fieldInfo: FieldInfo) => string)) {
5555
this._setOption('customizeText', value);
5656
}
5757

‎packages/devextreme-angular/src/ui/filter-builder/nested/custom-operation-dxi.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212

1313

1414

15-
import { dxFilterBuilderField } from 'devextreme/ui/filter_builder';
15+
import { dxFilterBuilderField, FieldInfo } from 'devextreme/ui/filter_builder';
1616
import { DataType } from 'devextreme/common';
1717

1818
import {
@@ -45,10 +45,10 @@ export class DxiFilterBuilderCustomOperationComponent extends CollectionNestedOp
4545
}
4646

4747
@Input()
48-
get customizeText(): ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string) {
48+
get customizeText(): ((fieldInfo: FieldInfo) => string) {
4949
return this._getOption('customizeText');
5050
}
51-
set customizeText(value: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string)) {
51+
set customizeText(value: ((fieldInfo: FieldInfo) => string)) {
5252
this._setOption('customizeText', value);
5353
}
5454

‎packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212

1313

1414

15+
import { FieldInfo, FilterBuilderOperation } from 'devextreme/ui/filter_builder';
1516
import { DataType } from 'devextreme/common';
16-
import { FilterBuilderOperation } from 'devextreme/ui/filter_builder';
1717
import { Format } from 'devextreme/common/core/localization';
1818
import { DataSourceOptions } from 'devextreme/data/data_source';
1919
import { Store } from 'devextreme/data/store';
@@ -48,10 +48,10 @@ export class DxiFilterBuilderFieldComponent extends CollectionNestedOption {
4848
}
4949

5050
@Input()
51-
get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) {
51+
get customizeText(): ((fieldInfo: FieldInfo) => string) {
5252
return this._getOption('customizeText');
5353
}
54-
set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) {
54+
set customizeText(value: ((fieldInfo: FieldInfo) => string)) {
5555
this._setOption('customizeText', value);
5656
}
5757

‎packages/devextreme-angular/src/ui/tree-list/nested/custom-operation-dxi.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212

1313

1414

15-
import { dxFilterBuilderField } from 'devextreme/ui/filter_builder';
15+
import { dxFilterBuilderField, FieldInfo } from 'devextreme/ui/filter_builder';
1616
import { DataType } from 'devextreme/common';
1717

1818
import {
@@ -45,10 +45,10 @@ export class DxiTreeListCustomOperationComponent extends CollectionNestedOption
4545
}
4646

4747
@Input()
48-
get customizeText(): ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string) {
48+
get customizeText(): ((fieldInfo: FieldInfo) => string) {
4949
return this._getOption('customizeText');
5050
}
51-
set customizeText(value: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string)) {
51+
set customizeText(value: ((fieldInfo: FieldInfo) => string)) {
5252
this._setOption('customizeText', value);
5353
}
5454

‎packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212

1313

1414

15+
import { FieldInfo, FilterBuilderOperation } from 'devextreme/ui/filter_builder';
1516
import { DataType } from 'devextreme/common';
16-
import { FilterBuilderOperation } from 'devextreme/ui/filter_builder';
1717
import { Format } from 'devextreme/common/core/localization';
1818
import { DataSourceOptions } from 'devextreme/data/data_source';
1919
import { Store } from 'devextreme/data/store';
@@ -48,10 +48,10 @@ export class DxiTreeListFieldComponent extends CollectionNestedOption {
4848
}
4949

5050
@Input()
51-
get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) {
51+
get customizeText(): ((fieldInfo: FieldInfo) => string) {
5252
return this._getOption('customizeText');
5353
}
54-
set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) {
54+
set customizeText(value: ((fieldInfo: FieldInfo) => string)) {
5555
this._setOption('customizeText', value);
5656
}
5757

‎packages/devextreme-react/src/data-grid.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import NestedOption from "./core/nested-option";
1212
import type { dxDataGridColumn, AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DisposingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, ExportingEvent, FocusedCellChangingEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, ToolbarPreparingEvent, dxDataGridRowObject, DataGridPredefinedColumnButton, ColumnButtonClickEvent, dxDataGridColumnButton, DataGridCommandColumnType, SelectionSensitivity, DataGridExportFormat, DataGridPredefinedToolbarItem, DataGridScrollMode, dxDataGridToolbarItem } from "devextreme/ui/data_grid";
1313
import type { DataChange, DataChangeType, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, HeaderFilterSearchConfig, SelectionColumnDisplayMode, GridsEditMode, NewRowPosition, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, GroupExpandMode, SummaryType, EnterKeyAction, EnterKeyDirection, PagerPageSize, DataRenderMode, StateStoreType } from "devextreme/common/grids";
1414
import type { Mode, ValidationRuleType, HorizontalAlignment, VerticalAlignment, template, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, SingleMultipleOrNone, SelectAllMode, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollbarMode } from "devextreme/common";
15-
import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder";
15+
import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FieldInfo, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder";
1616
import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, dxFormSimpleItem, dxFormOptions, OptionChangedEvent as FormOptionChangedEvent, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, FormItemComponent, FormItemType } from "devextreme/ui/form";
1717
import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation";
1818
import type { Format as LocalizationFormat } from "devextreme/common/core/localization";
@@ -819,7 +819,7 @@ const CursorOffset = Object.assign<typeof _componentCursorOffset, NestedComponen
819819
type ICustomOperationProps = React.PropsWithChildren<{
820820
calculateFilterExpression?: ((filterValue: any, field: dxFilterBuilderField) => string | (() => any) | Array<any>);
821821
caption?: string | undefined;
822-
customizeText?: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string);
822+
customizeText?: ((fieldInfo: FieldInfo) => string);
823823
dataTypes?: Array<DataType> | undefined;
824824
editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template;
825825
hasValue?: boolean;
@@ -1143,7 +1143,7 @@ const ExportTexts = Object.assign<typeof _componentExportTexts, NestedComponentM
11431143
type IFieldProps = React.PropsWithChildren<{
11441144
calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>);
11451145
caption?: string | undefined;
1146-
customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string);
1146+
customizeText?: ((fieldInfo: FieldInfo) => string);
11471147
dataField?: string | undefined;
11481148
dataType?: DataType;
11491149
editorOptions?: any;

‎packages/devextreme-react/src/filter-builder.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import dxFilterBuilder, {
88
import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component";
99
import NestedOption from "./core/nested-option";
1010

11-
import type { ContentReadyEvent, DisposingEvent, EditorPreparedEvent, EditorPreparingEvent, InitializedEvent, ValueChangedEvent, dxFilterBuilderField, FilterBuilderOperation } from "devextreme/ui/filter_builder";
11+
import type { ContentReadyEvent, DisposingEvent, EditorPreparedEvent, EditorPreparingEvent, InitializedEvent, ValueChangedEvent, dxFilterBuilderField, FieldInfo, FilterBuilderOperation } from "devextreme/ui/filter_builder";
1212
import type { DataType, template, Format as CommonFormat } from "devextreme/common";
1313
import type { Format as LocalizationFormat } from "devextreme/common/core/localization";
1414
import type { DataSourceOptions } from "devextreme/data/data_source";
@@ -85,7 +85,7 @@ const FilterBuilder = memo(
8585
type ICustomOperationProps = React.PropsWithChildren<{
8686
calculateFilterExpression?: ((filterValue: any, field: dxFilterBuilderField) => string | (() => any) | Array<any>);
8787
caption?: string | undefined;
88-
customizeText?: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string);
88+
customizeText?: ((fieldInfo: FieldInfo) => string);
8989
dataTypes?: Array<DataType> | undefined;
9090
editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template;
9191
hasValue?: boolean;
@@ -118,7 +118,7 @@ const CustomOperation = Object.assign<typeof _componentCustomOperation, NestedCo
118118
type IFieldProps = React.PropsWithChildren<{
119119
calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>);
120120
caption?: string | undefined;
121-
customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string);
121+
customizeText?: ((fieldInfo: FieldInfo) => string);
122122
dataField?: string | undefined;
123123
dataType?: DataType;
124124
editorOptions?: any;

‎packages/devextreme-react/src/tree-list.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option";
1111

1212
import type { dxTreeListColumn, AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DisposingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, FocusedCellChangingEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, NodesInitializedEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, ToolbarPreparingEvent, dxTreeListRowObject, TreeListPredefinedColumnButton, dxTreeListColumnButton, TreeListCommandColumnType, TreeListPredefinedToolbarItem, dxTreeListToolbarItem } from "devextreme/ui/tree_list";
1313
import type { DataChange, DataChangeType, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, GridsEditMode, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, HeaderFilterSearchConfig, EnterKeyAction, EnterKeyDirection, PagerPageSize, DataRenderMode, StateStoreType } from "devextreme/common/grids";
14-
import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder";
14+
import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FieldInfo, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder";
1515
import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, dxFormSimpleItem, dxFormOptions, OptionChangedEvent as FormOptionChangedEvent, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, FormItemComponent, FormItemType } from "devextreme/ui/form";
1616
import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation";
1717
import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, template, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, PositionAlignment, Mode, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollMode, ScrollbarMode, SingleMultipleOrNone } from "devextreme/common";
@@ -775,7 +775,7 @@ const CursorOffset = Object.assign<typeof _componentCursorOffset, NestedComponen
775775
type ICustomOperationProps = React.PropsWithChildren<{
776776
calculateFilterExpression?: ((filterValue: any, field: dxFilterBuilderField) => string | (() => any) | Array<any>);
777777
caption?: string | undefined;
778-
customizeText?: ((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string);
778+
customizeText?: ((fieldInfo: FieldInfo) => string);
779779
dataTypes?: Array<DataType> | undefined;
780780
editorTemplate?: ((conditionInfo: { field: dxFilterBuilderField, setValue: (() => void), value: string | number | Date }, container: any) => string | any) | template;
781781
hasValue?: boolean;
@@ -952,7 +952,7 @@ const EmailRule = Object.assign<typeof _componentEmailRule, NestedComponentMeta>
952952
type IFieldProps = React.PropsWithChildren<{
953953
calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>);
954954
caption?: string | undefined;
955-
customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string);
955+
customizeText?: ((fieldInfo: FieldInfo) => string);
956956
dataField?: string | undefined;
957957
dataType?: DataType;
958958
editorOptions?: any;

‎packages/devextreme-vue/src/data-grid.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ import {
125125
import {
126126
dxFilterBuilderOptions,
127127
dxFilterBuilderField,
128+
FieldInfo,
128129
FilterBuilderOperation,
129130
dxFilterBuilderCustomOperation,
130131
GroupOperation,
@@ -1239,7 +1240,7 @@ const DxCustomOperationConfig = {
12391240
props: {
12401241
calculateFilterExpression: Function as PropType<((filterValue: any, field: dxFilterBuilderField) => string | (() => any) | Array<any>)>,
12411242
caption: String,
1242-
customizeText: Function as PropType<((fieldInfo: { field: dxFilterBuilderField, value: string | number | Date, valueText: string }) => string)>,
1243+
customizeText: Function as PropType<((fieldInfo: FieldInfo) => string)>,
12431244
dataTypes: Array as PropType<Array<DataType>>,
12441245
editorTemplate: {},
12451246
hasValue: Boolean,
@@ -1577,7 +1578,7 @@ const DxFieldConfig = {
15771578
props: {
15781579
calculateFilterExpression: Function as PropType<((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>)>,
15791580
caption: String,
1580-
customizeText: Function as PropType<((fieldInfo: { value: string | number | Date, valueText: string }) => string)>,
1581+
customizeText: Function as PropType<((fieldInfo: FieldInfo) => string)>,
15811582
dataField: String,
15821583
dataType: String as PropType<DataType>,
15831584
editorOptions: {},

0 commit comments

Comments
 (0)