@@ -2482,7 +2482,8 @@ describe('CdkDrag', () => {
2482
2482
2483
2483
startDraggingViaMouse ( fixture , item ) ;
2484
2484
2485
- const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
2485
+ const preview = document . querySelector ( '.cdk-drag-preview' ) as HTMLElement ;
2486
+ const previewContainer = document . querySelector ( '.cdk-drag-preview-container' ) as HTMLElement ;
2486
2487
const previewRect = preview . getBoundingClientRect ( ) ;
2487
2488
const zeroPxRegex = / ^ 0 ( p x ) ? $ / ;
2488
2489
@@ -2504,12 +2505,14 @@ describe('CdkDrag', () => {
2504
2505
. withContext ( 'Expected element to be removed from layout' )
2505
2506
. toBe ( '-999em' ) ;
2506
2507
expect ( item . style . opacity ) . withContext ( 'Expected element to be invisible' ) . toBe ( '0' ) ;
2507
- expect ( preview ) . withContext ( 'Expected preview to be in the DOM' ) . toBeTruthy ( ) ;
2508
+ expect ( previewContainer )
2509
+ . withContext ( 'Expected preview container to be in the DOM' )
2510
+ . toBeTruthy ( ) ;
2508
2511
expect ( preview . textContent ! . trim ( ) )
2509
2512
. withContext ( 'Expected preview content to match element' )
2510
2513
. toContain ( 'One' ) ;
2511
- expect ( preview . getAttribute ( 'dir' ) )
2512
- . withContext ( 'Expected preview element to inherit the directionality.' )
2514
+ expect ( previewContainer . getAttribute ( 'dir' ) )
2515
+ . withContext ( 'Expected preview container element to inherit the directionality.' )
2513
2516
. toBe ( 'ltr' ) ;
2514
2517
expect ( previewRect . width )
2515
2518
. withContext ( 'Expected preview width to match element' )
@@ -2520,8 +2523,8 @@ describe('CdkDrag', () => {
2520
2523
expect ( preview . style . pointerEvents )
2521
2524
. withContext ( 'Expected pointer events to be disabled on the preview' )
2522
2525
. toBe ( 'none' ) ;
2523
- expect ( preview . style . zIndex )
2524
- . withContext ( 'Expected preview to have a high default zIndex.' )
2526
+ expect ( previewContainer . style . zIndex )
2527
+ . withContext ( 'Expected preview container to have a high default zIndex.' )
2525
2528
. toBe ( '1000' ) ;
2526
2529
// Use a regex here since some browsers normalize 0 to 0px, but others don't.
2527
2530
// Use a regex here since some browsers normalize 0 to 0px, but others don't.
@@ -2542,8 +2545,8 @@ describe('CdkDrag', () => {
2542
2545
expect ( item . style . top ) . withContext ( 'Expected element to be within the layout' ) . toBeFalsy ( ) ;
2543
2546
expect ( item . style . left ) . withContext ( 'Expected element to be within the layout' ) . toBeFalsy ( ) ;
2544
2547
expect ( item . style . opacity ) . withContext ( 'Expected element to be visible' ) . toBeFalsy ( ) ;
2545
- expect ( preview . parentNode )
2546
- . withContext ( 'Expected preview to be removed from the DOM' )
2548
+ expect ( previewContainer . parentNode )
2549
+ . withContext ( 'Expected preview container to be removed from the DOM' )
2547
2550
. toBeFalsy ( ) ;
2548
2551
} ) ) ;
2549
2552
@@ -2561,7 +2564,7 @@ describe('CdkDrag', () => {
2561
2564
const item = fixture . componentInstance . dragItems . toArray ( ) [ 1 ] . element . nativeElement ;
2562
2565
startDraggingViaMouse ( fixture , item ) ;
2563
2566
2564
- const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
2567
+ const preview = document . querySelector ( '.cdk-drag-preview-container ' ) ! as HTMLElement ;
2565
2568
expect ( preview . style . zIndex ) . toBe ( '3000' ) ;
2566
2569
} ) ) ;
2567
2570
@@ -2606,9 +2609,11 @@ describe('CdkDrag', () => {
2606
2609
startDraggingViaMouse ( fixture , item ) ;
2607
2610
flush ( ) ;
2608
2611
2609
- const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
2612
+ const previewContainer = document . querySelector (
2613
+ '.cdk-drag-preview-container' ,
2614
+ ) ! as HTMLElement ;
2610
2615
2611
- expect ( preview . parentNode ) . toBe ( fakeDocument . fullscreenElement ) ;
2616
+ expect ( previewContainer . parentNode ) . toBe ( fakeDocument . fullscreenElement ) ;
2612
2617
fakeDocument . fullscreenElement . remove ( ) ;
2613
2618
} ) ) ;
2614
2619
@@ -2907,8 +2912,8 @@ describe('CdkDrag', () => {
2907
2912
const item = fixture . componentInstance . dragItems . toArray ( ) [ 1 ] . element . nativeElement ;
2908
2913
startDraggingViaMouse ( fixture , item ) ;
2909
2914
2910
- expect ( document . querySelector ( '.cdk-drag-preview' ) ! . getAttribute ( 'dir' ) )
2911
- . withContext ( 'Expected preview element to inherit the directionality.' )
2915
+ expect ( document . querySelector ( '.cdk-drag-preview-container ' ) ! . getAttribute ( 'dir' ) )
2916
+ . withContext ( 'Expected preview container to inherit the directionality.' )
2912
2917
. toBe ( 'rtl' ) ;
2913
2918
} ) ) ;
2914
2919
@@ -2919,7 +2924,8 @@ describe('CdkDrag', () => {
2919
2924
2920
2925
startDraggingViaMouse ( fixture , item ) ;
2921
2926
2922
- const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
2927
+ const preview = document . querySelector ( '.cdk-drag-preview' ) as HTMLElement ;
2928
+ const previewContainer = document . querySelector ( '.cdk-drag-preview-container' ) as HTMLElement ;
2923
2929
2924
2930
// Add a duration since the tests won't include one.
2925
2931
preview . style . transitionDuration = '500ms' ;
@@ -2932,13 +2938,13 @@ describe('CdkDrag', () => {
2932
2938
fixture . detectChanges ( ) ;
2933
2939
tick ( 250 ) ;
2934
2940
2935
- expect ( preview . parentNode )
2941
+ expect ( previewContainer . parentNode )
2936
2942
. withContext ( 'Expected preview to be in the DOM mid-way through the transition' )
2937
2943
. toBeTruthy ( ) ;
2938
2944
2939
2945
tick ( 500 ) ;
2940
2946
2941
- expect ( preview . parentNode )
2947
+ expect ( previewContainer . parentNode )
2942
2948
. withContext ( 'Expected preview to be removed from the DOM if the transition timed out' )
2943
2949
. toBeFalsy ( ) ;
2944
2950
} ) ) ;
@@ -3042,6 +3048,7 @@ describe('CdkDrag', () => {
3042
3048
startDraggingViaMouse ( fixture , item ) ;
3043
3049
3044
3050
const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
3051
+ const previewContainer = document . querySelector ( '.cdk-drag-preview-container' ) as HTMLElement ;
3045
3052
preview . style . transition = 'opacity 500ms ease' ;
3046
3053
3047
3054
dispatchMouseEvent ( document , 'mousemove' , 50 , 50 ) ;
@@ -3051,8 +3058,8 @@ describe('CdkDrag', () => {
3051
3058
fixture . detectChanges ( ) ;
3052
3059
tick ( 0 ) ;
3053
3060
3054
- expect ( preview . parentNode )
3055
- . withContext ( 'Expected preview to be removed from the DOM immediately' )
3061
+ expect ( previewContainer . parentNode )
3062
+ . withContext ( 'Expected preview container to be removed from the DOM immediately' )
3056
3063
. toBeFalsy ( ) ;
3057
3064
} ) ) ;
3058
3065
@@ -3064,6 +3071,7 @@ describe('CdkDrag', () => {
3064
3071
startDraggingViaMouse ( fixture , item ) ;
3065
3072
3066
3073
const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
3074
+ const previewContainer = document . querySelector ( '.cdk-drag-preview-container' ) as HTMLElement ;
3067
3075
preview . style . transition = 'opacity 500ms ease, transform 1000ms ease' ;
3068
3076
3069
3077
dispatchMouseEvent ( document , 'mousemove' , 50 , 50 ) ;
@@ -3073,15 +3081,17 @@ describe('CdkDrag', () => {
3073
3081
fixture . detectChanges ( ) ;
3074
3082
tick ( 500 ) ;
3075
3083
3076
- expect ( preview . parentNode )
3077
- . withContext ( 'Expected preview to be in the DOM at the end of the opacity transition' )
3084
+ expect ( previewContainer . parentNode )
3085
+ . withContext (
3086
+ 'Expected preview container to be in the DOM at the end of the opacity transition' ,
3087
+ )
3078
3088
. toBeTruthy ( ) ;
3079
3089
3080
3090
tick ( 1000 ) ;
3081
3091
3082
- expect ( preview . parentNode )
3092
+ expect ( previewContainer . parentNode )
3083
3093
. withContext (
3084
- 'Expected preview to be removed from the DOM at the end of the ' + ' transform transition',
3094
+ 'Expected preview container to be removed from the DOM at the end of the transform transition' ,
3085
3095
)
3086
3096
. toBeFalsy ( ) ;
3087
3097
} ) ) ;
@@ -3123,8 +3133,8 @@ describe('CdkDrag', () => {
3123
3133
const item = fixture . componentInstance . dragItems . toArray ( ) [ 1 ] . element . nativeElement ;
3124
3134
3125
3135
startDraggingViaMouse ( fixture , item ) ;
3126
- const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
3127
- expect ( preview . parentNode ) . toBe ( document . body ) ;
3136
+ const previewContainer = document . querySelector ( '.cdk-drag-preview-container' ) as HTMLElement ;
3137
+ expect ( previewContainer . parentNode ) . toBe ( document . body ) ;
3128
3138
} ) ) ;
3129
3139
3130
3140
it ( 'should insert the preview into the parent node if previewContainer is set to `parent`' , fakeAsync ( ( ) => {
@@ -3135,9 +3145,9 @@ describe('CdkDrag', () => {
3135
3145
const list = fixture . nativeElement . querySelector ( '.drop-list' ) ;
3136
3146
3137
3147
startDraggingViaMouse ( fixture , item ) ;
3138
- const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
3148
+ const previewContainer = document . querySelector ( '.cdk-drag-preview-container' ) as HTMLElement ;
3139
3149
expect ( list ) . toBeTruthy ( ) ;
3140
- expect ( preview . parentNode ) . toBe ( list ) ;
3150
+ expect ( previewContainer . parentNode ) . toBe ( list ) ;
3141
3151
} ) ) ;
3142
3152
3143
3153
it ( 'should insert the preview into a particular element, if specified' , fakeAsync ( ( ) => {
@@ -3151,8 +3161,10 @@ describe('CdkDrag', () => {
3151
3161
fixture . detectChanges ( ) ;
3152
3162
3153
3163
startDraggingViaMouse ( fixture , item ) ;
3154
- const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
3155
- expect ( preview . parentNode ) . toBe ( previewContainer . nativeElement ) ;
3164
+ const previewContainerElement = document . querySelector (
3165
+ '.cdk-drag-preview-container' ,
3166
+ ) as HTMLElement ;
3167
+ expect ( previewContainerElement . parentNode ) . toBe ( previewContainer . nativeElement ) ;
3156
3168
} ) ) ;
3157
3169
3158
3170
it ( 'should remove the id from the placeholder' , fakeAsync ( ( ) => {
@@ -3664,15 +3676,17 @@ describe('CdkDrag', () => {
3664
3676
3665
3677
startDraggingViaMouse ( fixture , item ) ;
3666
3678
3667
- const preview = document . querySelector ( '.cdk-drag-preview' ) ! as HTMLElement ;
3679
+ const previewContainer = document . querySelector ( '.cdk-drag-preview-container' ) as HTMLElement ;
3668
3680
3669
- expect ( preview . parentNode ) . withContext ( 'Expected preview to be in the DOM' ) . toBeTruthy ( ) ;
3681
+ expect ( previewContainer . parentNode )
3682
+ . withContext ( 'Expected preview container to be in the DOM' )
3683
+ . toBeTruthy ( ) ;
3670
3684
expect ( item . parentNode ) . withContext ( 'Expected drag item to be in the DOM' ) . toBeTruthy ( ) ;
3671
3685
3672
3686
fixture . destroy ( ) ;
3673
3687
3674
- expect ( preview . parentNode )
3675
- . withContext ( 'Expected preview to be removed from the DOM' )
3688
+ expect ( previewContainer . parentNode )
3689
+ . withContext ( 'Expected preview container to be removed from the DOM' )
3676
3690
. toBeFalsy ( ) ;
3677
3691
expect ( item . parentNode )
3678
3692
. withContext ( 'Expected drag item to be removed from the DOM' )
@@ -6541,21 +6555,15 @@ describe('CdkDrag', () => {
6541
6555
startDraggingViaMouse ( fixture , item . element . nativeElement ) ;
6542
6556
fixture . detectChanges ( ) ;
6543
6557
6544
- const initialSelectStart = dispatchFakeEvent (
6545
- shadowRoot ,
6546
- 'selectstart' ,
6547
- ) ;
6558
+ const initialSelectStart = dispatchFakeEvent ( shadowRoot , 'selectstart' ) ;
6548
6559
fixture . detectChanges ( ) ;
6549
6560
expect ( initialSelectStart . defaultPrevented ) . toBe ( true ) ;
6550
6561
6551
6562
dispatchMouseEvent ( document , 'mouseup' ) ;
6552
6563
fixture . detectChanges ( ) ;
6553
6564
flush ( ) ;
6554
6565
6555
- const afterDropSelectStart = dispatchFakeEvent (
6556
- shadowRoot ,
6557
- 'selectstart' ,
6558
- ) ;
6566
+ const afterDropSelectStart = dispatchFakeEvent ( shadowRoot , 'selectstart' ) ;
6559
6567
fixture . detectChanges ( ) ;
6560
6568
expect ( afterDropSelectStart . defaultPrevented ) . toBe ( false ) ;
6561
6569
} ) ) ;
0 commit comments