Skip to content

Commit 3cf25a0

Browse files
crisbetojelbourn
authored andcommitted
refactor: change the toolkit directive prefixes and remove Md prefix from toolkit classes (#2258)
* refactor: change the toolkit directive prefixes and remove Md prefix from toolkit classes Renames the the component toolkit to use the `cdk-` prefix, in addition to removing the `Md` prefix from classes associated with the toolkit. The following CSS classes have been renamed as well: * `md-global-overlay-wrapper` -> `cdk-global-overlay-wrapper` * `md-overlay-container` -> `cdk-overlay-container` * `md-overlay-pane` -> `cdk-overlay-pane` * `md-overlay-backdrop-showing` -> `cdk-overlay-backdrop-showing` * `md-overlay-dark-backdrop` -> `cdk-overlay-dark-backdrop` * `md-overlay-backdrop` -> `cdk-overlay-backdrop` * `md-visually-hidden` -> `cdk-visually-hidden` * Re-export Md prefixed classes as deprecated * Fix linter errors. * Change the overlay variable prefixes to `cdk-` and remove dependency on theming. * Add backwards compatible selectors for core directives
1 parent 1b2db73 commit 3cf25a0

File tree

77 files changed

+267
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+267
-248
lines changed

e2e/components/dialog/dialog.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ describe('dialog', () => {
9191
browser.actions()
9292
// We need to move the cursor to the top left so
9393
// the dialog doesn't receive the click accidentally.
94-
.mouseMove(element(by.css('.md-overlay-backdrop')).getWebElement(), { x: 0, y: 0 })
94+
.mouseMove(element(by.css('.cdk-overlay-backdrop')).getWebElement(), { x: 0, y: 0 })
9595
.click()
9696
.perform();
9797
}

e2e/components/menu/menu-page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class MenuPage {
1414

1515
triggerTwo() { return element(by.id('trigger-two')); }
1616

17-
backdrop() { return element(by.css('.md-overlay-backdrop')); }
17+
backdrop() { return element(by.css('.cdk-overlay-backdrop')); }
1818

1919
items(index: number) { return element.all(by.css('[md-menu-item]')).get(index); }
2020

src/demo-app/button-toggle/button-toggle-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {Component} from '@angular/core';
2-
import {MdUniqueSelectionDispatcher} from '@angular/material';
2+
import {UniqueSelectionDispatcher} from '@angular/material';
33

44
@Component({
55
moduleId: module.id,
66
selector: 'button-toggle-demo',
77
templateUrl: 'button-toggle-demo.html',
8-
providers: [MdUniqueSelectionDispatcher],
8+
providers: [UniqueSelectionDispatcher],
99
})
1010
export class ButtonToggleDemo {
1111
isVertical = false;

src/demo-app/live-announcer/live-announcer-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {MdLiveAnnouncer} from '@angular/material';
2+
import {LiveAnnouncer} from '@angular/material';
33

44
@Component({
55
moduleId: module.id,
@@ -8,7 +8,7 @@ import {MdLiveAnnouncer} from '@angular/material';
88
})
99
export class LiveAnnouncerDemo {
1010

11-
constructor(private live: MdLiveAnnouncer) {}
11+
constructor(private live: LiveAnnouncer) {}
1212

1313
announceText(message: string) {
1414
this.live.announce(message);

src/demo-app/overlay/overlay-demo.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66
Pasta 2
77
</button>
88

9-
<button overlay-origin (click)="openSpaghettiPanel()">
9+
<button cdk-overlay-origin (click)="openSpaghettiPanel()">
1010
Pasta 3
1111
</button>
1212

1313

14-
<button overlay-origin #trigger="overlayOrigin" (click)="isMenuOpen = !isMenuOpen">
14+
<button cdk-overlay-origin #trigger="cdkOverlayOrigin" (click)="isMenuOpen = !isMenuOpen">
1515
Open menu
1616
</button>
1717

18-
<template connected-overlay [origin]="trigger" [width]="500" hasBackdrop [open]="isMenuOpen"
18+
<template cdk-connected-overlay [origin]="trigger" [width]="500" hasBackdrop [open]="isMenuOpen"
1919
(backdropClick)="isMenuOpen=false">
2020
<div style="background-color: mediumpurple" >
2121
This is the menu panel.
2222
</div>
2323
</template>
2424

2525
<!-- Template to load into an overlay. -->
26-
<template portal>
26+
<template cdk-portal>
2727
<p class="demo-fusilli"> Fusilli </p>
2828
</template>
2929

30-
<button (click)="openPanelWithBackdrop()">Backdrop panel</button>
30+
<button (click)="openPanelWithBackdrop()">Backdrop panel</button>

src/demo-app/overlay/overlay-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export class OverlayDemo {
8282
.global()
8383
.centerHorizontally();
8484
config.hasBackdrop = true;
85-
config.backdropClass = 'md-overlay-transparent-backdrop';
85+
config.backdropClass = 'cdk-overlay-transparent-backdrop';
8686

8787
let overlayRef = this.overlay.create(config);
8888
overlayRef.attach(this.templatePortals.first);

src/demo-app/platform/platform-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {MdPlatform, getSupportedInputTypes} from '@angular/material';
2+
import {Platform, getSupportedInputTypes} from '@angular/material';
33

44

55
@Component({
@@ -10,5 +10,5 @@ import {MdPlatform, getSupportedInputTypes} from '@angular/material';
1010
export class PlatformDemo {
1111
supportedInputTypes = getSupportedInputTypes();
1212

13-
constructor(public platform: MdPlatform) {}
13+
constructor(public platform: Platform) {}
1414
}

src/demo-app/portal/portal-demo.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<h2> The portal host is here: </h2>
22
<div class="demo-portal-host">
3-
<template [portalHost]="selectedPortal"></template>
3+
<template [cdkPortalHost]="selectedPortal"></template>
44
</div>
55

66
<button type="button" (click)="selectedPortal = programmingJoke">
@@ -20,12 +20,12 @@ <h2> The portal host is here: </h2>
2020
referring to something *in* the template (such as #item in ngFor). As such, the component
2121
has to use @ViewChild / @ViewChildren to get these references.
2222
See https://github.com/angular/angular/issues/7158 -->
23-
<template portal>
23+
<template cdk-portal>
2424
<p> - Why don't jokes work in octal?</p>
2525
<p> - Because 7 10 11.</p>
2626
</template>
2727

28-
<div *portal>
28+
<div *cdk-portal>
2929
<p> - Did you hear about this year's Fibonacci Conference? </p>
3030
<p> - It's going to be as big as the last two put together. </p>
3131
</div>

src/demo-app/projection/projection-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {DomProjectionHost, DomProjection} from '@angular/material';
77
template: `
88
<div class="demo-outer {{cssClass}}">
99
Before
10-
<dom-projection-host><ng-content></ng-content></dom-projection-host>
10+
<cdk-dom-projection-host><ng-content></ng-content></cdk-dom-projection-host>
1111
After
1212
</div>
1313
`,

src/lib/button-toggle/button-toggle.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<label [attr.for]="inputId" class="md-button-toggle-label">
2-
<input #input class="md-button-toggle-input md-visually-hidden"
2+
<input #input class="md-button-toggle-input cdk-visually-hidden"
33
[type]="_type"
44
[id]="inputId"
55
[checked]="checked"

0 commit comments

Comments
 (0)