diff --git a/src/cdk/collections/public-api.ts b/src/cdk/collections/public-api.ts index ed7251e3c14..f5eb48e42b7 100644 --- a/src/cdk/collections/public-api.ts +++ b/src/cdk/collections/public-api.ts @@ -9,3 +9,8 @@ export * from './collection-viewer'; export * from './data-source'; export * from './selection'; +export { + UniqueSelectionDispatcher, + UniqueSelectionDispatcherListener, + UNIQUE_SELECTION_DISPATCHER_PROVIDER, +} from './unique-selection-dispatcher'; diff --git a/src/lib/core/coordination/unique-selection-dispatcher.spec.ts b/src/cdk/collections/unique-selection-dispatcher.spec.ts similarity index 100% rename from src/lib/core/coordination/unique-selection-dispatcher.spec.ts rename to src/cdk/collections/unique-selection-dispatcher.spec.ts diff --git a/src/lib/core/coordination/unique-selection-dispatcher.ts b/src/cdk/collections/unique-selection-dispatcher.ts similarity index 99% rename from src/lib/core/coordination/unique-selection-dispatcher.ts rename to src/cdk/collections/unique-selection-dispatcher.ts index 248696b73a9..76c39095108 100644 --- a/src/lib/core/coordination/unique-selection-dispatcher.ts +++ b/src/cdk/collections/unique-selection-dispatcher.ts @@ -39,7 +39,7 @@ export class UniqueSelectionDispatcher { /** * Listen for future changes to item selection. * @return Function used to deregister listener - **/ + */ listen(listener: UniqueSelectionDispatcherListener): () => void { this._listeners.push(listener); return () => { diff --git a/src/lib/button-toggle/button-toggle-module.ts b/src/lib/button-toggle/button-toggle-module.ts index f3e6271430c..851b98fe283 100644 --- a/src/lib/button-toggle/button-toggle-module.ts +++ b/src/lib/button-toggle/button-toggle-module.ts @@ -8,7 +8,8 @@ import {NgModule} from '@angular/core'; import {MatButtonToggleGroup, MatButtonToggleGroupMultiple, MatButtonToggle} from './button-toggle'; -import {UNIQUE_SELECTION_DISPATCHER_PROVIDER, MatCommonModule} from '@angular/material/core'; +import {MatCommonModule} from '@angular/material/core'; +import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections'; import {A11yModule} from '@angular/cdk/a11y'; diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts index 29f80c92446..e2d11e80413 100644 --- a/src/lib/button-toggle/button-toggle.ts +++ b/src/lib/button-toggle/button-toggle.ts @@ -27,9 +27,9 @@ import { } from '@angular/core'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; -import {UniqueSelectionDispatcher} from '@angular/material/core'; import {CanDisable, mixinDisabled} from '@angular/material/core'; import {FocusMonitor} from '@angular/cdk/a11y'; +import {UniqueSelectionDispatcher} from '@angular/cdk/collections'; /** Acceptable types for a button toggle. */ export type ToggleType = 'checkbox' | 'radio'; diff --git a/src/lib/core/public-api.ts b/src/lib/core/public-api.ts index c059cace3f9..2723a2d05c5 100644 --- a/src/lib/core/public-api.ts +++ b/src/lib/core/public-api.ts @@ -9,7 +9,6 @@ export * from './animation/animation'; export * from './common-behaviors/index'; export * from './compatibility/compatibility'; -export * from './coordination/unique-selection-dispatcher'; export * from './datetime/index'; export * from './error/error-options'; export * from './gestures/gesture-annotations'; diff --git a/src/lib/expansion/accordion-item.ts b/src/lib/expansion/accordion-item.ts index a1a83054aa2..137cc9f20d3 100644 --- a/src/lib/expansion/accordion-item.ts +++ b/src/lib/expansion/accordion-item.ts @@ -15,7 +15,7 @@ import { Optional, ChangeDetectorRef, } from '@angular/core'; -import {UniqueSelectionDispatcher} from '@angular/material/core'; +import {UniqueSelectionDispatcher} from '@angular/cdk/collections'; import {CdkAccordion} from './accordion'; /** Used to generate unique ID for each expansion panel. */ diff --git a/src/lib/expansion/expansion-module.ts b/src/lib/expansion/expansion-module.ts index 156b774476a..7858f7d679a 100644 --- a/src/lib/expansion/expansion-module.ts +++ b/src/lib/expansion/expansion-module.ts @@ -8,7 +8,7 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; -import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/material/core'; +import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections'; import {A11yModule} from '@angular/cdk/a11y'; import {CdkAccordion, MatAccordion} from './accordion'; import {MatExpansionPanel, MatExpansionPanelActionRow} from './expansion-panel'; diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts index cf4a209f4c9..2e424a64206 100644 --- a/src/lib/expansion/expansion-panel.ts +++ b/src/lib/expansion/expansion-panel.ts @@ -21,7 +21,8 @@ import { SimpleChanges, ViewEncapsulation, } from '@angular/core'; -import {CanDisable, mixinDisabled, UniqueSelectionDispatcher} from '@angular/material/core'; +import {UniqueSelectionDispatcher} from '@angular/cdk/collections'; +import {CanDisable, mixinDisabled} from '@angular/material/core'; import {Subject} from 'rxjs/Subject'; import {MatAccordion} from './accordion'; import {AccordionItem} from './accordion-item'; diff --git a/src/lib/radio/radio-module.ts b/src/lib/radio/radio-module.ts index 59238a1682f..31a2aea986b 100644 --- a/src/lib/radio/radio-module.ts +++ b/src/lib/radio/radio-module.ts @@ -12,9 +12,9 @@ import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay'; import { MatRippleModule, MatCommonModule, - UNIQUE_SELECTION_DISPATCHER_PROVIDER, } from '@angular/material/core'; import {MatRadioGroup, MatRadioButton} from './radio'; +import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections'; import {A11yModule} from '@angular/cdk/a11y'; @NgModule({ diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts index 530c77f85a0..2196ee4308c 100644 --- a/src/lib/radio/radio.ts +++ b/src/lib/radio/radio.ts @@ -37,9 +37,9 @@ import { mixinDisabled, mixinDisableRipple, RippleRef, - UniqueSelectionDispatcher, } from '@angular/material/core'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; +import {UniqueSelectionDispatcher} from '@angular/cdk/collections'; import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y'; // Increasing integer for generating unique ids for radio components.