@recursyve/nice-ui-kit.v2 14.0.0-beta.122 → 14.0.0-beta.123
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/components/date-range-picker/date-range-picker.component.mjs +32 -11
- package/fesm2015/recursyve-nice-ui-kit.v2.mjs +31 -11
- package/fesm2015/recursyve-nice-ui-kit.v2.mjs.map +1 -1
- package/fesm2020/recursyve-nice-ui-kit.v2.mjs +31 -11
- package/fesm2020/recursyve-nice-ui-kit.v2.mjs.map +1 -1
- package/lib/components/date-range-picker/date-range-picker.component.d.ts +1 -2
- package/package.json +1 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import { Component, forwardRef, Input,
|
|
1
|
+
import { Component, forwardRef, Input, ViewEncapsulation } from "@angular/core";
|
|
2
2
|
import { FormControl, FormGroup, NG_VALUE_ACCESSOR } from "@angular/forms";
|
|
3
|
-
import {
|
|
3
|
+
import { isSameDay } from "date-fns";
|
|
4
4
|
import subDays from "date-fns/subDays";
|
|
5
|
+
import { pairwise, startWith } from "rxjs";
|
|
6
|
+
import { filter } from "rxjs/operators";
|
|
5
7
|
import { HeaderComponent } from "./components/header/header.component";
|
|
6
8
|
import * as i0 from "@angular/core";
|
|
7
9
|
import * as i1 from "@angular/common";
|
|
@@ -28,9 +30,31 @@ export class NiceDateRangePickerComponent {
|
|
|
28
30
|
to: this.max
|
|
29
31
|
};
|
|
30
32
|
this.formGroup.patchValue(this.value);
|
|
31
|
-
this.formGroup.valueChanges.
|
|
33
|
+
this.formGroup.valueChanges.pipe(startWith(this.value), pairwise(), filter(([before, after]) => {
|
|
34
|
+
/**
|
|
35
|
+
* We filter out the value changes to only emit when the selection is completed/
|
|
36
|
+
*/
|
|
37
|
+
if (!after.from && !after.to) {
|
|
38
|
+
return true;
|
|
39
|
+
}
|
|
40
|
+
// This is the middle of the selection
|
|
41
|
+
if (after.from && !after.to) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
// This means that the selection is done
|
|
45
|
+
if (!before.to && after.to) {
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
// This is an edge case when we select a new range with an active range selected.
|
|
49
|
+
// The after.to will be at null after the after.from is emitted
|
|
50
|
+
if (!isSameDay(before.from, after.from) && isSameDay(before.to, after.to)) {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
// Skip if noting has changed
|
|
54
|
+
return !(isSameDay(before.from, after.from) && !isSameDay(before.to, after.to));
|
|
55
|
+
})).subscribe((_) => {
|
|
32
56
|
this.value = this.formGroup.getRawValue();
|
|
33
|
-
this.
|
|
57
|
+
this.propagate?.(this.value);
|
|
34
58
|
});
|
|
35
59
|
}
|
|
36
60
|
writeValue(value) {
|
|
@@ -38,7 +62,7 @@ export class NiceDateRangePickerComponent {
|
|
|
38
62
|
this.formGroup.patchValue(this.value);
|
|
39
63
|
}
|
|
40
64
|
registerOnChange(fn) {
|
|
41
|
-
this.
|
|
65
|
+
this.propagate = fn;
|
|
42
66
|
}
|
|
43
67
|
registerOnTouched(fn) { }
|
|
44
68
|
}
|
|
@@ -49,7 +73,7 @@ NiceDateRangePickerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14
|
|
|
49
73
|
useExisting: forwardRef(() => NiceDateRangePickerComponent),
|
|
50
74
|
multi: true
|
|
51
75
|
}
|
|
52
|
-
],
|
|
76
|
+
], ngImport: i0, template: "<div class=\"nice-date-picker-container\">\n <div class=\"nice-date-picker-header\">\n <div class=\"from-to\">\n <ng-container *ngIf=\"value?.from\">\n {{ value.from | localizedDate: \"longDate\" }}\n </ng-container>\n <ng-container *ngIf=\"value?.to\">\n <div class=\"separator\">-</div>\n {{ value.to | localizedDate: \"longDate\" }}\n </ng-container>\n </div>\n </div>\n\n <mat-date-range-input [formGroup]=\"formGroup\" [max]=\"nowIsMax ? now : null\" [rangePicker]=\"picker\">\n <input formControlName=\"from\" class=\"hidden-input\" matStartDate placeholder=\"Start date\">\n <input formControlName=\"to\" class=\"hidden-input\" matEndDate placeholder=\"End date\">\n </mat-date-range-input>\n\n <mat-datepicker-toggle matSuffix [for]=\"picker\"></mat-datepicker-toggle>\n\n <mat-date-range-picker\n [calendarHeaderComponent]=\"HeaderComponent\"\n #picker\n ></mat-date-range-picker>\n</div>\n", styles: ["nice-date-range-picker .mat-date-range-input{width:0;height:0;padding:0;margin:0;border:none;visibility:hidden}\n"], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i2.MatDatepickerToggle, selector: "mat-datepicker-toggle", inputs: ["for", "tabIndex", "aria-label", "disabled", "disableRipple"], exportAs: ["matDatepickerToggle"] }, { kind: "component", type: i2.MatDateRangeInput, selector: "mat-date-range-input", inputs: ["rangePicker", "required", "dateFilter", "min", "max", "disabled", "separator", "comparisonStart", "comparisonEnd"], exportAs: ["matDateRangeInput"] }, { kind: "directive", type: i2.MatStartDate, selector: "input[matStartDate]", inputs: ["errorStateMatcher"], outputs: ["dateChange", "dateInput"] }, { kind: "directive", type: i2.MatEndDate, selector: "input[matEndDate]", inputs: ["errorStateMatcher"], outputs: ["dateChange", "dateInput"] }, { kind: "component", type: i2.MatDateRangePicker, selector: "mat-date-range-picker", exportAs: ["matDateRangePicker"] }, { kind: "directive", type: i3.MatSuffix, selector: "[matSuffix]" }, { kind: "directive", type: i4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i4.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i4.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i4.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "pipe", type: i5.LocalizedDatePipe, name: "localizedDate" }], encapsulation: i0.ViewEncapsulation.None });
|
|
53
77
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: NiceDateRangePickerComponent, decorators: [{
|
|
54
78
|
type: Component,
|
|
55
79
|
args: [{ selector: "nice-date-range-picker", encapsulation: ViewEncapsulation.None, providers: [
|
|
@@ -59,10 +83,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImpor
|
|
|
59
83
|
multi: true
|
|
60
84
|
}
|
|
61
85
|
], template: "<div class=\"nice-date-picker-container\">\n <div class=\"nice-date-picker-header\">\n <div class=\"from-to\">\n <ng-container *ngIf=\"value?.from\">\n {{ value.from | localizedDate: \"longDate\" }}\n </ng-container>\n <ng-container *ngIf=\"value?.to\">\n <div class=\"separator\">-</div>\n {{ value.to | localizedDate: \"longDate\" }}\n </ng-container>\n </div>\n </div>\n\n <mat-date-range-input [formGroup]=\"formGroup\" [max]=\"nowIsMax ? now : null\" [rangePicker]=\"picker\">\n <input formControlName=\"from\" class=\"hidden-input\" matStartDate placeholder=\"Start date\">\n <input formControlName=\"to\" class=\"hidden-input\" matEndDate placeholder=\"End date\">\n </mat-date-range-input>\n\n <mat-datepicker-toggle matSuffix [for]=\"picker\"></mat-datepicker-toggle>\n\n <mat-date-range-picker\n [calendarHeaderComponent]=\"HeaderComponent\"\n #picker\n ></mat-date-range-picker>\n</div>\n", styles: ["nice-date-range-picker .mat-date-range-input{width:0;height:0;padding:0;margin:0;border:none;visibility:hidden}\n"] }]
|
|
62
|
-
}], propDecorators: {
|
|
63
|
-
type: ViewChild,
|
|
64
|
-
args: [MatDateRangePicker]
|
|
65
|
-
}], min: [{
|
|
86
|
+
}], propDecorators: { min: [{
|
|
66
87
|
type: Input
|
|
67
88
|
}], max: [{
|
|
68
89
|
type: Input
|
|
@@ -71,4 +92,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImpor
|
|
|
71
92
|
}], allowClear: [{
|
|
72
93
|
type: Input
|
|
73
94
|
}] } });
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"date-range-picker.component.js","sourceRoot":"","sources":["../../../../../../projects/nice-ui-kit-v2/src/lib/components/date-range-picker/date-range-picker.component.ts","../../../../../../projects/nice-ui-kit-v2/src/lib/components/date-range-picker/date-range-picker.template.html"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAU,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACxF,OAAO,EAAwB,WAAW,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;;;;;;;AAoBvE,MAAM,OAAO,4BAA4B;IAbzC;QAcoB,oBAAe,GAAG,eAAe,CAAC;QAG3C,QAAG,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAG7B,QAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAGjB,aAAQ,GAAG,IAAI,CAAC;QAGhB,eAAU,GAAG,IAAI,CAAC;QAElB,cAAS,GAAG,IAAI,SAAS,CAAC;YAC7B,IAAI,EAAE,IAAI,WAAW,EAAE;YACvB,EAAE,EAAE,IAAI,WAAW,EAAE;SACxB,CAAC,CAAC;QACI,QAAG,GAAG,IAAI,IAAI,EAAE,CAAC;KA2D3B;IAtDU,QAAQ;QACX,IAAI,CAAC,KAAK,GAAG;YACT,IAAI,EAAE,IAAI,CAAC,GAAG;YACd,EAAE,EAAE,IAAI,CAAC,GAAG;SACf,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEtC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAC5B,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EACrB,QAAQ,EAAE,EACV,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;YACvB;;eAEG;YAEH,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE;gBAC1B,OAAO,IAAI,CAAC;aACf;YAED,sCAAsC;YACtC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE;gBACzB,OAAO,KAAK,CAAC;aAChB;YAED,wCAAwC;YACxC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,EAAE;gBACxB,OAAO,IAAI,CAAC;aACf;YAED,iFAAiF;YACjF,+DAA+D;YAC/D,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE;gBACvE,OAAO,KAAK,CAAC;aAChB;YAED,6BAA6B;YAC7B,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QACpF,CAAC,CAAC,CACL,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,UAAU,CAAC,KAA+B;QAC7C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAEM,gBAAgB,CAAC,EAA6C;QACjE,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACxB,CAAC;IAEM,iBAAiB,CAAC,EAAO,IAAS,CAAC;;yHA7EjC,4BAA4B;6GAA5B,4BAA4B,qIAR1B;QACP;YACI,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,4BAA4B,CAAC;YAC3D,KAAK,EAAE,IAAI;SACd;KACJ,0BCzBL,qiCAyBA;2FDEa,4BAA4B;kBAbxC,SAAS;+BACI,wBAAwB,iBAGnB,iBAAiB,CAAC,IAAI,aAC1B;wBACP;4BACI,OAAO,EAAE,iBAAiB;4BAC1B,WAAW,EAAE,UAAU,CAAC,GAAG,EAAE,6BAA6B,CAAC;4BAC3D,KAAK,EAAE,IAAI;yBACd;qBACJ;8BAMM,GAAG;sBADT,KAAK;gBAIC,GAAG;sBADT,KAAK;gBAIC,QAAQ;sBADd,KAAK;gBAIC,UAAU;sBADhB,KAAK","sourcesContent":["import { Component, forwardRef, Input, OnInit, ViewEncapsulation } from \"@angular/core\";\nimport { ControlValueAccessor, FormControl, FormGroup, NG_VALUE_ACCESSOR } from \"@angular/forms\";\nimport { isSameDay } from \"date-fns\";\nimport { th } from \"date-fns/locale\";\nimport subDays from \"date-fns/subDays\";\nimport { pairwise, startWith } from \"rxjs\";\nimport { filter } from \"rxjs/operators\";\nimport { HeaderComponent } from \"./components/header/header.component\";\n\nexport interface NiceDateRangePickerValue {\n    from: Date;\n    to: Date;\n}\n\n@Component({\n    selector: \"nice-date-range-picker\",\n    templateUrl: \"date-range-picker.template.html\",\n    styleUrls: [\"date-range-picker.style.scss\"],\n    encapsulation: ViewEncapsulation.None,\n    providers: [\n        {\n            provide: NG_VALUE_ACCESSOR,\n            useExisting: forwardRef(() => NiceDateRangePickerComponent),\n            multi: true\n        }\n    ]\n})\nexport class NiceDateRangePickerComponent implements OnInit, ControlValueAccessor {\n    public readonly HeaderComponent = HeaderComponent;\n\n    @Input()\n    public min = subDays(new Date(), 3);\n\n    @Input()\n    public max = new Date();\n\n    @Input()\n    public nowIsMax = true;\n\n    @Input()\n    public allowClear = true;\n\n    public formGroup = new FormGroup({\n        from: new FormControl(),\n        to: new FormControl()\n    });\n    public now = new Date();\n    public value: NiceDateRangePickerValue;\n\n    private propagate: (value: NiceDateRangePickerValue) => void;\n\n    public ngOnInit(): void {\n        this.value = {\n            from: this.min,\n            to: this.max\n        };\n        this.formGroup.patchValue(this.value);\n\n        this.formGroup.valueChanges.pipe(\n            startWith(this.value),\n            pairwise(),\n            filter(([before, after]) => {\n                /**\n                 * We filter out the value changes to only emit when the selection is completed/\n                 */\n\n                if (!after.from && !after.to) {\n                    return true;\n                }\n\n                // This is the middle of the selection\n                if (after.from && !after.to) {\n                    return false;\n                }\n\n                // This means that the selection is done\n                if (!before.to && after.to) {\n                    return true;\n                }\n\n                // This is an edge case when we select a new range with an active range selected.\n                // The after.to will be at null after the after.from is emitted\n                if (!isSameDay(before.from, after.from) && isSameDay(before.to, after.to)) {\n                    return false;\n                }\n\n                // Skip if noting has changed\n                return !(isSameDay(before.from, after.from) && !isSameDay(before.to, after.to));\n            }),\n        ).subscribe((_) => {\n            this.value = this.formGroup.getRawValue();\n            this.propagate?.(this.value);\n        });\n    }\n\n    public writeValue(value: NiceDateRangePickerValue): void {\n        this.value = value;\n        this.formGroup.patchValue(this.value);\n    }\n\n    public registerOnChange(fn: (value: NiceDateRangePickerValue) => void): void {\n        this.propagate = fn;\n    }\n\n    public registerOnTouched(fn: any): void {}\n}\n","<div class=\"nice-date-picker-container\">\n    <div class=\"nice-date-picker-header\">\n        <div class=\"from-to\">\n            <ng-container *ngIf=\"value?.from\">\n                {{ value.from | localizedDate: \"longDate\" }}\n            </ng-container>\n            <ng-container *ngIf=\"value?.to\">\n                <div class=\"separator\">-</div>\n                {{ value.to | localizedDate: \"longDate\" }}\n            </ng-container>\n        </div>\n    </div>\n\n    <mat-date-range-input [formGroup]=\"formGroup\" [max]=\"nowIsMax ? now : null\" [rangePicker]=\"picker\">\n        <input formControlName=\"from\" class=\"hidden-input\" matStartDate placeholder=\"Start date\">\n        <input formControlName=\"to\" class=\"hidden-input\" matEndDate placeholder=\"End date\">\n    </mat-date-range-input>\n\n    <mat-datepicker-toggle matSuffix [for]=\"picker\"></mat-datepicker-toggle>\n\n    <mat-date-range-picker\n            [calendarHeaderComponent]=\"HeaderComponent\"\n            #picker\n    ></mat-date-range-picker>\n</div>\n"]}
|
|
@@ -6,7 +6,7 @@ import { Injectable, NgModule, EventEmitter, Component, ViewEncapsulation, Chang
|
|
|
6
6
|
import { plainToInstance } from 'class-transformer';
|
|
7
7
|
import { map, filter, takeUntil, tap, take, debounceTime as debounceTime$1, delay, switchMap } from 'rxjs/operators';
|
|
8
8
|
import { __rest, __awaiter } from 'tslib';
|
|
9
|
-
import { catchError, ReplaySubject, Subject, BehaviorSubject, mergeMap, from, isObservable, firstValueFrom, debounceTime, distinctUntilChanged, startWith, tap as tap$1, Observable, combineLatest, of, fromEvent, merge as merge$1
|
|
9
|
+
import { catchError, ReplaySubject, Subject, BehaviorSubject, mergeMap, from, isObservable, firstValueFrom, debounceTime, distinctUntilChanged, startWith, pairwise, tap as tap$1, Observable, combineLatest, of, fromEvent, merge as merge$1 } from 'rxjs';
|
|
10
10
|
import { coerceBooleanProperty } from '@angular/cdk/coercion';
|
|
11
11
|
import * as i2 from '@angular/common';
|
|
12
12
|
import { CommonModule, DatePipe, CurrencyPipe, DOCUMENT, isPlatformServer, NgForOf, NgIf, AsyncPipe, UpperCasePipe } from '@angular/common';
|
|
@@ -43,9 +43,10 @@ import * as i1$6 from '@angular/cdk/overlay';
|
|
|
43
43
|
import { OverlayContainer, Overlay } from '@angular/cdk/overlay';
|
|
44
44
|
import * as i5 from '@angular/material/card';
|
|
45
45
|
import { MatCardModule } from '@angular/material/card';
|
|
46
|
-
import
|
|
47
|
-
import { MatDateRangePicker, MatDatepickerModule } from '@angular/material/datepicker';
|
|
46
|
+
import { isSameDay } from 'date-fns';
|
|
48
47
|
import subDays from 'date-fns/subDays';
|
|
48
|
+
import * as i2$3 from '@angular/material/datepicker';
|
|
49
|
+
import { MatDatepickerModule } from '@angular/material/datepicker';
|
|
49
50
|
import * as i1$7 from 'ngx-mask';
|
|
50
51
|
import * as i1$8 from '@angular/platform-browser';
|
|
51
52
|
import { merge } from 'lodash-es';
|
|
@@ -3902,10 +3903,32 @@ class NiceDateRangePickerComponent {
|
|
|
3902
3903
|
to: this.max
|
|
3903
3904
|
};
|
|
3904
3905
|
this.formGroup.patchValue(this.value);
|
|
3905
|
-
this.formGroup.valueChanges.
|
|
3906
|
+
this.formGroup.valueChanges.pipe(startWith(this.value), pairwise(), filter(([before, after]) => {
|
|
3907
|
+
/**
|
|
3908
|
+
* We filter out the value changes to only emit when the selection is completed/
|
|
3909
|
+
*/
|
|
3910
|
+
if (!after.from && !after.to) {
|
|
3911
|
+
return true;
|
|
3912
|
+
}
|
|
3913
|
+
// This is the middle of the selection
|
|
3914
|
+
if (after.from && !after.to) {
|
|
3915
|
+
return false;
|
|
3916
|
+
}
|
|
3917
|
+
// This means that the selection is done
|
|
3918
|
+
if (!before.to && after.to) {
|
|
3919
|
+
return true;
|
|
3920
|
+
}
|
|
3921
|
+
// This is an edge case when we select a new range with an active range selected.
|
|
3922
|
+
// The after.to will be at null after the after.from is emitted
|
|
3923
|
+
if (!isSameDay(before.from, after.from) && isSameDay(before.to, after.to)) {
|
|
3924
|
+
return false;
|
|
3925
|
+
}
|
|
3926
|
+
// Skip if noting has changed
|
|
3927
|
+
return !(isSameDay(before.from, after.from) && !isSameDay(before.to, after.to));
|
|
3928
|
+
})).subscribe((_) => {
|
|
3906
3929
|
var _a;
|
|
3907
3930
|
this.value = this.formGroup.getRawValue();
|
|
3908
|
-
(_a = this.
|
|
3931
|
+
(_a = this.propagate) === null || _a === void 0 ? void 0 : _a.call(this, this.value);
|
|
3909
3932
|
});
|
|
3910
3933
|
}
|
|
3911
3934
|
writeValue(value) {
|
|
@@ -3913,7 +3936,7 @@ class NiceDateRangePickerComponent {
|
|
|
3913
3936
|
this.formGroup.patchValue(this.value);
|
|
3914
3937
|
}
|
|
3915
3938
|
registerOnChange(fn) {
|
|
3916
|
-
this.
|
|
3939
|
+
this.propagate = fn;
|
|
3917
3940
|
}
|
|
3918
3941
|
registerOnTouched(fn) { }
|
|
3919
3942
|
}
|
|
@@ -3924,7 +3947,7 @@ NiceDateRangePickerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14
|
|
|
3924
3947
|
useExisting: forwardRef(() => NiceDateRangePickerComponent),
|
|
3925
3948
|
multi: true
|
|
3926
3949
|
}
|
|
3927
|
-
],
|
|
3950
|
+
], ngImport: i0, template: "<div class=\"nice-date-picker-container\">\n <div class=\"nice-date-picker-header\">\n <div class=\"from-to\">\n <ng-container *ngIf=\"value?.from\">\n {{ value.from | localizedDate: \"longDate\" }}\n </ng-container>\n <ng-container *ngIf=\"value?.to\">\n <div class=\"separator\">-</div>\n {{ value.to | localizedDate: \"longDate\" }}\n </ng-container>\n </div>\n </div>\n\n <mat-date-range-input [formGroup]=\"formGroup\" [max]=\"nowIsMax ? now : null\" [rangePicker]=\"picker\">\n <input formControlName=\"from\" class=\"hidden-input\" matStartDate placeholder=\"Start date\">\n <input formControlName=\"to\" class=\"hidden-input\" matEndDate placeholder=\"End date\">\n </mat-date-range-input>\n\n <mat-datepicker-toggle matSuffix [for]=\"picker\"></mat-datepicker-toggle>\n\n <mat-date-range-picker\n [calendarHeaderComponent]=\"HeaderComponent\"\n #picker\n ></mat-date-range-picker>\n</div>\n", styles: ["nice-date-range-picker .mat-date-range-input{width:0;height:0;padding:0;margin:0;border:none;visibility:hidden}\n"], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i2$3.MatDatepickerToggle, selector: "mat-datepicker-toggle", inputs: ["for", "tabIndex", "aria-label", "disabled", "disableRipple"], exportAs: ["matDatepickerToggle"] }, { kind: "component", type: i2$3.MatDateRangeInput, selector: "mat-date-range-input", inputs: ["rangePicker", "required", "dateFilter", "min", "max", "disabled", "separator", "comparisonStart", "comparisonEnd"], exportAs: ["matDateRangeInput"] }, { kind: "directive", type: i2$3.MatStartDate, selector: "input[matStartDate]", inputs: ["errorStateMatcher"], outputs: ["dateChange", "dateInput"] }, { kind: "directive", type: i2$3.MatEndDate, selector: "input[matEndDate]", inputs: ["errorStateMatcher"], outputs: ["dateChange", "dateInput"] }, { kind: "component", type: i2$3.MatDateRangePicker, selector: "mat-date-range-picker", exportAs: ["matDateRangePicker"] }, { kind: "directive", type: i1$3.MatSuffix, selector: "[matSuffix]" }, { kind: "directive", type: i1$2.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1$2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$2.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1$2.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1$2.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "pipe", type: LocalizedDatePipe, name: "localizedDate" }], encapsulation: i0.ViewEncapsulation.None });
|
|
3928
3951
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: NiceDateRangePickerComponent, decorators: [{
|
|
3929
3952
|
type: Component,
|
|
3930
3953
|
args: [{ selector: "nice-date-range-picker", encapsulation: ViewEncapsulation.None, providers: [
|
|
@@ -3934,10 +3957,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImpor
|
|
|
3934
3957
|
multi: true
|
|
3935
3958
|
}
|
|
3936
3959
|
], template: "<div class=\"nice-date-picker-container\">\n <div class=\"nice-date-picker-header\">\n <div class=\"from-to\">\n <ng-container *ngIf=\"value?.from\">\n {{ value.from | localizedDate: \"longDate\" }}\n </ng-container>\n <ng-container *ngIf=\"value?.to\">\n <div class=\"separator\">-</div>\n {{ value.to | localizedDate: \"longDate\" }}\n </ng-container>\n </div>\n </div>\n\n <mat-date-range-input [formGroup]=\"formGroup\" [max]=\"nowIsMax ? now : null\" [rangePicker]=\"picker\">\n <input formControlName=\"from\" class=\"hidden-input\" matStartDate placeholder=\"Start date\">\n <input formControlName=\"to\" class=\"hidden-input\" matEndDate placeholder=\"End date\">\n </mat-date-range-input>\n\n <mat-datepicker-toggle matSuffix [for]=\"picker\"></mat-datepicker-toggle>\n\n <mat-date-range-picker\n [calendarHeaderComponent]=\"HeaderComponent\"\n #picker\n ></mat-date-range-picker>\n</div>\n", styles: ["nice-date-range-picker .mat-date-range-input{width:0;height:0;padding:0;margin:0;border:none;visibility:hidden}\n"] }]
|
|
3937
|
-
}], propDecorators: {
|
|
3938
|
-
type: ViewChild,
|
|
3939
|
-
args: [MatDateRangePicker]
|
|
3940
|
-
}], min: [{
|
|
3960
|
+
}], propDecorators: { min: [{
|
|
3941
3961
|
type: Input
|
|
3942
3962
|
}], max: [{
|
|
3943
3963
|
type: Input
|