From 31b04f582d8cacbfcc52eeeca71f618cbbd10829 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Mon, 29 Jun 2026 22:05:11 +0600 Subject: [PATCH 01/12] fix grids.d.ts --- .../data_controller/m_data_controller.ts | 2 +- .../grids/grid_core/filter/m_filter_panel.ts | 1 - .../grids/grid_core/filter/m_filter_sync.ts | 2 - packages/devextreme/js/common/grids.d.ts | 94 +++++++++---------- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts index c9b720bbf9a0..4ec3afb18613 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts @@ -1805,7 +1805,7 @@ export const dataControllerModule: Module = { cacheEnabled: true, repaintChangesOnly: false, highlightChanges: false, - onDataErrorOccurred: null as any as undefined, + onDataErrorOccurred: null, remoteOperations: 'auto', paging: { enabled: true, diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts index 547b31d87734..041e937436d8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts @@ -165,7 +165,6 @@ export class FilterPanelView extends modules.View { private _getRemoveButtonElement() { const that = this; - // @ts-expect-error const clearFilterValue = () => that.option('filterValue', null); const clearFilterText = that.option('filterPanel.texts.clearFilter') ?? messageLocalization.format('dxDataGrid-filterPanelClearFilter'); diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_sync.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_sync.ts index bf7335f681b7..7dfe13d000f6 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_sync.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_sync.ts @@ -339,12 +339,10 @@ const data = (Base: ModuleType) => class DataControllerFilterSyn this.component.beginUpdate(); if (arguments.length > 0) { if (filterName === 'filterValue') { - // @ts-expect-error this.option('filterValue', null); } super.clearFilter(filterName); } else { - // @ts-expect-error this.option('filterValue', null); super.clearFilter(); } diff --git a/packages/devextreme/js/common/grids.d.ts b/packages/devextreme/js/common/grids.d.ts index 5c57e1b09c76..fb9e8162c020 100644 --- a/packages/devextreme/js/common/grids.d.ts +++ b/packages/devextreme/js/common/grids.d.ts @@ -601,7 +601,6 @@ export interface ColumnBase { falseText?: string; /** * @docid GridBaseColumn.filterOperations - * @default undefined * @public */ filterOperations?: Array; @@ -620,7 +619,6 @@ export interface ColumnBase { filterValue?: any | undefined; /** * @docid GridBaseColumn.filterValues - * @default undefined * @fires GridBaseOptions.onOptionChanged * @public */ @@ -1265,14 +1263,14 @@ export interface EditingBase { * @fires GridBaseOptions.onOptionChanged * @public */ - editColumnName?: string; + editColumnName?: string | null; /** * @docid GridBaseOptions.editing.editRowKey * @default null * @fires GridBaseOptions.onOptionChanged * @public */ - editRowKey?: TKey; + editRowKey?: TKey | null; /** * @docid GridBaseOptions.editing.form * @public @@ -2335,7 +2333,7 @@ export type GridBaseOptions, TRowDat * @fires GridBase.onOptionChanged * @public */ - filterValue?: string | Array | Function; + filterValue?: string | Array | Function | null; /** * @docid * @default -1 @@ -2394,13 +2392,13 @@ export type GridBaseOptions, TRowDat noDataText?: string; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:object * @type_function_param1_field component:this * @action * @public */ - onAIAssistantRequestCreating?: ((e: EventInfo & Cancelable & AIAssistantRequestCreatingInfo) => void); + onAIAssistantRequestCreating?: ((e: EventInfo & Cancelable & AIAssistantRequestCreatingInfo) => void) | undefined; /** * @docid * @default null @@ -2410,7 +2408,7 @@ export type GridBaseOptions, TRowDat * @action * @public */ - onAdaptiveDetailRowPreparing?: ((e: EventInfo & AdaptiveDetailRowPreparingInfo) => void); + onAdaptiveDetailRowPreparing?: ((e: EventInfo & AdaptiveDetailRowPreparingInfo) => void) | null; /** * @docid * @default null @@ -2419,121 +2417,121 @@ export type GridBaseOptions, TRowDat * @action * @public */ - onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void); + onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void) | null; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field changes:Array - * @default null + * @default undefined * @action * @public */ - onEditCanceled?: ((e: EventInfo & DataChangeInfo) => void); + onEditCanceled?: ((e: EventInfo & DataChangeInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field changes:Array - * @default null + * @default undefined * @action * @public */ - onEditCanceling?: ((e: Cancelable & EventInfo & DataChangeInfo) => void); + onEditCanceling?: ((e: Cancelable & EventInfo & DataChangeInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field promise:Promise - * @default null + * @default undefined * @action * @public */ - onInitNewRow?: ((e: EventInfo & NewRowInfo) => void); + onInitNewRow?: ((e: EventInfo & NewRowInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field event:event - * @default null + * @default undefined * @action * @public */ - onKeyDown?: ((e: NativeEventInfo & KeyDownInfo) => void); + onKeyDown?: ((e: NativeEventInfo & KeyDownInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field key:any - * @default null + * @default undefined * @action * @public */ - onRowCollapsed?: ((e: EventInfo & RowKeyInfo) => void); + onRowCollapsed?: ((e: EventInfo & RowKeyInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field key:any - * @default null + * @default undefined * @action * @public */ - onRowCollapsing?: ((e: Cancelable & EventInfo & RowKeyInfo) => void); + onRowCollapsing?: ((e: Cancelable & EventInfo & RowKeyInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field key:any - * @default null + * @default undefined * @action * @public */ - onRowExpanded?: ((e: EventInfo & RowKeyInfo) => void); + onRowExpanded?: ((e: EventInfo & RowKeyInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field key:any - * @default null + * @default undefined * @action * @public */ - onRowExpanding?: ((e: Cancelable & EventInfo & RowKeyInfo) => void); + onRowExpanding?: ((e: Cancelable & EventInfo & RowKeyInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field key:any - * @default null + * @default undefined * @action * @public */ - onRowInserted?: ((e: EventInfo & RowInsertedInfo) => void); + onRowInserted?: ((e: EventInfo & RowInsertedInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field cancel:boolean|Promise - * @default null + * @default undefined * @action * @public */ - onRowInserting?: ((e: EventInfo & RowInsertingInfo) => void); + onRowInserting?: ((e: EventInfo & RowInsertingInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field key:any - * @default null + * @default undefined * @action * @public */ - onRowRemoved?: ((e: EventInfo & RowRemovedInfo) => void); + onRowRemoved?: ((e: EventInfo & RowRemovedInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object @@ -2541,22 +2539,22 @@ export type GridBaseOptions, TRowDat * @type_function_param1_field data:object * @type_function_param1_field key:any * @type_function_param1_field cancel:boolean|Promise - * @default null + * @default undefined * @action * @public */ - onRowRemoving?: ((e: EventInfo & RowRemovingInfo) => void); + onRowRemoving?: ((e: EventInfo & RowRemovingInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field key:any - * @default null + * @default undefined * @action * @public */ - onRowUpdated?: ((e: EventInfo & RowUpdatedInfo) => void); + onRowUpdated?: ((e: EventInfo & RowUpdatedInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object @@ -2565,11 +2563,11 @@ export type GridBaseOptions, TRowDat * @type_function_param1_field newData:object * @type_function_param1_field key:any * @type_function_param1_field cancel:boolean|Promise - * @default null + * @default undefined * @action * @public */ - onRowUpdating?: ((e: EventInfo & RowUpdatingInfo) => void); + onRowUpdating?: ((e: EventInfo & RowUpdatingInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object @@ -2579,32 +2577,32 @@ export type GridBaseOptions, TRowDat * @type_function_param1_field oldData:object * @type_function_param1_field promise:Promise * @type_function_param1_field brokenRules:Array - * @default null + * @default undefined * @action * @public */ - onRowValidating?: ((e: EventInfo & RowValidatingInfo) => void); + onRowValidating?: ((e: EventInfo & RowValidatingInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field changes:Array - * @default null + * @default undefined * @action * @public */ - onSaved?: ((e: EventInfo & DataChangeInfo) => void); + onSaved?: ((e: EventInfo & DataChangeInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field changes:Array * @type_function_param1_field promise:Promise - * @default null + * @default undefined * @action * @public */ - onSaving?: ((e: EventInfo & SavingInfo) => void); + onSaving?: ((e: EventInfo & SavingInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object @@ -2613,21 +2611,21 @@ export type GridBaseOptions, TRowDat * @type_function_param1_field currentDeselectedRowKeys:Array * @type_function_param1_field selectedRowKeys:Array * @type_function_param1_field selectedRowsData:Array - * @default null + * @default undefined * @action * @public */ - onSelectionChanged?: ((e: EventInfo & SelectionChangedInfo) => void); + onSelectionChanged?: ((e: EventInfo & SelectionChangedInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field toolbarOptions:dxToolbarOptions - * @default null + * @default undefined * @action * @public */ - onToolbarPreparing?: ((e: EventInfo & ToolbarPreparingInfo) => void); + onToolbarPreparing?: ((e: EventInfo & ToolbarPreparingInfo) => void) | undefined; /** * @docid * @public @@ -3563,7 +3561,7 @@ export type StateStoring = { * @docid GridBaseOptions.stateStoring.storageKey * @default null */ - storageKey?: string; + storageKey?: string | null; /** * @docid GridBaseOptions.stateStoring.type * @default "localStorage" From 18b26674b36e36f9df84a3b04d231e616ff8fb5d Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Mon, 29 Jun 2026 22:15:20 +0600 Subject: [PATCH 02/12] fix data_grid.d.ts --- packages/devextreme/js/ui/data_grid.d.ts | 66 ++++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/packages/devextreme/js/ui/data_grid.d.ts b/packages/devextreme/js/ui/data_grid.d.ts index 9bfd423eb109..2a66772bc873 100644 --- a/packages/devextreme/js/ui/data_grid.d.ts +++ b/packages/devextreme/js/ui/data_grid.d.ts @@ -1240,35 +1240,35 @@ export type dxDataGridOptions = Omit) => void); + onCellClick?: ((e: CellClickEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:CellDblClickEvent} - * @default null + * @default undefined * @action * @public */ - onCellDblClick?: ((e: CellDblClickEvent) => void); + onCellDblClick?: ((e: CellDblClickEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:CellHoverChangedEvent} - * @default null + * @default undefined * @action * @public */ - onCellHoverChanged?: ((e: CellHoverChangedEvent) => void); + onCellHoverChanged?: ((e: CellHoverChangedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:CellPreparedEvent} - * @default null + * @default undefined * @action * @public */ - onCellPrepared?: ((e: CellPreparedEvent) => void); + onCellPrepared?: ((e: CellPreparedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:ContextMenuPreparingEvent} @@ -1276,95 +1276,95 @@ export type dxDataGridOptions = Omit) => void); + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | null; /** * @docid * @type_function_param1 e:{ui/data_grid:EditingStartEvent} - * @default null + * @default undefined * @action * @public */ - onEditingStart?: ((e: EditingStartEvent) => void); + onEditingStart?: ((e: EditingStartEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:EditorPreparedEvent} - * @default null + * @default undefined * @action * @public */ - onEditorPrepared?: ((options: EditorPreparedEvent) => void); + onEditorPrepared?: ((options: EditorPreparedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:EditorPreparingEvent} - * @default null + * @default undefined * @action * @public */ - onEditorPreparing?: ((e: EditorPreparingEvent) => void); + onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:ExportingEvent} - * @default null + * @default undefined * @action * @public */ - onExporting?: ((e: ExportingEvent) => void); + onExporting?: ((e: ExportingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:FocusedCellChangedEvent} - * @default null + * @default undefined * @action * @public */ - onFocusedCellChanged?: ((e: FocusedCellChangedEvent) => void); + onFocusedCellChanged?: ((e: FocusedCellChangedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:FocusedCellChangingEvent} - * @default null + * @default undefined * @action * @public */ - onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void); + onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:FocusedRowChangedEvent} - * @default null + * @default undefined * @action * @public */ - onFocusedRowChanged?: ((e: FocusedRowChangedEvent) => void); + onFocusedRowChanged?: ((e: FocusedRowChangedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:FocusedRowChangingEvent} - * @default null + * @default undefined * @action * @public */ - onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void); + onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:RowClickEvent} - * @default null + * @default undefined * @action * @public */ - onRowClick?: ((e: RowClickEvent) => void); + onRowClick?: ((e: RowClickEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:RowDblClickEvent} - * @default null + * @default undefined * @action * @public */ - onRowDblClick?: ((e: RowDblClickEvent) => void); + onRowDblClick?: ((e: RowDblClickEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:RowPreparedEvent} - * @default null + * @default undefined * @action * @public */ - onRowPrepared?: ((e: RowPreparedEvent) => void); + onRowPrepared?: ((e: RowPreparedEvent) => void) | undefined; /** * @docid * @default "auto" @@ -1465,12 +1465,12 @@ export type dxDataGridOptions = Omit void); + onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void) | undefined; }; /** From e1e78e01180271cdb479ff623dd0e141e9f719dc Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Mon, 29 Jun 2026 22:23:21 +0600 Subject: [PATCH 03/12] fix tree_list.d.ts --- packages/devextreme/js/ui/tree_list.d.ts | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/devextreme/js/ui/tree_list.d.ts b/packages/devextreme/js/ui/tree_list.d.ts index 207d2db69718..d8432d7af4de 100644 --- a/packages/devextreme/js/ui/tree_list.d.ts +++ b/packages/devextreme/js/ui/tree_list.d.ts @@ -997,35 +997,35 @@ export type dxTreeListOptions = Omit) => void); + onCellClick?: ((e: CellClickEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:CellDblClickEvent} - * @default null + * @default undefined * @action * @public */ - onCellDblClick?: ((e: CellDblClickEvent) => void); + onCellDblClick?: ((e: CellDblClickEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:CellHoverChangedEvent} - * @default null + * @default undefined * @action * @public */ - onCellHoverChanged?: ((e: CellHoverChangedEvent) => void); + onCellHoverChanged?: ((e: CellHoverChangedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:CellPreparedEvent} - * @default null + * @default undefined * @action * @public */ - onCellPrepared?: ((e: CellPreparedEvent) => void); + onCellPrepared?: ((e: CellPreparedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:ContextMenuPreparingEvent} @@ -1033,63 +1033,63 @@ export type dxTreeListOptions = Omit) => void); + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | null; /** * @docid * @type_function_param1 e:{ui/tree_list:EditingStartEvent} - * @default null + * @default undefined * @action * @public */ - onEditingStart?: ((e: EditingStartEvent) => void); + onEditingStart?: ((e: EditingStartEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:EditorPreparedEvent} - * @default null + * @default undefined * @action * @public */ - onEditorPrepared?: ((options: EditorPreparedEvent) => void); + onEditorPrepared?: ((options: EditorPreparedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:EditorPreparingEvent} - * @default null + * @default undefined * @action * @public */ - onEditorPreparing?: ((e: EditorPreparingEvent) => void); + onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:FocusedCellChangedEvent} - * @default null + * @default undefined * @action * @public */ - onFocusedCellChanged?: ((e: FocusedCellChangedEvent) => void); + onFocusedCellChanged?: ((e: FocusedCellChangedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:FocusedCellChangingEvent} - * @default null + * @default undefined * @action * @public */ - onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void); + onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:FocusedRowChangedEvent} - * @default null + * @default undefined * @action * @public */ - onFocusedRowChanged?: ((e: FocusedRowChangedEvent) => void); + onFocusedRowChanged?: ((e: FocusedRowChangedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:FocusedRowChangingEvent} - * @default null + * @default undefined * @action * @public */ - onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void); + onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:NodesInitializedEvent} @@ -1097,31 +1097,31 @@ export type dxTreeListOptions = Omit) => void); + onNodesInitialized?: ((e: NodesInitializedEvent) => void) | null; /** * @docid * @type_function_param1 e:{ui/tree_list:RowClickEvent} - * @default null + * @default undefined * @action * @public */ - onRowClick?: ((e: RowClickEvent) => void); + onRowClick?: ((e: RowClickEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:RowDblClickEvent} - * @default null + * @default undefined * @action * @public */ - onRowDblClick?: ((e: RowDblClickEvent) => void); + onRowDblClick?: ((e: RowDblClickEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:RowPreparedEvent} - * @default null + * @default undefined * @action * @public */ - onRowPrepared?: ((e: RowPreparedEvent) => void); + onRowPrepared?: ((e: RowPreparedEvent) => void) | undefined; /** * @docid * @public @@ -1183,12 +1183,12 @@ export type dxTreeListOptions = Omit void); + onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void) | undefined; }; /** From 88560a1ae7efe282fd74873f79f7164302b086e0 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Mon, 29 Jun 2026 22:52:41 +0600 Subject: [PATCH 04/12] fix draggable, sortable, filter_builder dts --- packages/devextreme/js/__internal/m_draggable.ts | 4 +--- packages/devextreme/js/ui/draggable.d.ts | 6 +++--- packages/devextreme/js/ui/filter_builder.d.ts | 10 ++++------ packages/devextreme/js/ui/sortable.d.ts | 14 +++++++------- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/packages/devextreme/js/__internal/m_draggable.ts b/packages/devextreme/js/__internal/m_draggable.ts index 2d14747b9cc0..18da5cc89bf7 100644 --- a/packages/devextreme/js/__internal/m_draggable.ts +++ b/packages/devextreme/js/__internal/m_draggable.ts @@ -329,12 +329,10 @@ class Draggable extends DOMComponent { _getDefaultOptions(): Properties { return { ...super._getDefaultOptions(), - // @ts-expect-error onDragStart: null, - // @ts-expect-error onDragMove: null, - // @ts-expect-error onDragEnd: null, + // @ts-expect-error onDragEnter: null, onDragLeave: null, onDragCancel: null, diff --git a/packages/devextreme/js/ui/draggable.d.ts b/packages/devextreme/js/ui/draggable.d.ts index b07df893d6e7..459cf5508f68 100644 --- a/packages/devextreme/js/ui/draggable.d.ts +++ b/packages/devextreme/js/ui/draggable.d.ts @@ -224,7 +224,7 @@ export interface dxDraggableOptions extends DraggableBaseOptions { * @action * @public */ - onDragEnd?: ((e: DragEndEvent) => void); + onDragEnd?: ((e: DragEndEvent) => void) | null; /** * @docid * @default null @@ -232,7 +232,7 @@ export interface dxDraggableOptions extends DraggableBaseOptions { * @action * @public */ - onDragMove?: ((e: DragMoveEvent) => void); + onDragMove?: ((e: DragMoveEvent) => void) | null; /** * @docid * @default null @@ -240,7 +240,7 @@ export interface dxDraggableOptions extends DraggableBaseOptions { * @action * @public */ - onDragStart?: ((e: DragStartEvent) => void); + onDragStart?: ((e: DragStartEvent) => void) | null; } /** * @docid diff --git a/packages/devextreme/js/ui/filter_builder.d.ts b/packages/devextreme/js/ui/filter_builder.d.ts index 579c62cbb29b..e31f3ce518f8 100644 --- a/packages/devextreme/js/ui/filter_builder.d.ts +++ b/packages/devextreme/js/ui/filter_builder.d.ts @@ -311,7 +311,7 @@ export interface dxFilterBuilderOptions extends WidgetOptions { * @action * @public */ - onEditorPrepared?: ((e: EditorPreparedEvent) => void); + onEditorPrepared?: ((e: EditorPreparedEvent) => void) | null; /** * @docid * @type_function_param1 e:{ui/filter_builder:EditorPreparingEvent} @@ -319,7 +319,7 @@ export interface dxFilterBuilderOptions extends WidgetOptions { * @action * @public */ - onEditorPreparing?: ((e: EditorPreparingEvent) => void); + onEditorPreparing?: ((e: EditorPreparingEvent) => void) | null; /** * @docid * @default null @@ -327,7 +327,7 @@ export interface dxFilterBuilderOptions extends WidgetOptions { * @action * @public */ - onValueChanged?: ((e: ValueChangedEvent) => void); + onValueChanged?: ((e: ValueChangedEvent) => void) | null; /** * @docid * @type Filter expression @@ -335,7 +335,7 @@ export interface dxFilterBuilderOptions extends WidgetOptions { * @fires dxFilterBuilderOptions.onValueChanged * @public */ - value?: string | Array | Function; + value?: string | Array | Function | null; } /** * @docid @@ -503,7 +503,6 @@ export interface dxFilterBuilderField { falseText?: string; /** * @docid - * @default undefined * @public */ filterOperations?: Array; @@ -515,7 +514,6 @@ export interface dxFilterBuilderField { format?: Format; /** * @docid - * @default undefined * @public */ lookup?: { diff --git a/packages/devextreme/js/ui/sortable.d.ts b/packages/devextreme/js/ui/sortable.d.ts index b66982894236..ae1ff2cbef78 100644 --- a/packages/devextreme/js/ui/sortable.d.ts +++ b/packages/devextreme/js/ui/sortable.d.ts @@ -314,7 +314,7 @@ export interface dxSortableOptions extends DraggableBaseOptions { * @action * @public */ - onAdd?: ((e: AddEvent) => void); + onAdd?: ((e: AddEvent) => void) | null; /** * @docid * @default null @@ -322,7 +322,7 @@ export interface dxSortableOptions extends DraggableBaseOptions { * @action * @public */ - onDragChange?: ((e: DragChangeEvent) => void); + onDragChange?: ((e: DragChangeEvent) => void) | null; /** * @docid * @default null @@ -330,7 +330,7 @@ export interface dxSortableOptions extends DraggableBaseOptions { * @action * @public */ - onDragEnd?: ((e: DragEndEvent) => void); + onDragEnd?: ((e: DragEndEvent) => void) | null; /** * @docid * @default null @@ -338,7 +338,7 @@ export interface dxSortableOptions extends DraggableBaseOptions { * @action * @public */ - onDragMove?: ((e: DragMoveEvent) => void); + onDragMove?: ((e: DragMoveEvent) => void) | null; /** * @docid * @default null @@ -346,7 +346,7 @@ export interface dxSortableOptions extends DraggableBaseOptions { * @action * @public */ - onDragStart?: ((e: DragStartEvent) => void); + onDragStart?: ((e: DragStartEvent) => void) | null; /** * @docid * @default null @@ -354,7 +354,7 @@ export interface dxSortableOptions extends DraggableBaseOptions { * @action * @public */ - onRemove?: ((e: RemoveEvent) => void); + onRemove?: ((e: RemoveEvent) => void) | null; /** * @docid * @default null @@ -362,7 +362,7 @@ export interface dxSortableOptions extends DraggableBaseOptions { * @action * @public */ - onReorder?: ((e: ReorderEvent) => void); + onReorder?: ((e: ReorderEvent) => void) | null; } /** * @docid From 287e1dfdd50dd426bdb45c60fc1ea41db310bf02 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Mon, 29 Jun 2026 23:17:13 +0600 Subject: [PATCH 05/12] fix card_view.d.ts --- packages/devextreme/js/ui/card_view.d.ts | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/devextreme/js/ui/card_view.d.ts b/packages/devextreme/js/ui/card_view.d.ts index 3e8b9f20f97f..355eee51b206 100644 --- a/packages/devextreme/js/ui/card_view.d.ts +++ b/packages/devextreme/js/ui/card_view.d.ts @@ -537,40 +537,40 @@ export type HeaderPanel = { scrollSensitivity?: number; /** * @docid - * @default null + * @default undefined * @public */ - onDragChange?: ((e: any) => void); + onDragChange?: ((e: any) => void) | undefined; /** * @docid - * @default null + * @default undefined * @public */ - onDragEnd?: ((e: any) => void); + onDragEnd?: ((e: any) => void) | undefined; /** * @docid - * @default null + * @default undefined * @public */ - onDragMove?: ((e: any) => void); + onDragMove?: ((e: any) => void) | undefined; /** * @docid - * @default null + * @default undefined * @public */ - onDragStart?: ((e: any) => void); + onDragStart?: ((e: any) => void) | undefined; /** * @docid - * @default null + * @default undefined * @public */ - onRemove?: ((e: any) => void); + onRemove?: ((e: any) => void) | undefined; /** * @docid - * @default null + * @default undefined * @public */ - onReorder?: ((e: any) => void); + onReorder?: ((e: any) => void) | undefined; }; /** * @docid @@ -1317,7 +1317,7 @@ export interface dxCardViewOptions extends * @type string | Array | Store | DataSource | DataSourceOptions * @public */ - dataSource?: DataSourceLike; + dataSource?: DataSourceLike | undefined; /** * @docid * @public @@ -1328,7 +1328,7 @@ export interface dxCardViewOptions extends * @default undefined * @public */ - keyExpr?: string | string[]; // can be undefined because of default? + keyExpr?: string | string[] | undefined; /** * @docid * @default "auto" @@ -1343,7 +1343,7 @@ export interface dxCardViewOptions extends * @action * @public */ - onDataErrorOccurred?: (e: EventInfo & DataErrorOccurredInfo) => void; + onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void) | undefined; // #endregion @@ -1592,7 +1592,7 @@ export interface dxCardViewOptions extends * @fires dxCardViewOptions.onOptionChanged * @public */ - filterValue?: string | Array | Function; + filterValue?: string | Array | Function | null; /** * @docid * @public From cee4382b30543312d8c0edcbaf8bd453b6c0d8ae Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Wed, 1 Jul 2026 18:45:50 +0600 Subject: [PATCH 06/12] change default from null to undefined for callbacks --- .../filter_builder/m_filter_builder.ts | 6 ---- .../grid_core/adaptivity/m_adaptivity.ts | 2 -- .../grid_core/context_menu/m_context_menu.ts | 4 +-- .../data_controller/m_data_controller.ts | 1 - .../data_controller/m_data_controller.ts | 2 -- .../devextreme/js/__internal/m_draggable.ts | 7 ----- .../devextreme/js/__internal/m_sortable.ts | 5 ---- packages/devextreme/js/common/grids.d.ts | 8 +++--- packages/devextreme/js/ui/data_grid.d.ts | 4 +-- packages/devextreme/js/ui/draggable.d.ts | 12 ++++---- packages/devextreme/js/ui/filter_builder.d.ts | 12 ++++---- packages/devextreme/js/ui/sortable.d.ts | 28 +++++++++---------- packages/devextreme/js/ui/tree_list.d.ts | 8 +++--- 13 files changed, 37 insertions(+), 62 deletions(-) diff --git a/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts b/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts index 53d37766067f..d50cdd60aae1 100644 --- a/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts +++ b/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts @@ -97,12 +97,6 @@ class FilterBuilder extends Widget { _getDefaultOptions() { // @ts-expect-error return extend(super._getDefaultOptions(), { - onEditorPreparing: null, - - onEditorPrepared: null, - - onValueChanged: null, - fields: [], groupOperations: ['and', 'or', 'notAnd', 'notOr'], diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts index 3a76473a7882..10741d6ab5a0 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts @@ -1430,8 +1430,6 @@ export const adaptivityModule: Module = { defaultOptions() { return { columnHidingEnabled: false, - // @ts-expect-error - onAdaptiveDetailRowPreparing: null as undefined, }; }, controllers: { diff --git a/packages/devextreme/js/__internal/grids/grid_core/context_menu/m_context_menu.ts b/packages/devextreme/js/__internal/grids/grid_core/context_menu/m_context_menu.ts index aadc49ad231c..34e3595ade9e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/context_menu/m_context_menu.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/context_menu/m_context_menu.ts @@ -129,9 +129,7 @@ export class ContextMenuView extends modules.View { export const contextMenuModule = { defaultOptions() { - return { - onContextMenuPreparing: null, - }; + return {}; }, controllers: { contextMenu: ContextMenuController, diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts index 4ec3afb18613..72f9d475941b 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts @@ -1805,7 +1805,6 @@ export const dataControllerModule: Module = { cacheEnabled: true, repaintChangesOnly: false, highlightChanges: false, - onDataErrorOccurred: null, remoteOperations: 'auto', paging: { enabled: true, diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/tree_list/data_controller/m_data_controller.ts index 5091bd8a65f7..d98f600ba8e1 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_controller/m_data_controller.ts @@ -221,8 +221,6 @@ treeListCore.registerModule('data', { filterMode: 'withAncestors', expandNodesOnFiltering: true, autoExpandAll: false, - - onNodesInitialized: null, maxFilterLengthInRequest: 1500, paging: { enabled: false, diff --git a/packages/devextreme/js/__internal/m_draggable.ts b/packages/devextreme/js/__internal/m_draggable.ts index 18da5cc89bf7..588c1917d7d7 100644 --- a/packages/devextreme/js/__internal/m_draggable.ts +++ b/packages/devextreme/js/__internal/m_draggable.ts @@ -329,15 +329,8 @@ class Draggable extends DOMComponent { _getDefaultOptions(): Properties { return { ...super._getDefaultOptions(), - onDragStart: null, - onDragMove: null, - onDragEnd: null, // @ts-expect-error - onDragEnter: null, - onDragLeave: null, - onDragCancel: null, onCancelByEsc: false, - onDrop: null, immediate: true, dragDirection: 'both', boundOffset: 0, diff --git a/packages/devextreme/js/__internal/m_sortable.ts b/packages/devextreme/js/__internal/m_sortable.ts index 972d7eb3a5f0..93b80a6e1f93 100644 --- a/packages/devextreme/js/__internal/m_sortable.ts +++ b/packages/devextreme/js/__internal/m_sortable.ts @@ -90,11 +90,6 @@ class Sortable extends Draggable { allowDropInsideItem: false, allowReordering: true, moveItemOnDrop: false, - onDragChange: null, - onAdd: null, - onRemove: null, - onReorder: null, - onPlaceholderPrepared: null, placeholderClassName: '', animation: { type: 'slide', diff --git a/packages/devextreme/js/common/grids.d.ts b/packages/devextreme/js/common/grids.d.ts index fb9e8162c020..e93556c4772f 100644 --- a/packages/devextreme/js/common/grids.d.ts +++ b/packages/devextreme/js/common/grids.d.ts @@ -2401,23 +2401,23 @@ export type GridBaseOptions, TRowDat onAIAssistantRequestCreating?: ((e: EventInfo & Cancelable & AIAssistantRequestCreatingInfo) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field formOptions:object * @action * @public */ - onAdaptiveDetailRowPreparing?: ((e: EventInfo & AdaptiveDetailRowPreparingInfo) => void) | null; + onAdaptiveDetailRowPreparing?: ((e: EventInfo & AdaptiveDetailRowPreparingInfo) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:object * @type_function_param1_field component:this * @action * @public */ - onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void) | null; + onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void) | undefined; /** * @docid * @type_function_param1 e:object diff --git a/packages/devextreme/js/ui/data_grid.d.ts b/packages/devextreme/js/ui/data_grid.d.ts index 2a66772bc873..0a269fd9629a 100644 --- a/packages/devextreme/js/ui/data_grid.d.ts +++ b/packages/devextreme/js/ui/data_grid.d.ts @@ -1272,11 +1272,11 @@ export type dxDataGridOptions = Omit) => void) | null; + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/data_grid:EditingStartEvent} diff --git a/packages/devextreme/js/ui/draggable.d.ts b/packages/devextreme/js/ui/draggable.d.ts index 459cf5508f68..cd07a46d31ae 100644 --- a/packages/devextreme/js/ui/draggable.d.ts +++ b/packages/devextreme/js/ui/draggable.d.ts @@ -219,28 +219,28 @@ export interface dxDraggableOptions extends DraggableBaseOptions { dragTemplate?: template | ((dragInfo: DragTemplateData, containerElement: DxElement) => string | UserDefinedElement) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/draggable:DragEndEvent} * @action * @public */ - onDragEnd?: ((e: DragEndEvent) => void) | null; + onDragEnd?: ((e: DragEndEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/draggable:DragMoveEvent} * @action * @public */ - onDragMove?: ((e: DragMoveEvent) => void) | null; + onDragMove?: ((e: DragMoveEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/draggable:DragStartEvent} * @action * @public */ - onDragStart?: ((e: DragStartEvent) => void) | null; + onDragStart?: ((e: DragStartEvent) => void) | undefined; } /** * @docid diff --git a/packages/devextreme/js/ui/filter_builder.d.ts b/packages/devextreme/js/ui/filter_builder.d.ts index e31f3ce518f8..85c012d4e3f7 100644 --- a/packages/devextreme/js/ui/filter_builder.d.ts +++ b/packages/devextreme/js/ui/filter_builder.d.ts @@ -307,27 +307,27 @@ export interface dxFilterBuilderOptions extends WidgetOptions { /** * @docid * @type_function_param1 e:{ui/filter_builder:EditorPreparedEvent} - * @default null + * @default undefined * @action * @public */ - onEditorPrepared?: ((e: EditorPreparedEvent) => void) | null; + onEditorPrepared?: ((e: EditorPreparedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/filter_builder:EditorPreparingEvent} - * @default null + * @default undefined * @action * @public */ - onEditorPreparing?: ((e: EditorPreparingEvent) => void) | null; + onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/filter_builder:ValueChangedEvent} * @action * @public */ - onValueChanged?: ((e: ValueChangedEvent) => void) | null; + onValueChanged?: ((e: ValueChangedEvent) => void) | undefined; /** * @docid * @type Filter expression diff --git a/packages/devextreme/js/ui/sortable.d.ts b/packages/devextreme/js/ui/sortable.d.ts index ae1ff2cbef78..e3feaedd0c5f 100644 --- a/packages/devextreme/js/ui/sortable.d.ts +++ b/packages/devextreme/js/ui/sortable.d.ts @@ -309,60 +309,60 @@ export interface dxSortableOptions extends DraggableBaseOptions { moveItemOnDrop?: boolean; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/sortable:AddEvent} * @action * @public */ - onAdd?: ((e: AddEvent) => void) | null; + onAdd?: ((e: AddEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/sortable:DragChangeEvent} * @action * @public */ - onDragChange?: ((e: DragChangeEvent) => void) | null; + onDragChange?: ((e: DragChangeEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/sortable:DragEndEvent} * @action * @public */ - onDragEnd?: ((e: DragEndEvent) => void) | null; + onDragEnd?: ((e: DragEndEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/sortable:DragMoveEvent} * @action * @public */ - onDragMove?: ((e: DragMoveEvent) => void) | null; + onDragMove?: ((e: DragMoveEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/sortable:DragStartEvent} * @action * @public */ - onDragStart?: ((e: DragStartEvent) => void) | null; + onDragStart?: ((e: DragStartEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/sortable:RemoveEvent} * @action * @public */ - onRemove?: ((e: RemoveEvent) => void) | null; + onRemove?: ((e: RemoveEvent) => void) | undefined; /** * @docid - * @default null + * @default undefined * @type_function_param1 e:{ui/sortable:ReorderEvent} * @action * @public */ - onReorder?: ((e: ReorderEvent) => void) | null; + onReorder?: ((e: ReorderEvent) => void) | undefined; } /** * @docid diff --git a/packages/devextreme/js/ui/tree_list.d.ts b/packages/devextreme/js/ui/tree_list.d.ts index d8432d7af4de..23a30047b8af 100644 --- a/packages/devextreme/js/ui/tree_list.d.ts +++ b/packages/devextreme/js/ui/tree_list.d.ts @@ -1029,11 +1029,11 @@ export type dxTreeListOptions = Omit) => void) | null; + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:EditingStartEvent} @@ -1093,11 +1093,11 @@ export type dxTreeListOptions = Omit) => void) | null; + onNodesInitialized?: ((e: NodesInitializedEvent) => void) | undefined; /** * @docid * @type_function_param1 e:{ui/tree_list:RowClickEvent} From 598b9d867f3193ef2db6a38e10ea25fe2c231dfe Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Wed, 1 Jul 2026 18:46:17 +0600 Subject: [PATCH 07/12] regenerate --- .../src/ui/card-view/index.ts | 6 +- .../src/ui/card-view/nested/dragging.ts | 24 +- .../src/ui/card-view/nested/filter-builder.ts | 12 +- .../src/ui/card-view/nested/header-panel.ts | 4 +- .../src/ui/data-grid/index.ts | 12 +- .../src/ui/data-grid/nested/editing.ts | 12 +- .../src/ui/data-grid/nested/filter-builder.ts | 12 +- .../src/ui/data-grid/nested/state-storing.ts | 4 +- .../src/ui/list/nested/item-dragging.ts | 28 +- .../src/ui/nested/editing.ts | 12 +- .../src/ui/nested/state-storing.ts | 4 +- .../src/ui/tree-list/index.ts | 12 +- .../src/ui/tree-list/nested/editing.ts | 12 +- .../src/ui/tree-list/nested/filter-builder.ts | 12 +- .../src/ui/tree-list/nested/state-storing.ts | 4 +- packages/devextreme-react/src/card-view.ts | 30 +- packages/devextreme-react/src/data-grid.ts | 48 +- packages/devextreme-react/src/draggable.ts | 6 +- .../devextreme-react/src/filter-builder.ts | 6 +- packages/devextreme-react/src/list.ts | 14 +- packages/devextreme-react/src/sortable.ts | 14 +- packages/devextreme-react/src/tree-list.ts | 48 +- packages/devextreme-vue/src/data-grid.ts | 4 +- packages/devextreme-vue/src/tree-list.ts | 4 +- packages/devextreme/ts/dx.all.d.ts | 574 +++++++++++------- 25 files changed, 514 insertions(+), 404 deletions(-) diff --git a/packages/devextreme-angular/src/ui/card-view/index.ts b/packages/devextreme-angular/src/ui/card-view/index.ts index bedbfc74436f..704ad153c775 100644 --- a/packages/devextreme-angular/src/ui/card-view/index.ts +++ b/packages/devextreme-angular/src/ui/card-view/index.ts @@ -479,10 +479,10 @@ export class DxCardViewComponent extends DxComponen @Input() - get keyExpr(): Array | string { + get keyExpr(): Array | string | undefined { return this._getOption('keyExpr'); } - set keyExpr(value: Array | string) { + set keyExpr(value: Array | string | undefined) { this._setOption('keyExpr', value); } @@ -1104,7 +1104,7 @@ export class DxCardViewComponent extends DxComponen * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() keyExprChange: EventEmitter | string>; + @Output() keyExprChange: EventEmitter | string | undefined>; /** diff --git a/packages/devextreme-angular/src/ui/card-view/nested/dragging.ts b/packages/devextreme-angular/src/ui/card-view/nested/dragging.ts index ebb4560cb032..c39030f7f897 100644 --- a/packages/devextreme-angular/src/ui/card-view/nested/dragging.ts +++ b/packages/devextreme-angular/src/ui/card-view/nested/dragging.ts @@ -40,50 +40,50 @@ export class DxoCardViewDraggingComponent extends NestedOption implements OnDest } @Input() - get onDragChange(): ((e: any) => void) { + get onDragChange(): ((e: any) => void) | undefined { return this._getOption('onDragChange'); } - set onDragChange(value: ((e: any) => void)) { + set onDragChange(value: ((e: any) => void) | undefined) { this._setOption('onDragChange', value); } @Input() - get onDragEnd(): ((e: any) => void) { + get onDragEnd(): ((e: any) => void) | undefined { return this._getOption('onDragEnd'); } - set onDragEnd(value: ((e: any) => void)) { + set onDragEnd(value: ((e: any) => void) | undefined) { this._setOption('onDragEnd', value); } @Input() - get onDragMove(): ((e: any) => void) { + get onDragMove(): ((e: any) => void) | undefined { return this._getOption('onDragMove'); } - set onDragMove(value: ((e: any) => void)) { + set onDragMove(value: ((e: any) => void) | undefined) { this._setOption('onDragMove', value); } @Input() - get onDragStart(): ((e: any) => void) { + get onDragStart(): ((e: any) => void) | undefined { return this._getOption('onDragStart'); } - set onDragStart(value: ((e: any) => void)) { + set onDragStart(value: ((e: any) => void) | undefined) { this._setOption('onDragStart', value); } @Input() - get onRemove(): ((e: any) => void) { + get onRemove(): ((e: any) => void) | undefined { return this._getOption('onRemove'); } - set onRemove(value: ((e: any) => void)) { + set onRemove(value: ((e: any) => void) | undefined) { this._setOption('onRemove', value); } @Input() - get onReorder(): ((e: any) => void) { + get onReorder(): ((e: any) => void) | undefined { return this._getOption('onReorder'); } - set onReorder(value: ((e: any) => void)) { + set onReorder(value: ((e: any) => void) | undefined) { this._setOption('onReorder', value); } diff --git a/packages/devextreme-angular/src/ui/card-view/nested/filter-builder.ts b/packages/devextreme-angular/src/ui/card-view/nested/filter-builder.ts index 8ae3ebf03689..f3600e3d6fdf 100644 --- a/packages/devextreme-angular/src/ui/card-view/nested/filter-builder.ts +++ b/packages/devextreme-angular/src/ui/card-view/nested/filter-builder.ts @@ -187,18 +187,18 @@ export class DxoCardViewFilterBuilderComponent extends NestedOption implements O } @Input() - get onEditorPrepared(): ((e: EditorPreparedEvent) => void) { + get onEditorPrepared(): ((e: EditorPreparedEvent) => void) | undefined { return this._getOption('onEditorPrepared'); } - set onEditorPrepared(value: ((e: EditorPreparedEvent) => void)) { + set onEditorPrepared(value: ((e: EditorPreparedEvent) => void) | undefined) { this._setOption('onEditorPrepared', value); } @Input() - get onEditorPreparing(): ((e: EditorPreparingEvent) => void) { + get onEditorPreparing(): ((e: EditorPreparingEvent) => void) | undefined { return this._getOption('onEditorPreparing'); } - set onEditorPreparing(value: ((e: EditorPreparingEvent) => void)) { + set onEditorPreparing(value: ((e: EditorPreparingEvent) => void) | undefined) { this._setOption('onEditorPreparing', value); } @@ -219,10 +219,10 @@ export class DxoCardViewFilterBuilderComponent extends NestedOption implements O } @Input() - get onValueChanged(): ((e: ValueChangedEvent) => void) { + get onValueChanged(): ((e: ValueChangedEvent) => void) | undefined { return this._getOption('onValueChanged'); } - set onValueChanged(value: ((e: ValueChangedEvent) => void)) { + set onValueChanged(value: ((e: ValueChangedEvent) => void) | undefined) { this._setOption('onValueChanged', value); } diff --git a/packages/devextreme-angular/src/ui/card-view/nested/header-panel.ts b/packages/devextreme-angular/src/ui/card-view/nested/header-panel.ts index 3b2cc5ac47b8..085662b0c468 100644 --- a/packages/devextreme-angular/src/ui/card-view/nested/header-panel.ts +++ b/packages/devextreme-angular/src/ui/card-view/nested/header-panel.ts @@ -32,10 +32,10 @@ import { NestedOption } from 'devextreme-angular/core'; }) export class DxoCardViewHeaderPanelComponent extends NestedOption implements OnDestroy, OnInit { @Input() - get dragging(): { dropFeedbackMode?: DragHighlight, onDragChange?: ((e: any) => void), onDragEnd?: ((e: any) => void), onDragMove?: ((e: any) => void), onDragStart?: ((e: any) => void), onRemove?: ((e: any) => void), onReorder?: ((e: any) => void), scrollSensitivity?: number, scrollSpeed?: number } { + get dragging(): { dropFeedbackMode?: DragHighlight, onDragChange?: ((e: any) => void) | undefined, onDragEnd?: ((e: any) => void) | undefined, onDragMove?: ((e: any) => void) | undefined, onDragStart?: ((e: any) => void) | undefined, onRemove?: ((e: any) => void) | undefined, onReorder?: ((e: any) => void) | undefined, scrollSensitivity?: number, scrollSpeed?: number } { return this._getOption('dragging'); } - set dragging(value: { dropFeedbackMode?: DragHighlight, onDragChange?: ((e: any) => void), onDragEnd?: ((e: any) => void), onDragMove?: ((e: any) => void), onDragStart?: ((e: any) => void), onRemove?: ((e: any) => void), onReorder?: ((e: any) => void), scrollSensitivity?: number, scrollSpeed?: number }) { + set dragging(value: { dropFeedbackMode?: DragHighlight, onDragChange?: ((e: any) => void) | undefined, onDragEnd?: ((e: any) => void) | undefined, onDragMove?: ((e: any) => void) | undefined, onDragStart?: ((e: any) => void) | undefined, onRemove?: ((e: any) => void) | undefined, onReorder?: ((e: any) => void) | undefined, scrollSensitivity?: number, scrollSpeed?: number }) { this._setOption('dragging', value); } diff --git a/packages/devextreme-angular/src/ui/data-grid/index.ts b/packages/devextreme-angular/src/ui/data-grid/index.ts index 2fd0024629bb..1d4c664a664e 100644 --- a/packages/devextreme-angular/src/ui/data-grid/index.ts +++ b/packages/devextreme-angular/src/ui/data-grid/index.ts @@ -609,10 +609,10 @@ export class DxDataGridComponent extends DxComponent */ @Input() - get editing(): { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } { + get editing(): { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } { return this._getOption('editing'); } - set editing(value: { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) { + set editing(value: { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) { this._setOption('editing', value); } @@ -1209,10 +1209,10 @@ export class DxDataGridComponent extends DxComponent */ @Input() - get stateStoring(): { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string, type?: StateStoreType } { + get stateStoring(): { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType } { return this._getOption('stateStoring'); } - set stateStoring(value: { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string, type?: StateStoreType }) { + set stateStoring(value: { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType }) { this._setOption('stateStoring', value); } @@ -1823,7 +1823,7 @@ export class DxDataGridComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editingChange: EventEmitter<{ allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>; + @Output() editingChange: EventEmitter<{ allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>; /** @@ -2145,7 +2145,7 @@ export class DxDataGridComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() stateStoringChange: EventEmitter<{ customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string, type?: StateStoreType }>; + @Output() stateStoringChange: EventEmitter<{ customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType }>; /** diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/editing.ts b/packages/devextreme-angular/src/ui/data-grid/nested/editing.ts index 64a02cedfc25..11540c1b05fd 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/editing.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/editing.ts @@ -88,18 +88,18 @@ export class DxoDataGridEditingComponent extends NestedOption implements OnDestr } @Input() - get editColumnName(): string { + get editColumnName(): null | string { return this._getOption('editColumnName'); } - set editColumnName(value: string) { + set editColumnName(value: null | string) { this._setOption('editColumnName', value); } @Input() - get editRowKey(): any { + get editRowKey(): any | null { return this._getOption('editRowKey'); } - set editRowKey(value: any) { + set editRowKey(value: any | null) { this._setOption('editRowKey', value); } @@ -188,14 +188,14 @@ export class DxoDataGridEditingComponent extends NestedOption implements OnDestr * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editColumnNameChange: EventEmitter; + @Output() editColumnNameChange: EventEmitter; /** * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editRowKeyChange: EventEmitter; + @Output() editRowKeyChange: EventEmitter; protected get _optionPath() { return 'editing'; } diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder.ts b/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder.ts index 86340a29362d..a47a9b6b883b 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder.ts @@ -187,18 +187,18 @@ export class DxoDataGridFilterBuilderComponent extends NestedOption implements O } @Input() - get onEditorPrepared(): ((e: EditorPreparedEvent) => void) { + get onEditorPrepared(): ((e: EditorPreparedEvent) => void) | undefined { return this._getOption('onEditorPrepared'); } - set onEditorPrepared(value: ((e: EditorPreparedEvent) => void)) { + set onEditorPrepared(value: ((e: EditorPreparedEvent) => void) | undefined) { this._setOption('onEditorPrepared', value); } @Input() - get onEditorPreparing(): ((e: EditorPreparingEvent) => void) { + get onEditorPreparing(): ((e: EditorPreparingEvent) => void) | undefined { return this._getOption('onEditorPreparing'); } - set onEditorPreparing(value: ((e: EditorPreparingEvent) => void)) { + set onEditorPreparing(value: ((e: EditorPreparingEvent) => void) | undefined) { this._setOption('onEditorPreparing', value); } @@ -219,10 +219,10 @@ export class DxoDataGridFilterBuilderComponent extends NestedOption implements O } @Input() - get onValueChanged(): ((e: ValueChangedEvent) => void) { + get onValueChanged(): ((e: ValueChangedEvent) => void) | undefined { return this._getOption('onValueChanged'); } - set onValueChanged(value: ((e: ValueChangedEvent) => void)) { + set onValueChanged(value: ((e: ValueChangedEvent) => void) | undefined) { this._setOption('onValueChanged', value); } diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/state-storing.ts b/packages/devextreme-angular/src/ui/data-grid/nested/state-storing.ts index 64cd671dc8bc..a98061488cc0 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/state-storing.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/state-storing.ts @@ -64,10 +64,10 @@ export class DxoDataGridStateStoringComponent extends NestedOption implements On } @Input() - get storageKey(): string { + get storageKey(): null | string { return this._getOption('storageKey'); } - set storageKey(value: string) { + set storageKey(value: null | string) { this._setOption('storageKey', value); } diff --git a/packages/devextreme-angular/src/ui/list/nested/item-dragging.ts b/packages/devextreme-angular/src/ui/list/nested/item-dragging.ts index c3baf6f32520..947d57b10f7d 100644 --- a/packages/devextreme-angular/src/ui/list/nested/item-dragging.ts +++ b/packages/devextreme-angular/src/ui/list/nested/item-dragging.ts @@ -169,10 +169,10 @@ export class DxoListItemDraggingComponent extends NestedOption implements OnDest } @Input() - get onAdd(): ((e: AddEvent) => void) { + get onAdd(): ((e: AddEvent) => void) | undefined { return this._getOption('onAdd'); } - set onAdd(value: ((e: AddEvent) => void)) { + set onAdd(value: ((e: AddEvent) => void) | undefined) { this._setOption('onAdd', value); } @@ -185,34 +185,34 @@ export class DxoListItemDraggingComponent extends NestedOption implements OnDest } @Input() - get onDragChange(): ((e: DragChangeEvent) => void) { + get onDragChange(): ((e: DragChangeEvent) => void) | undefined { return this._getOption('onDragChange'); } - set onDragChange(value: ((e: DragChangeEvent) => void)) { + set onDragChange(value: ((e: DragChangeEvent) => void) | undefined) { this._setOption('onDragChange', value); } @Input() - get onDragEnd(): ((e: DragEndEvent) => void) { + get onDragEnd(): ((e: DragEndEvent) => void) | undefined { return this._getOption('onDragEnd'); } - set onDragEnd(value: ((e: DragEndEvent) => void)) { + set onDragEnd(value: ((e: DragEndEvent) => void) | undefined) { this._setOption('onDragEnd', value); } @Input() - get onDragMove(): ((e: DragMoveEvent) => void) { + get onDragMove(): ((e: DragMoveEvent) => void) | undefined { return this._getOption('onDragMove'); } - set onDragMove(value: ((e: DragMoveEvent) => void)) { + set onDragMove(value: ((e: DragMoveEvent) => void) | undefined) { this._setOption('onDragMove', value); } @Input() - get onDragStart(): ((e: DragStartEvent) => void) { + get onDragStart(): ((e: DragStartEvent) => void) | undefined { return this._getOption('onDragStart'); } - set onDragStart(value: ((e: DragStartEvent) => void)) { + set onDragStart(value: ((e: DragStartEvent) => void) | undefined) { this._setOption('onDragStart', value); } @@ -233,18 +233,18 @@ export class DxoListItemDraggingComponent extends NestedOption implements OnDest } @Input() - get onRemove(): ((e: RemoveEvent) => void) { + get onRemove(): ((e: RemoveEvent) => void) | undefined { return this._getOption('onRemove'); } - set onRemove(value: ((e: RemoveEvent) => void)) { + set onRemove(value: ((e: RemoveEvent) => void) | undefined) { this._setOption('onRemove', value); } @Input() - get onReorder(): ((e: ReorderEvent) => void) { + get onReorder(): ((e: ReorderEvent) => void) | undefined { return this._getOption('onReorder'); } - set onReorder(value: ((e: ReorderEvent) => void)) { + set onReorder(value: ((e: ReorderEvent) => void) | undefined) { this._setOption('onReorder', value); } diff --git a/packages/devextreme-angular/src/ui/nested/editing.ts b/packages/devextreme-angular/src/ui/nested/editing.ts index 59fe62f432b3..5b1182bba985 100644 --- a/packages/devextreme-angular/src/ui/nested/editing.ts +++ b/packages/devextreme-angular/src/ui/nested/editing.ts @@ -87,18 +87,18 @@ export class DxoEditingComponent extends NestedOption implements OnDestroy, OnIn } @Input() - get editColumnName(): string { + get editColumnName(): null | string { return this._getOption('editColumnName'); } - set editColumnName(value: string) { + set editColumnName(value: null | string) { this._setOption('editColumnName', value); } @Input() - get editRowKey(): any { + get editRowKey(): any | null { return this._getOption('editRowKey'); } - set editRowKey(value: any) { + set editRowKey(value: any | null) { this._setOption('editRowKey', value); } @@ -363,14 +363,14 @@ export class DxoEditingComponent extends NestedOption implements OnDestroy, OnIn * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editColumnNameChange: EventEmitter; + @Output() editColumnNameChange: EventEmitter; /** * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editRowKeyChange: EventEmitter; + @Output() editRowKeyChange: EventEmitter; protected get _optionPath() { return 'editing'; } diff --git a/packages/devextreme-angular/src/ui/nested/state-storing.ts b/packages/devextreme-angular/src/ui/nested/state-storing.ts index 89f9ee5fdc9d..6647d99bcf35 100644 --- a/packages/devextreme-angular/src/ui/nested/state-storing.ts +++ b/packages/devextreme-angular/src/ui/nested/state-storing.ts @@ -64,10 +64,10 @@ export class DxoStateStoringComponent extends NestedOption implements OnDestroy, } @Input() - get storageKey(): string { + get storageKey(): null | string { return this._getOption('storageKey'); } - set storageKey(value: string) { + set storageKey(value: null | string) { this._setOption('storageKey', value); } diff --git a/packages/devextreme-angular/src/ui/tree-list/index.ts b/packages/devextreme-angular/src/ui/tree-list/index.ts index 9b97579a5597..814607e81d75 100644 --- a/packages/devextreme-angular/src/ui/tree-list/index.ts +++ b/packages/devextreme-angular/src/ui/tree-list/index.ts @@ -579,10 +579,10 @@ export class DxTreeListComponent extends DxComponent */ @Input() - get editing(): { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } { + get editing(): { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } { return this._getOption('editing'); } - set editing(value: { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) { + set editing(value: { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) { this._setOption('editing', value); } @@ -1177,10 +1177,10 @@ export class DxTreeListComponent extends DxComponent */ @Input() - get stateStoring(): { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string, type?: StateStoreType } { + get stateStoring(): { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType } { return this._getOption('stateStoring'); } - set stateStoring(value: { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string, type?: StateStoreType }) { + set stateStoring(value: { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType }) { this._setOption('stateStoring', value); } @@ -1785,7 +1785,7 @@ export class DxTreeListComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editingChange: EventEmitter<{ allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>; + @Output() editingChange: EventEmitter<{ allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>; /** @@ -2107,7 +2107,7 @@ export class DxTreeListComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() stateStoringChange: EventEmitter<{ customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string, type?: StateStoreType }>; + @Output() stateStoringChange: EventEmitter<{ customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType }>; /** diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/editing.ts b/packages/devextreme-angular/src/ui/tree-list/nested/editing.ts index f8b187f9b4fb..ca50f07272d7 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/editing.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/editing.ts @@ -88,18 +88,18 @@ export class DxoTreeListEditingComponent extends NestedOption implements OnDestr } @Input() - get editColumnName(): string { + get editColumnName(): null | string { return this._getOption('editColumnName'); } - set editColumnName(value: string) { + set editColumnName(value: null | string) { this._setOption('editColumnName', value); } @Input() - get editRowKey(): any { + get editRowKey(): any | null { return this._getOption('editRowKey'); } - set editRowKey(value: any) { + set editRowKey(value: any | null) { this._setOption('editRowKey', value); } @@ -180,14 +180,14 @@ export class DxoTreeListEditingComponent extends NestedOption implements OnDestr * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editColumnNameChange: EventEmitter; + @Output() editColumnNameChange: EventEmitter; /** * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editRowKeyChange: EventEmitter; + @Output() editRowKeyChange: EventEmitter; protected get _optionPath() { return 'editing'; } diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder.ts b/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder.ts index 932d72422c6f..236d1df4f6a4 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder.ts @@ -187,18 +187,18 @@ export class DxoTreeListFilterBuilderComponent extends NestedOption implements O } @Input() - get onEditorPrepared(): ((e: EditorPreparedEvent) => void) { + get onEditorPrepared(): ((e: EditorPreparedEvent) => void) | undefined { return this._getOption('onEditorPrepared'); } - set onEditorPrepared(value: ((e: EditorPreparedEvent) => void)) { + set onEditorPrepared(value: ((e: EditorPreparedEvent) => void) | undefined) { this._setOption('onEditorPrepared', value); } @Input() - get onEditorPreparing(): ((e: EditorPreparingEvent) => void) { + get onEditorPreparing(): ((e: EditorPreparingEvent) => void) | undefined { return this._getOption('onEditorPreparing'); } - set onEditorPreparing(value: ((e: EditorPreparingEvent) => void)) { + set onEditorPreparing(value: ((e: EditorPreparingEvent) => void) | undefined) { this._setOption('onEditorPreparing', value); } @@ -219,10 +219,10 @@ export class DxoTreeListFilterBuilderComponent extends NestedOption implements O } @Input() - get onValueChanged(): ((e: ValueChangedEvent) => void) { + get onValueChanged(): ((e: ValueChangedEvent) => void) | undefined { return this._getOption('onValueChanged'); } - set onValueChanged(value: ((e: ValueChangedEvent) => void)) { + set onValueChanged(value: ((e: ValueChangedEvent) => void) | undefined) { this._setOption('onValueChanged', value); } diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/state-storing.ts b/packages/devextreme-angular/src/ui/tree-list/nested/state-storing.ts index 95398d71dcda..d5b7658113e3 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/state-storing.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/state-storing.ts @@ -64,10 +64,10 @@ export class DxoTreeListStateStoringComponent extends NestedOption implements On } @Input() - get storageKey(): string { + get storageKey(): null | string { return this._getOption('storageKey'); } - set storageKey(value: string) { + set storageKey(value: null | string) { this._setOption('storageKey', value); } diff --git a/packages/devextreme-react/src/card-view.ts b/packages/devextreme-react/src/card-view.ts index c4c8c18ad6c0..76592d4e7f06 100644 --- a/packages/devextreme-react/src/card-view.ts +++ b/packages/devextreme-react/src/card-view.ts @@ -956,12 +956,12 @@ const CustomRule = Object.assign void); - onDragEnd?: ((e: any) => void); - onDragMove?: ((e: any) => void); - onDragStart?: ((e: any) => void); - onRemove?: ((e: any) => void); - onReorder?: ((e: any) => void); + onDragChange?: ((e: any) => void) | undefined; + onDragEnd?: ((e: any) => void) | undefined; + onDragMove?: ((e: any) => void) | undefined; + onDragStart?: ((e: any) => void) | undefined; + onRemove?: ((e: any) => void) | undefined; + onReorder?: ((e: any) => void) | undefined; scrollSensitivity?: number; scrollSpeed?: number; }> @@ -1172,11 +1172,11 @@ type IFilterBuilderProps = React.PropsWithChildren<{ maxGroupLevel?: number | undefined; onContentReady?: ((e: FilterBuilderContentReadyEvent) => void); onDisposing?: ((e: FilterBuilderDisposingEvent) => void); - onEditorPrepared?: ((e: EditorPreparedEvent) => void); - onEditorPreparing?: ((e: EditorPreparingEvent) => void); + onEditorPrepared?: ((e: EditorPreparedEvent) => void) | undefined; + onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; onInitialized?: ((e: FilterBuilderInitializedEvent) => void); onOptionChanged?: ((e: FilterBuilderOptionChangedEvent) => void); - onValueChanged?: ((e: ValueChangedEvent) => void); + onValueChanged?: ((e: ValueChangedEvent) => void) | undefined; rtlEnabled?: boolean; tabIndex?: number; value?: Array | (() => any) | string; @@ -1595,12 +1595,12 @@ const HeaderFilter = Object.assign | { dropFeedbackMode?: DragHighlight; - onDragChange?: ((e: any) => void); - onDragEnd?: ((e: any) => void); - onDragMove?: ((e: any) => void); - onDragStart?: ((e: any) => void); - onRemove?: ((e: any) => void); - onReorder?: ((e: any) => void); + onDragChange?: ((e: any) => void) | undefined; + onDragEnd?: ((e: any) => void) | undefined; + onDragMove?: ((e: any) => void) | undefined; + onDragStart?: ((e: any) => void) | undefined; + onRemove?: ((e: any) => void) | undefined; + onReorder?: ((e: any) => void) | undefined; scrollSensitivity?: number; scrollSpeed?: number; }; diff --git a/packages/devextreme-react/src/data-grid.ts b/packages/devextreme-react/src/data-grid.ts index 4224156bb62e..3a66cc523c78 100644 --- a/packages/devextreme-react/src/data-grid.ts +++ b/packages/devextreme-react/src/data-grid.ts @@ -48,34 +48,34 @@ type ReplaceFieldTypes = { type IDataGridOptionsNarrowedEvents = { onAdaptiveDetailRowPreparing?: ((e: AdaptiveDetailRowPreparingEvent) => void); onAIAssistantRequestCreating?: ((e: AIAssistantRequestCreatingEvent) => void); - onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void); - onCellClick?: ((e: CellClickEvent) => void); - onCellDblClick?: ((e: CellDblClickEvent) => void); - onCellPrepared?: ((e: CellPreparedEvent) => void); + onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void) | undefined; + onCellClick?: ((e: CellClickEvent) => void) | undefined; + onCellDblClick?: ((e: CellDblClickEvent) => void) | undefined; + onCellPrepared?: ((e: CellPreparedEvent) => void) | undefined; onContentReady?: ((e: ContentReadyEvent) => void); - onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void); + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | undefined; onDataErrorOccurred?: ((e: DataErrorOccurredEvent) => void); onDisposing?: ((e: DisposingEvent) => void); onEditCanceled?: ((e: EditCanceledEvent) => void); onEditCanceling?: ((e: EditCancelingEvent) => void); - onEditingStart?: ((e: EditingStartEvent) => void); - onEditorPrepared?: ((e: EditorPreparedEvent) => void); - onEditorPreparing?: ((e: EditorPreparingEvent) => void); - onExporting?: ((e: ExportingEvent) => void); - onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void); - onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void); + onEditingStart?: ((e: EditingStartEvent) => void) | undefined; + onEditorPrepared?: ((e: EditorPreparedEvent) => void) | undefined; + onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; + onExporting?: ((e: ExportingEvent) => void) | undefined; + onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void) | undefined; + onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void) | undefined; onInitialized?: ((e: InitializedEvent) => void); onInitNewRow?: ((e: InitNewRowEvent) => void); onKeyDown?: ((e: KeyDownEvent) => void); - onRowClick?: ((e: RowClickEvent) => void); + onRowClick?: ((e: RowClickEvent) => void) | undefined; onRowCollapsed?: ((e: RowCollapsedEvent) => void); onRowCollapsing?: ((e: RowCollapsingEvent) => void); - onRowDblClick?: ((e: RowDblClickEvent) => void); + onRowDblClick?: ((e: RowDblClickEvent) => void) | undefined; onRowExpanded?: ((e: RowExpandedEvent) => void); onRowExpanding?: ((e: RowExpandingEvent) => void); onRowInserted?: ((e: RowInsertedEvent) => void); onRowInserting?: ((e: RowInsertingEvent) => void); - onRowPrepared?: ((e: RowPreparedEvent) => void); + onRowPrepared?: ((e: RowPreparedEvent) => void) | undefined; onRowRemoved?: ((e: RowRemovedEvent) => void); onRowRemoving?: ((e: RowRemovingEvent) => void); onRowUpdated?: ((e: RowUpdatedEvent) => void); @@ -1220,8 +1220,8 @@ type IEditingProps = React.PropsWithChildren<{ allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean); changes?: Array; confirmDelete?: boolean; - editColumnName?: string; - editRowKey?: any; + editColumnName?: null | string; + editRowKey?: any | null; form?: dxFormOptions; mode?: GridsEditMode; newRowPosition?: NewRowPosition; @@ -1245,10 +1245,10 @@ type IEditingProps = React.PropsWithChildren<{ useIcons?: boolean; defaultChanges?: Array; onChangesChange?: (value: Array) => void; - defaultEditColumnName?: string; - onEditColumnNameChange?: (value: string) => void; - defaultEditRowKey?: any; - onEditRowKeyChange?: (value: any) => void; + defaultEditColumnName?: null | string; + onEditColumnNameChange?: (value: null | string) => void; + defaultEditRowKey?: any | null; + onEditRowKeyChange?: (value: any | null) => void; }> const _componentEditing = (props: IEditingProps) => { return React.createElement(NestedOption, { @@ -1618,11 +1618,11 @@ type IFilterBuilderProps = React.PropsWithChildren<{ maxGroupLevel?: number | undefined; onContentReady?: ((e: FilterBuilderContentReadyEvent) => void); onDisposing?: ((e: FilterBuilderDisposingEvent) => void); - onEditorPrepared?: ((e: FilterBuilderEditorPreparedEvent) => void); - onEditorPreparing?: ((e: FilterBuilderEditorPreparingEvent) => void); + onEditorPrepared?: ((e: FilterBuilderEditorPreparedEvent) => void) | undefined; + onEditorPreparing?: ((e: FilterBuilderEditorPreparingEvent) => void) | undefined; onInitialized?: ((e: FilterBuilderInitializedEvent) => void); onOptionChanged?: ((e: FilterBuilderOptionChangedEvent) => void); - onValueChanged?: ((e: FilterBuilderValueChangedEvent) => void); + onValueChanged?: ((e: FilterBuilderValueChangedEvent) => void) | undefined; rtlEnabled?: boolean; tabIndex?: number; value?: Array | (() => any) | string; @@ -3382,7 +3382,7 @@ type IStateStoringProps = React.PropsWithChildren<{ customSave?: ((gridState: any) => void); enabled?: boolean; savingTimeout?: number; - storageKey?: string; + storageKey?: null | string; type?: StateStoreType; }> const _componentStateStoring = (props: IStateStoringProps) => { diff --git a/packages/devextreme-react/src/draggable.ts b/packages/devextreme-react/src/draggable.ts index 3122e5a6a2f8..492c033e4961 100644 --- a/packages/devextreme-react/src/draggable.ts +++ b/packages/devextreme-react/src/draggable.ts @@ -16,9 +16,9 @@ type ReplaceFieldTypes = { type IDraggableOptionsNarrowedEvents = { onDisposing?: ((e: DisposingEvent) => void); - onDragEnd?: ((e: DragEndEvent) => void); - onDragMove?: ((e: DragMoveEvent) => void); - onDragStart?: ((e: DragStartEvent) => void); + onDragEnd?: ((e: DragEndEvent) => void) | undefined; + onDragMove?: ((e: DragMoveEvent) => void) | undefined; + onDragStart?: ((e: DragStartEvent) => void) | undefined; onInitialized?: ((e: InitializedEvent) => void); } diff --git a/packages/devextreme-react/src/filter-builder.ts b/packages/devextreme-react/src/filter-builder.ts index a8d6be7357f6..7c4e2bffbd77 100644 --- a/packages/devextreme-react/src/filter-builder.ts +++ b/packages/devextreme-react/src/filter-builder.ts @@ -21,10 +21,10 @@ type ReplaceFieldTypes = { type IFilterBuilderOptionsNarrowedEvents = { onContentReady?: ((e: ContentReadyEvent) => void); onDisposing?: ((e: DisposingEvent) => void); - onEditorPrepared?: ((e: EditorPreparedEvent) => void); - onEditorPreparing?: ((e: EditorPreparingEvent) => void); + onEditorPrepared?: ((e: EditorPreparedEvent) => void) | undefined; + onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; onInitialized?: ((e: InitializedEvent) => void); - onValueChanged?: ((e: ValueChangedEvent) => void); + onValueChanged?: ((e: ValueChangedEvent) => void) | undefined; } type IFilterBuilderOptions = React.PropsWithChildren & IHtmlOptions & { diff --git a/packages/devextreme-react/src/list.ts b/packages/devextreme-react/src/list.ts index 9514436e019e..5d9a88eff606 100644 --- a/packages/devextreme-react/src/list.ts +++ b/packages/devextreme-react/src/list.ts @@ -217,16 +217,16 @@ type IItemDraggingProps = React.PropsWithChildren<{ height?: number | string | undefined; itemOrientation?: Orientation; moveItemOnDrop?: boolean; - onAdd?: ((e: AddEvent) => void); + onAdd?: ((e: AddEvent) => void) | undefined; onDisposing?: ((e: SortableDisposingEvent) => void); - onDragChange?: ((e: DragChangeEvent) => void); - onDragEnd?: ((e: DragEndEvent) => void); - onDragMove?: ((e: DragMoveEvent) => void); - onDragStart?: ((e: DragStartEvent) => void); + onDragChange?: ((e: DragChangeEvent) => void) | undefined; + onDragEnd?: ((e: DragEndEvent) => void) | undefined; + onDragMove?: ((e: DragMoveEvent) => void) | undefined; + onDragStart?: ((e: DragStartEvent) => void) | undefined; onInitialized?: ((e: SortableInitializedEvent) => void); onOptionChanged?: ((e: OptionChangedEvent) => void); - onRemove?: ((e: RemoveEvent) => void); - onReorder?: ((e: ReorderEvent) => void); + onRemove?: ((e: RemoveEvent) => void) | undefined; + onReorder?: ((e: ReorderEvent) => void) | undefined; rtlEnabled?: boolean; scrollSensitivity?: number; scrollSpeed?: number; diff --git a/packages/devextreme-react/src/sortable.ts b/packages/devextreme-react/src/sortable.ts index bdfd07424b92..d2f5b9a1d7b2 100644 --- a/packages/devextreme-react/src/sortable.ts +++ b/packages/devextreme-react/src/sortable.ts @@ -15,15 +15,15 @@ type ReplaceFieldTypes = { } type ISortableOptionsNarrowedEvents = { - onAdd?: ((e: AddEvent) => void); + onAdd?: ((e: AddEvent) => void) | undefined; onDisposing?: ((e: DisposingEvent) => void); - onDragChange?: ((e: DragChangeEvent) => void); - onDragEnd?: ((e: DragEndEvent) => void); - onDragMove?: ((e: DragMoveEvent) => void); - onDragStart?: ((e: DragStartEvent) => void); + onDragChange?: ((e: DragChangeEvent) => void) | undefined; + onDragEnd?: ((e: DragEndEvent) => void) | undefined; + onDragMove?: ((e: DragMoveEvent) => void) | undefined; + onDragStart?: ((e: DragStartEvent) => void) | undefined; onInitialized?: ((e: InitializedEvent) => void); - onRemove?: ((e: RemoveEvent) => void); - onReorder?: ((e: ReorderEvent) => void); + onRemove?: ((e: RemoveEvent) => void) | undefined; + onReorder?: ((e: ReorderEvent) => void) | undefined; } type ISortableOptions = React.PropsWithChildren & IHtmlOptions & { diff --git a/packages/devextreme-react/src/tree-list.ts b/packages/devextreme-react/src/tree-list.ts index 5a6d53ae3ffc..7f99c1ac740c 100644 --- a/packages/devextreme-react/src/tree-list.ts +++ b/packages/devextreme-react/src/tree-list.ts @@ -48,34 +48,34 @@ type ReplaceFieldTypes = { type ITreeListOptionsNarrowedEvents = { onAdaptiveDetailRowPreparing?: ((e: AdaptiveDetailRowPreparingEvent) => void); onAIAssistantRequestCreating?: ((e: AIAssistantRequestCreatingEvent) => void); - onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void); - onCellClick?: ((e: CellClickEvent) => void); - onCellDblClick?: ((e: CellDblClickEvent) => void); - onCellPrepared?: ((e: CellPreparedEvent) => void); + onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void) | undefined; + onCellClick?: ((e: CellClickEvent) => void) | undefined; + onCellDblClick?: ((e: CellDblClickEvent) => void) | undefined; + onCellPrepared?: ((e: CellPreparedEvent) => void) | undefined; onContentReady?: ((e: ContentReadyEvent) => void); - onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void); + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | undefined; onDataErrorOccurred?: ((e: DataErrorOccurredEvent) => void); onDisposing?: ((e: DisposingEvent) => void); onEditCanceled?: ((e: EditCanceledEvent) => void); onEditCanceling?: ((e: EditCancelingEvent) => void); - onEditingStart?: ((e: EditingStartEvent) => void); - onEditorPrepared?: ((e: EditorPreparedEvent) => void); - onEditorPreparing?: ((e: EditorPreparingEvent) => void); - onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void); - onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void); + onEditingStart?: ((e: EditingStartEvent) => void) | undefined; + onEditorPrepared?: ((e: EditorPreparedEvent) => void) | undefined; + onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; + onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void) | undefined; + onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void) | undefined; onInitialized?: ((e: InitializedEvent) => void); onInitNewRow?: ((e: InitNewRowEvent) => void); onKeyDown?: ((e: KeyDownEvent) => void); - onNodesInitialized?: ((e: NodesInitializedEvent) => void); - onRowClick?: ((e: RowClickEvent) => void); + onNodesInitialized?: ((e: NodesInitializedEvent) => void) | undefined; + onRowClick?: ((e: RowClickEvent) => void) | undefined; onRowCollapsed?: ((e: RowCollapsedEvent) => void); onRowCollapsing?: ((e: RowCollapsingEvent) => void); - onRowDblClick?: ((e: RowDblClickEvent) => void); + onRowDblClick?: ((e: RowDblClickEvent) => void) | undefined; onRowExpanded?: ((e: RowExpandedEvent) => void); onRowExpanding?: ((e: RowExpandingEvent) => void); onRowInserted?: ((e: RowInsertedEvent) => void); onRowInserting?: ((e: RowInsertingEvent) => void); - onRowPrepared?: ((e: RowPreparedEvent) => void); + onRowPrepared?: ((e: RowPreparedEvent) => void) | undefined; onRowRemoved?: ((e: RowRemovedEvent) => void); onRowRemoving?: ((e: RowRemovingEvent) => void); onRowUpdated?: ((e: RowUpdatedEvent) => void); @@ -1037,8 +1037,8 @@ type IEditingProps = React.PropsWithChildren<{ allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean); changes?: Array; confirmDelete?: boolean; - editColumnName?: string; - editRowKey?: any; + editColumnName?: null | string; + editRowKey?: any | null; form?: dxFormOptions; mode?: GridsEditMode; popup?: dxPopupOptions; @@ -1062,10 +1062,10 @@ type IEditingProps = React.PropsWithChildren<{ useIcons?: boolean; defaultChanges?: Array; onChangesChange?: (value: Array) => void; - defaultEditColumnName?: string; - onEditColumnNameChange?: (value: string) => void; - defaultEditRowKey?: any; - onEditRowKeyChange?: (value: any) => void; + defaultEditColumnName?: null | string; + onEditColumnNameChange?: (value: null | string) => void; + defaultEditRowKey?: any | null; + onEditRowKeyChange?: (value: any | null) => void; }> const _componentEditing = (props: IEditingProps) => { return React.createElement(NestedOption, { @@ -1387,11 +1387,11 @@ type IFilterBuilderProps = React.PropsWithChildren<{ maxGroupLevel?: number | undefined; onContentReady?: ((e: FilterBuilderContentReadyEvent) => void); onDisposing?: ((e: FilterBuilderDisposingEvent) => void); - onEditorPrepared?: ((e: FilterBuilderEditorPreparedEvent) => void); - onEditorPreparing?: ((e: FilterBuilderEditorPreparingEvent) => void); + onEditorPrepared?: ((e: FilterBuilderEditorPreparedEvent) => void) | undefined; + onEditorPreparing?: ((e: FilterBuilderEditorPreparingEvent) => void) | undefined; onInitialized?: ((e: FilterBuilderInitializedEvent) => void); onOptionChanged?: ((e: FilterBuilderOptionChangedEvent) => void); - onValueChanged?: ((e: FilterBuilderValueChangedEvent) => void); + onValueChanged?: ((e: FilterBuilderValueChangedEvent) => void) | undefined; rtlEnabled?: boolean; tabIndex?: number; value?: Array | (() => any) | string; @@ -2986,7 +2986,7 @@ type IStateStoringProps = React.PropsWithChildren<{ customSave?: ((gridState: any) => void); enabled?: boolean; savingTimeout?: number; - storageKey?: string; + storageKey?: null | string; type?: StateStoreType; }> const _componentStateStoring = (props: IStateStoringProps) => { diff --git a/packages/devextreme-vue/src/data-grid.ts b/packages/devextreme-vue/src/data-grid.ts index 56a5258d1881..1ff3df6eecb8 100644 --- a/packages/devextreme-vue/src/data-grid.ts +++ b/packages/devextreme-vue/src/data-grid.ts @@ -1793,7 +1793,7 @@ const DxEditingConfig = { allowUpdating: [Boolean, Function] as PropType boolean))>, changes: Array as PropType>, confirmDelete: Boolean, - editColumnName: String, + editColumnName: String as PropType, editRowKey: {}, form: Object as PropType>, mode: String as PropType, @@ -4113,7 +4113,7 @@ const DxStateStoringConfig = { customSave: Function as PropType<((gridState: any) => void)>, enabled: Boolean, savingTimeout: Number, - storageKey: String, + storageKey: String as PropType, type: String as PropType } }; diff --git a/packages/devextreme-vue/src/tree-list.ts b/packages/devextreme-vue/src/tree-list.ts index 945e4e273a83..402c9d022597 100644 --- a/packages/devextreme-vue/src/tree-list.ts +++ b/packages/devextreme-vue/src/tree-list.ts @@ -1617,7 +1617,7 @@ const DxEditingConfig = { allowUpdating: [Boolean, Function] as PropType boolean))>, changes: Array as PropType>, confirmDelete: Boolean, - editColumnName: String, + editColumnName: String as PropType, editRowKey: {}, form: Object as PropType>, mode: String as PropType, @@ -3719,7 +3719,7 @@ const DxStateStoringConfig = { customSave: Function as PropType<((gridState: any) => void)>, enabled: Boolean, savingTimeout: Number, - storageKey: String, + storageKey: String as PropType, type: String as PropType } }; diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index e5da1ca7358d..6b83ea5f10c4 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -5368,11 +5368,11 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.editing.editColumnName] */ - editColumnName?: string; + editColumnName?: string | null; /** * [descr:GridBaseOptions.editing.editRowKey] */ - editRowKey?: TKey; + editRowKey?: TKey | null; /** * [descr:GridBaseOptions.editing.form] */ @@ -6048,7 +6048,7 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.filterValue] */ - filterValue?: string | Array | Function; + filterValue?: string | Array | Function | null; /** * [descr:GridBaseOptions.focusedColumnIndex] */ @@ -6088,162 +6088,208 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.onAIAssistantRequestCreating] */ - onAIAssistantRequestCreating?: ( - e: DevExpress.common.core.events.EventInfo & - DevExpress.common.core.events.Cancelable & - AIAssistantRequestCreatingInfo - ) => void; + onAIAssistantRequestCreating?: + | (( + e: DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.Cancelable & + AIAssistantRequestCreatingInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onAdaptiveDetailRowPreparing] */ - onAdaptiveDetailRowPreparing?: ( - e: DevExpress.common.core.events.EventInfo & - AdaptiveDetailRowPreparingInfo - ) => void; + onAdaptiveDetailRowPreparing?: + | (( + e: DevExpress.common.core.events.EventInfo & + AdaptiveDetailRowPreparingInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onDataErrorOccurred] */ - onDataErrorOccurred?: ( - e: DevExpress.common.core.events.EventInfo & - DataErrorOccurredInfo - ) => void; + onDataErrorOccurred?: + | (( + e: DevExpress.common.core.events.EventInfo & + DataErrorOccurredInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onEditCanceled] */ - onEditCanceled?: ( - e: DevExpress.common.core.events.EventInfo & - DataChangeInfo - ) => void; + onEditCanceled?: + | (( + e: DevExpress.common.core.events.EventInfo & + DataChangeInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onEditCanceling] */ - onEditCanceling?: ( - e: DevExpress.common.core.events.Cancelable & - DevExpress.common.core.events.EventInfo & - DataChangeInfo - ) => void; + onEditCanceling?: + | (( + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & + DataChangeInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onInitNewRow] */ - onInitNewRow?: ( - e: DevExpress.common.core.events.EventInfo & - NewRowInfo - ) => void; + onInitNewRow?: + | (( + e: DevExpress.common.core.events.EventInfo & + NewRowInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onKeyDown] */ - onKeyDown?: ( - e: DevExpress.common.core.events.NativeEventInfo< - TComponent, - KeyboardEvent - > & - KeyDownInfo - ) => void; + onKeyDown?: + | (( + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + KeyboardEvent + > & + KeyDownInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowCollapsed] */ - onRowCollapsed?: ( - e: DevExpress.common.core.events.EventInfo & RowKeyInfo - ) => void; + onRowCollapsed?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowKeyInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowCollapsing] */ - onRowCollapsing?: ( - e: DevExpress.common.core.events.Cancelable & - DevExpress.common.core.events.EventInfo & - RowKeyInfo - ) => void; + onRowCollapsing?: + | (( + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & + RowKeyInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowExpanded] */ - onRowExpanded?: ( - e: DevExpress.common.core.events.EventInfo & RowKeyInfo - ) => void; + onRowExpanded?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowKeyInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowExpanding] */ - onRowExpanding?: ( - e: DevExpress.common.core.events.Cancelable & - DevExpress.common.core.events.EventInfo & - RowKeyInfo - ) => void; + onRowExpanding?: + | (( + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & + RowKeyInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowInserted] */ - onRowInserted?: ( - e: DevExpress.common.core.events.EventInfo & - RowInsertedInfo - ) => void; + onRowInserted?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowInsertedInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowInserting] */ - onRowInserting?: ( - e: DevExpress.common.core.events.EventInfo & - RowInsertingInfo - ) => void; + onRowInserting?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowInsertingInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowRemoved] */ - onRowRemoved?: ( - e: DevExpress.common.core.events.EventInfo & - RowRemovedInfo - ) => void; + onRowRemoved?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowRemovedInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowRemoving] */ - onRowRemoving?: ( - e: DevExpress.common.core.events.EventInfo & - RowRemovingInfo - ) => void; + onRowRemoving?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowRemovingInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowUpdated] */ - onRowUpdated?: ( - e: DevExpress.common.core.events.EventInfo & - RowUpdatedInfo - ) => void; + onRowUpdated?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowUpdatedInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowUpdating] */ - onRowUpdating?: ( - e: DevExpress.common.core.events.EventInfo & - RowUpdatingInfo - ) => void; + onRowUpdating?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowUpdatingInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onRowValidating] */ - onRowValidating?: ( - e: DevExpress.common.core.events.EventInfo & - RowValidatingInfo - ) => void; + onRowValidating?: + | (( + e: DevExpress.common.core.events.EventInfo & + RowValidatingInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onSaved] */ - onSaved?: ( - e: DevExpress.common.core.events.EventInfo & - DataChangeInfo - ) => void; + onSaved?: + | (( + e: DevExpress.common.core.events.EventInfo & + DataChangeInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onSaving] */ - onSaving?: ( - e: DevExpress.common.core.events.EventInfo & - SavingInfo - ) => void; + onSaving?: + | (( + e: DevExpress.common.core.events.EventInfo & + SavingInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onSelectionChanged] */ - onSelectionChanged?: ( - e: DevExpress.common.core.events.EventInfo & - SelectionChangedInfo - ) => void; + onSelectionChanged?: + | (( + e: DevExpress.common.core.events.EventInfo & + SelectionChangedInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.onToolbarPreparing] */ - onToolbarPreparing?: ( - e: DevExpress.common.core.events.EventInfo & - ToolbarPreparingInfo - ) => void; + onToolbarPreparing?: + | (( + e: DevExpress.common.core.events.EventInfo & + ToolbarPreparingInfo + ) => void) + | undefined; /** * [descr:GridBaseOptions.pager] */ @@ -7168,7 +7214,7 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.stateStoring.storageKey] */ - storageKey?: string; + storageKey?: string | null; /** * [descr:GridBaseOptions.stateStoring.type] */ @@ -11138,7 +11184,7 @@ declare module DevExpress.ui { /** * [descr:dxCardViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSourceLike; + dataSource?: DevExpress.data.DataSourceLike | undefined; /** * [descr:dxCardViewOptions.paging] */ @@ -11146,7 +11192,7 @@ declare module DevExpress.ui { /** * [descr:dxCardViewOptions.keyExpr] */ - keyExpr?: string | string[]; + keyExpr?: string | string[] | undefined; /** * [descr:dxCardViewOptions.remoteOperations] */ @@ -11157,10 +11203,12 @@ declare module DevExpress.ui { /** * [descr:dxCardViewOptions.onDataErrorOccurred] */ - onDataErrorOccurred?: ( - e: DevExpress.common.core.events.EventInfo & - DevExpress.common.grids.DataErrorOccurredInfo - ) => void; + onDataErrorOccurred?: + | (( + e: DevExpress.common.core.events.EventInfo & + DevExpress.common.grids.DataErrorOccurredInfo + ) => void) + | undefined; /** * [descr:dxCardViewOptions.pager] @@ -11355,7 +11403,7 @@ declare module DevExpress.ui { /** * [descr:dxCardViewOptions.filterValue] */ - filterValue?: string | Array | Function; + filterValue?: string | Array | Function | null; /** * [descr:dxCardViewOptions.filterBuilderPopup] */ @@ -14568,99 +14616,121 @@ declare module DevExpress.ui { /** * [descr:dxDataGridOptions.onCellClick] */ - onCellClick?: ( - e: DevExpress.ui.dxDataGrid.CellClickEvent - ) => void; + onCellClick?: + | ((e: DevExpress.ui.dxDataGrid.CellClickEvent) => void) + | undefined; /** * [descr:dxDataGridOptions.onCellDblClick] */ - onCellDblClick?: ( - e: DevExpress.ui.dxDataGrid.CellDblClickEvent - ) => void; + onCellDblClick?: + | (( + e: DevExpress.ui.dxDataGrid.CellDblClickEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onCellHoverChanged] */ - onCellHoverChanged?: ( - e: DevExpress.ui.dxDataGrid.CellHoverChangedEvent - ) => void; + onCellHoverChanged?: + | (( + e: DevExpress.ui.dxDataGrid.CellHoverChangedEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onCellPrepared] */ - onCellPrepared?: ( - e: DevExpress.ui.dxDataGrid.CellPreparedEvent - ) => void; + onCellPrepared?: + | (( + e: DevExpress.ui.dxDataGrid.CellPreparedEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onContextMenuPreparing] */ - onContextMenuPreparing?: ( - e: DevExpress.ui.dxDataGrid.ContextMenuPreparingEvent - ) => void; + onContextMenuPreparing?: + | (( + e: DevExpress.ui.dxDataGrid.ContextMenuPreparingEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onEditingStart] */ - onEditingStart?: ( - e: DevExpress.ui.dxDataGrid.EditingStartEvent - ) => void; + onEditingStart?: + | (( + e: DevExpress.ui.dxDataGrid.EditingStartEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onEditorPrepared] */ - onEditorPrepared?: ( - options: DevExpress.ui.dxDataGrid.EditorPreparedEvent - ) => void; + onEditorPrepared?: + | (( + options: DevExpress.ui.dxDataGrid.EditorPreparedEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onEditorPreparing] */ - onEditorPreparing?: ( - e: DevExpress.ui.dxDataGrid.EditorPreparingEvent - ) => void; + onEditorPreparing?: + | (( + e: DevExpress.ui.dxDataGrid.EditorPreparingEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onExporting] */ - onExporting?: ( - e: DevExpress.ui.dxDataGrid.ExportingEvent - ) => void; + onExporting?: + | ((e: DevExpress.ui.dxDataGrid.ExportingEvent) => void) + | undefined; /** * [descr:dxDataGridOptions.onFocusedCellChanged] */ - onFocusedCellChanged?: ( - e: DevExpress.ui.dxDataGrid.FocusedCellChangedEvent - ) => void; + onFocusedCellChanged?: + | (( + e: DevExpress.ui.dxDataGrid.FocusedCellChangedEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onFocusedCellChanging] */ - onFocusedCellChanging?: ( - e: DevExpress.ui.dxDataGrid.FocusedCellChangingEvent - ) => void; + onFocusedCellChanging?: + | (( + e: DevExpress.ui.dxDataGrid.FocusedCellChangingEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onFocusedRowChanged] */ - onFocusedRowChanged?: ( - e: DevExpress.ui.dxDataGrid.FocusedRowChangedEvent - ) => void; + onFocusedRowChanged?: + | (( + e: DevExpress.ui.dxDataGrid.FocusedRowChangedEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onFocusedRowChanging] */ - onFocusedRowChanging?: ( - e: DevExpress.ui.dxDataGrid.FocusedRowChangingEvent - ) => void; + onFocusedRowChanging?: + | (( + e: DevExpress.ui.dxDataGrid.FocusedRowChangingEvent + ) => void) + | undefined; /** * [descr:dxDataGridOptions.onRowClick] */ - onRowClick?: ( - e: DevExpress.ui.dxDataGrid.RowClickEvent - ) => void; + onRowClick?: + | ((e: DevExpress.ui.dxDataGrid.RowClickEvent) => void) + | undefined; /** * [descr:dxDataGridOptions.onRowDblClick] */ - onRowDblClick?: ( - e: DevExpress.ui.dxDataGrid.RowDblClickEvent - ) => void; + onRowDblClick?: + | ((e: DevExpress.ui.dxDataGrid.RowDblClickEvent) => void) + | undefined; /** * [descr:dxDataGridOptions.onRowPrepared] */ - onRowPrepared?: ( - e: DevExpress.ui.dxDataGrid.RowPreparedEvent - ) => void; + onRowPrepared?: + | ((e: DevExpress.ui.dxDataGrid.RowPreparedEvent) => void) + | undefined; /** * [descr:dxDataGridOptions.remoteOperations] */ @@ -14741,9 +14811,9 @@ declare module DevExpress.ui { /** * [descr:dxDataGridOptions.onAIColumnRequestCreating] */ - onAIColumnRequestCreating?: ( - e: DevExpress.ui.dxDataGrid.AIColumnRequestCreatingEvent - ) => void; + onAIColumnRequestCreating?: + | ((e: DevExpress.ui.dxDataGrid.AIColumnRequestCreatingEvent) => void) + | undefined; }; /** * @deprecated Use DevExpress.ui.dxDataGrid.Row instead @@ -16659,15 +16729,21 @@ declare module DevExpress.ui { /** * [descr:dxDraggableOptions.onDragEnd] */ - onDragEnd?: (e: DevExpress.ui.dxDraggable.DragEndEvent) => void; + onDragEnd?: + | ((e: DevExpress.ui.dxDraggable.DragEndEvent) => void) + | undefined; /** * [descr:dxDraggableOptions.onDragMove] */ - onDragMove?: (e: DevExpress.ui.dxDraggable.DragMoveEvent) => void; + onDragMove?: + | ((e: DevExpress.ui.dxDraggable.DragMoveEvent) => void) + | undefined; /** * [descr:dxDraggableOptions.onDragStart] */ - onDragStart?: (e: DevExpress.ui.dxDraggable.DragStartEvent) => void; + onDragStart?: + | ((e: DevExpress.ui.dxDraggable.DragStartEvent) => void) + | undefined; } /** * [descr:dxDrawer] @@ -19162,25 +19238,25 @@ declare module DevExpress.ui { /** * [descr:dxFilterBuilderOptions.onEditorPrepared] */ - onEditorPrepared?: ( - e: DevExpress.ui.dxFilterBuilder.EditorPreparedEvent - ) => void; + onEditorPrepared?: + | ((e: DevExpress.ui.dxFilterBuilder.EditorPreparedEvent) => void) + | undefined; /** * [descr:dxFilterBuilderOptions.onEditorPreparing] */ - onEditorPreparing?: ( - e: DevExpress.ui.dxFilterBuilder.EditorPreparingEvent - ) => void; + onEditorPreparing?: + | ((e: DevExpress.ui.dxFilterBuilder.EditorPreparingEvent) => void) + | undefined; /** * [descr:dxFilterBuilderOptions.onValueChanged] */ - onValueChanged?: ( - e: DevExpress.ui.dxFilterBuilder.ValueChangedEvent - ) => void; + onValueChanged?: + | ((e: DevExpress.ui.dxFilterBuilder.ValueChangedEvent) => void) + | undefined; /** * [descr:dxFilterBuilderOptions.value] */ - value?: string | Array | Function; + value?: string | Array | Function | null; } /** * [descr:dxForm] @@ -28388,31 +28464,41 @@ declare module DevExpress.ui { /** * [descr:dxSortableOptions.onAdd] */ - onAdd?: (e: DevExpress.ui.dxSortable.AddEvent) => void; + onAdd?: ((e: DevExpress.ui.dxSortable.AddEvent) => void) | undefined; /** * [descr:dxSortableOptions.onDragChange] */ - onDragChange?: (e: DevExpress.ui.dxSortable.DragChangeEvent) => void; + onDragChange?: + | ((e: DevExpress.ui.dxSortable.DragChangeEvent) => void) + | undefined; /** * [descr:dxSortableOptions.onDragEnd] */ - onDragEnd?: (e: DevExpress.ui.dxSortable.DragEndEvent) => void; + onDragEnd?: + | ((e: DevExpress.ui.dxSortable.DragEndEvent) => void) + | undefined; /** * [descr:dxSortableOptions.onDragMove] */ - onDragMove?: (e: DevExpress.ui.dxSortable.DragMoveEvent) => void; + onDragMove?: + | ((e: DevExpress.ui.dxSortable.DragMoveEvent) => void) + | undefined; /** * [descr:dxSortableOptions.onDragStart] */ - onDragStart?: (e: DevExpress.ui.dxSortable.DragStartEvent) => void; + onDragStart?: + | ((e: DevExpress.ui.dxSortable.DragStartEvent) => void) + | undefined; /** * [descr:dxSortableOptions.onRemove] */ - onRemove?: (e: DevExpress.ui.dxSortable.RemoveEvent) => void; + onRemove?: ((e: DevExpress.ui.dxSortable.RemoveEvent) => void) | undefined; /** * [descr:dxSortableOptions.onReorder] */ - onReorder?: (e: DevExpress.ui.dxSortable.ReorderEvent) => void; + onReorder?: + | ((e: DevExpress.ui.dxSortable.ReorderEvent) => void) + | undefined; } /** * [descr:dxSpeechToText] @@ -32489,99 +32575,123 @@ declare module DevExpress.ui { /** * [descr:dxTreeListOptions.onCellClick] */ - onCellClick?: ( - e: DevExpress.ui.dxTreeList.CellClickEvent - ) => void; + onCellClick?: + | ((e: DevExpress.ui.dxTreeList.CellClickEvent) => void) + | undefined; /** * [descr:dxTreeListOptions.onCellDblClick] */ - onCellDblClick?: ( - e: DevExpress.ui.dxTreeList.CellDblClickEvent - ) => void; + onCellDblClick?: + | (( + e: DevExpress.ui.dxTreeList.CellDblClickEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onCellHoverChanged] */ - onCellHoverChanged?: ( - e: DevExpress.ui.dxTreeList.CellHoverChangedEvent - ) => void; + onCellHoverChanged?: + | (( + e: DevExpress.ui.dxTreeList.CellHoverChangedEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onCellPrepared] */ - onCellPrepared?: ( - e: DevExpress.ui.dxTreeList.CellPreparedEvent - ) => void; + onCellPrepared?: + | (( + e: DevExpress.ui.dxTreeList.CellPreparedEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onContextMenuPreparing] */ - onContextMenuPreparing?: ( - e: DevExpress.ui.dxTreeList.ContextMenuPreparingEvent - ) => void; + onContextMenuPreparing?: + | (( + e: DevExpress.ui.dxTreeList.ContextMenuPreparingEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onEditingStart] */ - onEditingStart?: ( - e: DevExpress.ui.dxTreeList.EditingStartEvent - ) => void; + onEditingStart?: + | (( + e: DevExpress.ui.dxTreeList.EditingStartEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onEditorPrepared] */ - onEditorPrepared?: ( - options: DevExpress.ui.dxTreeList.EditorPreparedEvent - ) => void; + onEditorPrepared?: + | (( + options: DevExpress.ui.dxTreeList.EditorPreparedEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onEditorPreparing] */ - onEditorPreparing?: ( - e: DevExpress.ui.dxTreeList.EditorPreparingEvent - ) => void; + onEditorPreparing?: + | (( + e: DevExpress.ui.dxTreeList.EditorPreparingEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onFocusedCellChanged] */ - onFocusedCellChanged?: ( - e: DevExpress.ui.dxTreeList.FocusedCellChangedEvent - ) => void; + onFocusedCellChanged?: + | (( + e: DevExpress.ui.dxTreeList.FocusedCellChangedEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onFocusedCellChanging] */ - onFocusedCellChanging?: ( - e: DevExpress.ui.dxTreeList.FocusedCellChangingEvent - ) => void; + onFocusedCellChanging?: + | (( + e: DevExpress.ui.dxTreeList.FocusedCellChangingEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onFocusedRowChanged] */ - onFocusedRowChanged?: ( - e: DevExpress.ui.dxTreeList.FocusedRowChangedEvent - ) => void; + onFocusedRowChanged?: + | (( + e: DevExpress.ui.dxTreeList.FocusedRowChangedEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onFocusedRowChanging] */ - onFocusedRowChanging?: ( - e: DevExpress.ui.dxTreeList.FocusedRowChangingEvent - ) => void; + onFocusedRowChanging?: + | (( + e: DevExpress.ui.dxTreeList.FocusedRowChangingEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onNodesInitialized] */ - onNodesInitialized?: ( - e: DevExpress.ui.dxTreeList.NodesInitializedEvent - ) => void; + onNodesInitialized?: + | (( + e: DevExpress.ui.dxTreeList.NodesInitializedEvent + ) => void) + | undefined; /** * [descr:dxTreeListOptions.onRowClick] */ - onRowClick?: ( - e: DevExpress.ui.dxTreeList.RowClickEvent - ) => void; + onRowClick?: + | ((e: DevExpress.ui.dxTreeList.RowClickEvent) => void) + | undefined; /** * [descr:dxTreeListOptions.onRowDblClick] */ - onRowDblClick?: ( - e: DevExpress.ui.dxTreeList.RowDblClickEvent - ) => void; + onRowDblClick?: + | ((e: DevExpress.ui.dxTreeList.RowDblClickEvent) => void) + | undefined; /** * [descr:dxTreeListOptions.onRowPrepared] */ - onRowPrepared?: ( - e: DevExpress.ui.dxTreeList.RowPreparedEvent - ) => void; + onRowPrepared?: + | ((e: DevExpress.ui.dxTreeList.RowPreparedEvent) => void) + | undefined; /** * [descr:dxTreeListOptions.paging] */ @@ -32630,9 +32740,9 @@ declare module DevExpress.ui { /** * [descr:dxTreeListOptions.onAIColumnRequestCreating] */ - onAIColumnRequestCreating?: ( - e: DevExpress.ui.dxTreeList.AIColumnRequestCreatingEvent - ) => void; + onAIColumnRequestCreating?: + | ((e: DevExpress.ui.dxTreeList.AIColumnRequestCreatingEvent) => void) + | undefined; }; /** * @deprecated Use DevExpress.ui.dxTreeList.Row instead @@ -34371,27 +34481,27 @@ declare module DevExpress.ui.dxCardView { /** * [descr:HeaderPanel.dragging.onDragChange] */ - onDragChange?: (e: any) => void; + onDragChange?: ((e: any) => void) | undefined; /** * [descr:HeaderPanel.dragging.onDragEnd] */ - onDragEnd?: (e: any) => void; + onDragEnd?: ((e: any) => void) | undefined; /** * [descr:HeaderPanel.dragging.onDragMove] */ - onDragMove?: (e: any) => void; + onDragMove?: ((e: any) => void) | undefined; /** * [descr:HeaderPanel.dragging.onDragStart] */ - onDragStart?: (e: any) => void; + onDragStart?: ((e: any) => void) | undefined; /** * [descr:HeaderPanel.dragging.onRemove] */ - onRemove?: (e: any) => void; + onRemove?: ((e: any) => void) | undefined; /** * [descr:HeaderPanel.dragging.onReorder] */ - onReorder?: (e: any) => void; + onReorder?: ((e: any) => void) | undefined; }; /** * [descr:HeaderPanel.visible] From 98c4c93602c62b1bc946f2cf1e4cdad35765c094 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Thu, 2 Jul 2026 18:01:01 +0600 Subject: [PATCH 08/12] remove @default undefined --- .../filter_builder/m_filter_builder.ts | 6 ++ .../devextreme/js/__internal/m_draggable.ts | 7 ++ .../devextreme/js/__internal/m_sortable.ts | 5 ++ packages/devextreme/js/common/grids.d.ts | 66 +++++++------------ packages/devextreme/js/ui/card_view.d.ts | 21 ++---- packages/devextreme/js/ui/data_grid.d.ts | 51 +++++--------- packages/devextreme/js/ui/tree_list.d.ts | 51 +++++--------- 7 files changed, 81 insertions(+), 126 deletions(-) diff --git a/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts b/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts index d50cdd60aae1..778dcb14c85b 100644 --- a/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts +++ b/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts @@ -97,6 +97,12 @@ class FilterBuilder extends Widget { _getDefaultOptions() { // @ts-expect-error return extend(super._getDefaultOptions(), { + onEditorPreparing: undefined, + + onEditorPrepared: undefined, + + onValueChanged: undefined, + fields: [], groupOperations: ['and', 'or', 'notAnd', 'notOr'], diff --git a/packages/devextreme/js/__internal/m_draggable.ts b/packages/devextreme/js/__internal/m_draggable.ts index 588c1917d7d7..7c01f6eeb02a 100644 --- a/packages/devextreme/js/__internal/m_draggable.ts +++ b/packages/devextreme/js/__internal/m_draggable.ts @@ -329,7 +329,14 @@ class Draggable extends DOMComponent { _getDefaultOptions(): Properties { return { ...super._getDefaultOptions(), + onDragStart: undefined, + onDragMove: undefined, + onDragEnd: undefined, // @ts-expect-error + onDragEnter: undefined, + onDragLeave: undefined, + onDragCancel: undefined, + onDrop: undefined, onCancelByEsc: false, immediate: true, dragDirection: 'both', diff --git a/packages/devextreme/js/__internal/m_sortable.ts b/packages/devextreme/js/__internal/m_sortable.ts index 93b80a6e1f93..2d5846e5a3f0 100644 --- a/packages/devextreme/js/__internal/m_sortable.ts +++ b/packages/devextreme/js/__internal/m_sortable.ts @@ -90,6 +90,11 @@ class Sortable extends Draggable { allowDropInsideItem: false, allowReordering: true, moveItemOnDrop: false, + onDragChange: undefined, + onAdd: undefined, + onRemove: undefined, + onReorder: undefined, + onPlaceholderPrepared: undefined, placeholderClassName: '', animation: { type: 'slide', diff --git a/packages/devextreme/js/common/grids.d.ts b/packages/devextreme/js/common/grids.d.ts index e93556c4772f..464aedb025f0 100644 --- a/packages/devextreme/js/common/grids.d.ts +++ b/packages/devextreme/js/common/grids.d.ts @@ -2392,146 +2392,132 @@ export type GridBaseOptions, TRowDat noDataText?: string; /** * @docid - * @default undefined * @type_function_param1 e:object * @type_function_param1_field component:this * @action * @public */ - onAIAssistantRequestCreating?: ((e: EventInfo & Cancelable & AIAssistantRequestCreatingInfo) => void) | undefined; + onAIAssistantRequestCreating?: ((e: EventInfo & Cancelable & AIAssistantRequestCreatingInfo) => void); /** * @docid - * @default undefined * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field formOptions:object * @action * @public */ - onAdaptiveDetailRowPreparing?: ((e: EventInfo & AdaptiveDetailRowPreparingInfo) => void) | undefined; + onAdaptiveDetailRowPreparing?: ((e: EventInfo & AdaptiveDetailRowPreparingInfo) => void); /** * @docid - * @default undefined * @type_function_param1 e:object * @type_function_param1_field component:this * @action * @public */ - onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void) | undefined; + onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field changes:Array - * @default undefined * @action * @public */ - onEditCanceled?: ((e: EventInfo & DataChangeInfo) => void) | undefined; + onEditCanceled?: ((e: EventInfo & DataChangeInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field changes:Array - * @default undefined * @action * @public */ - onEditCanceling?: ((e: Cancelable & EventInfo & DataChangeInfo) => void) | undefined; + onEditCanceling?: ((e: Cancelable & EventInfo & DataChangeInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field promise:Promise - * @default undefined * @action * @public */ - onInitNewRow?: ((e: EventInfo & NewRowInfo) => void) | undefined; + onInitNewRow?: ((e: EventInfo & NewRowInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field event:event - * @default undefined * @action * @public */ - onKeyDown?: ((e: NativeEventInfo & KeyDownInfo) => void) | undefined; + onKeyDown?: ((e: NativeEventInfo & KeyDownInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field key:any - * @default undefined * @action * @public */ - onRowCollapsed?: ((e: EventInfo & RowKeyInfo) => void) | undefined; + onRowCollapsed?: ((e: EventInfo & RowKeyInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field key:any - * @default undefined * @action * @public */ - onRowCollapsing?: ((e: Cancelable & EventInfo & RowKeyInfo) => void) | undefined; + onRowCollapsing?: ((e: Cancelable & EventInfo & RowKeyInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field key:any - * @default undefined * @action * @public */ - onRowExpanded?: ((e: EventInfo & RowKeyInfo) => void) | undefined; + onRowExpanded?: ((e: EventInfo & RowKeyInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field key:any - * @default undefined * @action * @public */ - onRowExpanding?: ((e: Cancelable & EventInfo & RowKeyInfo) => void) | undefined; + onRowExpanding?: ((e: Cancelable & EventInfo & RowKeyInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field key:any - * @default undefined * @action * @public */ - onRowInserted?: ((e: EventInfo & RowInsertedInfo) => void) | undefined; + onRowInserted?: ((e: EventInfo & RowInsertedInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field cancel:boolean|Promise - * @default undefined * @action * @public */ - onRowInserting?: ((e: EventInfo & RowInsertingInfo) => void) | undefined; + onRowInserting?: ((e: EventInfo & RowInsertingInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field key:any - * @default undefined * @action * @public */ - onRowRemoved?: ((e: EventInfo & RowRemovedInfo) => void) | undefined; + onRowRemoved?: ((e: EventInfo & RowRemovedInfo) => void); /** * @docid * @type_function_param1 e:object @@ -2539,22 +2525,20 @@ export type GridBaseOptions, TRowDat * @type_function_param1_field data:object * @type_function_param1_field key:any * @type_function_param1_field cancel:boolean|Promise - * @default undefined * @action * @public */ - onRowRemoving?: ((e: EventInfo & RowRemovingInfo) => void) | undefined; + onRowRemoving?: ((e: EventInfo & RowRemovingInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field data:object * @type_function_param1_field key:any - * @default undefined * @action * @public */ - onRowUpdated?: ((e: EventInfo & RowUpdatedInfo) => void) | undefined; + onRowUpdated?: ((e: EventInfo & RowUpdatedInfo) => void); /** * @docid * @type_function_param1 e:object @@ -2563,11 +2547,10 @@ export type GridBaseOptions, TRowDat * @type_function_param1_field newData:object * @type_function_param1_field key:any * @type_function_param1_field cancel:boolean|Promise - * @default undefined * @action * @public */ - onRowUpdating?: ((e: EventInfo & RowUpdatingInfo) => void) | undefined; + onRowUpdating?: ((e: EventInfo & RowUpdatingInfo) => void); /** * @docid * @type_function_param1 e:object @@ -2577,32 +2560,29 @@ export type GridBaseOptions, TRowDat * @type_function_param1_field oldData:object * @type_function_param1_field promise:Promise * @type_function_param1_field brokenRules:Array - * @default undefined * @action * @public */ - onRowValidating?: ((e: EventInfo & RowValidatingInfo) => void) | undefined; + onRowValidating?: ((e: EventInfo & RowValidatingInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field changes:Array - * @default undefined * @action * @public */ - onSaved?: ((e: EventInfo & DataChangeInfo) => void) | undefined; + onSaved?: ((e: EventInfo & DataChangeInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field changes:Array * @type_function_param1_field promise:Promise - * @default undefined * @action * @public */ - onSaving?: ((e: EventInfo & SavingInfo) => void) | undefined; + onSaving?: ((e: EventInfo & SavingInfo) => void); /** * @docid * @type_function_param1 e:object @@ -2611,21 +2591,19 @@ export type GridBaseOptions, TRowDat * @type_function_param1_field currentDeselectedRowKeys:Array * @type_function_param1_field selectedRowKeys:Array * @type_function_param1_field selectedRowsData:Array - * @default undefined * @action * @public */ - onSelectionChanged?: ((e: EventInfo & SelectionChangedInfo) => void) | undefined; + onSelectionChanged?: ((e: EventInfo & SelectionChangedInfo) => void); /** * @docid * @type_function_param1 e:object * @type_function_param1_field component:this * @type_function_param1_field toolbarOptions:dxToolbarOptions - * @default undefined * @action * @public */ - onToolbarPreparing?: ((e: EventInfo & ToolbarPreparingInfo) => void) | undefined; + onToolbarPreparing?: ((e: EventInfo & ToolbarPreparingInfo) => void); /** * @docid * @public diff --git a/packages/devextreme/js/ui/card_view.d.ts b/packages/devextreme/js/ui/card_view.d.ts index 355eee51b206..9ffd3236435f 100644 --- a/packages/devextreme/js/ui/card_view.d.ts +++ b/packages/devextreme/js/ui/card_view.d.ts @@ -537,40 +537,34 @@ export type HeaderPanel = { scrollSensitivity?: number; /** * @docid - * @default undefined * @public */ - onDragChange?: ((e: any) => void) | undefined; + onDragChange?: ((e: any) => void); /** * @docid - * @default undefined * @public */ - onDragEnd?: ((e: any) => void) | undefined; + onDragEnd?: ((e: any) => void); /** * @docid - * @default undefined * @public */ - onDragMove?: ((e: any) => void) | undefined; + onDragMove?: ((e: any) => void); /** * @docid - * @default undefined * @public */ - onDragStart?: ((e: any) => void) | undefined; + onDragStart?: ((e: any) => void); /** * @docid - * @default undefined * @public */ - onRemove?: ((e: any) => void) | undefined; + onRemove?: ((e: any) => void); /** * @docid - * @default undefined * @public */ - onReorder?: ((e: any) => void) | undefined; + onReorder?: ((e: any) => void); }; /** * @docid @@ -1337,13 +1331,12 @@ export interface dxCardViewOptions extends remoteOperations?: RemoteOperations | boolean | Mode; /** * @docid - * @default undefined * @type_function_param1 e:object * @type_function_param1_field component:this * @action * @public */ - onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void) | undefined; + onDataErrorOccurred?: ((e: EventInfo & DataErrorOccurredInfo) => void); // #endregion diff --git a/packages/devextreme/js/ui/data_grid.d.ts b/packages/devextreme/js/ui/data_grid.d.ts index 0a269fd9629a..fc265e7c3f5a 100644 --- a/packages/devextreme/js/ui/data_grid.d.ts +++ b/packages/devextreme/js/ui/data_grid.d.ts @@ -1240,131 +1240,115 @@ export type dxDataGridOptions = Omit) => void) | undefined; + onCellClick?: ((e: CellClickEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:CellDblClickEvent} - * @default undefined * @action * @public */ - onCellDblClick?: ((e: CellDblClickEvent) => void) | undefined; + onCellDblClick?: ((e: CellDblClickEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:CellHoverChangedEvent} - * @default undefined * @action * @public */ - onCellHoverChanged?: ((e: CellHoverChangedEvent) => void) | undefined; + onCellHoverChanged?: ((e: CellHoverChangedEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:CellPreparedEvent} - * @default undefined * @action * @public */ - onCellPrepared?: ((e: CellPreparedEvent) => void) | undefined; + onCellPrepared?: ((e: CellPreparedEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:ContextMenuPreparingEvent} - * @default undefined * @action * @public */ - onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | undefined; + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:EditingStartEvent} - * @default undefined * @action * @public */ - onEditingStart?: ((e: EditingStartEvent) => void) | undefined; + onEditingStart?: ((e: EditingStartEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:EditorPreparedEvent} - * @default undefined * @action * @public */ - onEditorPrepared?: ((options: EditorPreparedEvent) => void) | undefined; + onEditorPrepared?: ((options: EditorPreparedEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:EditorPreparingEvent} - * @default undefined * @action * @public */ - onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; + onEditorPreparing?: ((e: EditorPreparingEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:ExportingEvent} - * @default undefined * @action * @public */ - onExporting?: ((e: ExportingEvent) => void) | undefined; + onExporting?: ((e: ExportingEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:FocusedCellChangedEvent} - * @default undefined * @action * @public */ - onFocusedCellChanged?: ((e: FocusedCellChangedEvent) => void) | undefined; + onFocusedCellChanged?: ((e: FocusedCellChangedEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:FocusedCellChangingEvent} - * @default undefined * @action * @public */ - onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void) | undefined; + onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:FocusedRowChangedEvent} - * @default undefined * @action * @public */ - onFocusedRowChanged?: ((e: FocusedRowChangedEvent) => void) | undefined; + onFocusedRowChanged?: ((e: FocusedRowChangedEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:FocusedRowChangingEvent} - * @default undefined * @action * @public */ - onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void) | undefined; + onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:RowClickEvent} - * @default undefined * @action * @public */ - onRowClick?: ((e: RowClickEvent) => void) | undefined; + onRowClick?: ((e: RowClickEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:RowDblClickEvent} - * @default undefined * @action * @public */ - onRowDblClick?: ((e: RowDblClickEvent) => void) | undefined; + onRowDblClick?: ((e: RowDblClickEvent) => void); /** * @docid * @type_function_param1 e:{ui/data_grid:RowPreparedEvent} - * @default undefined * @action * @public */ - onRowPrepared?: ((e: RowPreparedEvent) => void) | undefined; + onRowPrepared?: ((e: RowPreparedEvent) => void); /** * @docid * @default "auto" @@ -1465,12 +1449,11 @@ export type dxDataGridOptions = Omit void) | undefined; + onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void); }; /** diff --git a/packages/devextreme/js/ui/tree_list.d.ts b/packages/devextreme/js/ui/tree_list.d.ts index 23a30047b8af..96daa6bac6ca 100644 --- a/packages/devextreme/js/ui/tree_list.d.ts +++ b/packages/devextreme/js/ui/tree_list.d.ts @@ -997,131 +997,115 @@ export type dxTreeListOptions = Omit) => void) | undefined; + onCellClick?: ((e: CellClickEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:CellDblClickEvent} - * @default undefined * @action * @public */ - onCellDblClick?: ((e: CellDblClickEvent) => void) | undefined; + onCellDblClick?: ((e: CellDblClickEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:CellHoverChangedEvent} - * @default undefined * @action * @public */ - onCellHoverChanged?: ((e: CellHoverChangedEvent) => void) | undefined; + onCellHoverChanged?: ((e: CellHoverChangedEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:CellPreparedEvent} - * @default undefined * @action * @public */ - onCellPrepared?: ((e: CellPreparedEvent) => void) | undefined; + onCellPrepared?: ((e: CellPreparedEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:ContextMenuPreparingEvent} - * @default undefined * @action * @public */ - onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | undefined; + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:EditingStartEvent} - * @default undefined * @action * @public */ - onEditingStart?: ((e: EditingStartEvent) => void) | undefined; + onEditingStart?: ((e: EditingStartEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:EditorPreparedEvent} - * @default undefined * @action * @public */ - onEditorPrepared?: ((options: EditorPreparedEvent) => void) | undefined; + onEditorPrepared?: ((options: EditorPreparedEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:EditorPreparingEvent} - * @default undefined * @action * @public */ - onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; + onEditorPreparing?: ((e: EditorPreparingEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:FocusedCellChangedEvent} - * @default undefined * @action * @public */ - onFocusedCellChanged?: ((e: FocusedCellChangedEvent) => void) | undefined; + onFocusedCellChanged?: ((e: FocusedCellChangedEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:FocusedCellChangingEvent} - * @default undefined * @action * @public */ - onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void) | undefined; + onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:FocusedRowChangedEvent} - * @default undefined * @action * @public */ - onFocusedRowChanged?: ((e: FocusedRowChangedEvent) => void) | undefined; + onFocusedRowChanged?: ((e: FocusedRowChangedEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:FocusedRowChangingEvent} - * @default undefined * @action * @public */ - onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void) | undefined; + onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:NodesInitializedEvent} - * @default undefined * @action * @public */ - onNodesInitialized?: ((e: NodesInitializedEvent) => void) | undefined; + onNodesInitialized?: ((e: NodesInitializedEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:RowClickEvent} - * @default undefined * @action * @public */ - onRowClick?: ((e: RowClickEvent) => void) | undefined; + onRowClick?: ((e: RowClickEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:RowDblClickEvent} - * @default undefined * @action * @public */ - onRowDblClick?: ((e: RowDblClickEvent) => void) | undefined; + onRowDblClick?: ((e: RowDblClickEvent) => void); /** * @docid * @type_function_param1 e:{ui/tree_list:RowPreparedEvent} - * @default undefined * @action * @public */ - onRowPrepared?: ((e: RowPreparedEvent) => void) | undefined; + onRowPrepared?: ((e: RowPreparedEvent) => void); /** * @docid * @public @@ -1183,12 +1167,11 @@ export type dxTreeListOptions = Omit void) | undefined; + onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void); }; /** From 146e881f41d5ab35f67d30832db5d0cc6a133a04 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Thu, 2 Jul 2026 18:03:09 +0600 Subject: [PATCH 09/12] apply anrey's suggestion --- packages/devextreme/js/ui/card_view.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devextreme/js/ui/card_view.d.ts b/packages/devextreme/js/ui/card_view.d.ts index 9ffd3236435f..288cf8c6404d 100644 --- a/packages/devextreme/js/ui/card_view.d.ts +++ b/packages/devextreme/js/ui/card_view.d.ts @@ -1308,7 +1308,7 @@ export interface dxCardViewOptions extends /** * @docid * @default undefined - * @type string | Array | Store | DataSource | DataSourceOptions + * @type string | Array | Store | DataSource | DataSourceOptions | undefined * @public */ dataSource?: DataSourceLike | undefined; From 67d55d0e1272f75b018ccd7cc238bef1b662c584 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Thu, 2 Jul 2026 18:39:52 +0600 Subject: [PATCH 10/12] remove @default null --- .../data_controller/m_data_controller.ts | 2 +- .../grids/grid_core/editing/m_editing.ts | 10 +++++----- .../grid_core/state_storing/m_state_storing.ts | 6 +++--- packages/devextreme/js/common/grids.d.ts | 18 +++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts index 72f9d475941b..6259c3bb7edf 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts @@ -1801,7 +1801,7 @@ export const dataControllerModule: Module = { defaultOptions() { return { loadingTimeout: 0, - dataSource: null, + dataSource: undefined, cacheEnabled: true, repaintChangesOnly: false, highlightChanges: false, diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts index 6c5bb483c746..a16fe5b928c5 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts @@ -1168,7 +1168,7 @@ class EditingControllerImpl extends modules.ViewController { } protected _resetEditColumnName() { - this._setEditColumnName(null, true); + this._setEditColumnName(undefined, true); } protected _getEditColumn() { @@ -1214,7 +1214,7 @@ class EditingControllerImpl extends modules.ViewController { protected _resetEditRowKey() { this._refocusEditCell = false; - this._setEditRowKey(null, true); + this._setEditRowKey(undefined, true); } protected _resetEditIndices() { @@ -2624,7 +2624,7 @@ export const dataControllerEditingExtenderMixin = (Base: ModuleType change.type === 'insert' && equalByValue(editRowKey, change.key), ); if (!isEditNewItem && dataSourceKeys.every((key) => !equalByValue(editRowKey, key))) { - this.option('editing.editRowKey', null); + this.option('editing.editRowKey', undefined); } } return result; @@ -2939,9 +2939,9 @@ export const editingModule = { startEditAction: 'click', - editRowKey: null, + editRowKey: undefined, - editColumnName: null, + editColumnName: undefined, changes: [], }, diff --git a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing.ts b/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing.ts index 052c59ec6cd2..77a2ac13bca3 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing.ts @@ -287,10 +287,10 @@ export const stateStoringModule = { return { stateStoring: { enabled: false, - storageKey: null, + storageKey: undefined, type: 'localStorage', - customLoad: null, - customSave: null, + customLoad: undefined, + customSave: undefined, savingTimeout: 2000, }, }; diff --git a/packages/devextreme/js/common/grids.d.ts b/packages/devextreme/js/common/grids.d.ts index 464aedb025f0..19a85478b545 100644 --- a/packages/devextreme/js/common/grids.d.ts +++ b/packages/devextreme/js/common/grids.d.ts @@ -1259,18 +1259,18 @@ export interface EditingBase { changes?: Array>; /** * @docid GridBaseOptions.editing.editColumnName - * @default null + * @default undefined * @fires GridBaseOptions.onOptionChanged * @public */ - editColumnName?: string | null; + editColumnName?: string | undefined; /** * @docid GridBaseOptions.editing.editRowKey - * @default null + * @default undefined * @fires GridBaseOptions.onOptionChanged * @public */ - editRowKey?: TKey | null; + editRowKey?: TKey | undefined; /** * @docid GridBaseOptions.editing.form * @public @@ -2272,11 +2272,11 @@ export type GridBaseOptions, TRowDat columns?: Array | string> | undefined; /** * @docid - * @default null + * @default undefined * @public - * @type Store|DataSource|DataSourceOptions|string|Array|null + * @type Store|DataSource|DataSourceOptions|string|Array|undefined */ - dataSource?: DataSourceLike | null; + dataSource?: DataSourceLike | undefined; /** * @docid * @public @@ -3537,9 +3537,9 @@ export type StateStoring = { savingTimeout?: number; /** * @docid GridBaseOptions.stateStoring.storageKey - * @default null + * @default undefined */ - storageKey?: string | null; + storageKey?: string | undefined; /** * @docid GridBaseOptions.stateStoring.type * @default "localStorage" From 28ff05ea80954c44a6aee0faa23d548f0437b5d7 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Thu, 2 Jul 2026 18:41:23 +0600 Subject: [PATCH 11/12] regenerate all --- .../src/ui/card-view/index.ts | 6 +- .../src/ui/card-view/nested/dragging.ts | 24 +- .../src/ui/card-view/nested/header-panel.ts | 4 +- .../src/ui/data-grid/index.ts | 18 +- .../src/ui/data-grid/nested/editing.ts | 12 +- .../src/ui/data-grid/nested/state-storing.ts | 4 +- .../src/ui/nested/editing.ts | 12 +- .../src/ui/nested/state-storing.ts | 4 +- .../src/ui/tree-list/index.ts | 18 +- .../src/ui/tree-list/nested/editing.ts | 12 +- .../src/ui/tree-list/nested/state-storing.ts | 4 +- packages/devextreme-react/src/card-view.ts | 24 +- packages/devextreme-react/src/data-grid.ts | 42 +- packages/devextreme-react/src/tree-list.ts | 42 +- packages/devextreme-vue/src/data-grid.ts | 6 +- packages/devextreme-vue/src/tree-list.ts | 6 +- packages/devextreme/ts/dx.all.d.ts | 512 +++++++----------- 17 files changed, 328 insertions(+), 422 deletions(-) diff --git a/packages/devextreme-angular/src/ui/card-view/index.ts b/packages/devextreme-angular/src/ui/card-view/index.ts index 704ad153c775..18850d31fbad 100644 --- a/packages/devextreme-angular/src/ui/card-view/index.ts +++ b/packages/devextreme-angular/src/ui/card-view/index.ts @@ -319,10 +319,10 @@ export class DxCardViewComponent extends DxComponen @Input() - get dataSource(): Array | DataSource | DataSourceOptions | Store | string { + get dataSource(): Array | DataSource | DataSourceOptions | Store | string | undefined { return this._getOption('dataSource'); } - set dataSource(value: Array | DataSource | DataSourceOptions | Store | string) { + set dataSource(value: Array | DataSource | DataSourceOptions | Store | string | undefined) { this._setOption('dataSource', value); } @@ -992,7 +992,7 @@ export class DxCardViewComponent extends DxComponen * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() dataSourceChange: EventEmitter | DataSource | DataSourceOptions | Store | string>; + @Output() dataSourceChange: EventEmitter | DataSource | DataSourceOptions | Store | string | undefined>; /** diff --git a/packages/devextreme-angular/src/ui/card-view/nested/dragging.ts b/packages/devextreme-angular/src/ui/card-view/nested/dragging.ts index c39030f7f897..ebb4560cb032 100644 --- a/packages/devextreme-angular/src/ui/card-view/nested/dragging.ts +++ b/packages/devextreme-angular/src/ui/card-view/nested/dragging.ts @@ -40,50 +40,50 @@ export class DxoCardViewDraggingComponent extends NestedOption implements OnDest } @Input() - get onDragChange(): ((e: any) => void) | undefined { + get onDragChange(): ((e: any) => void) { return this._getOption('onDragChange'); } - set onDragChange(value: ((e: any) => void) | undefined) { + set onDragChange(value: ((e: any) => void)) { this._setOption('onDragChange', value); } @Input() - get onDragEnd(): ((e: any) => void) | undefined { + get onDragEnd(): ((e: any) => void) { return this._getOption('onDragEnd'); } - set onDragEnd(value: ((e: any) => void) | undefined) { + set onDragEnd(value: ((e: any) => void)) { this._setOption('onDragEnd', value); } @Input() - get onDragMove(): ((e: any) => void) | undefined { + get onDragMove(): ((e: any) => void) { return this._getOption('onDragMove'); } - set onDragMove(value: ((e: any) => void) | undefined) { + set onDragMove(value: ((e: any) => void)) { this._setOption('onDragMove', value); } @Input() - get onDragStart(): ((e: any) => void) | undefined { + get onDragStart(): ((e: any) => void) { return this._getOption('onDragStart'); } - set onDragStart(value: ((e: any) => void) | undefined) { + set onDragStart(value: ((e: any) => void)) { this._setOption('onDragStart', value); } @Input() - get onRemove(): ((e: any) => void) | undefined { + get onRemove(): ((e: any) => void) { return this._getOption('onRemove'); } - set onRemove(value: ((e: any) => void) | undefined) { + set onRemove(value: ((e: any) => void)) { this._setOption('onRemove', value); } @Input() - get onReorder(): ((e: any) => void) | undefined { + get onReorder(): ((e: any) => void) { return this._getOption('onReorder'); } - set onReorder(value: ((e: any) => void) | undefined) { + set onReorder(value: ((e: any) => void)) { this._setOption('onReorder', value); } diff --git a/packages/devextreme-angular/src/ui/card-view/nested/header-panel.ts b/packages/devextreme-angular/src/ui/card-view/nested/header-panel.ts index 085662b0c468..3b2cc5ac47b8 100644 --- a/packages/devextreme-angular/src/ui/card-view/nested/header-panel.ts +++ b/packages/devextreme-angular/src/ui/card-view/nested/header-panel.ts @@ -32,10 +32,10 @@ import { NestedOption } from 'devextreme-angular/core'; }) export class DxoCardViewHeaderPanelComponent extends NestedOption implements OnDestroy, OnInit { @Input() - get dragging(): { dropFeedbackMode?: DragHighlight, onDragChange?: ((e: any) => void) | undefined, onDragEnd?: ((e: any) => void) | undefined, onDragMove?: ((e: any) => void) | undefined, onDragStart?: ((e: any) => void) | undefined, onRemove?: ((e: any) => void) | undefined, onReorder?: ((e: any) => void) | undefined, scrollSensitivity?: number, scrollSpeed?: number } { + get dragging(): { dropFeedbackMode?: DragHighlight, onDragChange?: ((e: any) => void), onDragEnd?: ((e: any) => void), onDragMove?: ((e: any) => void), onDragStart?: ((e: any) => void), onRemove?: ((e: any) => void), onReorder?: ((e: any) => void), scrollSensitivity?: number, scrollSpeed?: number } { return this._getOption('dragging'); } - set dragging(value: { dropFeedbackMode?: DragHighlight, onDragChange?: ((e: any) => void) | undefined, onDragEnd?: ((e: any) => void) | undefined, onDragMove?: ((e: any) => void) | undefined, onDragStart?: ((e: any) => void) | undefined, onRemove?: ((e: any) => void) | undefined, onReorder?: ((e: any) => void) | undefined, scrollSensitivity?: number, scrollSpeed?: number }) { + set dragging(value: { dropFeedbackMode?: DragHighlight, onDragChange?: ((e: any) => void), onDragEnd?: ((e: any) => void), onDragMove?: ((e: any) => void), onDragStart?: ((e: any) => void), onRemove?: ((e: any) => void), onReorder?: ((e: any) => void), scrollSensitivity?: number, scrollSpeed?: number }) { this._setOption('dragging', value); } diff --git a/packages/devextreme-angular/src/ui/data-grid/index.ts b/packages/devextreme-angular/src/ui/data-grid/index.ts index 1d4c664a664e..052e9e2f8b75 100644 --- a/packages/devextreme-angular/src/ui/data-grid/index.ts +++ b/packages/devextreme-angular/src/ui/data-grid/index.ts @@ -570,10 +570,10 @@ export class DxDataGridComponent extends DxComponent */ @Input() - get dataSource(): Array | DataSource | DataSourceOptions | null | Store | string { + get dataSource(): Array | DataSource | DataSourceOptions | Store | string | undefined { return this._getOption('dataSource'); } - set dataSource(value: Array | DataSource | DataSourceOptions | null | Store | string) { + set dataSource(value: Array | DataSource | DataSourceOptions | Store | string | undefined) { this._setOption('dataSource', value); } @@ -609,10 +609,10 @@ export class DxDataGridComponent extends DxComponent */ @Input() - get editing(): { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } { + get editing(): { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } { return this._getOption('editing'); } - set editing(value: { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) { + set editing(value: { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) { this._setOption('editing', value); } @@ -1209,10 +1209,10 @@ export class DxDataGridComponent extends DxComponent */ @Input() - get stateStoring(): { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType } { + get stateStoring(): { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string | undefined, type?: StateStoreType } { return this._getOption('stateStoring'); } - set stateStoring(value: { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType }) { + set stateStoring(value: { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string | undefined, type?: StateStoreType }) { this._setOption('stateStoring', value); } @@ -1802,7 +1802,7 @@ export class DxDataGridComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() dataSourceChange: EventEmitter | DataSource | DataSourceOptions | null | Store | string>; + @Output() dataSourceChange: EventEmitter | DataSource | DataSourceOptions | Store | string | undefined>; /** @@ -1823,7 +1823,7 @@ export class DxDataGridComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editingChange: EventEmitter<{ allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>; + @Output() editingChange: EventEmitter<{ allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>; /** @@ -2145,7 +2145,7 @@ export class DxDataGridComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() stateStoringChange: EventEmitter<{ customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType }>; + @Output() stateStoringChange: EventEmitter<{ customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string | undefined, type?: StateStoreType }>; /** diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/editing.ts b/packages/devextreme-angular/src/ui/data-grid/nested/editing.ts index 11540c1b05fd..a5c0b6774512 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/editing.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/editing.ts @@ -88,18 +88,18 @@ export class DxoDataGridEditingComponent extends NestedOption implements OnDestr } @Input() - get editColumnName(): null | string { + get editColumnName(): string | undefined { return this._getOption('editColumnName'); } - set editColumnName(value: null | string) { + set editColumnName(value: string | undefined) { this._setOption('editColumnName', value); } @Input() - get editRowKey(): any | null { + get editRowKey(): any | undefined { return this._getOption('editRowKey'); } - set editRowKey(value: any | null) { + set editRowKey(value: any | undefined) { this._setOption('editRowKey', value); } @@ -188,14 +188,14 @@ export class DxoDataGridEditingComponent extends NestedOption implements OnDestr * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editColumnNameChange: EventEmitter; + @Output() editColumnNameChange: EventEmitter; /** * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editRowKeyChange: EventEmitter; + @Output() editRowKeyChange: EventEmitter; protected get _optionPath() { return 'editing'; } diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/state-storing.ts b/packages/devextreme-angular/src/ui/data-grid/nested/state-storing.ts index a98061488cc0..9603535b9c88 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/state-storing.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/state-storing.ts @@ -64,10 +64,10 @@ export class DxoDataGridStateStoringComponent extends NestedOption implements On } @Input() - get storageKey(): null | string { + get storageKey(): string | undefined { return this._getOption('storageKey'); } - set storageKey(value: null | string) { + set storageKey(value: string | undefined) { this._setOption('storageKey', value); } diff --git a/packages/devextreme-angular/src/ui/nested/editing.ts b/packages/devextreme-angular/src/ui/nested/editing.ts index 5b1182bba985..d613de9b97f4 100644 --- a/packages/devextreme-angular/src/ui/nested/editing.ts +++ b/packages/devextreme-angular/src/ui/nested/editing.ts @@ -87,18 +87,18 @@ export class DxoEditingComponent extends NestedOption implements OnDestroy, OnIn } @Input() - get editColumnName(): null | string { + get editColumnName(): string | undefined { return this._getOption('editColumnName'); } - set editColumnName(value: null | string) { + set editColumnName(value: string | undefined) { this._setOption('editColumnName', value); } @Input() - get editRowKey(): any | null { + get editRowKey(): any | undefined { return this._getOption('editRowKey'); } - set editRowKey(value: any | null) { + set editRowKey(value: any | undefined) { this._setOption('editRowKey', value); } @@ -363,14 +363,14 @@ export class DxoEditingComponent extends NestedOption implements OnDestroy, OnIn * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editColumnNameChange: EventEmitter; + @Output() editColumnNameChange: EventEmitter; /** * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editRowKeyChange: EventEmitter; + @Output() editRowKeyChange: EventEmitter; protected get _optionPath() { return 'editing'; } diff --git a/packages/devextreme-angular/src/ui/nested/state-storing.ts b/packages/devextreme-angular/src/ui/nested/state-storing.ts index 6647d99bcf35..f9dc97937748 100644 --- a/packages/devextreme-angular/src/ui/nested/state-storing.ts +++ b/packages/devextreme-angular/src/ui/nested/state-storing.ts @@ -64,10 +64,10 @@ export class DxoStateStoringComponent extends NestedOption implements OnDestroy, } @Input() - get storageKey(): null | string { + get storageKey(): string | undefined { return this._getOption('storageKey'); } - set storageKey(value: null | string) { + set storageKey(value: string | undefined) { this._setOption('storageKey', value); } diff --git a/packages/devextreme-angular/src/ui/tree-list/index.ts b/packages/devextreme-angular/src/ui/tree-list/index.ts index 814607e81d75..afbe2380d955 100644 --- a/packages/devextreme-angular/src/ui/tree-list/index.ts +++ b/packages/devextreme-angular/src/ui/tree-list/index.ts @@ -527,10 +527,10 @@ export class DxTreeListComponent extends DxComponent */ @Input() - get dataSource(): Array | DataSource | DataSourceOptions | null | Store | string { + get dataSource(): Array | DataSource | DataSourceOptions | Store | string | undefined { return this._getOption('dataSource'); } - set dataSource(value: Array | DataSource | DataSourceOptions | null | Store | string) { + set dataSource(value: Array | DataSource | DataSourceOptions | Store | string | undefined) { this._setOption('dataSource', value); } @@ -579,10 +579,10 @@ export class DxTreeListComponent extends DxComponent */ @Input() - get editing(): { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } { + get editing(): { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } { return this._getOption('editing'); } - set editing(value: { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) { + set editing(value: { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) { this._setOption('editing', value); } @@ -1177,10 +1177,10 @@ export class DxTreeListComponent extends DxComponent */ @Input() - get stateStoring(): { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType } { + get stateStoring(): { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string | undefined, type?: StateStoreType } { return this._getOption('stateStoring'); } - set stateStoring(value: { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType }) { + set stateStoring(value: { customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string | undefined, type?: StateStoreType }) { this._setOption('stateStoring', value); } @@ -1757,7 +1757,7 @@ export class DxTreeListComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() dataSourceChange: EventEmitter | DataSource | DataSourceOptions | null | Store | string>; + @Output() dataSourceChange: EventEmitter | DataSource | DataSourceOptions | Store | string | undefined>; /** @@ -1785,7 +1785,7 @@ export class DxTreeListComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editingChange: EventEmitter<{ allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: null | string, editRowKey?: any | null, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>; + @Output() editingChange: EventEmitter<{ allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>; /** @@ -2107,7 +2107,7 @@ export class DxTreeListComponent extends DxComponent * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() stateStoringChange: EventEmitter<{ customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: null | string, type?: StateStoreType }>; + @Output() stateStoringChange: EventEmitter<{ customLoad?: Function, customSave?: ((gridState: any) => void), enabled?: boolean, savingTimeout?: number, storageKey?: string | undefined, type?: StateStoreType }>; /** diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/editing.ts b/packages/devextreme-angular/src/ui/tree-list/nested/editing.ts index ca50f07272d7..c6c4c82dec8d 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/editing.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/editing.ts @@ -88,18 +88,18 @@ export class DxoTreeListEditingComponent extends NestedOption implements OnDestr } @Input() - get editColumnName(): null | string { + get editColumnName(): string | undefined { return this._getOption('editColumnName'); } - set editColumnName(value: null | string) { + set editColumnName(value: string | undefined) { this._setOption('editColumnName', value); } @Input() - get editRowKey(): any | null { + get editRowKey(): any | undefined { return this._getOption('editRowKey'); } - set editRowKey(value: any | null) { + set editRowKey(value: any | undefined) { this._setOption('editRowKey', value); } @@ -180,14 +180,14 @@ export class DxoTreeListEditingComponent extends NestedOption implements OnDestr * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editColumnNameChange: EventEmitter; + @Output() editColumnNameChange: EventEmitter; /** * This member supports the internal infrastructure and is not intended to be used directly from your code. */ - @Output() editRowKeyChange: EventEmitter; + @Output() editRowKeyChange: EventEmitter; protected get _optionPath() { return 'editing'; } diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/state-storing.ts b/packages/devextreme-angular/src/ui/tree-list/nested/state-storing.ts index d5b7658113e3..7f8562ef4335 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/state-storing.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/state-storing.ts @@ -64,10 +64,10 @@ export class DxoTreeListStateStoringComponent extends NestedOption implements On } @Input() - get storageKey(): null | string { + get storageKey(): string | undefined { return this._getOption('storageKey'); } - set storageKey(value: null | string) { + set storageKey(value: string | undefined) { this._setOption('storageKey', value); } diff --git a/packages/devextreme-react/src/card-view.ts b/packages/devextreme-react/src/card-view.ts index 76592d4e7f06..4cf1b45263e7 100644 --- a/packages/devextreme-react/src/card-view.ts +++ b/packages/devextreme-react/src/card-view.ts @@ -956,12 +956,12 @@ const CustomRule = Object.assign void) | undefined; - onDragEnd?: ((e: any) => void) | undefined; - onDragMove?: ((e: any) => void) | undefined; - onDragStart?: ((e: any) => void) | undefined; - onRemove?: ((e: any) => void) | undefined; - onReorder?: ((e: any) => void) | undefined; + onDragChange?: ((e: any) => void); + onDragEnd?: ((e: any) => void); + onDragMove?: ((e: any) => void); + onDragStart?: ((e: any) => void); + onRemove?: ((e: any) => void); + onReorder?: ((e: any) => void); scrollSensitivity?: number; scrollSpeed?: number; }> @@ -1595,12 +1595,12 @@ const HeaderFilter = Object.assign | { dropFeedbackMode?: DragHighlight; - onDragChange?: ((e: any) => void) | undefined; - onDragEnd?: ((e: any) => void) | undefined; - onDragMove?: ((e: any) => void) | undefined; - onDragStart?: ((e: any) => void) | undefined; - onRemove?: ((e: any) => void) | undefined; - onReorder?: ((e: any) => void) | undefined; + onDragChange?: ((e: any) => void); + onDragEnd?: ((e: any) => void); + onDragMove?: ((e: any) => void); + onDragStart?: ((e: any) => void); + onRemove?: ((e: any) => void); + onReorder?: ((e: any) => void); scrollSensitivity?: number; scrollSpeed?: number; }; diff --git a/packages/devextreme-react/src/data-grid.ts b/packages/devextreme-react/src/data-grid.ts index 3a66cc523c78..285e527e5e4d 100644 --- a/packages/devextreme-react/src/data-grid.ts +++ b/packages/devextreme-react/src/data-grid.ts @@ -48,34 +48,34 @@ type ReplaceFieldTypes = { type IDataGridOptionsNarrowedEvents = { onAdaptiveDetailRowPreparing?: ((e: AdaptiveDetailRowPreparingEvent) => void); onAIAssistantRequestCreating?: ((e: AIAssistantRequestCreatingEvent) => void); - onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void) | undefined; - onCellClick?: ((e: CellClickEvent) => void) | undefined; - onCellDblClick?: ((e: CellDblClickEvent) => void) | undefined; - onCellPrepared?: ((e: CellPreparedEvent) => void) | undefined; + onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void); + onCellClick?: ((e: CellClickEvent) => void); + onCellDblClick?: ((e: CellDblClickEvent) => void); + onCellPrepared?: ((e: CellPreparedEvent) => void); onContentReady?: ((e: ContentReadyEvent) => void); - onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | undefined; + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void); onDataErrorOccurred?: ((e: DataErrorOccurredEvent) => void); onDisposing?: ((e: DisposingEvent) => void); onEditCanceled?: ((e: EditCanceledEvent) => void); onEditCanceling?: ((e: EditCancelingEvent) => void); - onEditingStart?: ((e: EditingStartEvent) => void) | undefined; - onEditorPrepared?: ((e: EditorPreparedEvent) => void) | undefined; - onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; - onExporting?: ((e: ExportingEvent) => void) | undefined; - onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void) | undefined; - onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void) | undefined; + onEditingStart?: ((e: EditingStartEvent) => void); + onEditorPrepared?: ((e: EditorPreparedEvent) => void); + onEditorPreparing?: ((e: EditorPreparingEvent) => void); + onExporting?: ((e: ExportingEvent) => void); + onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void); + onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void); onInitialized?: ((e: InitializedEvent) => void); onInitNewRow?: ((e: InitNewRowEvent) => void); onKeyDown?: ((e: KeyDownEvent) => void); - onRowClick?: ((e: RowClickEvent) => void) | undefined; + onRowClick?: ((e: RowClickEvent) => void); onRowCollapsed?: ((e: RowCollapsedEvent) => void); onRowCollapsing?: ((e: RowCollapsingEvent) => void); - onRowDblClick?: ((e: RowDblClickEvent) => void) | undefined; + onRowDblClick?: ((e: RowDblClickEvent) => void); onRowExpanded?: ((e: RowExpandedEvent) => void); onRowExpanding?: ((e: RowExpandingEvent) => void); onRowInserted?: ((e: RowInsertedEvent) => void); onRowInserting?: ((e: RowInsertingEvent) => void); - onRowPrepared?: ((e: RowPreparedEvent) => void) | undefined; + onRowPrepared?: ((e: RowPreparedEvent) => void); onRowRemoved?: ((e: RowRemovedEvent) => void); onRowRemoving?: ((e: RowRemovingEvent) => void); onRowUpdated?: ((e: RowUpdatedEvent) => void); @@ -1220,8 +1220,8 @@ type IEditingProps = React.PropsWithChildren<{ allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean); changes?: Array; confirmDelete?: boolean; - editColumnName?: null | string; - editRowKey?: any | null; + editColumnName?: string | undefined; + editRowKey?: any | undefined; form?: dxFormOptions; mode?: GridsEditMode; newRowPosition?: NewRowPosition; @@ -1245,10 +1245,10 @@ type IEditingProps = React.PropsWithChildren<{ useIcons?: boolean; defaultChanges?: Array; onChangesChange?: (value: Array) => void; - defaultEditColumnName?: null | string; - onEditColumnNameChange?: (value: null | string) => void; - defaultEditRowKey?: any | null; - onEditRowKeyChange?: (value: any | null) => void; + defaultEditColumnName?: string | undefined; + onEditColumnNameChange?: (value: string | undefined) => void; + defaultEditRowKey?: any | undefined; + onEditRowKeyChange?: (value: any | undefined) => void; }> const _componentEditing = (props: IEditingProps) => { return React.createElement(NestedOption, { @@ -3382,7 +3382,7 @@ type IStateStoringProps = React.PropsWithChildren<{ customSave?: ((gridState: any) => void); enabled?: boolean; savingTimeout?: number; - storageKey?: null | string; + storageKey?: string | undefined; type?: StateStoreType; }> const _componentStateStoring = (props: IStateStoringProps) => { diff --git a/packages/devextreme-react/src/tree-list.ts b/packages/devextreme-react/src/tree-list.ts index 7f99c1ac740c..25acb626d9eb 100644 --- a/packages/devextreme-react/src/tree-list.ts +++ b/packages/devextreme-react/src/tree-list.ts @@ -48,34 +48,34 @@ type ReplaceFieldTypes = { type ITreeListOptionsNarrowedEvents = { onAdaptiveDetailRowPreparing?: ((e: AdaptiveDetailRowPreparingEvent) => void); onAIAssistantRequestCreating?: ((e: AIAssistantRequestCreatingEvent) => void); - onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void) | undefined; - onCellClick?: ((e: CellClickEvent) => void) | undefined; - onCellDblClick?: ((e: CellDblClickEvent) => void) | undefined; - onCellPrepared?: ((e: CellPreparedEvent) => void) | undefined; + onAIColumnRequestCreating?: ((e: AIColumnRequestCreatingEvent) => void); + onCellClick?: ((e: CellClickEvent) => void); + onCellDblClick?: ((e: CellDblClickEvent) => void); + onCellPrepared?: ((e: CellPreparedEvent) => void); onContentReady?: ((e: ContentReadyEvent) => void); - onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void) | undefined; + onContextMenuPreparing?: ((e: ContextMenuPreparingEvent) => void); onDataErrorOccurred?: ((e: DataErrorOccurredEvent) => void); onDisposing?: ((e: DisposingEvent) => void); onEditCanceled?: ((e: EditCanceledEvent) => void); onEditCanceling?: ((e: EditCancelingEvent) => void); - onEditingStart?: ((e: EditingStartEvent) => void) | undefined; - onEditorPrepared?: ((e: EditorPreparedEvent) => void) | undefined; - onEditorPreparing?: ((e: EditorPreparingEvent) => void) | undefined; - onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void) | undefined; - onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void) | undefined; + onEditingStart?: ((e: EditingStartEvent) => void); + onEditorPrepared?: ((e: EditorPreparedEvent) => void); + onEditorPreparing?: ((e: EditorPreparingEvent) => void); + onFocusedCellChanging?: ((e: FocusedCellChangingEvent) => void); + onFocusedRowChanging?: ((e: FocusedRowChangingEvent) => void); onInitialized?: ((e: InitializedEvent) => void); onInitNewRow?: ((e: InitNewRowEvent) => void); onKeyDown?: ((e: KeyDownEvent) => void); - onNodesInitialized?: ((e: NodesInitializedEvent) => void) | undefined; - onRowClick?: ((e: RowClickEvent) => void) | undefined; + onNodesInitialized?: ((e: NodesInitializedEvent) => void); + onRowClick?: ((e: RowClickEvent) => void); onRowCollapsed?: ((e: RowCollapsedEvent) => void); onRowCollapsing?: ((e: RowCollapsingEvent) => void); - onRowDblClick?: ((e: RowDblClickEvent) => void) | undefined; + onRowDblClick?: ((e: RowDblClickEvent) => void); onRowExpanded?: ((e: RowExpandedEvent) => void); onRowExpanding?: ((e: RowExpandingEvent) => void); onRowInserted?: ((e: RowInsertedEvent) => void); onRowInserting?: ((e: RowInsertingEvent) => void); - onRowPrepared?: ((e: RowPreparedEvent) => void) | undefined; + onRowPrepared?: ((e: RowPreparedEvent) => void); onRowRemoved?: ((e: RowRemovedEvent) => void); onRowRemoving?: ((e: RowRemovingEvent) => void); onRowUpdated?: ((e: RowUpdatedEvent) => void); @@ -1037,8 +1037,8 @@ type IEditingProps = React.PropsWithChildren<{ allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean); changes?: Array; confirmDelete?: boolean; - editColumnName?: null | string; - editRowKey?: any | null; + editColumnName?: string | undefined; + editRowKey?: any | undefined; form?: dxFormOptions; mode?: GridsEditMode; popup?: dxPopupOptions; @@ -1062,10 +1062,10 @@ type IEditingProps = React.PropsWithChildren<{ useIcons?: boolean; defaultChanges?: Array; onChangesChange?: (value: Array) => void; - defaultEditColumnName?: null | string; - onEditColumnNameChange?: (value: null | string) => void; - defaultEditRowKey?: any | null; - onEditRowKeyChange?: (value: any | null) => void; + defaultEditColumnName?: string | undefined; + onEditColumnNameChange?: (value: string | undefined) => void; + defaultEditRowKey?: any | undefined; + onEditRowKeyChange?: (value: any | undefined) => void; }> const _componentEditing = (props: IEditingProps) => { return React.createElement(NestedOption, { @@ -2986,7 +2986,7 @@ type IStateStoringProps = React.PropsWithChildren<{ customSave?: ((gridState: any) => void); enabled?: boolean; savingTimeout?: number; - storageKey?: null | string; + storageKey?: string | undefined; type?: StateStoreType; }> const _componentStateStoring = (props: IStateStoringProps) => { diff --git a/packages/devextreme-vue/src/data-grid.ts b/packages/devextreme-vue/src/data-grid.ts index 1ff3df6eecb8..7eb39a9740a6 100644 --- a/packages/devextreme-vue/src/data-grid.ts +++ b/packages/devextreme-vue/src/data-grid.ts @@ -423,7 +423,7 @@ const componentConfig = { columnWidth: [String, Number] as PropType, customizeColumns: Function as PropType<((columns: Array) => void)>, dataRowTemplate: {}, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | Store | string | Record>, dateSerializationFormat: String, disabled: Boolean, editing: Object as PropType>, @@ -1793,7 +1793,7 @@ const DxEditingConfig = { allowUpdating: [Boolean, Function] as PropType boolean))>, changes: Array as PropType>, confirmDelete: Boolean, - editColumnName: String as PropType, + editColumnName: String, editRowKey: {}, form: Object as PropType>, mode: String as PropType, @@ -4113,7 +4113,7 @@ const DxStateStoringConfig = { customSave: Function as PropType<((gridState: any) => void)>, enabled: Boolean, savingTimeout: Number, - storageKey: String as PropType, + storageKey: String, type: String as PropType } }; diff --git a/packages/devextreme-vue/src/tree-list.ts b/packages/devextreme-vue/src/tree-list.ts index 402c9d022597..a6abed1aea26 100644 --- a/packages/devextreme-vue/src/tree-list.ts +++ b/packages/devextreme-vue/src/tree-list.ts @@ -418,7 +418,7 @@ const componentConfig = { columns: Array as PropType>, columnWidth: [String, Number] as PropType, customizeColumns: Function as PropType<((columns: Array) => void)>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | Store | string | Record>, dataStructure: String as PropType, dateSerializationFormat: String, disabled: Boolean, @@ -1617,7 +1617,7 @@ const DxEditingConfig = { allowUpdating: [Boolean, Function] as PropType boolean))>, changes: Array as PropType>, confirmDelete: Boolean, - editColumnName: String as PropType, + editColumnName: String, editRowKey: {}, form: Object as PropType>, mode: String as PropType, @@ -3719,7 +3719,7 @@ const DxStateStoringConfig = { customSave: Function as PropType<((gridState: any) => void)>, enabled: Boolean, savingTimeout: Number, - storageKey: String as PropType, + storageKey: String, type: String as PropType } }; diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 6b83ea5f10c4..d915f281adee 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -5368,11 +5368,11 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.editing.editColumnName] */ - editColumnName?: string | null; + editColumnName?: string | undefined; /** * [descr:GridBaseOptions.editing.editRowKey] */ - editRowKey?: TKey | null; + editRowKey?: TKey | undefined; /** * [descr:GridBaseOptions.editing.form] */ @@ -6012,7 +6012,7 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.dataSource] */ - dataSource?: DevExpress.data.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | undefined; /** * [descr:GridBaseOptions.dateSerializationFormat] */ @@ -6088,208 +6088,162 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.onAIAssistantRequestCreating] */ - onAIAssistantRequestCreating?: - | (( - e: DevExpress.common.core.events.EventInfo & - DevExpress.common.core.events.Cancelable & - AIAssistantRequestCreatingInfo - ) => void) - | undefined; + onAIAssistantRequestCreating?: ( + e: DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.Cancelable & + AIAssistantRequestCreatingInfo + ) => void; /** * [descr:GridBaseOptions.onAdaptiveDetailRowPreparing] */ - onAdaptiveDetailRowPreparing?: - | (( - e: DevExpress.common.core.events.EventInfo & - AdaptiveDetailRowPreparingInfo - ) => void) - | undefined; + onAdaptiveDetailRowPreparing?: ( + e: DevExpress.common.core.events.EventInfo & + AdaptiveDetailRowPreparingInfo + ) => void; /** * [descr:GridBaseOptions.onDataErrorOccurred] */ - onDataErrorOccurred?: - | (( - e: DevExpress.common.core.events.EventInfo & - DataErrorOccurredInfo - ) => void) - | undefined; + onDataErrorOccurred?: ( + e: DevExpress.common.core.events.EventInfo & + DataErrorOccurredInfo + ) => void; /** * [descr:GridBaseOptions.onEditCanceled] */ - onEditCanceled?: - | (( - e: DevExpress.common.core.events.EventInfo & - DataChangeInfo - ) => void) - | undefined; + onEditCanceled?: ( + e: DevExpress.common.core.events.EventInfo & + DataChangeInfo + ) => void; /** * [descr:GridBaseOptions.onEditCanceling] */ - onEditCanceling?: - | (( - e: DevExpress.common.core.events.Cancelable & - DevExpress.common.core.events.EventInfo & - DataChangeInfo - ) => void) - | undefined; + onEditCanceling?: ( + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & + DataChangeInfo + ) => void; /** * [descr:GridBaseOptions.onInitNewRow] */ - onInitNewRow?: - | (( - e: DevExpress.common.core.events.EventInfo & - NewRowInfo - ) => void) - | undefined; + onInitNewRow?: ( + e: DevExpress.common.core.events.EventInfo & + NewRowInfo + ) => void; /** * [descr:GridBaseOptions.onKeyDown] */ - onKeyDown?: - | (( - e: DevExpress.common.core.events.NativeEventInfo< - TComponent, - KeyboardEvent - > & - KeyDownInfo - ) => void) - | undefined; + onKeyDown?: ( + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + KeyboardEvent + > & + KeyDownInfo + ) => void; /** * [descr:GridBaseOptions.onRowCollapsed] */ - onRowCollapsed?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowKeyInfo - ) => void) - | undefined; + onRowCollapsed?: ( + e: DevExpress.common.core.events.EventInfo & RowKeyInfo + ) => void; /** * [descr:GridBaseOptions.onRowCollapsing] */ - onRowCollapsing?: - | (( - e: DevExpress.common.core.events.Cancelable & - DevExpress.common.core.events.EventInfo & - RowKeyInfo - ) => void) - | undefined; + onRowCollapsing?: ( + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & + RowKeyInfo + ) => void; /** * [descr:GridBaseOptions.onRowExpanded] */ - onRowExpanded?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowKeyInfo - ) => void) - | undefined; + onRowExpanded?: ( + e: DevExpress.common.core.events.EventInfo & RowKeyInfo + ) => void; /** * [descr:GridBaseOptions.onRowExpanding] */ - onRowExpanding?: - | (( - e: DevExpress.common.core.events.Cancelable & - DevExpress.common.core.events.EventInfo & - RowKeyInfo - ) => void) - | undefined; + onRowExpanding?: ( + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & + RowKeyInfo + ) => void; /** * [descr:GridBaseOptions.onRowInserted] */ - onRowInserted?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowInsertedInfo - ) => void) - | undefined; + onRowInserted?: ( + e: DevExpress.common.core.events.EventInfo & + RowInsertedInfo + ) => void; /** * [descr:GridBaseOptions.onRowInserting] */ - onRowInserting?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowInsertingInfo - ) => void) - | undefined; + onRowInserting?: ( + e: DevExpress.common.core.events.EventInfo & + RowInsertingInfo + ) => void; /** * [descr:GridBaseOptions.onRowRemoved] */ - onRowRemoved?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowRemovedInfo - ) => void) - | undefined; + onRowRemoved?: ( + e: DevExpress.common.core.events.EventInfo & + RowRemovedInfo + ) => void; /** * [descr:GridBaseOptions.onRowRemoving] */ - onRowRemoving?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowRemovingInfo - ) => void) - | undefined; + onRowRemoving?: ( + e: DevExpress.common.core.events.EventInfo & + RowRemovingInfo + ) => void; /** * [descr:GridBaseOptions.onRowUpdated] */ - onRowUpdated?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowUpdatedInfo - ) => void) - | undefined; + onRowUpdated?: ( + e: DevExpress.common.core.events.EventInfo & + RowUpdatedInfo + ) => void; /** * [descr:GridBaseOptions.onRowUpdating] */ - onRowUpdating?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowUpdatingInfo - ) => void) - | undefined; + onRowUpdating?: ( + e: DevExpress.common.core.events.EventInfo & + RowUpdatingInfo + ) => void; /** * [descr:GridBaseOptions.onRowValidating] */ - onRowValidating?: - | (( - e: DevExpress.common.core.events.EventInfo & - RowValidatingInfo - ) => void) - | undefined; + onRowValidating?: ( + e: DevExpress.common.core.events.EventInfo & + RowValidatingInfo + ) => void; /** * [descr:GridBaseOptions.onSaved] */ - onSaved?: - | (( - e: DevExpress.common.core.events.EventInfo & - DataChangeInfo - ) => void) - | undefined; + onSaved?: ( + e: DevExpress.common.core.events.EventInfo & + DataChangeInfo + ) => void; /** * [descr:GridBaseOptions.onSaving] */ - onSaving?: - | (( - e: DevExpress.common.core.events.EventInfo & - SavingInfo - ) => void) - | undefined; + onSaving?: ( + e: DevExpress.common.core.events.EventInfo & + SavingInfo + ) => void; /** * [descr:GridBaseOptions.onSelectionChanged] */ - onSelectionChanged?: - | (( - e: DevExpress.common.core.events.EventInfo & - SelectionChangedInfo - ) => void) - | undefined; + onSelectionChanged?: ( + e: DevExpress.common.core.events.EventInfo & + SelectionChangedInfo + ) => void; /** * [descr:GridBaseOptions.onToolbarPreparing] */ - onToolbarPreparing?: - | (( - e: DevExpress.common.core.events.EventInfo & - ToolbarPreparingInfo - ) => void) - | undefined; + onToolbarPreparing?: ( + e: DevExpress.common.core.events.EventInfo & + ToolbarPreparingInfo + ) => void; /** * [descr:GridBaseOptions.pager] */ @@ -7214,7 +7168,7 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.stateStoring.storageKey] */ - storageKey?: string | null; + storageKey?: string | undefined; /** * [descr:GridBaseOptions.stateStoring.type] */ @@ -11203,12 +11157,10 @@ declare module DevExpress.ui { /** * [descr:dxCardViewOptions.onDataErrorOccurred] */ - onDataErrorOccurred?: - | (( - e: DevExpress.common.core.events.EventInfo & - DevExpress.common.grids.DataErrorOccurredInfo - ) => void) - | undefined; + onDataErrorOccurred?: ( + e: DevExpress.common.core.events.EventInfo & + DevExpress.common.grids.DataErrorOccurredInfo + ) => void; /** * [descr:dxCardViewOptions.pager] @@ -14616,121 +14568,99 @@ declare module DevExpress.ui { /** * [descr:dxDataGridOptions.onCellClick] */ - onCellClick?: - | ((e: DevExpress.ui.dxDataGrid.CellClickEvent) => void) - | undefined; + onCellClick?: ( + e: DevExpress.ui.dxDataGrid.CellClickEvent + ) => void; /** * [descr:dxDataGridOptions.onCellDblClick] */ - onCellDblClick?: - | (( - e: DevExpress.ui.dxDataGrid.CellDblClickEvent - ) => void) - | undefined; + onCellDblClick?: ( + e: DevExpress.ui.dxDataGrid.CellDblClickEvent + ) => void; /** * [descr:dxDataGridOptions.onCellHoverChanged] */ - onCellHoverChanged?: - | (( - e: DevExpress.ui.dxDataGrid.CellHoverChangedEvent - ) => void) - | undefined; + onCellHoverChanged?: ( + e: DevExpress.ui.dxDataGrid.CellHoverChangedEvent + ) => void; /** * [descr:dxDataGridOptions.onCellPrepared] */ - onCellPrepared?: - | (( - e: DevExpress.ui.dxDataGrid.CellPreparedEvent - ) => void) - | undefined; + onCellPrepared?: ( + e: DevExpress.ui.dxDataGrid.CellPreparedEvent + ) => void; /** * [descr:dxDataGridOptions.onContextMenuPreparing] */ - onContextMenuPreparing?: - | (( - e: DevExpress.ui.dxDataGrid.ContextMenuPreparingEvent - ) => void) - | undefined; + onContextMenuPreparing?: ( + e: DevExpress.ui.dxDataGrid.ContextMenuPreparingEvent + ) => void; /** * [descr:dxDataGridOptions.onEditingStart] */ - onEditingStart?: - | (( - e: DevExpress.ui.dxDataGrid.EditingStartEvent - ) => void) - | undefined; + onEditingStart?: ( + e: DevExpress.ui.dxDataGrid.EditingStartEvent + ) => void; /** * [descr:dxDataGridOptions.onEditorPrepared] */ - onEditorPrepared?: - | (( - options: DevExpress.ui.dxDataGrid.EditorPreparedEvent - ) => void) - | undefined; + onEditorPrepared?: ( + options: DevExpress.ui.dxDataGrid.EditorPreparedEvent + ) => void; /** * [descr:dxDataGridOptions.onEditorPreparing] */ - onEditorPreparing?: - | (( - e: DevExpress.ui.dxDataGrid.EditorPreparingEvent - ) => void) - | undefined; + onEditorPreparing?: ( + e: DevExpress.ui.dxDataGrid.EditorPreparingEvent + ) => void; /** * [descr:dxDataGridOptions.onExporting] */ - onExporting?: - | ((e: DevExpress.ui.dxDataGrid.ExportingEvent) => void) - | undefined; + onExporting?: ( + e: DevExpress.ui.dxDataGrid.ExportingEvent + ) => void; /** * [descr:dxDataGridOptions.onFocusedCellChanged] */ - onFocusedCellChanged?: - | (( - e: DevExpress.ui.dxDataGrid.FocusedCellChangedEvent - ) => void) - | undefined; + onFocusedCellChanged?: ( + e: DevExpress.ui.dxDataGrid.FocusedCellChangedEvent + ) => void; /** * [descr:dxDataGridOptions.onFocusedCellChanging] */ - onFocusedCellChanging?: - | (( - e: DevExpress.ui.dxDataGrid.FocusedCellChangingEvent - ) => void) - | undefined; + onFocusedCellChanging?: ( + e: DevExpress.ui.dxDataGrid.FocusedCellChangingEvent + ) => void; /** * [descr:dxDataGridOptions.onFocusedRowChanged] */ - onFocusedRowChanged?: - | (( - e: DevExpress.ui.dxDataGrid.FocusedRowChangedEvent - ) => void) - | undefined; + onFocusedRowChanged?: ( + e: DevExpress.ui.dxDataGrid.FocusedRowChangedEvent + ) => void; /** * [descr:dxDataGridOptions.onFocusedRowChanging] */ - onFocusedRowChanging?: - | (( - e: DevExpress.ui.dxDataGrid.FocusedRowChangingEvent - ) => void) - | undefined; + onFocusedRowChanging?: ( + e: DevExpress.ui.dxDataGrid.FocusedRowChangingEvent + ) => void; /** * [descr:dxDataGridOptions.onRowClick] */ - onRowClick?: - | ((e: DevExpress.ui.dxDataGrid.RowClickEvent) => void) - | undefined; + onRowClick?: ( + e: DevExpress.ui.dxDataGrid.RowClickEvent + ) => void; /** * [descr:dxDataGridOptions.onRowDblClick] */ - onRowDblClick?: - | ((e: DevExpress.ui.dxDataGrid.RowDblClickEvent) => void) - | undefined; + onRowDblClick?: ( + e: DevExpress.ui.dxDataGrid.RowDblClickEvent + ) => void; /** * [descr:dxDataGridOptions.onRowPrepared] */ - onRowPrepared?: - | ((e: DevExpress.ui.dxDataGrid.RowPreparedEvent) => void) - | undefined; + onRowPrepared?: ( + e: DevExpress.ui.dxDataGrid.RowPreparedEvent + ) => void; /** * [descr:dxDataGridOptions.remoteOperations] */ @@ -14811,9 +14741,9 @@ declare module DevExpress.ui { /** * [descr:dxDataGridOptions.onAIColumnRequestCreating] */ - onAIColumnRequestCreating?: - | ((e: DevExpress.ui.dxDataGrid.AIColumnRequestCreatingEvent) => void) - | undefined; + onAIColumnRequestCreating?: ( + e: DevExpress.ui.dxDataGrid.AIColumnRequestCreatingEvent + ) => void; }; /** * @deprecated Use DevExpress.ui.dxDataGrid.Row instead @@ -32575,123 +32505,99 @@ declare module DevExpress.ui { /** * [descr:dxTreeListOptions.onCellClick] */ - onCellClick?: - | ((e: DevExpress.ui.dxTreeList.CellClickEvent) => void) - | undefined; + onCellClick?: ( + e: DevExpress.ui.dxTreeList.CellClickEvent + ) => void; /** * [descr:dxTreeListOptions.onCellDblClick] */ - onCellDblClick?: - | (( - e: DevExpress.ui.dxTreeList.CellDblClickEvent - ) => void) - | undefined; + onCellDblClick?: ( + e: DevExpress.ui.dxTreeList.CellDblClickEvent + ) => void; /** * [descr:dxTreeListOptions.onCellHoverChanged] */ - onCellHoverChanged?: - | (( - e: DevExpress.ui.dxTreeList.CellHoverChangedEvent - ) => void) - | undefined; + onCellHoverChanged?: ( + e: DevExpress.ui.dxTreeList.CellHoverChangedEvent + ) => void; /** * [descr:dxTreeListOptions.onCellPrepared] */ - onCellPrepared?: - | (( - e: DevExpress.ui.dxTreeList.CellPreparedEvent - ) => void) - | undefined; + onCellPrepared?: ( + e: DevExpress.ui.dxTreeList.CellPreparedEvent + ) => void; /** * [descr:dxTreeListOptions.onContextMenuPreparing] */ - onContextMenuPreparing?: - | (( - e: DevExpress.ui.dxTreeList.ContextMenuPreparingEvent - ) => void) - | undefined; + onContextMenuPreparing?: ( + e: DevExpress.ui.dxTreeList.ContextMenuPreparingEvent + ) => void; /** * [descr:dxTreeListOptions.onEditingStart] */ - onEditingStart?: - | (( - e: DevExpress.ui.dxTreeList.EditingStartEvent - ) => void) - | undefined; + onEditingStart?: ( + e: DevExpress.ui.dxTreeList.EditingStartEvent + ) => void; /** * [descr:dxTreeListOptions.onEditorPrepared] */ - onEditorPrepared?: - | (( - options: DevExpress.ui.dxTreeList.EditorPreparedEvent - ) => void) - | undefined; + onEditorPrepared?: ( + options: DevExpress.ui.dxTreeList.EditorPreparedEvent + ) => void; /** * [descr:dxTreeListOptions.onEditorPreparing] */ - onEditorPreparing?: - | (( - e: DevExpress.ui.dxTreeList.EditorPreparingEvent - ) => void) - | undefined; + onEditorPreparing?: ( + e: DevExpress.ui.dxTreeList.EditorPreparingEvent + ) => void; /** * [descr:dxTreeListOptions.onFocusedCellChanged] */ - onFocusedCellChanged?: - | (( - e: DevExpress.ui.dxTreeList.FocusedCellChangedEvent - ) => void) - | undefined; + onFocusedCellChanged?: ( + e: DevExpress.ui.dxTreeList.FocusedCellChangedEvent + ) => void; /** * [descr:dxTreeListOptions.onFocusedCellChanging] */ - onFocusedCellChanging?: - | (( - e: DevExpress.ui.dxTreeList.FocusedCellChangingEvent - ) => void) - | undefined; + onFocusedCellChanging?: ( + e: DevExpress.ui.dxTreeList.FocusedCellChangingEvent + ) => void; /** * [descr:dxTreeListOptions.onFocusedRowChanged] */ - onFocusedRowChanged?: - | (( - e: DevExpress.ui.dxTreeList.FocusedRowChangedEvent - ) => void) - | undefined; + onFocusedRowChanged?: ( + e: DevExpress.ui.dxTreeList.FocusedRowChangedEvent + ) => void; /** * [descr:dxTreeListOptions.onFocusedRowChanging] */ - onFocusedRowChanging?: - | (( - e: DevExpress.ui.dxTreeList.FocusedRowChangingEvent - ) => void) - | undefined; + onFocusedRowChanging?: ( + e: DevExpress.ui.dxTreeList.FocusedRowChangingEvent + ) => void; /** * [descr:dxTreeListOptions.onNodesInitialized] */ - onNodesInitialized?: - | (( - e: DevExpress.ui.dxTreeList.NodesInitializedEvent - ) => void) - | undefined; + onNodesInitialized?: ( + e: DevExpress.ui.dxTreeList.NodesInitializedEvent + ) => void; /** * [descr:dxTreeListOptions.onRowClick] */ - onRowClick?: - | ((e: DevExpress.ui.dxTreeList.RowClickEvent) => void) - | undefined; + onRowClick?: ( + e: DevExpress.ui.dxTreeList.RowClickEvent + ) => void; /** * [descr:dxTreeListOptions.onRowDblClick] */ - onRowDblClick?: - | ((e: DevExpress.ui.dxTreeList.RowDblClickEvent) => void) - | undefined; + onRowDblClick?: ( + e: DevExpress.ui.dxTreeList.RowDblClickEvent + ) => void; /** * [descr:dxTreeListOptions.onRowPrepared] */ - onRowPrepared?: - | ((e: DevExpress.ui.dxTreeList.RowPreparedEvent) => void) - | undefined; + onRowPrepared?: ( + e: DevExpress.ui.dxTreeList.RowPreparedEvent + ) => void; /** * [descr:dxTreeListOptions.paging] */ @@ -32740,9 +32646,9 @@ declare module DevExpress.ui { /** * [descr:dxTreeListOptions.onAIColumnRequestCreating] */ - onAIColumnRequestCreating?: - | ((e: DevExpress.ui.dxTreeList.AIColumnRequestCreatingEvent) => void) - | undefined; + onAIColumnRequestCreating?: ( + e: DevExpress.ui.dxTreeList.AIColumnRequestCreatingEvent + ) => void; }; /** * @deprecated Use DevExpress.ui.dxTreeList.Row instead @@ -34481,27 +34387,27 @@ declare module DevExpress.ui.dxCardView { /** * [descr:HeaderPanel.dragging.onDragChange] */ - onDragChange?: ((e: any) => void) | undefined; + onDragChange?: (e: any) => void; /** * [descr:HeaderPanel.dragging.onDragEnd] */ - onDragEnd?: ((e: any) => void) | undefined; + onDragEnd?: (e: any) => void; /** * [descr:HeaderPanel.dragging.onDragMove] */ - onDragMove?: ((e: any) => void) | undefined; + onDragMove?: (e: any) => void; /** * [descr:HeaderPanel.dragging.onDragStart] */ - onDragStart?: ((e: any) => void) | undefined; + onDragStart?: (e: any) => void; /** * [descr:HeaderPanel.dragging.onRemove] */ - onRemove?: ((e: any) => void) | undefined; + onRemove?: (e: any) => void; /** * [descr:HeaderPanel.dragging.onReorder] */ - onReorder?: ((e: any) => void) | undefined; + onReorder?: (e: any) => void; }; /** * [descr:HeaderPanel.visible] From 8a0a49d3af3ec39f34928d7cf0af6361cf6961a4 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Thu, 2 Jul 2026 19:01:34 +0600 Subject: [PATCH 12/12] fix qunit test --- .../DevExpress.ui.widgets.dataGrid/editing.integration.tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js index b2cd2e555d08..8949d47315b5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js @@ -7203,7 +7203,7 @@ QUnit.module('Editing state', baseModuleConfig, () => { // assert assert.deepEqual(dataGrid.option('editing.changes'), [], 'change are empty'); - assert.deepEqual(dataGrid.option('editing.editRowKey'), null, 'editRowKey is empty'); + assert.deepEqual(dataGrid.option('editing.editRowKey'), undefined, 'editRowKey is empty'); });