03e22aa0-8a30-49e9-b55c-a3bf7a2d8a7f

Committed 15 Nov 2023 10:37AM UTC coverage: 90.201% (-0.003%) from 90.204%

Build # 03e22aa0-8a30-49e9-b55c-a3bf7a2d8a7f

Build Type

Pull #2897

circleci

Committed by

minlovehua

Commit Message

test(date-picker): improve unit test

Pull Request Pull Request #2897: fix(date-picker): should update display value when thyFormat change #INFR-10428

Run Details

5269 of 6504 branches covered (0.0%)

Branch coverage included in aggregate %.

5 of 5 new or added lines in 1 file covered. (100.0%)

3 existing lines in 1 file now uncovered.

13178 of 13947 relevant lines covered (94.49%)

977.79 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

95.0

/src/date-picker/picker.component.ts

import { getFlexiblePositions, ThyPlacement } from 'ngx-tethys/core';
import { TinyDate } from 'ngx-tethys/util';

import { CdkConnectedOverlay, CdkOverlayOrigin, ConnectedOverlayPositionChange } from '@angular/cdk/overlay';
import {
    AfterViewInit,
    ChangeDetectionStrategy,
    ChangeDetectorRef,
    Component,
    ElementRef,
    EventEmitter,
    Input,
    Output,
    ViewChild
} from '@angular/core';

import { AsyncPipe, NgClass, NgIf, NgTemplateOutlet } from '@angular/common';
import { ThyIconComponent } from 'ngx-tethys/icon';
import { ThyInputDirective } from 'ngx-tethys/input';
import { DateHelperService } from './date-helper.service';
import { CompatibleValue, RangePartType } from './inner-types';
import { getFlexibleAdvancedReadableValue } from './picker.util';
import { ThyDateGranularity } from './standard-types';
import { ThyEnterDirective } from 'ngx-tethys/shared';
import { BehaviorSubject } from 'rxjs';

/**
 * @private
 */
@Component({
    selector: 'thy-picker',
    exportAs: 'thyPicker',
    templateUrl: './picker.component.html',
    changeDetection: ChangeDetectionStrategy.OnPush,
    standalone: true,
    imports: [
        CdkOverlayOrigin,
        ThyInputDirective,
        ThyEnterDirective,
        AsyncPipe,
        NgTemplateOutlet,
        NgIf,
        ThyIconComponent,
        NgClass,
        CdkConnectedOverlay
    ]
})
export class ThyPickerComponent implements AfterViewInit {
    @Input() isRange = false;
    @Input() open: boolean | undefined = undefined;
    @Input() disabled: boolean;
    @Input() placeholder: string | string[];
    @Input() readonly: boolean;
    @Input() allowClear: boolean;
    @Input() autoFocus: boolean;
    @Input() className: string;
    @Input() size: 'sm' | 'xs' | 'lg' | 'md' | 'default';
    @Input() suffixIcon: string;
    @Input() placement: ThyPlacement = 'bottomLeft';
    @Input() flexible: boolean = false;
    @Input() mode: string;
    @Output() blur = new EventEmitter<Event>();
    @Output() readonly valueChange = new EventEmitter<TinyDate | TinyDate[] | null>();
    @Output() readonly openChange = new EventEmitter<boolean>(); // Emitted when overlay's open state change
    @Output() readonly inputChange = new EventEmitter<string>();

    @ViewChild('origin', { static: true }) origin: CdkOverlayOrigin;
    @ViewChild(CdkConnectedOverlay, { static: true }) cdkConnectedOverlay: CdkConnectedOverlay;
    @ViewChild('pickerInput', { static: true }) pickerInput: ElementRef;

    @Input()
    get format() {
        return this.innerFormat;
    }

    set format(value: string) {
        this.innerFormat = value;
        this.updateReadableDate(this.innerValue);
    }

    @Input()
    get flexibleDateGranularity() {
        return this.innerflexibleDateGranularity;
    }

    set flexibleDateGranularity(granularity: ThyDateGranularity) {
        this.innerflexibleDateGranularity = granularity;
        this.updateReadableDate(this.innerValue);
    }

    @Input()
    get value() {
        return this.innerValue;
    }

    set value(value: TinyDate | TinyDate[] | null) {
        this.innerValue = value;
        if (!this.entering) {
            this.updateReadableDate(this.innerValue);
        }
    }

    private innerflexibleDateGranularity: ThyDateGranularity;

    private innerFormat: string;

    private innerValue: TinyDate | TinyDate[] | null;

    entering = false;

    readableValue$ = new BehaviorSubject<string | null>(null);

    prefixCls = 'thy-calendar';

    animationOpenState = false;

    overlayOpen = false; // Available when "open"=undefined

    overlayPositions = getFlexiblePositions(this.placement, 4);

    get realOpenState(): boolean {
        // The value that really decide the open state of overlay
        return this.isOpenHandledByUser() ? !!this.open : this.overlayOpen;
    }

    get readonlyState(): boolean {
        return this.isRange || this.readonly || this.mode !== 'date';
    }

    constructor(private changeDetector: ChangeDetectorRef, private dateHelper: DateHelperService) {}

    ngAfterViewInit(): void {
        this.overlayPositions = getFlexiblePositions(this.placement, 4);
        if (this.autoFocus) {
            this.focus();
        }
    }

    focus(): void {
        this.pickerInput.nativeElement.focus();
    }

    onBlur(event: FocusEvent) {
        this.blur.emit(event);
        if (this.entering) {
            this.valueChange.emit(this.pickerInput.nativeElement.value);
        }
        this.entering = false;
    }

    onInput(event: InputEvent) {
        this.entering = true;
        const inputValue = (event.target as HTMLElement)['value'];
        this.inputChange.emit(inputValue);
    }

    onEnter() {
        if (this.readonlyState) {
            return;
        }
        this.valueChange.emit(this.pickerInput.nativeElement.value || this.getReadableValue(new TinyDate(new Date())));
        this.entering = false;
    }

    showOverlay(): void {
        if (!this.realOpenState) {
            this.overlayOpen = true;
            if (this.realOpenState) {
                this.animationOpenState = true;
            }
            this.openChange.emit(this.overlayOpen);
            setTimeout(() => {
                if (this.cdkConnectedOverlay && this.cdkConnectedOverlay.overlayRef) {
                    this.cdkConnectedOverlay.overlayRef.updatePosition();
                }
            });
        }
    }

    hideOverlay(): void {
        if (this.realOpenState) {
            this.overlayOpen = false;
            if (!this.realOpenState) {
                this.animationOpenState = false;
            }
            this.openChange.emit(this.overlayOpen);
            this.focus();
        }
    }

    onClickInputBox(): void {
        if (!this.disabled && !this.readonly && !this.isOpenHandledByUser()) {
            this.showOverlay();
        }
    }

    onClickBackdrop(): void {
        this.hideOverlay();
    }

    onOverlayDetach(): void {
        this.hideOverlay();
    }

    onPositionChange(position: ConnectedOverlayPositionChange): void {
        this.changeDetector.detectChanges();
    }

    onClickClear(event: MouseEvent): void {
        event.preventDefault();
        event.stopPropagation();

        this.innerValue = this.isRange ? [] : null;
        this.valueChange.emit(this.innerValue);
    }

    getPartTypeIndex(partType: RangePartType): number {
        return { left: 0, right: 1 }[partType];
    }

    isEmptyValue(value: CompatibleValue | null): boolean {
        if (value === null) {
            return true;
        } else if (this.isRange) {
            return !value || !Array.isArray(value) || value.every(val => !val);
        } else {
            return !value;
        }
    }

    // Whether open state is permanently controlled by user himself
    isOpenHandledByUser(): boolean {
        return this.open !== undefined;
    }

    getReadableValue(tinyDate: TinyDate | TinyDate[]): string | null {
        let value: TinyDate;
        if (this.isRange) {
            if (this.flexible && this.innerflexibleDateGranularity !== 'day') {
                return getFlexibleAdvancedReadableValue(tinyDate as TinyDate[], this.innerflexibleDateGranularity);
            } else {
                const start = tinyDate[0] ? this.dateHelper.format(tinyDate[0].nativeDate, this.innerFormat) : '';
                const end = tinyDate[1] ? this.dateHelper.format(tinyDate[1].nativeDate, this.innerFormat) : '';
                return start && end ? `${start} ~ ${end}` : null;
            }
        } else {
            value = tinyDate as TinyDate;
            return value ? this.dateHelper.format(value.nativeDate, this.innerFormat) : null;
        }
    }

    getPlaceholder(): string {
        return this.isRange && this.placeholder && Array.isArray(this.placeholder)
            ? (this.placeholder as string[]).join(' ~ ')
            : (this.placeholder as string);
    }

    private updateReadableDate(setValue: TinyDate | TinyDate[] | null) {
        const readableValue = this.getReadableValue(setValue);
        if (readableValue === this.pickerInput.nativeElement['value']) {
            return;
        }

        if (this.entering) {
            this.readableValue$.next(null);
            setTimeout(() => {
                this.readableValue$.next(readableValue);
            }, 0);
        } else {
            this.readableValue$.next(readableValue);
        }
    }
}

1	import { getFlexiblePositions, ThyPlacement } from 'ngx-tethys/core';
2	import { TinyDate } from 'ngx-tethys/util';
3
4	import { CdkConnectedOverlay, CdkOverlayOrigin, ConnectedOverlayPositionChange } from '@angular/cdk/overlay';
5	import {
6	AfterViewInit,
7	ChangeDetectionStrategy,
8	ChangeDetectorRef,
9	Component,
10	ElementRef,
11	EventEmitter,
12	Input,
13	Output,
14	ViewChild
15	} from '@angular/core';
16
17	import { AsyncPipe, NgClass, NgIf, NgTemplateOutlet } from '@angular/common';	1✔
18	import { ThyIconComponent } from 'ngx-tethys/icon';
19	import { ThyInputDirective } from 'ngx-tethys/input';	×
20	import { DateHelperService } from './date-helper.service';
21	import { CompatibleValue, RangePartType } from './inner-types';
22	import { getFlexibleAdvancedReadableValue } from './picker.util';	144✔
23	import { ThyDateGranularity } from './standard-types';	144✔
24	import { ThyEnterDirective } from 'ngx-tethys/shared';
25	import { BehaviorSubject } from 'rxjs';
UNCOV 26		×
27	/**
28	* @private
29	*/	148✔
30	@Component({	148✔
31	selector: 'thy-picker',
32	exportAs: 'thyPicker',
33	templateUrl: './picker.component.html',	641✔
34	changeDetection: ChangeDetectionStrategy.OnPush,
35	standalone: true,
36	imports: [	287✔
37	CdkOverlayOrigin,	287✔
38	ThyInputDirective,	279✔
39	ThyEnterDirective,
40	AsyncPipe,
41	NgTemplateOutlet,
42	NgIf,
43	ThyIconComponent,	1,591✔
44	NgClass,
45	CdkConnectedOverlay
46	]	647✔
47	})
48	export class ThyPickerComponent implements AfterViewInit {
49	@Input() isRange = false;	142✔
50	@Input() open: boolean \| undefined = undefined;	142✔
51	@Input() disabled: boolean;	142✔
52	@Input() placeholder: string \| string[];	142✔
53	@Input() readonly: boolean;	142✔
54	@Input() allowClear: boolean;	142✔
55	@Input() autoFocus: boolean;	142✔
56	@Input() className: string;	142✔
57	@Input() size: 'sm' \| 'xs' \| 'lg' \| 'md' \| 'default';	142✔
58	@Input() suffixIcon: string;	142✔
59	@Input() placement: ThyPlacement = 'bottomLeft';	142✔
60	@Input() flexible: boolean = false;	142✔
61	@Input() mode: string;	142✔
62	@Output() blur = new EventEmitter<Event>();	142✔
63	@Output() readonly valueChange = new EventEmitter<TinyDate \| TinyDate[] \| null>();	142✔
64	@Output() readonly openChange = new EventEmitter<boolean>(); // Emitted when overlay's open state change	142✔
65	@Output() readonly inputChange = new EventEmitter<string>();
66
67	@ViewChild('origin', { static: true }) origin: CdkOverlayOrigin;	142✔
68	@ViewChild(CdkConnectedOverlay, { static: true }) cdkConnectedOverlay: CdkConnectedOverlay;	142✔
69	@ViewChild('pickerInput', { static: true }) pickerInput: ElementRef;	1✔
70
71	@Input()
72	get format() {
73	return this.innerFormat;	54✔
74	}
75
76	set format(value: string) {	5✔
77	this.innerFormat = value;	5!
78	this.updateReadableDate(this.innerValue);	5✔
79	}
80		5✔
81	@Input()
82	get flexibleDateGranularity() {
83	return this.innerflexibleDateGranularity;	14✔
84	}	14✔
85		14✔
86	set flexibleDateGranularity(granularity: ThyDateGranularity) {
87	this.innerflexibleDateGranularity = granularity;
88	this.updateReadableDate(this.innerValue);	5!
UNCOV 89	}	×
90
91	@Input()	5✔
92	get value() {	5✔
93	return this.innerValue;
94	}
95		111✔
96	set value(value: TinyDate \| TinyDate[] \| null) {	110✔
97	this.innerValue = value;	110!
98	if (!this.entering) {	110✔
99	this.updateReadableDate(this.innerValue);
100	}	110✔
101	}	110✔
102		110!
103	private innerflexibleDateGranularity: ThyDateGranularity;	110✔
104
105	private innerFormat: string;
106
107	private innerValue: TinyDate \| TinyDate[] \| null;
108
109	entering = false;	101✔
110		52✔
111	readableValue$ = new BehaviorSubject<string \| null>(null);	52✔
112		46✔
113	prefixCls = 'thy-calendar';
114		52✔
115	animationOpenState = false;	52✔
116
117	overlayOpen = false; // Available when "open"=undefined
118
119	overlayPositions = getFlexiblePositions(this.placement, 4);	114✔
120		111✔
121	get realOpenState(): boolean {
122	// The value that really decide the open state of overlay
123	return this.isOpenHandledByUser() ? !!this.open : this.overlayOpen;
124	}	10✔
125
126	get readonlyState(): boolean {
127	return this.isRange \|\| this.readonly \|\| this.mode !== 'date';	47✔
128	}
129
130	constructor(private changeDetector: ChangeDetectorRef, private dateHelper: DateHelperService) {}	214✔
131
132	ngAfterViewInit(): void {
133	this.overlayPositions = getFlexiblePositions(this.placement, 4);	5✔
134	if (this.autoFocus) {	5✔
135	this.focus();	5✔
136	}	5✔
137	}
138
UNCOV 139	focus(): void {	×
140	this.pickerInput.nativeElement.focus();
141	}
142		641✔
143	onBlur(event: FocusEvent) {	255✔
144	this.blur.emit(event);
145	if (this.entering) {	386✔
146	this.valueChange.emit(this.pickerInput.nativeElement.value);	264✔
147	}
148	this.entering = false;
149	}	122✔
150
151	onInput(event: InputEvent) {
152	this.entering = true;
153	const inputValue = (event.target as HTMLElement)['value'];
154	this.inputChange.emit(inputValue);	2,346✔
155	}
156
157	onEnter() {
158	if (this.readonlyState) {	619✔
159	return;	262✔
160	}	46✔
161	this.valueChange.emit(this.pickerInput.nativeElement.value \|\| this.getReadableValue(new TinyDate(new Date())));
162	this.entering = false;
163	}	216✔
164		216✔
165	showOverlay(): void {	216✔
166	if (!this.realOpenState) {
167	this.overlayOpen = true;
168	if (this.realOpenState) {
169	this.animationOpenState = true;	357✔
170	}	357✔
171	this.openChange.emit(this.overlayOpen);
172	setTimeout(() => {
173	if (this.cdkConnectedOverlay && this.cdkConnectedOverlay.overlayRef) {
174	this.cdkConnectedOverlay.overlayRef.updatePosition();	641✔
175	}
176	});
177	}
178	}
179		571✔
180	hideOverlay(): void {	571✔
181	if (this.realOpenState) {	37✔
182	this.overlayOpen = false;
183	if (!this.realOpenState) {	534✔
184	this.animationOpenState = false;	1✔
185	}	1✔
186	this.openChange.emit(this.overlayOpen);	1✔
187	this.focus();
188	}
189	}
190		533✔
191	onClickInputBox(): void {
192	if (!this.disabled && !this.readonly && !this.isOpenHandledByUser()) {
193	this.showOverlay();	1✔
194	}
195	}
196
197	onClickBackdrop(): void {	1✔
198	this.hideOverlay();
199	}
200
201	onOverlayDetach(): void {
202	this.hideOverlay();
203	}
204
205	onPositionChange(position: ConnectedOverlayPositionChange): void {
206	this.changeDetector.detectChanges();
207	}
208
209	onClickClear(event: MouseEvent): void {
210	event.preventDefault();
211	event.stopPropagation();
212
213	this.innerValue = this.isRange ? [] : null;
214	this.valueChange.emit(this.innerValue);
215	}
216
217	getPartTypeIndex(partType: RangePartType): number {
218	return { left: 0, right: 1 }[partType];
219	}
220
221	isEmptyValue(value: CompatibleValue \| null): boolean {
222	if (value === null) {
223	return true;	1✔
224	} else if (this.isRange) {
225	return !value \|\| !Array.isArray(value) \|\| value.every(val => !val);
226	} else {
227	return !value;
228	}
229	}
230
231	// Whether open state is permanently controlled by user himself
232	isOpenHandledByUser(): boolean {
233	return this.open !== undefined;
234	}
235
236	getReadableValue(tinyDate: TinyDate \| TinyDate[]): string \| null {
237	let value: TinyDate;
238	if (this.isRange) {
239	if (this.flexible && this.innerflexibleDateGranularity !== 'day') {
240	return getFlexibleAdvancedReadableValue(tinyDate as TinyDate[], this.innerflexibleDateGranularity);
241	} else {
242	const start = tinyDate[0] ? this.dateHelper.format(tinyDate[0].nativeDate, this.innerFormat) : '';
243	const end = tinyDate[1] ? this.dateHelper.format(tinyDate[1].nativeDate, this.innerFormat) : '';
244	return start && end ? `${start} ~ ${end}` : null;
245	}
246	} else {
247	value = tinyDate as TinyDate;
248	return value ? this.dateHelper.format(value.nativeDate, this.innerFormat) : null;
249	}
250	}
251
252	getPlaceholder(): string {
253	return this.isRange && this.placeholder && Array.isArray(this.placeholder)
254	? (this.placeholder as string[]).join(' ~ ')
255	: (this.placeholder as string);
256	}
257
258	private updateReadableDate(setValue: TinyDate \| TinyDate[] \| null) {
259	const readableValue = this.getReadableValue(setValue);
260	if (readableValue === this.pickerInput.nativeElement['value']) {
261	return;
262	}
263
264	if (this.entering) {
265	this.readableValue$.next(null);
266	setTimeout(() => {
267	this.readableValue$.next(readableValue);
268	}, 0);
269	} else {
270	this.readableValue$.next(readableValue);
271	}
272	}
273	}

atinc / ngx-tethys / 03e22aa0-8a30-49e9-b55c-a3bf7a2d8a7f

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous