Skip to content

Commit 49a268e

Browse files
committed
Move UniqueSelectionDispatcher to CDK.
BREAKING CHANGE: UniqueSelectionDispatcher, UniqueSelectionDispatcherListener and UNIQUE_SELECTION_DISPATCHER_PROVIDER are no longer available from @angular/material and instead must be imported from @angular/cdk/collections
1 parent 95ab1eb commit 49a268e

File tree

11 files changed

+16
-10
lines changed

11 files changed

+16
-10
lines changed

src/cdk/collections/public_api.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@
99
export * from './collection-viewer';
1010
export * from './data-source';
1111
export * from './selection';
12+
export {
13+
UniqueSelectionDispatcher,
14+
UniqueSelectionDispatcherListener,
15+
UNIQUE_SELECTION_DISPATCHER_PROVIDER,
16+
} from './unique-selection-dispatcher';

src/lib/core/coordination/unique-selection-dispatcher.ts renamed to src/cdk/collections/unique-selection-dispatcher.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class UniqueSelectionDispatcher {
3939
/**
4040
* Listen for future changes to item selection.
4141
* @return Function used to deregister listener
42-
**/
42+
*/
4343
listen(listener: UniqueSelectionDispatcherListener): () => void {
4444
this._listeners.push(listener);
4545
return () => {

src/lib/button-toggle/button-toggle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import {
2727
} from '@angular/core';
2828
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
2929
import {coerceBooleanProperty} from '@angular/cdk/coercion';
30-
import {UniqueSelectionDispatcher} from '@angular/material/core';
3130
import {CanDisable, mixinDisabled} from '@angular/material/core';
3231
import {FocusMonitor} from '@angular/cdk/a11y';
32+
import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
3333

3434
/** Acceptable types for a button toggle. */
3535
export type ToggleType = 'checkbox' | 'radio';

src/lib/button-toggle/public_api.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99
import {NgModule} from '@angular/core';
1010
import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
11-
import {UNIQUE_SELECTION_DISPATCHER_PROVIDER, MdCommonModule} from '@angular/material/core';
1211
import {A11yModule} from '@angular/cdk/a11y';
12+
import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
13+
import {MdCommonModule} from '@angular/material/core';
1314

1415

1516
@NgModule({

src/lib/core/public_api.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export * from './animation/animation';
1111
export * from './bidi/index';
1212
export * from './common-behaviors/index';
1313
export * from './compatibility/compatibility';
14-
export * from './coordination/unique-selection-dispatcher';
1514
export * from './datetime/index';
1615
export * from './error/error-options';
1716
export * from './gestures/gesture-annotations';

src/lib/expansion/accordion-item.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
Optional,
1616
ChangeDetectorRef,
1717
} from '@angular/core';
18-
import {UniqueSelectionDispatcher} from '@angular/material/core';
18+
import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
1919
import {CdkAccordion} from './accordion';
2020

2121
/** Used to generate unique ID for each expansion panel. */

src/lib/expansion/expansion-panel.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import {
2121
SimpleChanges,
2222
ViewEncapsulation,
2323
} from '@angular/core';
24-
import {CanDisable, mixinDisabled, UniqueSelectionDispatcher} from '@angular/material/core';
24+
import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
25+
import {CanDisable, mixinDisabled} from '@angular/material/core';
2526
import {Subject} from 'rxjs/Subject';
2627
import {MdAccordion} from './accordion';
2728
import {AccordionItem} from './accordion-item';
2829

29-
3030
// Boilerplate for applying mixins to MdExpansionPanel.
3131
/** @docs-private */
3232
export class MdExpansionPanelBase extends AccordionItem {

src/lib/expansion/public_api.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
11-
import {CompatibilityModule, UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/material/core';
1211
import {A11yModule} from '@angular/cdk/a11y';
12+
import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
13+
import {CompatibilityModule} from '@angular/material/core';
1314
import {CdkAccordion, MdAccordion} from './accordion';
1415
import {MdExpansionPanel, MdExpansionPanelActionRow} from './expansion-panel';
1516
import {

src/lib/radio/public_api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
import {NgModule} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
11+
import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
1112
import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
1213
import {
1314
MdRippleModule,
1415
MdCommonModule,
15-
UNIQUE_SELECTION_DISPATCHER_PROVIDER,
1616
} from '@angular/material/core';
1717
import {MdRadioGroup, MdRadioButton} from './radio';
1818
import {A11yModule} from '@angular/cdk/a11y';

src/lib/radio/radio.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import {
3030
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
3131
import {
3232
RippleRef,
33-
UniqueSelectionDispatcher,
3433
MdRipple,
3534
} from '@angular/material/core';
3635
import {coerceBooleanProperty} from '@angular/cdk/coercion';
36+
import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
3737
import {mixinDisabled, CanDisable} from '@angular/material/core';
3838
import {CanColor, mixinColor} from '@angular/material/core';
3939
import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';

0 commit comments

Comments
 (0)