From 6794affda53ce2892067fbc6c2ffbad5fad1656f Mon Sep 17 00:00:00 2001 From: Ruslan Farkhutdinov Date: Mon, 12 Jan 2026 15:14:57 +0200 Subject: [PATCH] Validator: Update validationCallback value parameter type (T1317117) (#32092) Co-authored-by: Ruslan Farkhutdinov --- .../src/ui/card-view/nested/async-rule-dxi.ts | 4 ++-- .../src/ui/card-view/nested/custom-rule-dxi.ts | 4 ++-- .../src/ui/card-view/nested/validation-rule-dxi.ts | 4 ++-- .../src/ui/data-grid/nested/async-rule-dxi.ts | 4 ++-- .../src/ui/data-grid/nested/custom-rule-dxi.ts | 4 ++-- .../src/ui/data-grid/nested/validation-rule-dxi.ts | 4 ++-- .../devextreme-angular/src/ui/form/nested/async-rule-dxi.ts | 4 ++-- .../src/ui/form/nested/custom-rule-dxi.ts | 4 ++-- .../src/ui/form/nested/validation-rule-dxi.ts | 4 ++-- .../src/ui/tree-list/nested/async-rule-dxi.ts | 4 ++-- .../src/ui/tree-list/nested/custom-rule-dxi.ts | 4 ++-- .../src/ui/tree-list/nested/validation-rule-dxi.ts | 4 ++-- .../src/ui/validator/nested/async-rule-dxi.ts | 4 ++-- .../src/ui/validator/nested/custom-rule-dxi.ts | 4 ++-- .../src/ui/validator/nested/validation-rule-dxi.ts | 4 ++-- packages/devextreme-react/src/card-view.ts | 6 +++--- packages/devextreme-react/src/data-grid.ts | 6 +++--- packages/devextreme-react/src/form.ts | 6 +++--- packages/devextreme-react/src/tree-list.ts | 6 +++--- packages/devextreme-react/src/validator.ts | 6 +++--- packages/devextreme-vue/src/card-view.ts | 6 +++--- packages/devextreme-vue/src/data-grid.ts | 6 +++--- packages/devextreme-vue/src/form.ts | 6 +++--- packages/devextreme-vue/src/tree-list.ts | 6 +++--- packages/devextreme-vue/src/validator.ts | 6 +++--- packages/devextreme/js/common.d.ts | 4 ++-- 26 files changed, 62 insertions(+), 62 deletions(-) diff --git a/packages/devextreme-angular/src/ui/card-view/nested/async-rule-dxi.ts b/packages/devextreme-angular/src/ui/card-view/nested/async-rule-dxi.ts index dc3f6264612f..c15e0ba8e463 100644 --- a/packages/devextreme-angular/src/ui/card-view/nested/async-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/card-view/nested/async-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiCardViewAsyncRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/card-view/nested/custom-rule-dxi.ts b/packages/devextreme-angular/src/ui/card-view/nested/custom-rule-dxi.ts index 9daa43a07bb2..bed686bdfc37 100644 --- a/packages/devextreme-angular/src/ui/card-view/nested/custom-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/card-view/nested/custom-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiCardViewCustomRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/card-view/nested/validation-rule-dxi.ts b/packages/devextreme-angular/src/ui/card-view/nested/validation-rule-dxi.ts index b2ee2b0894f6..91f01749ad95 100644 --- a/packages/devextreme-angular/src/ui/card-view/nested/validation-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/card-view/nested/validation-rule-dxi.ts @@ -94,10 +94,10 @@ export class DxiCardViewValidationRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/async-rule-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/async-rule-dxi.ts index d989a9137f40..ce447b3506b4 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/async-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/async-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiDataGridAsyncRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/custom-rule-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/custom-rule-dxi.ts index 7ac8006d2202..457ea1072946 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/custom-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/custom-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiDataGridCustomRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/validation-rule-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/validation-rule-dxi.ts index bd00be3f1976..d3cbad699b3d 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/validation-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/validation-rule-dxi.ts @@ -94,10 +94,10 @@ export class DxiDataGridValidationRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/form/nested/async-rule-dxi.ts b/packages/devextreme-angular/src/ui/form/nested/async-rule-dxi.ts index 171ea03357b2..3074a9622ea3 100644 --- a/packages/devextreme-angular/src/ui/form/nested/async-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/form/nested/async-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiFormAsyncRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/form/nested/custom-rule-dxi.ts b/packages/devextreme-angular/src/ui/form/nested/custom-rule-dxi.ts index bcc0078ff120..654f712ca079 100644 --- a/packages/devextreme-angular/src/ui/form/nested/custom-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/form/nested/custom-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiFormCustomRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/form/nested/validation-rule-dxi.ts b/packages/devextreme-angular/src/ui/form/nested/validation-rule-dxi.ts index beec413534e8..9aca7dd04c21 100644 --- a/packages/devextreme-angular/src/ui/form/nested/validation-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/form/nested/validation-rule-dxi.ts @@ -94,10 +94,10 @@ export class DxiFormValidationRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/async-rule-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/async-rule-dxi.ts index ab3881617768..52d59842ddfd 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/async-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/async-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiTreeListAsyncRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/custom-rule-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/custom-rule-dxi.ts index a818667bc673..f227aca19255 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/custom-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/custom-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiTreeListCustomRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/validation-rule-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/validation-rule-dxi.ts index 91f9e2e0296d..5119c0ab22c6 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/validation-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/validation-rule-dxi.ts @@ -94,10 +94,10 @@ export class DxiTreeListValidationRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/validator/nested/async-rule-dxi.ts b/packages/devextreme-angular/src/ui/validator/nested/async-rule-dxi.ts index 548c67fe5caf..559ac16e3eb1 100644 --- a/packages/devextreme-angular/src/ui/validator/nested/async-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/validator/nested/async-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiValidatorAsyncRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/validator/nested/custom-rule-dxi.ts b/packages/devextreme-angular/src/ui/validator/nested/custom-rule-dxi.ts index 2160b06bc493..45a1337f86ef 100644 --- a/packages/devextreme-angular/src/ui/validator/nested/custom-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/validator/nested/custom-rule-dxi.ts @@ -70,10 +70,10 @@ export class DxiValidatorCustomRuleComponent extends CollectionNestedOption { } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-angular/src/ui/validator/nested/validation-rule-dxi.ts b/packages/devextreme-angular/src/ui/validator/nested/validation-rule-dxi.ts index e41604da4d18..e1e6524d03cb 100644 --- a/packages/devextreme-angular/src/ui/validator/nested/validation-rule-dxi.ts +++ b/packages/devextreme-angular/src/ui/validator/nested/validation-rule-dxi.ts @@ -94,10 +94,10 @@ export class DxiValidatorValidationRuleComponent extends CollectionNestedOption } @Input() - get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean) { + get validationCallback(): ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean) { return this._getOption('validationCallback'); } - set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)) { + set validationCallback(value: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)) { this._setOption('validationCallback', value); } diff --git a/packages/devextreme-react/src/card-view.ts b/packages/devextreme-react/src/card-view.ts index 42a8fafa385f..7a6a000ee342 100644 --- a/packages/devextreme-react/src/card-view.ts +++ b/packages/devextreme-react/src/card-view.ts @@ -195,7 +195,7 @@ type IAsyncRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any); }> const _componentAsyncRule = (props: IAsyncRuleProps) => { return React.createElement(NestedOption, { @@ -911,7 +911,7 @@ type ICustomRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); }> const _componentCustomRule = (props: ICustomRuleProps) => { return React.createElement(NestedOption, { @@ -2755,7 +2755,7 @@ type IValidationRuleProps = React.PropsWithChildren<{ max?: Date | number | string; min?: Date | number | string; reevaluate?: boolean; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); comparisonTarget?: (() => any); comparisonType?: ComparisonOperator; pattern?: RegExp | string; diff --git a/packages/devextreme-react/src/data-grid.ts b/packages/devextreme-react/src/data-grid.ts index 20314e721c57..246426a1713e 100644 --- a/packages/devextreme-react/src/data-grid.ts +++ b/packages/devextreme-react/src/data-grid.ts @@ -233,7 +233,7 @@ type IAsyncRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any); }> const _componentAsyncRule = (props: IAsyncRuleProps) => { return React.createElement(NestedOption, { @@ -840,7 +840,7 @@ type ICustomRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); }> const _componentCustomRule = (props: ICustomRuleProps) => { return React.createElement(NestedOption, { @@ -3014,7 +3014,7 @@ type IValidationRuleProps = React.PropsWithChildren<{ max?: Date | number | string; min?: Date | number | string; reevaluate?: boolean; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); comparisonTarget?: (() => any); comparisonType?: ComparisonOperator; pattern?: RegExp | string; diff --git a/packages/devextreme-react/src/form.ts b/packages/devextreme-react/src/form.ts index 4c79fe8c58ed..bcbe3b001da5 100644 --- a/packages/devextreme-react/src/form.ts +++ b/packages/devextreme-react/src/form.ts @@ -93,7 +93,7 @@ type IAsyncRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any); }> const _componentAsyncRule = (props: IAsyncRuleProps) => { return React.createElement(NestedOption, { @@ -249,7 +249,7 @@ type ICustomRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); }> const _componentCustomRule = (props: ICustomRuleProps) => { return React.createElement(NestedOption, { @@ -946,7 +946,7 @@ type IValidationRuleProps = React.PropsWithChildren<{ max?: Date | number | string; min?: Date | number | string; reevaluate?: boolean; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); comparisonTarget?: (() => any); comparisonType?: ComparisonOperator; pattern?: RegExp | string; diff --git a/packages/devextreme-react/src/tree-list.ts b/packages/devextreme-react/src/tree-list.ts index 7225e37ecf8e..a45116850b45 100644 --- a/packages/devextreme-react/src/tree-list.ts +++ b/packages/devextreme-react/src/tree-list.ts @@ -205,7 +205,7 @@ type IAsyncRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any); }> const _componentAsyncRule = (props: IAsyncRuleProps) => { return React.createElement(NestedOption, { @@ -796,7 +796,7 @@ type ICustomRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); }> const _componentCustomRule = (props: ICustomRuleProps) => { return React.createElement(NestedOption, { @@ -2617,7 +2617,7 @@ type IValidationRuleProps = React.PropsWithChildren<{ max?: Date | number | string; min?: Date | number | string; reevaluate?: boolean; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); comparisonTarget?: (() => any); comparisonType?: ComparisonOperator; pattern?: RegExp | string; diff --git a/packages/devextreme-react/src/validator.ts b/packages/devextreme-react/src/validator.ts index 9f618f16cd71..62d5991273d1 100644 --- a/packages/devextreme-react/src/validator.ts +++ b/packages/devextreme-react/src/validator.ts @@ -105,7 +105,7 @@ type IAsyncRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any); }> const _componentAsyncRule = (props: IAsyncRuleProps) => { return React.createElement(NestedOption, { @@ -157,7 +157,7 @@ type ICustomRuleProps = React.PropsWithChildren<{ message?: string; reevaluate?: boolean; type?: ValidationRuleType; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); }> const _componentCustomRule = (props: ICustomRuleProps) => { return React.createElement(NestedOption, { @@ -337,7 +337,7 @@ type IValidationRuleProps = React.PropsWithChildren<{ max?: Date | number | string; min?: Date | number | string; reevaluate?: boolean; - validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean); + validationCallback?: ((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean); comparisonTarget?: (() => any); comparisonType?: ComparisonOperator; pattern?: RegExp | string; diff --git a/packages/devextreme-vue/src/card-view.ts b/packages/devextreme-vue/src/card-view.ts index 11f5d8fbe904..e713d7269b8b 100644 --- a/packages/devextreme-vue/src/card-view.ts +++ b/packages/devextreme-vue/src/card-view.ts @@ -519,7 +519,7 @@ const DxAsyncRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)> } }; @@ -1272,7 +1272,7 @@ const DxCustomRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; @@ -3189,7 +3189,7 @@ const DxValidationRuleConfig = { reevaluate: Boolean, trim: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; diff --git a/packages/devextreme-vue/src/data-grid.ts b/packages/devextreme-vue/src/data-grid.ts index 2670c86e10bb..202d0cdcdded 100644 --- a/packages/devextreme-vue/src/data-grid.ts +++ b/packages/devextreme-vue/src/data-grid.ts @@ -645,7 +645,7 @@ const DxAsyncRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)> } }; @@ -1279,7 +1279,7 @@ const DxCustomRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; @@ -3633,7 +3633,7 @@ const DxValidationRuleConfig = { reevaluate: Boolean, trim: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; diff --git a/packages/devextreme-vue/src/form.ts b/packages/devextreme-vue/src/form.ts index 6a120b0f5f25..5f88c6c41b0a 100644 --- a/packages/devextreme-vue/src/form.ts +++ b/packages/devextreme-vue/src/form.ts @@ -240,7 +240,7 @@ const DxAsyncRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)> } }; @@ -424,7 +424,7 @@ const DxCustomRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; @@ -1113,7 +1113,7 @@ const DxValidationRuleConfig = { reevaluate: Boolean, trim: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; diff --git a/packages/devextreme-vue/src/tree-list.ts b/packages/devextreme-vue/src/tree-list.ts index cbd79ef4a48b..53896865ab60 100644 --- a/packages/devextreme-vue/src/tree-list.ts +++ b/packages/devextreme-vue/src/tree-list.ts @@ -633,7 +633,7 @@ const DxAsyncRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)> } }; @@ -1253,7 +1253,7 @@ const DxCustomRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; @@ -3245,7 +3245,7 @@ const DxValidationRuleConfig = { reevaluate: Boolean, trim: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; diff --git a/packages/devextreme-vue/src/validator.ts b/packages/devextreme-vue/src/validator.ts index 612f10eeb77d..035a24eddc37 100644 --- a/packages/devextreme-vue/src/validator.ts +++ b/packages/devextreme-vue/src/validator.ts @@ -133,7 +133,7 @@ const DxAsyncRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => any)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => any)> } }; @@ -191,7 +191,7 @@ const DxCustomRuleConfig = { message: String, reevaluate: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; @@ -396,7 +396,7 @@ const DxValidationRuleConfig = { reevaluate: Boolean, trim: Boolean, type: String as PropType, - validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: string | number }) => boolean)> + validationCallback: Function as PropType<((options: { column: Record, data: Record, formItem: Record, rule: Record, validator: Record, value: any }) => boolean)> } }; diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index 2ed6975ebaf9..523fdb46a0ed 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -58,7 +58,7 @@ export type AsyncRule = { * @docid * @type_function_return Promise * @type_function_param1 options:object - * @type_function_param1_field value:string|number + * @type_function_param1_field value:any * @type_function_param1_field rule:object * @type_function_param1_field validator:object * @type_function_param1_field data:object @@ -160,7 +160,7 @@ export type CustomRule = { /** * @docid * @type_function_param1 options:object - * @type_function_param1_field value:string|number + * @type_function_param1_field value:any * @type_function_param1_field rule:object * @type_function_param1_field validator:object * @type_function_param1_field data:object