refactor(drag-drop): remove deprecated APIs for 9.0.0

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

@@ -45,12 +45,17 @@ import {
 import {CdkDragHandle} from './drag-handle';
 import {CdkDragPlaceholder} from './drag-placeholder';
 import {CdkDragPreview} from './drag-preview';
-import {CDK_DROP_LIST} from '../drop-list-container';
 import {CDK_DRAG_PARENT} from '../drag-parent';
 import {DragRef, DragRefConfig, Point} from '../drag-ref';
 import {CdkDropListInternal as CdkDropList} from './drop-list';
 import {DragDrop} from '../drag-drop';
 
+/**
+ * Injection token that is used to provide a CdkDropList instance to CdkDrag.
+ * Used for avoiding circular imports.
+ */
+export const CDK_DROP_LIST = new InjectionToken<CdkDropList>('CDK_DROP_LIST');
+
 /** Injection token that can be used to configure the behavior of `CdkDrag`. */
 export const CDK_DRAG_CONFIG = new InjectionToken<DragRefConfig>('CDK_DRAG_CONFIG', {
   providedIn: 'root',
@@ -109,20 +114,6 @@ export class CdkDrag<T = any> implements AfterViewInit, OnChanges, OnDestroy {
    */
   @Input('cdkDragBoundary') boundaryElement: string | ElementRef<HTMLElement> | HTMLElement;
 
-  /**
-   * Selector that will be used to determine the element to which the draggable's position will
-   * be constrained. Matching starts from the element's parent and goes up the DOM until a matching
-   * element has been found
-   * @deprecated Use `boundaryElement` instead.
-   * @breaking-change 9.0.0
-   */
-  get boundaryElementSelector(): string {
-    return typeof this.boundaryElement === 'string' ? this.boundaryElement : undefined!;
-  }
-  set boundaryElementSelector(selector: string) {
-    this.boundaryElement = selector;
-  }
-
   /**
    * Amount of milliseconds to wait after the user has put their
    * pointer down before starting to drag the element.

src/cdk/drag-drop/directives/drop-list.ts

@@ -11,7 +11,6 @@ import {
   ContentChildren,
   ElementRef,
   EventEmitter,
-  forwardRef,
   Input,
   OnDestroy,
   Output,
@@ -23,9 +22,8 @@ import {
   AfterContentInit,
 } from '@angular/core';
 import {Directionality} from '@angular/cdk/bidi';
-import {CdkDrag} from './drag';
+import {CdkDrag, CDK_DROP_LIST} from './drag';
 import {CdkDragDrop, CdkDragEnter, CdkDragExit, CdkDragSortEvent} from '../drag-events';
-import {CDK_DROP_LIST_CONTAINER, CdkDropListContainer} from '../drop-list-container';
 import {CdkDropListGroup} from './drop-list-group';
 import {DropListRef} from '../drop-list-ref';
 import {DragRef} from '../drag-ref';
@@ -43,18 +41,14 @@ let _uniqueIdCounter = 0;
  */
 export interface CdkDropListInternal extends CdkDropList {}
 
-// @breaking-change 8.0.0 `CdkDropList` implements `CdkDropListContainer` for backwards
-// compatiblity. The implements clause, as well as all the methods that it enforces can
-// be removed when `CdkDropListContainer` is deleted.
-
 /** Container that wraps a set of draggable items. */
 @Directive({
   selector: '[cdkDropList], cdk-drop-list',
   exportAs: 'cdkDropList',
   providers: [
     // Prevent child drop lists from picking up the same group as their parent.
     {provide: CdkDropListGroup, useValue: undefined},
-    {provide: CDK_DROP_LIST_CONTAINER, useExisting: CdkDropList},
+    {provide: CDK_DROP_LIST, useExisting: CdkDropList},
   ],
   host: {
     'class': 'cdk-drop-list',
@@ -64,7 +58,7 @@ export interface CdkDropListInternal extends CdkDropList {}
     '[class.cdk-drop-list-receiving]': '_dropListRef.isReceiving()',
   }
 })
-export class CdkDropList<T = any> implements CdkDropListContainer, AfterContentInit, OnDestroy {
+export class CdkDropList<T = any> implements AfterContentInit, OnDestroy {
   /** Emits when the list has been destroyed. */
   private _destroyed = new Subject<void>();
 
@@ -75,7 +69,7 @@ export class CdkDropList<T = any> implements CdkDropListContainer, AfterContentI
   _dropListRef: DropListRef<CdkDropList<T>>;
 
   /** Draggable items in the container. */
-  @ContentChildren(forwardRef(() => CdkDrag), {
+  @ContentChildren(CdkDrag, {
     // Explicitly set to false since some of the logic below makes assumptions about it.
     // The `.withItems` call below should be updated if we ever need to switch this to `true`.
     descendants: false
@@ -198,7 +192,11 @@ export class CdkDropList<T = any> implements CdkDropListContainer, AfterContentI
     this._destroyed.complete();
   }
 
-  /** Starts dragging an item. */
+  /**
+   * Starts dragging an item.
+   * @deprecated No longer being used. To be removed.
+   * @breaking-change 10.0.0
+   */
   start(): void {
     this._dropListRef.start();
   }
@@ -210,18 +208,23 @@ export class CdkDropList<T = any> implements CdkDropListContainer, AfterContentI
    * @param previousContainer Container from which the item got dragged in.
    * @param isPointerOverContainer Whether the user's pointer was over the
    *    container when the item was dropped.
+   *
+   * @deprecated No longer being used. To be removed.
+   * @breaking-change 10.0.0
    */
-  drop(item: CdkDrag, currentIndex: number, previousContainer: Partial<CdkDropListContainer>,
+  drop(item: CdkDrag, currentIndex: number, previousContainer: CdkDropList,
     isPointerOverContainer: boolean): void {
-    this._dropListRef.drop(item._dragRef, currentIndex,
-      (previousContainer as CdkDropList)._dropListRef, isPointerOverContainer);
+    this._dropListRef.drop(item._dragRef, currentIndex, previousContainer._dropListRef,
+        isPointerOverContainer, {x: 0, y: 0});
   }
 
   /**
    * Emits an event to indicate that the user moved an item into the container.
    * @param item Item that was moved into the container.
    * @param pointerX Position of the item along the X axis.
    * @param pointerY Position of the item along the Y axis.
+   * @deprecated No longer being used. To be removed.
+   * @breaking-change 10.0.0
    */
   enter(item: CdkDrag, pointerX: number, pointerY: number): void {
     this._dropListRef.enter(item._dragRef, pointerX, pointerY);
@@ -230,6 +233,8 @@ export class CdkDropList<T = any> implements CdkDropListContainer, AfterContentI
   /**
    * Removes an item from the container after it was dragged into another container by the user.
    * @param item Item that was dragged out.
+   * @deprecated No longer being used. To be removed.
+   * @breaking-change 10.0.0
    */
   exit(item: CdkDrag): void {
     this._dropListRef.exit(item._dragRef);
@@ -238,45 +243,13 @@ export class CdkDropList<T = any> implements CdkDropListContainer, AfterContentI
   /**
    * Figures out the index of an item in the container.
    * @param item Item whose index should be determined.
+   * @deprecated No longer being used. To be removed.
+   * @breaking-change 10.0.0
    */
   getItemIndex(item: CdkDrag): number {
     return this._dropListRef.getItemIndex(item._dragRef);
   }
 
-  /**
-   * Sorts an item inside the container based on its position.
-   * @param item Item to be sorted.
-   * @param pointerX Position of the item along the X axis.
-   * @param pointerY Position of the item along the Y axis.
-   * @param pointerDelta Direction in which the pointer is moving along each axis.
-   */
-  _sortItem(item: CdkDrag, pointerX: number, pointerY: number,
-            pointerDelta: {x: number, y: number}): void {
-    return this._dropListRef._sortItem(item._dragRef, pointerX, pointerY, pointerDelta);
-  }
-
-  /**
-   * Figures out whether an item should be moved into a sibling
-   * drop container, based on its current position.
-   * @param item Drag item that is being moved.
-   * @param x Position of the item along the X axis.
-   * @param y Position of the item along the Y axis.
-   */
-  _getSiblingContainerFromPosition(item: CdkDrag, x: number, y: number):
-    CdkDropListContainer | null {
-    const result = this._dropListRef._getSiblingContainerFromPosition(item._dragRef, x, y);
-    return result ? result.data : null;
-  }
-
-  /**
-   * Checks whether the user's pointer is positioned over the container.
-   * @param x Pointer position along the X axis.
-   * @param y Pointer position along the Y axis.
-   */
-  _isOverContainer(x: number, y: number): boolean {
-    return this._dropListRef._isOverContainer(x, y);
-  }
-
   /** Syncs the inputs of the CdkDropList with the options of the underlying DropListRef. */
   private _syncInputs(ref: DropListRef<CdkDropList>) {
     if (this._dir) {

src/cdk/drag-drop/drag-drop-registry.spec.ts

@@ -186,10 +186,6 @@ describe('DragDropRegistry', () => {
     pointerMoveSubscription.unsubscribe();
   });
 
-  it('should not throw when trying to register the same container again', () => {
-    expect(() => registry.registerDropContainer(testComponent.dropInstances.first)).not.toThrow();
-  });
-
   it('should not prevent the default `touchmove` actions when nothing is being dragged', () => {
     expect(dispatchTouchEvent(document, 'touchmove').defaultPrevented).toBe(false);
   });

src/cdk/drag-drop/drag-drop-registry.ts

@@ -26,7 +26,7 @@ const activeCapturingEventOptions = normalizePassiveListenerOptions({
 // to avoid circular imports. If we were to reference them here, importing the registry into the
 // classes that are registering themselves will introduce a circular import.
 @Injectable({providedIn: 'root'})
-export class DragDropRegistry<I, C extends {id: string}> implements OnDestroy {
+export class DragDropRegistry<I, C> implements OnDestroy {
   private _document: Document;
 
   /** Registered drop container instances. */
@@ -68,10 +68,6 @@ export class DragDropRegistry<I, C extends {id: string}> implements OnDestroy {
   /** Adds a drop container to the registry. */
   registerDropContainer(drop: C) {
     if (!this._dropInstances.has(drop)) {
-      if (this.getDropContainer(drop.id)) {
-        throw Error(`Drop instance with id "${drop.id}" has already been registered.`);
-      }
-
       this._dropInstances.add(drop);
     }
   }
@@ -173,15 +169,6 @@ export class DragDropRegistry<I, C extends {id: string}> implements OnDestroy {
     return this._activeDragInstances.has(drag);
   }
 
-  /**
-   * Gets a drop container by its id.
-   * @deprecated No longer being used. To be removed.
-   * @breaking-change 8.0.0
-   */
-  getDropContainer(id: string): C | undefined {
-    return Array.from(this._dropInstances).find(instance => instance.id === id);
-  }
-
   ngOnDestroy() {
     this._dragInstances.forEach(instance => this.removeDragItem(instance));
     this._dropInstances.forEach(instance => this.removeDropContainer(instance));