diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c39e11661f98..066f68eefec8 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -89,6 +89,7 @@ /src/cdk/drag-drop/** @crisbeto /src/cdk/keycodes/** @andrewseguin /src/cdk/layout/** @andrewseguin +/src/cdk/listbox/** @jelbourn /src/cdk/menu/** @mmalerba @crisbeto /src/cdk/observers/** @andrewseguin @crisbeto /src/cdk/overlay/** @jelbourn @crisbeto @@ -142,7 +143,6 @@ /src/cdk-experimental/popover-edit/** @andrewseguin /src/cdk-experimental/scrolling/** @mmalerba /src/cdk-experimental/table-scroll-container/** @andrewseguin -/src/cdk-experimental/listbox/** @jelbourn /src/cdk-experimental/selection/** @andrewseguin # Docs examples & guides @@ -160,8 +160,8 @@ /src/dev-app/button/** @andrewseguin /src/dev-app/card/** @andrewseguin /src/dev-app/cdk-dialog/** @crisbeto +/src/dev-app/cdk-listbox/** @jelbourn /src/dev-app/cdk-experimental-combobox/** @jelbourn -/src/dev-app/cdk-experimental-listbox/** @jelbourn /src/dev-app/checkbox/** @jelbourn @devversion /src/dev-app/chips/** @andrewseguin /src/dev-app/clipboard/** @andrewseguin diff --git a/.ng-dev/commit-message.mts b/.ng-dev/commit-message.mts index bf2a8bfd5f3f..256e697c7421 100644 --- a/.ng-dev/commit-message.mts +++ b/.ng-dev/commit-message.mts @@ -11,7 +11,6 @@ export const commitMessage: CommitMessageConfig = { 'multiple', // For when a commit applies to multiple components. 'cdk-experimental/column-resize', 'cdk-experimental/combobox', - 'cdk-experimental/listbox', 'cdk-experimental/popover-edit', 'cdk-experimental/scrolling', 'cdk-experimental/selection', @@ -26,6 +25,7 @@ export const commitMessage: CommitMessageConfig = { 'cdk/drag-drop', 'cdk/keycodes', 'cdk/layout', + 'cdk/listbox', 'cdk/menu', 'cdk/observers', 'cdk/overlay', diff --git a/src/cdk-experimental/config.bzl b/src/cdk-experimental/config.bzl index e749bef03d74..7198c3d37550 100644 --- a/src/cdk-experimental/config.bzl +++ b/src/cdk-experimental/config.bzl @@ -2,7 +2,6 @@ CDK_EXPERIMENTAL_ENTRYPOINTS = [ "column-resize", "combobox", - "listbox", "popover-edit", "scrolling", "selection", diff --git a/src/cdk/config.bzl b/src/cdk/config.bzl index 2fa32023d757..ef490d23be14 100644 --- a/src/cdk/config.bzl +++ b/src/cdk/config.bzl @@ -10,6 +10,7 @@ CDK_ENTRYPOINTS = [ "drag-drop", "keycodes", "layout", + "listbox", "menu", "observers", "overlay", diff --git a/src/cdk-experimental/listbox/BUILD.bazel b/src/cdk/listbox/BUILD.bazel similarity index 100% rename from src/cdk-experimental/listbox/BUILD.bazel rename to src/cdk/listbox/BUILD.bazel diff --git a/src/cdk-experimental/listbox/index.ts b/src/cdk/listbox/index.ts similarity index 100% rename from src/cdk-experimental/listbox/index.ts rename to src/cdk/listbox/index.ts diff --git a/src/cdk-experimental/listbox/listbox-module.ts b/src/cdk/listbox/listbox-module.ts similarity index 100% rename from src/cdk-experimental/listbox/listbox-module.ts rename to src/cdk/listbox/listbox-module.ts diff --git a/src/cdk-experimental/listbox/listbox.md b/src/cdk/listbox/listbox.md similarity index 100% rename from src/cdk-experimental/listbox/listbox.md rename to src/cdk/listbox/listbox.md diff --git a/src/cdk-experimental/listbox/listbox.spec.ts b/src/cdk/listbox/listbox.spec.ts similarity index 99% rename from src/cdk-experimental/listbox/listbox.spec.ts rename to src/cdk/listbox/listbox.spec.ts index 84b35b8fb90e..2f2cfce4f737 100644 --- a/src/cdk-experimental/listbox/listbox.spec.ts +++ b/src/cdk/listbox/listbox.spec.ts @@ -2,7 +2,7 @@ import {fakeAsync, TestBed, tick} from '@angular/core/testing'; import {Component, Type} from '@angular/core'; import {By} from '@angular/platform-browser'; import {CdkListbox, CdkListboxModule, CdkOption, ListboxValueChangeEvent} from './index'; -import {dispatchKeyboardEvent, dispatchMouseEvent} from '../../cdk/testing/private'; +import {dispatchKeyboardEvent, dispatchMouseEvent} from '../testing/private'; import { A, B, diff --git a/src/cdk-experimental/listbox/listbox.ts b/src/cdk/listbox/listbox.ts similarity index 100% rename from src/cdk-experimental/listbox/listbox.ts rename to src/cdk/listbox/listbox.ts diff --git a/src/cdk-experimental/listbox/public-api.ts b/src/cdk/listbox/public-api.ts similarity index 100% rename from src/cdk-experimental/listbox/public-api.ts rename to src/cdk/listbox/public-api.ts diff --git a/src/components-examples/cdk-experimental/listbox/BUILD.bazel b/src/components-examples/cdk/listbox/BUILD.bazel similarity index 91% rename from src/components-examples/cdk-experimental/listbox/BUILD.bazel rename to src/components-examples/cdk/listbox/BUILD.bazel index 5e4e64dc5f60..5233babd28af 100644 --- a/src/components-examples/cdk-experimental/listbox/BUILD.bazel +++ b/src/components-examples/cdk/listbox/BUILD.bazel @@ -10,7 +10,7 @@ ng_module( "**/*.css", ]), deps = [ - "//src/cdk-experimental/listbox", + "//src/cdk/listbox", "@npm//@angular/common", "@npm//@angular/forms", ], diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.css b/src/components-examples/cdk/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.html b/src/components-examples/cdk/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-activedescendant/cdk-listbox-activedescendant-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.css b/src/components-examples/cdk/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.html b/src/components-examples/cdk/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-compare-with/cdk-listbox-compare-with-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.css b/src/components-examples/cdk/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.html b/src/components-examples/cdk/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-custom-navigation/cdk-listbox-custom-navigation-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.css b/src/components-examples/cdk/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.html b/src/components-examples/cdk/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-custom-typeahead/cdk-listbox-custom-typeahead-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.css b/src/components-examples/cdk/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.html b/src/components-examples/cdk/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-disabled/cdk-listbox-disabled-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.css b/src/components-examples/cdk/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.html b/src/components-examples/cdk/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-forms-validation/cdk-listbox-forms-validation-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.css b/src/components-examples/cdk/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.html b/src/components-examples/cdk/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-horizontal/cdk-listbox-horizontal-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.css b/src/components-examples/cdk/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.html b/src/components-examples/cdk/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-multiple/cdk-listbox-multiple-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-overview/cdk-listbox-overview-example.css b/src/components-examples/cdk/listbox/cdk-listbox-overview/cdk-listbox-overview-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-overview/cdk-listbox-overview-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-overview/cdk-listbox-overview-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-overview/cdk-listbox-overview-example.html b/src/components-examples/cdk/listbox/cdk-listbox-overview/cdk-listbox-overview-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-overview/cdk-listbox-overview-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-overview/cdk-listbox-overview-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-overview/cdk-listbox-overview-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-overview/cdk-listbox-overview-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-overview/cdk-listbox-overview-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-overview/cdk-listbox-overview-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.css b/src/components-examples/cdk/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.html b/src/components-examples/cdk/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.css b/src/components-examples/cdk/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.html b/src/components-examples/cdk/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-template-forms/cdk-listbox-template-forms-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.css b/src/components-examples/cdk/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.css similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.css rename to src/components-examples/cdk/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.css diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.html b/src/components-examples/cdk/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.html similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.html rename to src/components-examples/cdk/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.html diff --git a/src/components-examples/cdk-experimental/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.ts b/src/components-examples/cdk/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.ts similarity index 100% rename from src/components-examples/cdk-experimental/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.ts rename to src/components-examples/cdk/listbox/cdk-listbox-value-binding/cdk-listbox-value-binding-example.ts diff --git a/src/components-examples/cdk-experimental/listbox/index.ts b/src/components-examples/cdk/listbox/index.ts similarity index 97% rename from src/components-examples/cdk-experimental/listbox/index.ts rename to src/components-examples/cdk/listbox/index.ts index 121858ad4bd3..8283ecda40cf 100644 --- a/src/components-examples/cdk-experimental/listbox/index.ts +++ b/src/components-examples/cdk/listbox/index.ts @@ -13,7 +13,7 @@ import {CdkListboxOverviewExample} from './cdk-listbox-overview/cdk-listbox-over import {CdkListboxReactiveFormsExample} from './cdk-listbox-reactive-forms/cdk-listbox-reactive-forms-example'; import {CdkListboxTemplateFormsExample} from './cdk-listbox-template-forms/cdk-listbox-template-forms-example'; import {CdkListboxValueBindingExample} from './cdk-listbox-value-binding/cdk-listbox-value-binding-example'; -import {CdkListboxModule} from '@angular/cdk-experimental/listbox'; +import {CdkListboxModule} from '@angular/cdk/listbox'; export { CdkListboxActivedescendantExample, diff --git a/src/dev-app/BUILD.bazel b/src/dev-app/BUILD.bazel index 2099a2874dd6..47fe1efecd87 100644 --- a/src/dev-app/BUILD.bazel +++ b/src/dev-app/BUILD.bazel @@ -24,7 +24,7 @@ ng_module( "//src/dev-app/card", "//src/dev-app/cdk-dialog", "//src/dev-app/cdk-experimental-combobox", - "//src/dev-app/cdk-experimental-listbox", + "//src/dev-app/cdk-listbox", "//src/dev-app/cdk-menu", "//src/dev-app/checkbox", "//src/dev-app/chips", diff --git a/src/dev-app/cdk-experimental-listbox/BUILD.bazel b/src/dev-app/cdk-listbox/BUILD.bazel similarity index 68% rename from src/dev-app/cdk-experimental-listbox/BUILD.bazel rename to src/dev-app/cdk-listbox/BUILD.bazel index e15ed00e8921..d4dac3a73da2 100644 --- a/src/dev-app/cdk-experimental-listbox/BUILD.bazel +++ b/src/dev-app/cdk-listbox/BUILD.bazel @@ -3,12 +3,12 @@ load("//tools:defaults.bzl", "ng_module") package(default_visibility = ["//visibility:public"]) ng_module( - name = "cdk-experimental-listbox", + name = "cdk-listbox", srcs = glob(["**/*.ts"]), assets = [ "cdk-listbox-demo.html", ], deps = [ - "//src/components-examples/cdk-experimental/listbox", + "//src/components-examples/cdk/listbox", ], ) diff --git a/src/dev-app/cdk-experimental-listbox/cdk-listbox-demo.html b/src/dev-app/cdk-listbox/cdk-listbox-demo.html similarity index 100% rename from src/dev-app/cdk-experimental-listbox/cdk-listbox-demo.html rename to src/dev-app/cdk-listbox/cdk-listbox-demo.html diff --git a/src/dev-app/cdk-experimental-listbox/cdk-listbox-demo.ts b/src/dev-app/cdk-listbox/cdk-listbox-demo.ts similarity index 94% rename from src/dev-app/cdk-experimental-listbox/cdk-listbox-demo.ts rename to src/dev-app/cdk-listbox/cdk-listbox-demo.ts index 74125b2d88c1..93ca17c9a7a8 100644 --- a/src/dev-app/cdk-experimental-listbox/cdk-listbox-demo.ts +++ b/src/dev-app/cdk-listbox/cdk-listbox-demo.ts @@ -7,7 +7,7 @@ */ import {ChangeDetectionStrategy, Component} from '@angular/core'; -import {CdkListboxExamplesModule} from '@angular/components-examples/cdk-experimental/listbox'; +import {CdkListboxExamplesModule} from '@angular/components-examples/cdk/listbox'; @Component({ templateUrl: 'cdk-listbox-demo.html', diff --git a/src/dev-app/dev-app/dev-app-layout.ts b/src/dev-app/dev-app/dev-app-layout.ts index fb16ccc68b94..43d5cbb557b5 100644 --- a/src/dev-app/dev-app/dev-app-layout.ts +++ b/src/dev-app/dev-app/dev-app-layout.ts @@ -53,9 +53,9 @@ export class DevAppLayout { {name: 'Button', route: '/button'}, {name: 'Card', route: '/card'}, {name: 'CDK Dialog', route: '/cdk-dialog'}, + {name: 'CDK Listbox', route: '/cdk-listbox'}, {name: 'CDK Menu', route: '/cdk-menu'}, {name: 'CDK Experimental Combobox', route: '/cdk-experimental-combobox'}, - {name: 'CDK Experimental Listbox', route: '/cdk-experimental-listbox'}, {name: 'Checkbox', route: '/checkbox'}, {name: 'Chips', route: '/chips'}, {name: 'Clipboard', route: '/clipboard'}, diff --git a/src/dev-app/routes.ts b/src/dev-app/routes.ts index 80634f6e8b4f..63609d86ada7 100644 --- a/src/dev-app/routes.ts +++ b/src/dev-app/routes.ts @@ -50,9 +50,8 @@ export const DEV_APP_ROUTES: Routes = [ loadComponent: () => import('./cdk-dialog/dialog-demo').then(m => m.DialogDemo), }, { - path: 'cdk-experimental-listbox', - loadComponent: () => - import('./cdk-experimental-listbox/cdk-listbox-demo').then(m => m.CdkListboxDemo), + path: 'cdk-listbox', + loadComponent: () => import('./cdk-listbox/cdk-listbox-demo').then(m => m.CdkListboxDemo), }, { path: 'cdk-menu',