diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9f5f4d33c41..eb3fde5f180 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -64,6 +64,7 @@
/src/cdk/bidi/** @jelbourn
/src/cdk/coercion/** @jelbourn
/src/cdk/collections/** @jelbourn @crisbeto @andrewseguin
+/src/cdk/drag-drop/** @crisbeto
/src/cdk/keycodes/** @jelbourn
/src/cdk/layout/** @josephperrott
/src/cdk/observers/** @jelbourn @crisbeto
@@ -87,7 +88,6 @@
/src/cdk-experimental/** @jelbourn
/src/cdk-experimental/dialog/** @jelbourn @josephperrott @crisbeto
/src/cdk-experimental/scrolling/** @mmalerba
-/src/cdk-experimental/drag-drop/** @crisbeto
# Docs examples & guides
/guides/** @amcdnl @jelbourn
diff --git a/packages.bzl b/packages.bzl
index 17aa21984ad..befb5e66790 100644
--- a/packages.bzl
+++ b/packages.bzl
@@ -1,22 +1,23 @@
# List of all components / subpackages.
CDK_PACKAGES = [
- "coercion",
- "keycodes",
- "scrolling",
- "accordion",
- "observers",
"a11y",
+ "accordion",
+ "bidi",
+ "coercion",
+ "collections",
+ "drag-drop",
+ "keycodes",
+ "layout",
+ "observers",
"overlay",
"platform",
- "bidi",
- "table",
- "tree",
"portal",
- "layout",
+ "scrolling",
"stepper",
+ "table",
"text-field",
- "collections",
+ "tree",
]
CDK_TARGETS = ["//src/cdk"] + ["//src/cdk/%s" % p for p in CDK_PACKAGES]
@@ -24,7 +25,6 @@ CDK_TARGETS = ["//src/cdk"] + ["//src/cdk/%s" % p for p in CDK_PACKAGES]
CDK_EXPERIMENTAL_PACKAGES = [
"dialog",
"scrolling",
- "drag-drop",
]
CDK_EXPERIMENTAL_TARGETS = ["//src/cdk-experimental"] + [
diff --git a/src/cdk-experimental/drag-drop/BUILD.bazel b/src/cdk/drag-drop/BUILD.bazel
similarity index 85%
rename from src/cdk-experimental/drag-drop/BUILD.bazel
rename to src/cdk/drag-drop/BUILD.bazel
index 06f1f159d56..188aab0b6aa 100644
--- a/src/cdk-experimental/drag-drop/BUILD.bazel
+++ b/src/cdk/drag-drop/BUILD.bazel
@@ -7,7 +7,7 @@ load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
ng_module(
name = "drag-drop",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
- module_name = "@angular/cdk-experimental/drag-drop",
+ module_name = "@angular/cdk/drag-drop",
assets = [":drop.css"],
deps = [
"@rxjs",
@@ -15,7 +15,7 @@ ng_module(
"//src/cdk/overlay",
"//src/cdk/bidi",
],
- tsconfig = "//src/cdk-experimental:tsconfig-build.json",
+ tsconfig = "//src/cdk:tsconfig-build.json",
)
@@ -28,7 +28,7 @@ ts_library(
"//src/cdk/testing",
"//src/cdk/bidi",
],
- tsconfig = "//src/cdk-experimental:tsconfig-build.json",
+ tsconfig = "//src/cdk:tsconfig-build.json",
)
sass_binary(
diff --git a/src/cdk-experimental/drag-drop/drag-drop-module.ts b/src/cdk/drag-drop/drag-drop-module.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-drop-module.ts
rename to src/cdk/drag-drop/drag-drop-module.ts
diff --git a/src/cdk-experimental/drag-drop/drag-drop-registry.spec.ts b/src/cdk/drag-drop/drag-drop-registry.spec.ts
similarity index 99%
rename from src/cdk-experimental/drag-drop/drag-drop-registry.spec.ts
rename to src/cdk/drag-drop/drag-drop-registry.spec.ts
index 5acc567d30c..0d17e3e1278 100644
--- a/src/cdk-experimental/drag-drop/drag-drop-registry.spec.ts
+++ b/src/cdk/drag-drop/drag-drop-registry.spec.ts
@@ -166,7 +166,7 @@ describe('DragDropRegistry', () => {
`
})
-export class SimpleDropZone {
+class SimpleDropZone {
@ViewChildren(CdkDrag) dragItems: QueryList;
@ViewChildren(CdkDrop) dropInstances: QueryList;
items = ['Zero', 'One', 'Two', 'Three'];
diff --git a/src/cdk-experimental/drag-drop/drag-drop-registry.ts b/src/cdk/drag-drop/drag-drop-registry.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-drop-registry.ts
rename to src/cdk/drag-drop/drag-drop-registry.ts
diff --git a/src/cdk-experimental/drag-drop/drag-drop.md b/src/cdk/drag-drop/drag-drop.md
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-drop.md
rename to src/cdk/drag-drop/drag-drop.md
diff --git a/src/cdk-experimental/drag-drop/drag-events.ts b/src/cdk/drag-drop/drag-events.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-events.ts
rename to src/cdk/drag-drop/drag-events.ts
diff --git a/src/cdk-experimental/drag-drop/drag-handle.ts b/src/cdk/drag-drop/drag-handle.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-handle.ts
rename to src/cdk/drag-drop/drag-handle.ts
diff --git a/src/cdk-experimental/drag-drop/drag-placeholder.ts b/src/cdk/drag-drop/drag-placeholder.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-placeholder.ts
rename to src/cdk/drag-drop/drag-placeholder.ts
diff --git a/src/cdk-experimental/drag-drop/drag-preview.ts b/src/cdk/drag-drop/drag-preview.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-preview.ts
rename to src/cdk/drag-drop/drag-preview.ts
diff --git a/src/cdk-experimental/drag-drop/drag-utils.spec.ts b/src/cdk/drag-drop/drag-utils.spec.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-utils.spec.ts
rename to src/cdk/drag-drop/drag-utils.spec.ts
diff --git a/src/cdk-experimental/drag-drop/drag-utils.ts b/src/cdk/drag-drop/drag-utils.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag-utils.ts
rename to src/cdk/drag-drop/drag-utils.ts
diff --git a/src/cdk-experimental/drag-drop/drag.spec.ts b/src/cdk/drag-drop/drag.spec.ts
similarity index 99%
rename from src/cdk-experimental/drag-drop/drag.spec.ts
rename to src/cdk/drag-drop/drag.spec.ts
index 46258f080f5..252c300e72d 100644
--- a/src/cdk-experimental/drag-drop/drag.spec.ts
+++ b/src/cdk/drag-drop/drag.spec.ts
@@ -1165,7 +1165,7 @@ describe('CdkDrag', () => {
style="width: 100px; height: 100px; background: red;">
`
})
-export class StandaloneDraggable {
+class StandaloneDraggable {
@ViewChild('dragElement') dragElement: ElementRef;
@ViewChild(CdkDrag) dragInstance: CdkDrag;
startedSpy = jasmine.createSpy('started spy');
@@ -1180,7 +1180,7 @@ export class StandaloneDraggable {
`
})
-export class StandaloneDraggableWithHandle {
+class StandaloneDraggableWithHandle {
@ViewChild('dragElement') dragElement: ElementRef;
@ViewChild('handleElement') handleElement: ElementRef;
}
@@ -1196,7 +1196,7 @@ export class StandaloneDraggableWithHandle {
`
})
-export class StandaloneDraggableWithDelayedHandle {
+class StandaloneDraggableWithDelayedHandle {
@ViewChild('dragElement') dragElement: ElementRef;
@ViewChild('handleElement') handleElement: ElementRef;
showHandle = false;
@@ -1221,7 +1221,7 @@ export class StandaloneDraggableWithDelayedHandle {
`
})
-export class StandaloneDraggableWithMultipleHandles {
+class StandaloneDraggableWithMultipleHandles {
@ViewChild('dragElement') dragElement: ElementRef;
@ViewChildren(CdkDragHandle) handles: QueryList;
}
@@ -1241,7 +1241,7 @@ export class StandaloneDraggableWithMultipleHandles {
`
})
-export class DraggableInDropZone {
+class DraggableInDropZone {
@ViewChildren(CdkDrag) dragItems: QueryList;
@ViewChild(CdkDrop) dropInstance: CdkDrop;
items = ['Zero', 'One', 'Two', 'Three'];
@@ -1280,7 +1280,7 @@ export class DraggableInDropZone {
`
})
-export class DraggableInHorizontalDropZone {
+class DraggableInHorizontalDropZone {
@ViewChildren(CdkDrag) dragItems: QueryList;
@ViewChild(CdkDrop) dropInstance: CdkDrop;
items = ['Zero', 'One', 'Two', 'Three'];
@@ -1300,7 +1300,7 @@ export class DraggableInHorizontalDropZone {
`
})
-export class DraggableInDropZoneWithCustomPreview {
+class DraggableInDropZoneWithCustomPreview {
@ViewChild(CdkDrop) dropInstance: CdkDrop;
@ViewChildren(CdkDrag) dragItems: QueryList;
items = ['Zero', 'One', 'Two', 'Three'];
@@ -1318,7 +1318,7 @@ export class DraggableInDropZoneWithCustomPreview {
`
})
-export class DraggableInDropZoneWithCustomPlaceholder {
+class DraggableInDropZoneWithCustomPlaceholder {
@ViewChildren(CdkDrag) dragItems: QueryList;
items = ['Zero', 'One', 'Two', 'Three'];
}
@@ -1358,7 +1358,7 @@ export class DraggableInDropZoneWithCustomPlaceholder {
`
})
-export class ConnectedDropZones implements AfterViewInit {
+class ConnectedDropZones implements AfterViewInit {
@ViewChildren(CdkDrag) rawDragItems: QueryList;
@ViewChildren(CdkDrop) dropInstances: QueryList;
diff --git a/src/cdk-experimental/drag-drop/drag.ts b/src/cdk/drag-drop/drag.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drag.ts
rename to src/cdk/drag-drop/drag.ts
diff --git a/src/cdk-experimental/drag-drop/drop-container.ts b/src/cdk/drag-drop/drop-container.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drop-container.ts
rename to src/cdk/drag-drop/drop-container.ts
diff --git a/src/cdk-experimental/drag-drop/drop.scss b/src/cdk/drag-drop/drop.scss
similarity index 100%
rename from src/cdk-experimental/drag-drop/drop.scss
rename to src/cdk/drag-drop/drop.scss
diff --git a/src/cdk-experimental/drag-drop/drop.ts b/src/cdk/drag-drop/drop.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/drop.ts
rename to src/cdk/drag-drop/drop.ts
diff --git a/src/cdk-experimental/drag-drop/index.ts b/src/cdk/drag-drop/index.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/index.ts
rename to src/cdk/drag-drop/index.ts
diff --git a/src/cdk-experimental/drag-drop/public-api.ts b/src/cdk/drag-drop/public-api.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/public-api.ts
rename to src/cdk/drag-drop/public-api.ts
diff --git a/src/cdk-experimental/drag-drop/tsconfig-build.json b/src/cdk/drag-drop/tsconfig-build.json
similarity index 83%
rename from src/cdk-experimental/drag-drop/tsconfig-build.json
rename to src/cdk/drag-drop/tsconfig-build.json
index ef320fb9221..3b1840ee476 100644
--- a/src/cdk-experimental/drag-drop/tsconfig-build.json
+++ b/src/cdk/drag-drop/tsconfig-build.json
@@ -8,7 +8,7 @@
"annotateForClosureCompiler": true,
"strictMetadataEmit": true,
"flatModuleOutFile": "index.js",
- "flatModuleId": "@angular/cdk-experimental/drag-drop",
+ "flatModuleId": "@angular/cdk/drag-drop",
"skipTemplateCodegen": true,
"fullTemplateTypeCheck": true
}
diff --git a/src/cdk-experimental/drag-drop/typings.d.ts b/src/cdk/drag-drop/typings.d.ts
similarity index 100%
rename from src/cdk-experimental/drag-drop/typings.d.ts
rename to src/cdk/drag-drop/typings.d.ts
diff --git a/src/demo-app/demo-material-module.ts b/src/demo-app/demo-material-module.ts
index a4e8f5efc9d..9501b379f3f 100644
--- a/src/demo-app/demo-material-module.ts
+++ b/src/demo-app/demo-material-module.ts
@@ -7,7 +7,7 @@
*/
import {DialogModule} from '@angular/cdk-experimental/dialog';
-import {DragDropModule} from '@angular/cdk-experimental/drag-drop';
+import {DragDropModule} from '@angular/cdk/drag-drop';
import {ScrollingModule as ExperimentalScrollingModule} from '@angular/cdk-experimental/scrolling';
import {A11yModule} from '@angular/cdk/a11y';
import {CdkAccordionModule} from '@angular/cdk/accordion';
diff --git a/src/demo-app/drag-drop/drag-drop-demo.ts b/src/demo-app/drag-drop/drag-drop-demo.ts
index 0d08cf4aef8..f682360aa81 100644
--- a/src/demo-app/drag-drop/drag-drop-demo.ts
+++ b/src/demo-app/drag-drop/drag-drop-demo.ts
@@ -9,7 +9,7 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {MatIconRegistry} from '@angular/material/icon';
import {DomSanitizer} from '@angular/platform-browser';
-import {CdkDragDrop, moveItemInArray, transferArrayItem} from '@angular/cdk-experimental/drag-drop';
+import {CdkDragDrop, moveItemInArray, transferArrayItem} from '@angular/cdk/drag-drop';
@Component({
moduleId: module.id,
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 7561a3745cb..fa42bcf77c5 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -49,6 +49,7 @@ System.config({
'@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
'@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
'@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
+ '@angular/cdk/drag-drop': 'dist/packages/cdk/drag-drop/index.js',
'@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
'@angular/cdk/layout': 'dist/packages/cdk/layout/index.js',
'@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
@@ -63,8 +64,6 @@ System.config({
'@angular/cdk-experimental/scrolling': 'dist/packages/cdk-experimental/scrolling/index.js',
'@angular/cdk-experimental/dialog': 'dist/packages/cdk-experimental/dialog/index.js',
- '@angular/cdk-experimental/drag-drop':
- 'dist/packages/cdk-experimental/drag-drop/index.js',
'@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
'@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
diff --git a/src/e2e-app/e2e-app-module.ts b/src/e2e-app/e2e-app-module.ts
index 2792fbd5a4d..8570f3eaf0b 100644
--- a/src/e2e-app/e2e-app-module.ts
+++ b/src/e2e-app/e2e-app-module.ts
@@ -1,5 +1,5 @@
import {DialogModule} from '@angular/cdk-experimental/dialog';
-import {DragDropModule} from '@angular/cdk-experimental/drag-drop';
+import {DragDropModule} from '@angular/cdk/drag-drop';
import {ScrollingModule as ExperimentalScrollingModule} from '@angular/cdk-experimental/scrolling';
import {FullscreenOverlayContainer, OverlayContainer} from '@angular/cdk/overlay';
import {ScrollingModule} from '@angular/cdk/scrolling';
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index a3b88b569af..5ee59c0e5b5 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -38,6 +38,7 @@ System.config({
'@angular/cdk/bidi': 'dist/bundles/cdk-bidi.umd.js',
'@angular/cdk/coercion': 'dist/bundles/cdk-coercion.umd.js',
'@angular/cdk/collections': 'dist/bundles/cdk-collections.umd.js',
+ '@angular/cdk/drag-drop': 'dist/bundles/cdk-drag-drop.umd.js',
'@angular/cdk/keycodes': 'dist/bundles/cdk-keycodes.umd.js',
'@angular/cdk/layout': 'dist/bundles/cdk-layout.umd.js',
'@angular/cdk/observers': 'dist/bundles/cdk-observers.umd.js',
@@ -54,7 +55,6 @@ System.config({
'@angular/cdk-experimental/scrolling': 'dist/bundles/cdk-experimental-scrolling.umd.js',
'@angular/cdk-experimental/dialog': 'dist/bundles/cdk-experimental-dialog.umd.js',
- '@angular/cdk-experimental/drag-drop': 'dist/bundles/cdk-experimental-drag-drop.umd.js',
'@angular/material/autocomplete': 'dist/bundles/material-autocomplete.umd.js',
'@angular/material/bottom-sheet': 'dist/bundles/material-bottom-sheet.umd.js',
diff --git a/test/karma-system-config.js b/test/karma-system-config.js
index 18a0b8ab0b7..af7a6e8d4f3 100644
--- a/test/karma-system-config.js
+++ b/test/karma-system-config.js
@@ -44,6 +44,7 @@ System.config({
'@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
'@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
'@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
+ '@angular/cdk/drag-drop': 'dist/packages/cdk/drag-drop/index.js',
'@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
'@angular/cdk/layout': 'dist/packages/cdk/layout/index.js',
'@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
@@ -59,8 +60,6 @@ System.config({
'@angular/cdk-experimental/scrolling': 'dist/packages/cdk-experimental/scrolling/index.js',
'@angular/cdk-experimental/dialog': 'dist/packages/cdk-experimental/dialog/index.js',
- '@angular/cdk-experimental/drag-drop':
- 'dist/packages/cdk-experimental/drag-drop/index.js',
'@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
'@angular/material/badge': 'dist/packages/material/badge/index.js',