1b395ef9-9b5d-4553-9091-e0714143e3a7

Committed 13 Dec 2023 02:40AM UTC coverage: 17.395% (-73.0%) from 90.364%

Build # 1b395ef9-9b5d-4553-9091-e0714143e3a7

Build Type

push

circleci

Committed by

luxiaobei

Commit Message

fix(select): remove focus() when close panel #INFR-10914

Run Details

502 of 6578 branches covered (0.0%)

Branch coverage included in aggregate %.

1 of 2 new or added lines in 1 file covered. (50.0%)

10248 existing lines in 329 files now uncovered.

3092 of 14083 relevant lines covered (21.96%)

92.82 hits per line

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

16.67

/src/select/select.component.ts

import { Component, forwardRef, HostBinding, Input, OnInit } from '@angular/core';
import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
import { TabIndexDisabledControlValueAccessorMixin, InputBoolean } from 'ngx-tethys/core';
import { elementMatchClosest } from 'ngx-tethys/util';

import { NgIf } from '@angular/common';
import { ElementRef, ViewChild } from '@angular/core';
import { useHostRenderer } from '@tethys/cdk/dom';
import { ThyIconComponent } from 'ngx-tethys/icon';
import { ThyInputDirective } from 'ngx-tethys/input';

export type InputSize = 'xs' | 'sm' | 'md' | 'lg' | '';

const noop = () => {};

/**
 * 下拉选择
 * @name thy-select
 * @order 20
 */
@Component({
    selector: 'thy-select',
    templateUrl: './select.component.html',
    providers: [
        {
            provide: NG_VALUE_ACCESSOR,
            useExisting: forwardRef(() => ThySelectComponent),
            multi: true
        }
    ],
    standalone: true,
    imports: [ThyInputDirective, FormsModule, ThyIconComponent, NgIf],
    host: {
        '[attr.tabindex]': 'tabIndex',
        '(focus)': 'onFocus($event)',
        '(blur)': 'onBlur($event)'
    }
})
export class ThySelectComponent extends TabIndexDisabledControlValueAccessorMixin implements ControlValueAccessor, OnInit {
    @ViewChild('select', { static: true }) selectElement: ElementRef<any>;

    // The internal data model
    _innerValue: any = null;
    _disabled = false;
    _size: InputSize;
    _expandOptions = false;

    private hostRenderer = useHostRenderer();

    @HostBinding('class.thy-select') _isSelect = true;

    @Input()
    set thySize(value: InputSize) {
        this._size = value;
    }

    @Input() name: string;

    @Input() @InputBoolean() thyAllowClear = false;

    writeValue(obj: any): void {
        if (obj !== this._innerValue) {
            this._innerValue = obj;
        }
    }

    setDisabledState?(isDisabled: boolean): void {
        this._disabled = isDisabled;
    }

    constructor(private elementRef: ElementRef) {
        super();
    }

    ngModelChange() {
        this.onChangeFn(this._innerValue);
        this.onTouchedFn();
    }

    ngOnInit() {
        const classes = this._size ? [`thy-select-${this._size}`] : [];
        this.hostRenderer.updateClass(classes);
    }

    onBlur(event: FocusEvent) {
        if (elementMatchClosest(event?.relatedTarget as HTMLElement, 'thy-select')) {
            return;
        }
        this.onTouchedFn();
    }

    onFocus(event?: Event) {
        this.selectElement.nativeElement.focus();
    }

    clearSelectValue(event: Event) {
        event.stopPropagation();
        this._innerValue = '';
        this.onChangeFn(this._innerValue);
    }
}

1	import { Component, forwardRef, HostBinding, Input, OnInit } from '@angular/core';
2	import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
3	import { TabIndexDisabledControlValueAccessorMixin, InputBoolean } from 'ngx-tethys/core';
4	import { elementMatchClosest } from 'ngx-tethys/util';
5
6	import { NgIf } from '@angular/common';
7	import { ElementRef, ViewChild } from '@angular/core';
8	import { useHostRenderer } from '@tethys/cdk/dom';
9	import { ThyIconComponent } from 'ngx-tethys/icon';
10	import { ThyInputDirective } from 'ngx-tethys/input';
11
12	export type InputSize = 'xs' \| 'sm' \| 'md' \| 'lg' \| '';
13		1✔
14	const noop = () => {};
15
16	/**
17	* 下拉选择
18	* @name thy-select
19	* @order 20	1✔
20	*/
UNCOV 21	@Component({	×
22	selector: 'thy-select',
23	templateUrl: './select.component.html',
UNCOV 24	providers: [	×
UNCOV 25	{	×
26	provide: NG_VALUE_ACCESSOR,
27	useExisting: forwardRef(() => ThySelectComponent),
28	multi: true
UNCOV 29	}	×
30	],
31	standalone: true,
UNCOV 32	imports: [ThyInputDirective, FormsModule, ThyIconComponent, NgIf],	×
UNCOV 33	host: {	×
34	'[attr.tabindex]': 'tabIndex',
UNCOV 35	'(focus)': 'onFocus($event)',	×
UNCOV 36	'(blur)': 'onBlur($event)'	×
UNCOV 37	}	×
UNCOV 38	})	×
UNCOV 39	export class ThySelectComponent extends TabIndexDisabledControlValueAccessorMixin implements ControlValueAccessor, OnInit {	×
UNCOV 40	@ViewChild('select', { static: true }) selectElement: ElementRef<any>;	×
41
42	// The internal data model
43	_innerValue: any = null;	×
44	_disabled = false;	×
45	_size: InputSize;
46	_expandOptions = false;
UNCOV 47		×
UNCOV 48	private hostRenderer = useHostRenderer();	×
49
50	@HostBinding('class.thy-select') _isSelect = true;
UNCOV 51		×
UNCOV 52	@Input()	×
53	set thySize(value: InputSize) {
UNCOV 54	this._size = value;	×
55	}
56
UNCOV 57	@Input() name: string;	×
58
59	@Input() @InputBoolean() thyAllowClear = false;
UNCOV 60		×
UNCOV 61	writeValue(obj: any): void {	×
UNCOV 62	if (obj !== this._innerValue) {	×
63	this._innerValue = obj;
64	}	1✔
65	}
66
67	setDisabledState?(isDisabled: boolean): void {	1✔
68	this._disabled = isDisabled;
69	}
70
71	constructor(private elementRef: ElementRef) {
72	super();
73	}
74
75	ngModelChange() {	1✔
76	this.onChangeFn(this._innerValue);
77	this.onTouchedFn();
78	}
79		1✔
80	ngOnInit() {
81	const classes = this._size ? [`thy-select-${this._size}`] : [];
82	this.hostRenderer.updateClass(classes);
83	}
84
85	onBlur(event: FocusEvent) {
UNCOV 86	if (elementMatchClosest(event?.relatedTarget as HTMLElement, 'thy-select')) {	×
87	return;
88	}
89	this.onTouchedFn();
90	}
91
92	onFocus(event?: Event) {
93	this.selectElement.nativeElement.focus();
94	}
95
96	clearSelectValue(event: Event) {
97	event.stopPropagation();
98	this._innerValue = '';
99	this.onChangeFn(this._innerValue);
100	}
101	}

atinc / ngx-tethys / 1b395ef9-9b5d-4553-9091-e0714143e3a7

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