Skip to content

Commit 6261b50

Browse files
ksercsksercs
authored
DateRangeBox, DateBox, Calendar: extend type for date props with null (T1282901) (DevExpress#29636)
1 parent b579f7e commit 6261b50

File tree

26 files changed

+155
-115
lines changed

26 files changed

+155
-115
lines changed

‎packages/devextreme-angular/src/common/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export {
99
CustomRule,
1010
DataStructure,
1111
DataType,
12+
DateLike,
1213
DefaultOptionsRule,
1314
Direction,
1415
DisplayMode,

‎packages/devextreme-angular/src/ui/calendar/index.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,10 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
259259
260260
*/
261261
@Input()
262-
get max(): Date | number | string {
262+
get max(): Date | null | number | string {
263263
return this._getOption('max');
264264
}
265-
set max(value: Date | number | string) {
265+
set max(value: Date | null | number | string) {
266266
this._setOption('max', value);
267267
}
268268

@@ -285,10 +285,10 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
285285
286286
*/
287287
@Input()
288-
get min(): Date | number | string {
288+
get min(): Date | null | number | string {
289289
return this._getOption('min');
290290
}
291-
set min(value: Date | number | string) {
291+
set min(value: Date | null | number | string) {
292292
this._setOption('min', value);
293293
}
294294

@@ -480,10 +480,10 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
480480
481481
*/
482482
@Input()
483-
get value(): Array<Date | number | string> | Date | number | string {
483+
get value(): Array<Date | null | number | string> | Date | null | number | string {
484484
return this._getOption('value');
485485
}
486-
set value(value: Array<Date | number | string> | Date | number | string) {
486+
set value(value: Array<Date | null | number | string> | Date | null | number | string) {
487487
this._setOption('value', value);
488488
}
489489

@@ -674,7 +674,7 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
674674
* This member supports the internal infrastructure and is not intended to be used directly from your code.
675675
676676
*/
677-
@Output() maxChange: EventEmitter<Date | number | string>;
677+
@Output() maxChange: EventEmitter<Date | null | number | string>;
678678

679679
/**
680680
@@ -688,7 +688,7 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
688688
* This member supports the internal infrastructure and is not intended to be used directly from your code.
689689
690690
*/
691-
@Output() minChange: EventEmitter<Date | number | string>;
691+
@Output() minChange: EventEmitter<Date | null | number | string>;
692692

693693
/**
694694
@@ -793,7 +793,7 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
793793
* This member supports the internal infrastructure and is not intended to be used directly from your code.
794794
795795
*/
796-
@Output() valueChange: EventEmitter<Array<Date | number | string> | Date | number | string>;
796+
@Output() valueChange: EventEmitter<Array<Date | null | number | string> | Date | null | number | string>;
797797

798798
/**
799799

‎packages/devextreme-angular/src/ui/date-box/index.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -496,10 +496,10 @@ export class DxDateBoxComponent extends DxComponent implements OnDestroy, Contro
496496
497497
*/
498498
@Input()
499-
get max(): Date | number | string | undefined {
499+
get max(): Date | null | number | string | undefined {
500500
return this._getOption('max');
501501
}
502-
set max(value: Date | number | string | undefined) {
502+
set max(value: Date | null | number | string | undefined) {
503503
this._setOption('max', value);
504504
}
505505

@@ -522,10 +522,10 @@ export class DxDateBoxComponent extends DxComponent implements OnDestroy, Contro
522522
523523
*/
524524
@Input()
525-
get min(): Date | number | string | undefined {
525+
get min(): Date | null | number | string | undefined {
526526
return this._getOption('min');
527527
}
528-
set min(value: Date | number | string | undefined) {
528+
set min(value: Date | null | number | string | undefined) {
529529
this._setOption('min', value);
530530
}
531531

@@ -821,10 +821,10 @@ export class DxDateBoxComponent extends DxComponent implements OnDestroy, Contro
821821
822822
*/
823823
@Input()
824-
get value(): Date | number | string {
824+
get value(): Date | null | number | string {
825825
return this._getOption('value');
826826
}
827-
set value(value: Date | number | string) {
827+
set value(value: Date | null | number | string) {
828828
this._setOption('value', value);
829829
}
830830

@@ -1211,7 +1211,7 @@ export class DxDateBoxComponent extends DxComponent implements OnDestroy, Contro
12111211
* This member supports the internal infrastructure and is not intended to be used directly from your code.
12121212
12131213
*/
1214-
@Output() maxChange: EventEmitter<Date | number | string | undefined>;
1214+
@Output() maxChange: EventEmitter<Date | null | number | string | undefined>;
12151215

12161216
/**
12171217
@@ -1225,7 +1225,7 @@ export class DxDateBoxComponent extends DxComponent implements OnDestroy, Contro
12251225
* This member supports the internal infrastructure and is not intended to be used directly from your code.
12261226
12271227
*/
1228-
@Output() minChange: EventEmitter<Date | number | string | undefined>;
1228+
@Output() minChange: EventEmitter<Date | null | number | string | undefined>;
12291229

12301230
/**
12311231
@@ -1386,7 +1386,7 @@ export class DxDateBoxComponent extends DxComponent implements OnDestroy, Contro
13861386
* This member supports the internal infrastructure and is not intended to be used directly from your code.
13871387
13881388
*/
1389-
@Output() valueChange: EventEmitter<Date | number | string>;
1389+
@Output() valueChange: EventEmitter<Date | null | number | string>;
13901390

13911391
/**
13921392

‎packages/devextreme-angular/src/ui/date-box/nested/calendar-options.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ export class DxoDateBoxCalendarOptionsComponent extends NestedOption implements
145145
}
146146

147147
@Input()
148-
get max(): Date | number | string {
148+
get max(): Date | null | number | string {
149149
return this._getOption('max');
150150
}
151-
set max(value: Date | number | string) {
151+
set max(value: Date | null | number | string) {
152152
this._setOption('max', value);
153153
}
154154

@@ -161,10 +161,10 @@ export class DxoDateBoxCalendarOptionsComponent extends NestedOption implements
161161
}
162162

163163
@Input()
164-
get min(): Date | number | string {
164+
get min(): Date | null | number | string {
165165
return this._getOption('min');
166166
}
167-
set min(value: Date | number | string) {
167+
set min(value: Date | null | number | string) {
168168
this._setOption('min', value);
169169
}
170170

@@ -313,10 +313,10 @@ export class DxoDateBoxCalendarOptionsComponent extends NestedOption implements
313313
}
314314

315315
@Input()
316-
get value(): Array<Date | number | string> | Date | number | string {
316+
get value(): Array<Date | null | number | string> | Date | null | number | string {
317317
return this._getOption('value');
318318
}
319-
set value(value: Array<Date | number | string> | Date | number | string) {
319+
set value(value: Array<Date | null | number | string> | Date | null | number | string) {
320320
this._setOption('value', value);
321321
}
322322

@@ -358,7 +358,7 @@ export class DxoDateBoxCalendarOptionsComponent extends NestedOption implements
358358
* This member supports the internal infrastructure and is not intended to be used directly from your code.
359359
360360
*/
361-
@Output() valueChange: EventEmitter<Array<Date | number | string> | Date | number | string>;
361+
@Output() valueChange: EventEmitter<Array<Date | null | number | string> | Date | null | number | string>;
362362

363363
/**
364364

‎packages/devextreme-angular/src/ui/date-range-box/index.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
326326
327327
*/
328328
@Input()
329-
get endDate(): Date | number | string {
329+
get endDate(): Date | null | number | string {
330330
return this._getOption('endDate');
331331
}
332-
set endDate(value: Date | number | string) {
332+
set endDate(value: Date | null | number | string) {
333333
this._setOption('endDate', value);
334334
}
335335

@@ -534,10 +534,10 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
534534
535535
*/
536536
@Input()
537-
get max(): Date | number | string | undefined {
537+
get max(): Date | null | number | string | undefined {
538538
return this._getOption('max');
539539
}
540-
set max(value: Date | number | string | undefined) {
540+
set max(value: Date | null | number | string | undefined) {
541541
this._setOption('max', value);
542542
}
543543

@@ -547,10 +547,10 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
547547
548548
*/
549549
@Input()
550-
get min(): Date | number | string | undefined {
550+
get min(): Date | null | number | string | undefined {
551551
return this._getOption('min');
552552
}
553-
set min(value: Date | number | string | undefined) {
553+
set min(value: Date | null | number | string | undefined) {
554554
this._setOption('min', value);
555555
}
556556

@@ -664,10 +664,10 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
664664
665665
*/
666666
@Input()
667-
get startDate(): Date | number | string {
667+
get startDate(): Date | null | number | string {
668668
return this._getOption('startDate');
669669
}
670-
set startDate(value: Date | number | string) {
670+
set startDate(value: Date | null | number | string) {
671671
this._setOption('startDate', value);
672672
}
673673

@@ -872,10 +872,10 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
872872
873873
*/
874874
@Input()
875-
get value(): Array<Date | number | string> {
875+
get value(): Array<Date | null | number | string> {
876876
return this._getOption('value');
877877
}
878-
set value(value: Array<Date | number | string>) {
878+
set value(value: Array<Date | null | number | string>) {
879879
this._setOption('value', value);
880880
}
881881

@@ -1171,7 +1171,7 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
11711171
* This member supports the internal infrastructure and is not intended to be used directly from your code.
11721172
11731173
*/
1174-
@Output() endDateChange: EventEmitter<Date | number | string>;
1174+
@Output() endDateChange: EventEmitter<Date | null | number | string>;
11751175

11761176
/**
11771177
@@ -1283,14 +1283,14 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
12831283
* This member supports the internal infrastructure and is not intended to be used directly from your code.
12841284
12851285
*/
1286-
@Output() maxChange: EventEmitter<Date | number | string | undefined>;
1286+
@Output() maxChange: EventEmitter<Date | null | number | string | undefined>;
12871287

12881288
/**
12891289
12901290
* This member supports the internal infrastructure and is not intended to be used directly from your code.
12911291
12921292
*/
1293-
@Output() minChange: EventEmitter<Date | number | string | undefined>;
1293+
@Output() minChange: EventEmitter<Date | null | number | string | undefined>;
12941294

12951295
/**
12961296
@@ -1353,7 +1353,7 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
13531353
* This member supports the internal infrastructure and is not intended to be used directly from your code.
13541354
13551355
*/
1356-
@Output() startDateChange: EventEmitter<Date | number | string>;
1356+
@Output() startDateChange: EventEmitter<Date | null | number | string>;
13571357

13581358
/**
13591359
@@ -1465,7 +1465,7 @@ export class DxDateRangeBoxComponent extends DxComponent implements OnDestroy, C
14651465
* This member supports the internal infrastructure and is not intended to be used directly from your code.
14661466
14671467
*/
1468-
@Output() valueChange: EventEmitter<Array<Date | number | string>>;
1468+
@Output() valueChange: EventEmitter<Array<Date | null | number | string>>;
14691469

14701470
/**
14711471

‎packages/devextreme-angular/src/ui/date-range-box/nested/calendar-options.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ export class DxoDateRangeBoxCalendarOptionsComponent extends NestedOption implem
145145
}
146146

147147
@Input()
148-
get max(): Date | number | string {
148+
get max(): Date | null | number | string {
149149
return this._getOption('max');
150150
}
151-
set max(value: Date | number | string) {
151+
set max(value: Date | null | number | string) {
152152
this._setOption('max', value);
153153
}
154154

@@ -161,10 +161,10 @@ export class DxoDateRangeBoxCalendarOptionsComponent extends NestedOption implem
161161
}
162162

163163
@Input()
164-
get min(): Date | number | string {
164+
get min(): Date | null | number | string {
165165
return this._getOption('min');
166166
}
167-
set min(value: Date | number | string) {
167+
set min(value: Date | null | number | string) {
168168
this._setOption('min', value);
169169
}
170170

@@ -313,10 +313,10 @@ export class DxoDateRangeBoxCalendarOptionsComponent extends NestedOption implem
313313
}
314314

315315
@Input()
316-
get value(): Array<Date | number | string> | Date | number | string {
316+
get value(): Array<Date | null | number | string> | Date | null | number | string {
317317
return this._getOption('value');
318318
}
319-
set value(value: Array<Date | number | string> | Date | number | string) {
319+
set value(value: Array<Date | null | number | string> | Date | null | number | string) {
320320
this._setOption('value', value);
321321
}
322322

@@ -358,7 +358,7 @@ export class DxoDateRangeBoxCalendarOptionsComponent extends NestedOption implem
358358
* This member supports the internal infrastructure and is not intended to be used directly from your code.
359359
360360
*/
361-
@Output() valueChange: EventEmitter<Array<Date | number | string> | Date | number | string>;
361+
@Output() valueChange: EventEmitter<Array<Date | null | number | string> | Date | null | number | string>;
362362

363363
/**
364364

‎packages/devextreme-angular/src/ui/nested/base/calendar-options.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ export abstract class DxoCalendarOptions extends NestedOption {
110110
this._setOption('isValid', value);
111111
}
112112

113-
get max(): Date | number | string {
113+
get max(): Date | number | null | string {
114114
return this._getOption('max');
115115
}
116-
set max(value: Date | number | string) {
116+
set max(value: Date | number | null | string) {
117117
this._setOption('max', value);
118118
}
119119

@@ -124,10 +124,10 @@ export abstract class DxoCalendarOptions extends NestedOption {
124124
this._setOption('maxZoomLevel', value);
125125
}
126126

127-
get min(): Date | number | string {
127+
get min(): Date | number | null | string {
128128
return this._getOption('min');
129129
}
130-
set min(value: Date | number | string) {
130+
set min(value: Date | number | null | string) {
131131
this._setOption('min', value);
132132
}
133133

@@ -257,10 +257,10 @@ export abstract class DxoCalendarOptions extends NestedOption {
257257
this._setOption('validationStatus', value);
258258
}
259259

260-
get value(): Date | number | string | Array<Date | number | string> {
260+
get value(): Date | number | null | string | Array<Date | number | string | null> {
261261
return this._getOption('value');
262262
}
263-
set value(value: Date | number | string | Array<Date | number | string>) {
263+
set value(value: Date | number | null | string | Array<Date | number | string | null>) {
264264
this._setOption('value', value);
265265
}
266266

‎packages/devextreme-angular/src/ui/nested/calendar-options.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class DxoCalendarOptionsComponent extends DxoCalendarOptions implements O
7979
* This member supports the internal infrastructure and is not intended to be used directly from your code.
8080
8181
*/
82-
@Output() valueChange: EventEmitter<Date | number | string | Array<Date | number | string>>;
82+
@Output() valueChange: EventEmitter<Date | number | null | string | Array<Date | number | string | null>>;
8383

8484
/**
8585

0 commit comments

Comments
 (0)