Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/devextreme-angular/src/ui/card-view/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,10 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen


@Input()
get dataSource(): Array<any> | DataSource | DataSourceOptions | Store | string {
get dataSource(): Array<any> | DataSource | DataSourceOptions | Store | string | undefined {
return this._getOption('dataSource');
}
set dataSource(value: Array<any> | DataSource | DataSourceOptions | Store | string) {
set dataSource(value: Array<any> | DataSource | DataSourceOptions | Store | string | undefined) {
this._setOption('dataSource', value);
}

Expand Down Expand Up @@ -479,10 +479,10 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen


@Input()
get keyExpr(): Array<string> | string {
get keyExpr(): Array<string> | string | undefined {
return this._getOption('keyExpr');
}
set keyExpr(value: Array<string> | string) {
set keyExpr(value: Array<string> | string | undefined) {
this._setOption('keyExpr', value);
}

Expand Down Expand Up @@ -992,7 +992,7 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() dataSourceChange: EventEmitter<Array<any> | DataSource | DataSourceOptions | Store | string>;
@Output() dataSourceChange: EventEmitter<Array<any> | DataSource | DataSourceOptions | Store | string | undefined>;

/**

Expand Down Expand Up @@ -1104,7 +1104,7 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() keyExprChange: EventEmitter<Array<string> | string>;
@Output() keyExprChange: EventEmitter<Array<string> | string | undefined>;

/**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down
18 changes: 9 additions & 9 deletions packages/devextreme-angular/src/ui/data-grid/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,10 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent

*/
@Input()
get dataSource(): Array<any> | DataSource | DataSourceOptions | null | Store | string {
get dataSource(): Array<any> | DataSource | DataSourceOptions | Store | string | undefined {
return this._getOption('dataSource');
}
set dataSource(value: Array<any> | DataSource | DataSourceOptions | null | Store | string) {
set dataSource(value: Array<any> | DataSource | DataSourceOptions | Store | string | undefined) {
this._setOption('dataSource', value);
Comment thread
Tucchhaa marked this conversation as resolved.
}

Expand Down Expand Up @@ -609,10 +609,10 @@ export class DxDataGridComponent<TRowData = any, TKey = any> 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<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, 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<DataChange>, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, 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<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, 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<DataChange>, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, 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);
}

Expand Down Expand Up @@ -1209,10 +1209,10 @@ export class DxDataGridComponent<TRowData = any, TKey = any> 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?: string | undefined, 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?: string | undefined, type?: StateStoreType }) {
this._setOption('stateStoring', value);
}

Expand Down Expand Up @@ -1802,7 +1802,7 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() dataSourceChange: EventEmitter<Array<any> | DataSource | DataSourceOptions | null | Store | string>;
@Output() dataSourceChange: EventEmitter<Array<any> | DataSource | DataSourceOptions | Store | string | undefined>;

/**

Expand All @@ -1823,7 +1823,7 @@ export class DxDataGridComponent<TRowData = any, TKey = any> 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<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, 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<DataChange>, confirmDelete?: boolean, editColumnName?: string | undefined, editRowKey?: any | undefined, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, 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 }>;

/**

Expand Down Expand Up @@ -2145,7 +2145,7 @@ export class DxDataGridComponent<TRowData = any, TKey = any> 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?: string | undefined, type?: StateStoreType }>;

/**

Expand Down
12 changes: 6 additions & 6 deletions packages/devextreme-angular/src/ui/data-grid/nested/editing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,18 @@ export class DxoDataGridEditingComponent extends NestedOption implements OnDestr
}

@Input()
get editColumnName(): string {
get editColumnName(): string | undefined {
return this._getOption('editColumnName');
}
set editColumnName(value: string) {
set editColumnName(value: string | undefined) {
this._setOption('editColumnName', value);
}

@Input()
get editRowKey(): any {
get editRowKey(): any | undefined {
return this._getOption('editRowKey');
}
set editRowKey(value: any) {
set editRowKey(value: any | undefined) {
this._setOption('editRowKey', value);
}

Expand Down Expand Up @@ -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<string>;
@Output() editColumnNameChange: EventEmitter<string | undefined>;

/**

* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() editRowKeyChange: EventEmitter<any>;
@Output() editRowKeyChange: EventEmitter<any | undefined>;
protected get _optionPath() {
return 'editing';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ export class DxoDataGridStateStoringComponent extends NestedOption implements On
}

@Input()
get storageKey(): string {
get storageKey(): string | undefined {
return this._getOption('storageKey');
}
set storageKey(value: string) {
set storageKey(value: string | undefined) {
this._setOption('storageKey', value);
}

Expand Down
28 changes: 14 additions & 14 deletions packages/devextreme-angular/src/ui/list/nested/item-dragging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand Down
12 changes: 6 additions & 6 deletions packages/devextreme-angular/src/ui/nested/editing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,18 @@ export class DxoEditingComponent extends NestedOption implements OnDestroy, OnIn
}

@Input()
get editColumnName(): string {
get editColumnName(): string | undefined {
return this._getOption('editColumnName');
}
set editColumnName(value: string) {
set editColumnName(value: string | undefined) {
this._setOption('editColumnName', value);
}

@Input()
get editRowKey(): any {
get editRowKey(): any | undefined {
return this._getOption('editRowKey');
}
set editRowKey(value: any) {
set editRowKey(value: any | undefined) {
this._setOption('editRowKey', value);
}

Expand Down Expand Up @@ -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<string>;
@Output() editColumnNameChange: EventEmitter<string | undefined>;

/**

* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() editRowKeyChange: EventEmitter<any>;
@Output() editRowKeyChange: EventEmitter<any | undefined>;
protected get _optionPath() {
return 'editing';
}
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/nested/state-storing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ export class DxoStateStoringComponent extends NestedOption implements OnDestroy,
}

@Input()
get storageKey(): string {
get storageKey(): string | undefined {
return this._getOption('storageKey');
}
set storageKey(value: string) {
set storageKey(value: string | undefined) {
this._setOption('storageKey', value);
}

Expand Down
Loading
Loading