Skip to content
Draft
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
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/accordion/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,10 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i

*/
@Input()
get keyExpr(): Function | string {
get keyExpr(): ((item: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((item: any) => any) | string) {
this._setOption('keyExpr', value);
}

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

*/
@Output() keyExprChange: EventEmitter<Function | string>;
@Output() keyExprChange: EventEmitter<((item: any) => any) | string>;

/**

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/button-group/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On

*/
@Input()
get keyExpr(): Function | string {
get keyExpr(): ((item: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((item: any) => any) | string) {
this._setOption('keyExpr', value);
}

Expand Down Expand Up @@ -441,7 +441,7 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() keyExprChange: EventEmitter<Function | string>;
@Output() keyExprChange: EventEmitter<((item: any) => any) | string>;

/**

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

@Input()
get keyExpr(): Function | string {
get keyExpr(): ((item: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((item: any) => any) | string) {
this._setOption('keyExpr', value);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/chat/nested/suggestions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ export class DxoChatSuggestionsComponent extends NestedOption implements OnDestr
}

@Input()
get keyExpr(): Function | string {
get keyExpr(): ((item: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((item: any) => any) | string) {
this._setOption('keyExpr', value);
}

Expand Down
18 changes: 9 additions & 9 deletions packages/devextreme-angular/src/ui/context-menu/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent

*/
@Input()
get disabledExpr(): Function | string {
get disabledExpr(): ((item: any) => any) | string {
return this._getOption('disabledExpr');
}
set disabledExpr(value: Function | string) {
set disabledExpr(value: ((item: any) => any) | string) {
this._setOption('disabledExpr', value);
}

Expand Down Expand Up @@ -305,10 +305,10 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent

*/
@Input()
get itemsExpr(): Function | string {
get itemsExpr(): ((item: any, value: any) => any) | string {
return this._getOption('itemsExpr');
}
set itemsExpr(value: Function | string) {
set itemsExpr(value: ((item: any, value: any) => any) | string) {
this._setOption('itemsExpr', value);
}

Expand Down Expand Up @@ -370,10 +370,10 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent

*/
@Input()
get selectedExpr(): Function | string {
get selectedExpr(): ((item: any) => any) | string {
return this._getOption('selectedExpr');
}
set selectedExpr(value: Function | string) {
set selectedExpr(value: ((item: any) => any) | string) {
this._setOption('selectedExpr', value);
}

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

*/
@Output() disabledExprChange: EventEmitter<Function | string>;
@Output() disabledExprChange: EventEmitter<((item: any) => any) | string>;

/**

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

*/
@Output() itemsExprChange: EventEmitter<Function | string>;
@Output() itemsExprChange: EventEmitter<((item: any, value: any) => any) | string>;

/**

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

*/
@Output() selectedExprChange: EventEmitter<Function | string>;
@Output() selectedExprChange: EventEmitter<((item: any) => any) | string>;

/**

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

@Input()
get keyExpr(): Function | string {
get keyExpr(): ((item: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((item: any) => any) | string) {
this._setOption('keyExpr', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ export class DxoFormTabPanelOptionsComponent extends NestedOption implements OnD
}

@Input()
get keyExpr(): Function | string {
get keyExpr(): ((item: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((item: any) => any) | string) {
this._setOption('keyExpr', value);
}

Expand Down
24 changes: 12 additions & 12 deletions packages/devextreme-angular/src/ui/gantt/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange

*/
@Input()
get dependencies(): { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, predecessorIdExpr?: Function | string, successorIdExpr?: Function | string, typeExpr?: Function | string } {
get dependencies(): { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((dependency: any) => any) | string, predecessorIdExpr?: ((dependency: any, value: any) => any) | string, successorIdExpr?: ((dependency: any, value: any) => any) | string, typeExpr?: ((dependency: any, value: any) => any) | string } {
return this._getOption('dependencies');
}
set dependencies(value: { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, predecessorIdExpr?: Function | string, successorIdExpr?: Function | string, typeExpr?: Function | string }) {
set dependencies(value: { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((dependency: any) => any) | string, predecessorIdExpr?: ((dependency: any, value: any) => any) | string, successorIdExpr?: ((dependency: any, value: any) => any) | string, typeExpr?: ((dependency: any, value: any) => any) | string }) {
this._setOption('dependencies', value);
}

Expand Down Expand Up @@ -355,10 +355,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange

*/
@Input()
get resourceAssignments(): { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, resourceIdExpr?: Function | string, taskIdExpr?: Function | string } {
get resourceAssignments(): { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resourceAssignment: any) => any) | string, resourceIdExpr?: ((resourceAssignment: any, value: any) => any) | string, taskIdExpr?: ((resourceAssignment: any, value: any) => any) | string } {
return this._getOption('resourceAssignments');
}
set resourceAssignments(value: { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, resourceIdExpr?: Function | string, taskIdExpr?: Function | string }) {
set resourceAssignments(value: { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resourceAssignment: any) => any) | string, resourceIdExpr?: ((resourceAssignment: any, value: any) => any) | string, taskIdExpr?: ((resourceAssignment: any, value: any) => any) | string }) {
this._setOption('resourceAssignments', value);
}

Expand All @@ -368,10 +368,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange

*/
@Input()
get resources(): { colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, textExpr?: Function | string } {
get resources(): { colorExpr?: ((resource: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resource: any) => any) | string, textExpr?: ((resource: any, value: any) => string) | string } {
return this._getOption('resources');
}
set resources(value: { colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, textExpr?: Function | string }) {
set resources(value: { colorExpr?: ((resource: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resource: any) => any) | string, textExpr?: ((resource: any, value: any) => string) | string }) {
this._setOption('resources', value);
}

Expand Down Expand Up @@ -563,10 +563,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange

*/
@Input()
get tasks(): { colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: Function | string, keyExpr?: Function | string, parentIdExpr?: Function | string, progressExpr?: Function | string, startExpr?: Function | string, titleExpr?: Function | string } {
get tasks(): { colorExpr?: ((task: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: ((task: any, value: any) => any) | string, keyExpr?: ((task: any) => any) | string, parentIdExpr?: ((task: any, value: any) => any) | string, progressExpr?: ((task: any, value: any) => any) | string, startExpr?: ((task: any, value: any) => any) | string, titleExpr?: ((task: any, value: any) => any) | string } {
return this._getOption('tasks');
}
set tasks(value: { colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: Function | string, keyExpr?: Function | string, parentIdExpr?: Function | string, progressExpr?: Function | string, startExpr?: Function | string, titleExpr?: Function | string }) {
set tasks(value: { colorExpr?: ((task: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: ((task: any, value: any) => any) | string, keyExpr?: ((task: any) => any) | string, parentIdExpr?: ((task: any, value: any) => any) | string, progressExpr?: ((task: any, value: any) => any) | string, startExpr?: ((task: any, value: any) => any) | string, titleExpr?: ((task: any, value: any) => any) | string }) {
this._setOption('tasks', value);
}

Expand Down Expand Up @@ -949,7 +949,7 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() dependenciesChange: EventEmitter<{ dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, predecessorIdExpr?: Function | string, successorIdExpr?: Function | string, typeExpr?: Function | string }>;
@Output() dependenciesChange: EventEmitter<{ dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((dependency: any) => any) | string, predecessorIdExpr?: ((dependency: any, value: any) => any) | string, successorIdExpr?: ((dependency: any, value: any) => any) | string, typeExpr?: ((dependency: any, value: any) => any) | string }>;

/**

Expand Down Expand Up @@ -1033,14 +1033,14 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() resourceAssignmentsChange: EventEmitter<{ dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, resourceIdExpr?: Function | string, taskIdExpr?: Function | string }>;
@Output() resourceAssignmentsChange: EventEmitter<{ dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resourceAssignment: any) => any) | string, resourceIdExpr?: ((resourceAssignment: any, value: any) => any) | string, taskIdExpr?: ((resourceAssignment: any, value: any) => any) | string }>;

/**

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

*/
@Output() resourcesChange: EventEmitter<{ colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, textExpr?: Function | string }>;
@Output() resourcesChange: EventEmitter<{ colorExpr?: ((resource: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resource: any) => any) | string, textExpr?: ((resource: any, value: any) => string) | string }>;

/**

Expand Down Expand Up @@ -1145,7 +1145,7 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() tasksChange: EventEmitter<{ colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: Function | string, keyExpr?: Function | string, parentIdExpr?: Function | string, progressExpr?: Function | string, startExpr?: Function | string, titleExpr?: Function | string }>;
@Output() tasksChange: EventEmitter<{ colorExpr?: ((task: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: ((task: any, value: any) => any) | string, keyExpr?: ((task: any) => any) | string, parentIdExpr?: ((task: any, value: any) => any) | string, progressExpr?: ((task: any, value: any) => any) | string, startExpr?: ((task: any, value: any) => any) | string, titleExpr?: ((task: any, value: any) => any) | string }>;

/**

Expand Down
16 changes: 8 additions & 8 deletions packages/devextreme-angular/src/ui/gantt/nested/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,34 +41,34 @@ export class DxoGanttDependenciesComponent extends NestedOption implements OnDes
}

@Input()
get keyExpr(): Function | string {
get keyExpr(): ((dependency: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((dependency: any) => any) | string) {
this._setOption('keyExpr', value);
}

@Input()
get predecessorIdExpr(): Function | string {
get predecessorIdExpr(): ((dependency: any, value: any) => any) | string {
return this._getOption('predecessorIdExpr');
}
set predecessorIdExpr(value: Function | string) {
set predecessorIdExpr(value: ((dependency: any, value: any) => any) | string) {
this._setOption('predecessorIdExpr', value);
}

@Input()
get successorIdExpr(): Function | string {
get successorIdExpr(): ((dependency: any, value: any) => any) | string {
return this._getOption('successorIdExpr');
}
set successorIdExpr(value: Function | string) {
set successorIdExpr(value: ((dependency: any, value: any) => any) | string) {
this._setOption('successorIdExpr', value);
}

@Input()
get typeExpr(): Function | string {
get typeExpr(): ((dependency: any, value: any) => any) | string {
return this._getOption('typeExpr');
}
set typeExpr(value: Function | string) {
set typeExpr(value: ((dependency: any, value: any) => any) | string) {
this._setOption('typeExpr', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,26 @@ export class DxoGanttResourceAssignmentsComponent extends NestedOption implement
}

@Input()
get keyExpr(): Function | string {
get keyExpr(): ((resourceAssignment: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((resourceAssignment: any) => any) | string) {
this._setOption('keyExpr', value);
}

@Input()
get resourceIdExpr(): Function | string {
get resourceIdExpr(): ((resourceAssignment: any, value: any) => any) | string {
return this._getOption('resourceIdExpr');
}
set resourceIdExpr(value: Function | string) {
set resourceIdExpr(value: ((resourceAssignment: any, value: any) => any) | string) {
this._setOption('resourceIdExpr', value);
}

@Input()
get taskIdExpr(): Function | string {
get taskIdExpr(): ((resourceAssignment: any, value: any) => any) | string {
return this._getOption('taskIdExpr');
}
set taskIdExpr(value: Function | string) {
set taskIdExpr(value: ((resourceAssignment: any, value: any) => any) | string) {
this._setOption('taskIdExpr', value);
}

Expand Down
12 changes: 6 additions & 6 deletions packages/devextreme-angular/src/ui/gantt/nested/resources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import { NestedOption } from 'devextreme-angular/core';
})
export class DxoGanttResourcesComponent extends NestedOption implements OnDestroy, OnInit {
@Input()
get colorExpr(): Function | string {
get colorExpr(): ((resource: any, value: any) => any) | string {
return this._getOption('colorExpr');
}
set colorExpr(value: Function | string) {
set colorExpr(value: ((resource: any, value: any) => any) | string) {
this._setOption('colorExpr', value);
}

Expand All @@ -49,18 +49,18 @@ export class DxoGanttResourcesComponent extends NestedOption implements OnDestro
}

@Input()
get keyExpr(): Function | string {
get keyExpr(): ((resource: any) => any) | string {
return this._getOption('keyExpr');
}
set keyExpr(value: Function | string) {
set keyExpr(value: ((resource: any) => any) | string) {
this._setOption('keyExpr', value);
}

@Input()
get textExpr(): Function | string {
get textExpr(): ((resource: any, value: any) => string) | string {
return this._getOption('textExpr');
}
set textExpr(value: Function | string) {
set textExpr(value: ((resource: any, value: any) => string) | string) {
this._setOption('textExpr', value);
}

Expand Down
Loading
Loading