00e56734-0265-4beb-b624-bd70efab4836

Committed 09 Apr 2024 05:51AM UTC coverage: 90.364% (-0.04%) from 90.399%

Build # 00e56734-0265-4beb-b624-bd70efab4836

Build Type

Pull #3061

circleci

Committed by

web-flow

Commit Message

Merge branch 'master' into minlovehua/takeuntil

Pull Request Pull Request #3061: refactor(all): use takeUntilDestroyed instead of mixinUnsubscribe INFR-9529

Run Details

5411 of 6635 branches covered (81.55%)

Branch coverage included in aggregate %.

45 of 48 new or added lines in 16 files covered. (93.75%)

53 existing lines in 8 files now uncovered.

13148 of 13903 relevant lines covered (94.57%)

981.77 hits per line

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

93.1

/src/drag-drop/drop-container.directive.ts

import {
    OnInit,
    Directive,
    Output,
    EventEmitter,
    ContentChildren,
    QueryList,
    AfterContentInit,
    NgZone,
    Input,
    OnDestroy,
    booleanAttribute
} from '@angular/core';
import { ThyDragDirective } from './drag.directive';
import { merge, Observable, defer, Subject } from 'rxjs';
import { takeUntil, startWith, take, switchMap } from 'rxjs/operators';
import { ThyDragDropEvent, ThyDragStartEvent, ThyDragEndEvent, ThyDragOverEvent } from './drag-drop.class';
import { THY_DROP_CONTAINER_DIRECTIVE, IThyDropContainerDirective } from './drop-container.class';

/**
 * @name thy-drop-container,[thyDropContainer]
 * @order 30
 */
@Directive({
    selector: 'thy-drop-container,[thyDropContainer]',
    providers: [
        {
            provide: THY_DROP_CONTAINER_DIRECTIVE,
            useExisting: ThyDropContainerDirective
        }
    ],
    standalone: true
})
export class ThyDropContainerDirective<T = any> implements OnInit, AfterContentInit, IThyDropContainerDirective, OnDestroy {
    private ngUnsubscribe$ = new Subject<void>();

    /**
     * 元数据
     * @type any[]
     */
    @Input('thyDropContainer')
    set dragContainer(data: T[]) {
        this.data = data;
    }

    /**
     * 元数据
     * @type any[]
     */
    @Input('thyDropContainerData') data: T[];

    /**
     * 是否禁用拖拽
     * @default false
     */
    @Input({ alias: 'thyDropContainerDisabled', transform: booleanAttribute }) disabled: boolean;

    /**
     * 拖拽之前的回调，函数返回 false 则阻止拖拽
     */
    @Input('thyBeforeDragStart') beforeStart: (e: ThyDragStartEvent<T>) => boolean;

    /**
     * 拖拽时回调，函数返回 false 则阻止移入
     */
    @Input('thyBeforeDragOver') beforeOver: (e: ThyDragOverEvent<T>) => boolean;

    /**
     * 拖放到元素时回调，函数返回 false 则阻止放置
     */
    @Input('thyBeforeDragDrop') beforeDrop: (e: ThyDragDropEvent<T>) => boolean;

    /**
     * 开始拖拽时调用
     */
    @Output('thyDragStarted') started = new EventEmitter<ThyDragStartEvent<ThyDragDirective>>();

    /**
     * dragend 触发时调用
     */
    @Output('thyDragEnded') ended = new EventEmitter<ThyDragEndEvent<ThyDragDirective>>();

    /**
     * dragover 触发时调用
     */
    @Output('thyDragOvered') overed = new EventEmitter<ThyDragOverEvent<ThyDragDirective>>();

    /**
     * drop 触发时调用
     */
    @Output('thyDragDropped') dropped = new EventEmitter<ThyDragDropEvent<ThyDragDirective>>();

    /**
     * @internal
     */
    @ContentChildren(ThyDragDirective, {
        descendants: false
    })
    draggables: QueryList<ThyDragDirective>;

    constructor(private ngZone: NgZone) {}

    ngOnInit() {}

    ngAfterContentInit() {
        this.draggables.changes.pipe(startWith(null), takeUntil(this.ngUnsubscribe$)).subscribe(() => {
            this.draggableChanges();
        });
    }

    private draggableChanges() {
        this.resetDraggableChanges(item => item.dragRef.started).subscribe(event => {
            this.started.emit(event);
        });
        this.resetDraggableChanges(item => item.dragRef.ended).subscribe(event => {
            this.ended.emit(event);
        });
        this.resetDraggableChanges(item => item.dragRef.overed).subscribe(event => {
            this.overed.emit(event);
        });
        this.resetDraggableChanges(item => item.dragRef.dropped).subscribe(event => {
            this.dropped.emit(event);
        });
    }

    private resetDraggableChanges(fn: (item: ThyDragDirective) => Observable<any>) {
        return defer(() => {
            if (this.draggables) {
                return merge(...this.draggables.map(fn));
            }
            return this.ngZone.onStable.asObservable().pipe(
                take(1),
                switchMap(() => this.resetDraggableChanges.bind(this, fn))
            );
        }).pipe(takeUntil(merge(this.ngUnsubscribe$, this.draggables.changes))) as Observable<any>;
    }

    ngOnDestroy(): void {
        this.ngUnsubscribe$.next();
        this.ngUnsubscribe$.complete();
    }
}

1	import {
2	OnInit,
3	Directive,
4	Output,
5	EventEmitter,
6	ContentChildren,
7	QueryList,
8	AfterContentInit,
9	NgZone,
10	Input,
11	OnDestroy,	1✔
12	booleanAttribute
13	} from '@angular/core';	20✔
14	import { ThyDragDirective } from './drag.directive';
15	import { merge, Observable, defer, Subject } from 'rxjs';
16	import { takeUntil, startWith, take, switchMap } from 'rxjs/operators';	20✔
17	import { ThyDragDropEvent, ThyDragStartEvent, ThyDragEndEvent, ThyDragOverEvent } from './drag-drop.class';	20✔
18	import { THY_DROP_CONTAINER_DIRECTIVE, IThyDropContainerDirective } from './drop-container.class';	20✔
19		20✔
20	/**	20✔
21	* @name thy-drop-container,[thyDropContainer]	20✔
22	* @order 30
23	*/
24	@Directive({
25	selector: 'thy-drop-container,[thyDropContainer]',	20✔
26	providers: [	20✔
27	{
28	provide: THY_DROP_CONTAINER_DIRECTIVE,
29	useExisting: ThyDropContainerDirective
30	}	38✔
31	],	1✔
32	standalone: true
33	})	38✔
34	export class ThyDropContainerDirective<T = any> implements OnInit, AfterContentInit, IThyDropContainerDirective, OnDestroy {	1✔
35	private ngUnsubscribe$ = new Subject<void>();
36		38✔
37	/**	1✔
38	* 元数据
39	* @type any[]	38✔
40	*/	1✔
41	@Input('thyDropContainer')
42	set dragContainer(data: T[]) {
43	this.data = data;
44	}	80✔
45		80!
46	/**	80✔
47	* 元数据
UNCOV 48	* @type any[]	×
49	*/
50	@Input('thyDropContainerData') data: T[];
51
52	/**	20✔
53	* 是否禁用拖拽	20✔
54	* @default false
55	*/	1✔
56	@Input({ alias: 'thyDropContainerDisabled', transform: booleanAttribute }) disabled: boolean;
57
58	/**	1✔
59	* 拖拽之前的回调，函数返回 false 则阻止拖拽
60	*/
61	@Input('thyBeforeDragStart') beforeStart: (e: ThyDragStartEvent<T>) => boolean;
62
63	/**
64	* 拖拽时回调，函数返回 false 则阻止移入
65	*/
66	@Input('thyBeforeDragOver') beforeOver: (e: ThyDragOverEvent<T>) => boolean;
67
68	/**
69	* 拖放到元素时回调，函数返回 false 则阻止放置
70	*/
71	@Input('thyBeforeDragDrop') beforeDrop: (e: ThyDragDropEvent<T>) => boolean;
72
73	/**
74	* 开始拖拽时调用	1✔
75	*/
76	@Output('thyDragStarted') started = new EventEmitter<ThyDragStartEvent<ThyDragDirective>>();
77
78	/**
79	* dragend 触发时调用
80	*/
81	@Output('thyDragEnded') ended = new EventEmitter<ThyDragEndEvent<ThyDragDirective>>();
82
83	/**
84	* dragover 触发时调用
85	*/
86	@Output('thyDragOvered') overed = new EventEmitter<ThyDragOverEvent<ThyDragDirective>>();
87
88	/**
89	* drop 触发时调用
90	*/
91	@Output('thyDragDropped') dropped = new EventEmitter<ThyDragDropEvent<ThyDragDirective>>();
92
93	/**
94	* @internal
95	*/
96	@ContentChildren(ThyDragDirective, {
97	descendants: false
98	})
99	draggables: QueryList<ThyDragDirective>;
100
101	constructor(private ngZone: NgZone) {}
102
103	ngOnInit() {}
104
105	ngAfterContentInit() {
106	this.draggables.changes.pipe(startWith(null), takeUntil(this.ngUnsubscribe$)).subscribe(() => {
107	this.draggableChanges();
108	});
109	}
110
111	private draggableChanges() {
112	this.resetDraggableChanges(item => item.dragRef.started).subscribe(event => {
113	this.started.emit(event);
114	});
115	this.resetDraggableChanges(item => item.dragRef.ended).subscribe(event => {
116	this.ended.emit(event);
117	});
118	this.resetDraggableChanges(item => item.dragRef.overed).subscribe(event => {
119	this.overed.emit(event);
120	});
121	this.resetDraggableChanges(item => item.dragRef.dropped).subscribe(event => {
122	this.dropped.emit(event);
123	});
124	}
125
126	private resetDraggableChanges(fn: (item: ThyDragDirective) => Observable<any>) {
127	return defer(() => {
128	if (this.draggables) {
129	return merge(...this.draggables.map(fn));
130	}
131	return this.ngZone.onStable.asObservable().pipe(
132	take(1),
133	switchMap(() => this.resetDraggableChanges.bind(this, fn))
134	);
135	}).pipe(takeUntil(merge(this.ngUnsubscribe$, this.draggables.changes))) as Observable<any>;
136	}
137
138	ngOnDestroy(): void {
139	this.ngUnsubscribe$.next();
140	this.ngUnsubscribe$.complete();
141	}
142	}

atinc / ngx-tethys / 00e56734-0265-4beb-b624-bd70efab4836

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