Skip to content

Commit b4e40c1

Browse files
committed
feat: upgrade to material-web-components 0.27.0
BREAKING CHANGE: * mdcSelect has been removed for now, will be readded when upgrading to material-web-components 0.34.0 * mdcListItemTextSecondary was renamed to mdcListItemSecondaryText * MdcListItemTextSecondaryDirective was renamed to MdcListItemSecondaryTextDirective
1 parent 6142d1c commit b4e40c1

27 files changed

+371
-1151
lines changed

bundle/package-lock.json

Lines changed: 164 additions & 383 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"build": "npm run clean && npm run ngc && npm run bundle && npm run copy-types && npm run copy-metadata && npm run apidocs"
2626
},
2727
"dependencies": {
28-
"material-components-web": "^0.26.0"
28+
"material-components-web": "^0.27.0"
2929
},
3030
"peerDependencies": {
3131
"@angular/common": ">=4.0.0",
@@ -43,8 +43,8 @@
4343
"@angular/forms": "^5.2.10",
4444
"@angular/router": "^5.2.10",
4545
"@types/glob": "^5.0.35",
46-
"@types/jasmine": "^2.8.6",
47-
"@types/node": "^10.0.2",
46+
"@types/jasmine": "^2.8.7",
47+
"@types/node": "^10.0.3",
4848
"@types/rollup": "^0.54.0",
4949
"@types/selenium-webdriver": "^3.0.8",
5050
"codelyzer": "^4.3.0",
@@ -57,12 +57,11 @@
5757
"jasmine-spec-reporter": "^4.2.1",
5858
"karma": "^2.0.2",
5959
"karma-chrome-launcher": "^2.2.0",
60-
"karma-coverage": "^1.1.1",
61-
"karma-jasmine": "^1.1.1",
60+
"karma-coverage": "^1.1.2",
61+
"karma-jasmine": "^1.1.2",
6262
"karma-mocha-reporter": "^2.2.4",
6363
"karma-remap-istanbul": "0.6.0",
6464
"karma-sourcemap-loader": "^0.3.7",
65-
"karma-webpack": "^3.0.0",
6665
"remap-istanbul": "^0.11.1",
6766
"rimraf": "^2.6.2",
6867
"rollup": "^0.58.2",
@@ -73,7 +72,7 @@
7372
"source-map-explorer": "^1.4.0",
7473
"ts-helpers": "^1.1.2",
7574
"ts-node": "^3.3.0",
76-
"tslint": "^5.9.1",
75+
"tslint": "^5.10.0",
7776
"typedoc": "^0.11.1",
7877
"typescript": "2.4.2",
7978
"zone.js": "^0.8.26"

bundle/src/components/drawer/mdc.drawer.directive.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,12 @@ export class MdcDrawerContainerDirective implements AfterContentInit, OnDestroy
298298
updateCssVariable: (value: string) => {
299299
if (util.supportsCssCustomProperties())
300300
this._elm.nativeElement.style.setProperty(MDCTemporaryDrawerFoundation.strings.OPACITY_VAR_NAME, value);
301+
},
302+
eventTargetHasClass: (target: HTMLElement, className: string) => {
303+
if (target === this._elm.nativeElement && this.type === 'temporary' && className === 'mdc-temporary-drawer')
304+
// make sure this returns true even if class HostBinding is not effectuated yet:
305+
return true;
306+
return target.classList.contains(className);
301307
}
302308
};
303309
this.mdcAdapter = adapter;

bundle/src/components/drawer/mdc.temporary.drawer.adapter.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ export interface MdcTemporaryDrawerAdapter extends MdcSlidableDrawerAdapter {
55
addBodyClass: (className: string) => void;
66
removeBodyClass: (className: string) => void;
77
updateCssVariable: (value: string) => void;
8+
eventTargetHasClass: (target: HTMLElement, className: string) => boolean;
89
}

bundle/src/components/list/mdc.list.directive.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ export class MdcListItemTextDirective {
106106
* Directive for the secondary text of an item with "two line list" styling.
107107
*/
108108
@Directive({
109-
selector: '[mdcListItemTextSecondary]',
109+
selector: '[mdcListItemSecondaryText]',
110110
})
111-
export class MdcListItemTextSecondaryDirective {
112-
@HostBinding('class.mdc-list-item__text__secondary') _cls = true;
111+
export class MdcListItemSecondaryTextDirective {
112+
@HostBinding('class.mdc-list-item__secondary-text') _cls = true;
113113

114114
constructor() {}
115115
}

bundle/src/components/menu/mdc.simple.menu.adapter.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export interface MdcSimpleMenuAdapter {
55
hasClass: (className: string) => boolean,
66
hasNecessaryDom: () => boolean,
77
getAttributeForEventTarget: (target: Element, attrName: string) => string,
8+
eventTargetHasClass: (target: HTMLElement, className: string) => boolean;
89
getInnerDimensions: () => {width: number, height: number},
910
hasAnchor: () => boolean,
1011
getAnchorDimensions: () => {width: number, height: number, top: number, right: number, bottom: number, left: number},

bundle/src/components/menu/mdc.simple.menu.directive.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ export class MdcSimpleMenuDirective implements AfterContentInit, OnDestroy {
106106
},
107107
hasNecessaryDom: () => this._listQuery.length != 0,
108108
getAttributeForEventTarget: (target: Element, attrName: string) => target.getAttribute(attrName),
109+
eventTargetHasClass: (target: HTMLElement, className: string) => target.classList.contains(className),
109110
getInnerDimensions: () => {
110111
let elm = this._list._elm.nativeElement;
111112
return {width: elm.offsetWidth, height: elm.offsetHeight};

bundle/src/components/select/mdc.select.adapter.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)