From 554c261a8383c7c4d01cf1ade41ee257de014a85 Mon Sep 17 00:00:00 2001 From: aomarks Date: Fri, 19 Jul 2019 17:21:37 -0700 Subject: [PATCH 1/2] Fix some type annotations PiperOrigin-RevId: 259067006 --- packages/drawer/src/mwc-drawer-base.ts | 6 +++--- packages/linear-progress/src/mwc-linear-progress-base.ts | 6 +++++- packages/tab-bar/src/mwc-tab-bar-base.ts | 4 ++-- packages/tab-bar/src/mwc-tab-bar.ts | 2 +- packages/tab/src/mwc-tab-base.ts | 2 +- packages/tab/src/mwc-tab.ts | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/drawer/src/mwc-drawer-base.ts b/packages/drawer/src/mwc-drawer-base.ts index 725e621de..6e46ef592 100644 --- a/packages/drawer/src/mwc-drawer-base.ts +++ b/packages/drawer/src/mwc-drawer-base.ts @@ -25,8 +25,8 @@ import 'blocking-elements/blocking-elements.js'; declare global { interface Document { $blockingElements: { - push(HTMLElement): void; - remove(HTMLElement): Boolean; + push(element: HTMLElement): void; + remove(element: HTMLElement): Boolean; } } @@ -146,4 +146,4 @@ export class DrawerBase extends BaseElement { this.createFoundation(); } } -} \ No newline at end of file +} diff --git a/packages/linear-progress/src/mwc-linear-progress-base.ts b/packages/linear-progress/src/mwc-linear-progress-base.ts index 34352dd1d..11b2820c9 100644 --- a/packages/linear-progress/src/mwc-linear-progress-base.ts +++ b/packages/linear-progress/src/mwc-linear-progress-base.ts @@ -85,7 +85,11 @@ export class LinearProgressBase extends BaseElement { ...addHasRemoveClass(this.mdcRoot), getPrimaryBar: () => this.primaryBar, getBuffer: () => this.bufferElement, - setStyle: (el: HTMLElement, property: string, value: string) => el.style[property] = value, + setStyle: (el: HTMLElement, property: string, value: string) => + el.style + [property as + Exclude] = + value, }; } diff --git a/packages/tab-bar/src/mwc-tab-bar-base.ts b/packages/tab-bar/src/mwc-tab-bar-base.ts index 632fd9233..d2ec15db5 100644 --- a/packages/tab-bar/src/mwc-tab-bar-base.ts +++ b/packages/tab-bar/src/mwc-tab-bar-base.ts @@ -78,7 +78,7 @@ export class TabBarBase extends BaseElement { return this.tabsSlot.assignedNodes({flatten: true}).filter((e: Node) => e instanceof Tab) as Tab[]; } - private _getTab(index) { + private _getTab(index: number) { return this._getTabs()[index]; } @@ -169,4 +169,4 @@ export class TabBarBase extends BaseElement { this.mdcFoundation.scrollIntoView(index); } -} \ No newline at end of file +} diff --git a/packages/tab-bar/src/mwc-tab-bar.ts b/packages/tab-bar/src/mwc-tab-bar.ts index 8bc8c2b6e..17c022bf3 100644 --- a/packages/tab-bar/src/mwc-tab-bar.ts +++ b/packages/tab-bar/src/mwc-tab-bar.ts @@ -27,4 +27,4 @@ declare global { @customElement('mwc-tab-bar' as any) export class TabBar extends TabBarBase { static styles = style; -} \ No newline at end of file +} diff --git a/packages/tab/src/mwc-tab-base.ts b/packages/tab/src/mwc-tab-base.ts index 488f85dbb..6bec38631 100644 --- a/packages/tab/src/mwc-tab-base.ts +++ b/packages/tab/src/mwc-tab-base.ts @@ -164,4 +164,4 @@ export class TabBase extends BaseElement { this.mdcRoot.focus(); } -} \ No newline at end of file +} diff --git a/packages/tab/src/mwc-tab.ts b/packages/tab/src/mwc-tab.ts index acdbb0e40..8f1369a26 100644 --- a/packages/tab/src/mwc-tab.ts +++ b/packages/tab/src/mwc-tab.ts @@ -28,4 +28,4 @@ declare global { @customElement('mwc-tab' as any) export class Tab extends TabBase { static styles = style; -} \ No newline at end of file +} From 9a31484d9b7a8bd910529821f09d2c3073724193 Mon Sep 17 00:00:00 2001 From: Alexander Marks Date: Sun, 21 Jul 2019 11:11:30 -0700 Subject: [PATCH 2/2] Add note about CSSStyleDeclaration cast --- packages/linear-progress/src/mwc-linear-progress-base.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/linear-progress/src/mwc-linear-progress-base.ts b/packages/linear-progress/src/mwc-linear-progress-base.ts index 11b2820c9..93eeb6f18 100644 --- a/packages/linear-progress/src/mwc-linear-progress-base.ts +++ b/packages/linear-progress/src/mwc-linear-progress-base.ts @@ -87,6 +87,12 @@ export class LinearProgressBase extends BaseElement { getBuffer: () => this.bufferElement, setStyle: (el: HTMLElement, property: string, value: string) => el.style + // TODO(aomarks) Consider moving this type to the + // MDCLinearProgressAdapter parameter type, but note that the + // "-webkit" prefixed CSS properties are not declared in + // CSSStyleDeclaration. + // + // Exclude read-only properties. [property as Exclude] = value,