Skip to content

Commit 34c8c1d

Browse files
author
Timon Krebs
committed
fix(cdk/drag-drop): fixed tests
1 parent 6f7edc2 commit 34c8c1d

File tree

2 files changed

+55
-25
lines changed

2 files changed

+55
-25
lines changed

‎src/cdk/drag-drop/directives/drag.spec.ts

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,7 +1690,8 @@ describe('CdkDrag', () => {
16901690
container: fixture.componentInstance.dropInstance,
16911691
previousContainer: fixture.componentInstance.dropInstance,
16921692
isPointerOverContainer: true,
1693-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
1693+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
1694+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
16941695
});
16951696

16961697
expect(dragItems.map(drag => drag.element.nativeElement.textContent!.trim()))
@@ -1817,7 +1818,8 @@ describe('CdkDrag', () => {
18171818
container: fixture.componentInstance.dropInstance,
18181819
previousContainer: fixture.componentInstance.dropInstance,
18191820
isPointerOverContainer: false,
1820-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
1821+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
1822+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
18211823
});
18221824

18231825
expect(dragItems.map(drag => drag.element.nativeElement.textContent!.trim()))
@@ -1876,7 +1878,8 @@ describe('CdkDrag', () => {
18761878
container: fixture.componentInstance.dropInstance,
18771879
previousContainer: fixture.componentInstance.dropInstance,
18781880
isPointerOverContainer: true,
1879-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
1881+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
1882+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
18801883
});
18811884

18821885
expect(dragItems.map(drag => drag.element.nativeElement.textContent!.trim()))
@@ -1917,7 +1920,8 @@ describe('CdkDrag', () => {
19171920
container: fixture.componentInstance.dropInstance,
19181921
previousContainer: fixture.componentInstance.dropInstance,
19191922
isPointerOverContainer: true,
1920-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
1923+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
1924+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
19211925
});
19221926

19231927
expect(dragItems.map(drag => drag.element.nativeElement.textContent!.trim()))
@@ -1954,7 +1958,8 @@ describe('CdkDrag', () => {
19541958
container: fixture.componentInstance.dropInstance,
19551959
previousContainer: fixture.componentInstance.dropInstance,
19561960
isPointerOverContainer: false,
1957-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
1961+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
1962+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
19581963
});
19591964

19601965
expect(dragItems.map(drag => drag.element.nativeElement.textContent!.trim()))
@@ -1997,7 +2002,8 @@ describe('CdkDrag', () => {
19972002
container: fixture.componentInstance.dropInstance,
19982003
previousContainer: fixture.componentInstance.dropInstance,
19992004
isPointerOverContainer: jasmine.any(Boolean),
2000-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
2005+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
2006+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
20012007
});
20022008
}));
20032009

@@ -2045,7 +2051,8 @@ describe('CdkDrag', () => {
20452051
container: fixture.componentInstance.dropInstance,
20462052
previousContainer: fixture.componentInstance.dropInstance,
20472053
isPointerOverContainer: jasmine.any(Boolean),
2048-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
2054+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
2055+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
20492056
});
20502057

20512058
scrollTo(0, 0);
@@ -3636,7 +3643,8 @@ describe('CdkDrag', () => {
36363643
container: dropInstance,
36373644
previousContainer: dropInstance,
36383645
isPointerOverContainer: true,
3639-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
3646+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
3647+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
36403648
});
36413649

36423650
expect(dragItems.map(drag => drag.element.nativeElement.textContent!.trim()))
@@ -4068,7 +4076,8 @@ describe('CdkDrag', () => {
40684076
container: fixture.componentInstance.dropInstance,
40694077
previousContainer: fixture.componentInstance.dropInstance,
40704078
isPointerOverContainer: true,
4071-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4079+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4080+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
40724081
});
40734082
}));
40744083

@@ -4291,7 +4300,8 @@ describe('CdkDrag', () => {
42914300
container: fixture.componentInstance.dropInstance,
42924301
previousContainer: fixture.componentInstance.dropInstance,
42934302
isPointerOverContainer: jasmine.any(Boolean),
4294-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4303+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4304+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
42954305
});
42964306
}));
42974307

@@ -4346,7 +4356,8 @@ describe('CdkDrag', () => {
43464356
container: fixture.componentInstance.dropInstances.toArray()[1],
43474357
previousContainer: fixture.componentInstance.dropInstances.first,
43484358
isPointerOverContainer: true,
4349-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4359+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4360+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
43504361
});
43514362
}));
43524363

@@ -4451,7 +4462,8 @@ describe('CdkDrag', () => {
44514462
container: dropInstances[1],
44524463
previousContainer: dropInstances[0],
44534464
isPointerOverContainer: true,
4454-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4465+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4466+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
44554467
});
44564468
}));
44574469

@@ -4482,7 +4494,8 @@ describe('CdkDrag', () => {
44824494
container: dropInstances[0],
44834495
previousContainer: dropInstances[0],
44844496
isPointerOverContainer: false,
4485-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4497+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4498+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
44864499
});
44874500
}));
44884501

@@ -4513,7 +4526,8 @@ describe('CdkDrag', () => {
45134526
container: dropInstances[0],
45144527
previousContainer: dropInstances[0],
45154528
isPointerOverContainer: false,
4516-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4529+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4530+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
45174531
});
45184532
}));
45194533

@@ -4649,7 +4663,8 @@ describe('CdkDrag', () => {
46494663
container: dropInstances[1],
46504664
previousContainer: dropInstances[0],
46514665
isPointerOverContainer: true,
4652-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4666+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4667+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
46534668
});
46544669
}));
46554670

@@ -4786,7 +4801,8 @@ describe('CdkDrag', () => {
47864801
container: dropInstances[1],
47874802
previousContainer: dropInstances[0],
47884803
isPointerOverContainer: true,
4789-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4804+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4805+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
47904806
});
47914807
}));
47924808

@@ -4813,7 +4829,8 @@ describe('CdkDrag', () => {
48134829
container: dropInstances[1],
48144830
previousContainer: dropInstances[0],
48154831
isPointerOverContainer: true,
4816-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4832+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4833+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
48174834
});
48184835
}));
48194836

@@ -4845,7 +4862,8 @@ describe('CdkDrag', () => {
48454862
container: dropInstances[1],
48464863
previousContainer: dropInstances[0],
48474864
isPointerOverContainer: true,
4848-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4865+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4866+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
48494867
});
48504868
}));
48514869

@@ -4881,7 +4899,8 @@ describe('CdkDrag', () => {
48814899
container: fixture.componentInstance.dropInstances.toArray()[1],
48824900
previousContainer: fixture.componentInstance.dropInstances.first,
48834901
isPointerOverContainer: true,
4884-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
4902+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
4903+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
48854904
});
48864905

48874906
expect(dropContainers[0].contains(item.element.nativeElement)).toBe(true,
@@ -4978,7 +4997,8 @@ describe('CdkDrag', () => {
49784997
container: dropInstances[0],
49794998
previousContainer: dropInstances[0],
49804999
isPointerOverContainer: false,
4981-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
5000+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
5001+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
49825002
});
49835003
}));
49845004

@@ -5160,7 +5180,8 @@ describe('CdkDrag', () => {
51605180
container: dropInstances[2],
51615181
previousContainer: dropInstances[0],
51625182
isPointerOverContainer: false,
5163-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
5183+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
5184+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
51645185
}));
51655186

51665187
}));
@@ -5419,7 +5440,8 @@ describe('CdkDrag', () => {
54195440
container: fixture.componentInstance.dropInstances.toArray()[1],
54205441
previousContainer: fixture.componentInstance.dropInstances.first,
54215442
isPointerOverContainer: true,
5422-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
5443+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
5444+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
54235445
});
54245446

54255447
cleanup();
@@ -5454,7 +5476,8 @@ describe('CdkDrag', () => {
54545476
container: fixture.componentInstance.dropInstances.toArray()[1],
54555477
previousContainer: fixture.componentInstance.dropInstances.first,
54565478
isPointerOverContainer: true,
5457-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
5479+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
5480+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
54585481
});
54595482
}));
54605483

@@ -5488,7 +5511,8 @@ describe('CdkDrag', () => {
54885511
container: fixture.componentInstance.dropInstances.toArray()[1],
54895512
previousContainer: fixture.componentInstance.dropInstances.first,
54905513
isPointerOverContainer: true,
5491-
distance: {x: jasmine.any(Number), y: jasmine.any(Number)}
5514+
distance: {x: jasmine.any(Number), y: jasmine.any(Number)},
5515+
dropPoint: {x: jasmine.any(Number), y: jasmine.any(Number)}
54925516
});
54935517
}));
54945518

‎tools/public_api_guard/cdk/drag-drop.d.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ export interface CdkDragDrop<T, O = T> {
6666
x: number;
6767
y: number;
6868
};
69+
dropPoint: {
70+
x: number;
71+
y: number;
72+
};
6973
isPointerOverContainer: boolean;
7074
item: CdkDrag;
7175
previousContainer: CdkDropList<O>;
@@ -269,6 +273,7 @@ export declare class DragRef<T = any> {
269273
container: DropListRef;
270274
previousContainer: DropListRef;
271275
distance: Point;
276+
dropPoint: Point;
272277
isPointerOverContainer: boolean;
273278
}>;
274279
ended: Subject<{
@@ -356,6 +361,7 @@ export declare class DropListRef<T = any> {
356361
previousContainer: DropListRef;
357362
isPointerOverContainer: boolean;
358363
distance: Point;
364+
dropPoint: Point;
359365
}>;
360366
element: HTMLElement | ElementRef<HTMLElement>;
361367
enterPredicate: (drag: DragRef, drop: DropListRef) => boolean;
@@ -391,7 +397,7 @@ export declare class DropListRef<T = any> {
391397
_stopScrolling(): void;
392398
connectedTo(connectedTo: DropListRef[]): this;
393399
dispose(): void;
394-
drop(item: DragRef, currentIndex: number, previousIndex: number, previousContainer: DropListRef, isPointerOverContainer: boolean, distance: Point): void;
400+
drop(item: DragRef, currentIndex: number, previousIndex: number, previousContainer: DropListRef, isPointerOverContainer: boolean, distance: Point, dropPoint: Point): void;
395401
enter(item: DragRef, pointerX: number, pointerY: number, index?: number): void;
396402
exit(item: DragRef): void;
397403
getItemIndex(item: DragRef): number;

0 commit comments

Comments
 (0)