From ec0a8ebf6ec973282b9a382a1f2fa347b5c82975 Mon Sep 17 00:00:00 2001 From: Elizabeth Mitchell Date: Fri, 23 Feb 2024 10:01:21 -0800 Subject: [PATCH] chore: use `CSSResultOrNative` instead of `CSSResult` for static styles PiperOrigin-RevId: 609760445 --- button/elevated-button.ts | 4 ++-- button/filled-button.ts | 4 ++-- button/filled-tonal-button.ts | 4 ++-- button/outlined-button.ts | 4 ++-- button/text-button.ts | 4 ++-- checkbox/checkbox.ts | 4 ++-- chips/assist-chip.ts | 4 ++-- chips/chip-set.ts | 4 ++-- chips/filter-chip.ts | 4 ++-- chips/input-chip.ts | 4 ++-- chips/suggestion-chip.ts | 4 ++-- dialog/dialog.ts | 4 ++-- divider/divider.ts | 4 ++-- elevation/elevation.ts | 4 ++-- fab/branded-fab.ts | 4 ++-- fab/fab.ts | 4 ++-- field/filled-field.ts | 4 ++-- field/outlined-field.ts | 4 ++-- focus/md-focus-ring.ts | 4 ++-- icon/icon.ts | 4 ++-- iconbutton/filled-icon-button.ts | 4 ++-- iconbutton/filled-tonal-icon-button.ts | 4 ++-- iconbutton/icon-button.ts | 4 ++-- iconbutton/outlined-icon-button.ts | 4 ++-- labs/badge/badge.ts | 4 ++-- labs/card/elevated-card.ts | 4 ++-- labs/card/filled-card.ts | 4 ++-- labs/card/outlined-card.ts | 4 ++-- labs/item/item.ts | 4 ++-- labs/navigationbar/navigation-bar.ts | 4 ++-- labs/navigationtab/navigation-tab.ts | 4 ++-- labs/segmentedbutton/outlined-segmented-button.ts | 4 ++-- .../outlined-segmented-button-set.ts | 4 ++-- list/list-item.ts | 4 ++-- list/list.ts | 4 ++-- menu/menu-item.ts | 4 ++-- menu/menu.ts | 4 ++-- menu/sub-menu.ts | 4 ++-- progress/circular-progress.ts | 4 ++-- progress/linear-progress.ts | 4 ++-- radio/radio.ts | 4 ++-- ripple/ripple.ts | 4 ++-- select/filled-select.ts | 4 ++-- select/outlined-select.ts | 4 ++-- select/select-option.ts | 4 ++-- slider/slider.ts | 4 ++-- switch/switch.ts | 4 ++-- tabs/primary-tab.ts | 4 ++-- tabs/secondary-tab.ts | 4 ++-- tabs/tabs.ts | 4 ++-- testing/table/test-table.ts | 4 ++-- testing/tokens.ts | 10 +++++----- textfield/filled-text-field.ts | 4 ++-- textfield/outlined-text-field.ts | 4 ++-- 54 files changed, 111 insertions(+), 111 deletions(-) diff --git a/button/elevated-button.ts b/button/elevated-button.ts index 75b60fc88..e677e1b5c 100644 --- a/button/elevated-button.ts +++ b/button/elevated-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {ElevatedButton} from './internal/elevated-button.js'; @@ -42,7 +42,7 @@ declare global { */ @customElement('md-elevated-button') export class MdElevatedButton extends ElevatedButton { - static override styles: CSSResult[] = [ + static override styles: CSSResultOrNative[] = [ sharedStyles, sharedElevationStyles, elevatedStyles, diff --git a/button/filled-button.ts b/button/filled-button.ts index 742f3851c..7c7bb26a4 100644 --- a/button/filled-button.ts +++ b/button/filled-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {FilledButton} from './internal/filled-button.js'; @@ -40,7 +40,7 @@ declare global { */ @customElement('md-filled-button') export class MdFilledButton extends FilledButton { - static override styles: CSSResult[] = [ + static override styles: CSSResultOrNative[] = [ sharedStyles, sharedElevationStyles, filledStyles, diff --git a/button/filled-tonal-button.ts b/button/filled-tonal-button.ts index 5f34d3e58..70ee08f17 100644 --- a/button/filled-tonal-button.ts +++ b/button/filled-tonal-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {FilledTonalButton} from './internal/filled-tonal-button.js'; @@ -41,7 +41,7 @@ declare global { */ @customElement('md-filled-tonal-button') export class MdFilledTonalButton extends FilledTonalButton { - static override styles: CSSResult[] = [ + static override styles: CSSResultOrNative[] = [ sharedStyles, sharedElevationStyles, tonalStyles, diff --git a/button/outlined-button.ts b/button/outlined-button.ts index 9431f80ab..1aebe825d 100644 --- a/button/outlined-button.ts +++ b/button/outlined-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {OutlinedButton} from './internal/outlined-button.js'; @@ -41,5 +41,5 @@ declare global { */ @customElement('md-outlined-button') export class MdOutlinedButton extends OutlinedButton { - static override styles: CSSResult[] = [sharedStyles, outlinedStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, outlinedStyles]; } diff --git a/button/text-button.ts b/button/text-button.ts index 7cafeb2e8..36b9559fc 100644 --- a/button/text-button.ts +++ b/button/text-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {styles as sharedStyles} from './internal/shared-styles.css.js'; @@ -39,5 +39,5 @@ declare global { */ @customElement('md-text-button') export class MdTextButton extends TextButton { - static override styles: CSSResult[] = [sharedStyles, textStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, textStyles]; } diff --git a/checkbox/checkbox.ts b/checkbox/checkbox.ts index 02a7ea82e..9ea34bc50 100644 --- a/checkbox/checkbox.ts +++ b/checkbox/checkbox.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Checkbox} from './internal/checkbox.js'; @@ -31,5 +31,5 @@ declare global { */ @customElement('md-checkbox') export class MdCheckbox extends Checkbox { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/chips/assist-chip.ts b/chips/assist-chip.ts index 2ce30f341..8b4798142 100644 --- a/chips/assist-chip.ts +++ b/chips/assist-chip.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {AssistChip} from './internal/assist-chip.js'; @@ -26,5 +26,5 @@ declare global { */ @customElement('md-assist-chip') export class MdAssistChip extends AssistChip { - static override styles: CSSResult[] = [sharedStyles, elevatedStyles, styles]; + static override styles: CSSResultOrNative[] = [sharedStyles, elevatedStyles, styles]; } diff --git a/chips/chip-set.ts b/chips/chip-set.ts index ae967ff20..d968511d0 100644 --- a/chips/chip-set.ts +++ b/chips/chip-set.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {ChipSet} from './internal/chip-set.js'; @@ -24,5 +24,5 @@ declare global { */ @customElement('md-chip-set') export class MdChipSet extends ChipSet { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/chips/filter-chip.ts b/chips/filter-chip.ts index ff63734b9..92b34199e 100644 --- a/chips/filter-chip.ts +++ b/chips/filter-chip.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {styles as elevatedStyles} from './internal/elevated-styles.css.js'; @@ -28,7 +28,7 @@ declare global { */ @customElement('md-filter-chip') export class MdFilterChip extends FilterChip { - static override styles: CSSResult[] = [ + static override styles: CSSResultOrNative[] = [ sharedStyles, elevatedStyles, trailingIconStyles, diff --git a/chips/input-chip.ts b/chips/input-chip.ts index d5ed7df64..3bddb0f0b 100644 --- a/chips/input-chip.ts +++ b/chips/input-chip.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {InputChip} from './internal/input-chip.js'; @@ -27,7 +27,7 @@ declare global { */ @customElement('md-input-chip') export class MdInputChip extends InputChip { - static override styles: CSSResult[] = [ + static override styles: CSSResultOrNative[] = [ sharedStyles, trailingIconStyles, selectableStyles, diff --git a/chips/suggestion-chip.ts b/chips/suggestion-chip.ts index b1ed7a989..70032214e 100644 --- a/chips/suggestion-chip.ts +++ b/chips/suggestion-chip.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {styles as elevatedStyles} from './internal/elevated-styles.css.js'; @@ -26,5 +26,5 @@ declare global { */ @customElement('md-suggestion-chip') export class MdSuggestionChip extends SuggestionChip { - static override styles: CSSResult[] = [sharedStyles, elevatedStyles, styles]; + static override styles: CSSResultOrNative[] = [sharedStyles, elevatedStyles, styles]; } diff --git a/dialog/dialog.ts b/dialog/dialog.ts index 20f67f323..3c145007b 100644 --- a/dialog/dialog.ts +++ b/dialog/dialog.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Dialog} from './internal/dialog.js'; @@ -45,5 +45,5 @@ declare global { */ @customElement('md-dialog') export class MdDialog extends Dialog { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/divider/divider.ts b/divider/divider.ts index e8cda694f..9e21597d0 100644 --- a/divider/divider.ts +++ b/divider/divider.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Divider} from './internal/divider.js'; @@ -28,5 +28,5 @@ declare global { */ @customElement('md-divider') export class MdDivider extends Divider { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/elevation/elevation.ts b/elevation/elevation.ts index 18b3f6147..94bf1c39f 100644 --- a/elevation/elevation.ts +++ b/elevation/elevation.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Elevation} from './internal/elevation.js'; @@ -26,5 +26,5 @@ declare global { */ @customElement('md-elevation') export class MdElevation extends Elevation { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/fab/branded-fab.ts b/fab/branded-fab.ts index c24901323..822fbb261 100644 --- a/fab/branded-fab.ts +++ b/fab/branded-fab.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Fab, FabVariant} from './internal/fab.js'; @@ -64,5 +64,5 @@ export class MdBrandedFab extends Fab { 'small': false, }; } - static override styles: CSSResult[] = [sharedStyles, styles, forcedColors]; + static override styles: CSSResultOrNative[] = [sharedStyles, styles, forcedColors]; } diff --git a/fab/fab.ts b/fab/fab.ts index 693d2fb5c..ca7e0b39e 100644 --- a/fab/fab.ts +++ b/fab/fab.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Fab} from './internal/fab.js'; @@ -50,5 +50,5 @@ declare global { */ @customElement('md-fab') export class MdFab extends Fab { - static override styles: CSSResult[] = [sharedStyles, styles, forcedColors]; + static override styles: CSSResultOrNative[] = [sharedStyles, styles, forcedColors]; } diff --git a/field/filled-field.ts b/field/filled-field.ts index fb1d13e0a..248574ab7 100644 --- a/field/filled-field.ts +++ b/field/filled-field.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {FilledField} from './internal/filled-field.js'; @@ -24,5 +24,5 @@ declare global { */ @customElement('md-filled-field') export class MdFilledField extends FilledField { - static override styles: CSSResult[] = [sharedStyles, filledStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, filledStyles]; } diff --git a/field/outlined-field.ts b/field/outlined-field.ts index 804453caa..05ad91f4e 100644 --- a/field/outlined-field.ts +++ b/field/outlined-field.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {OutlinedField} from './internal/outlined-field.js'; @@ -24,5 +24,5 @@ declare global { */ @customElement('md-outlined-field') export class MdOutlinedField extends OutlinedField { - static override styles: CSSResult[] = [sharedStyles, outlinedStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, outlinedStyles]; } diff --git a/focus/md-focus-ring.ts b/focus/md-focus-ring.ts index 652e999ab..f6ac40222 100644 --- a/focus/md-focus-ring.ts +++ b/focus/md-focus-ring.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {FocusRing} from './internal/focus-ring.js'; @@ -24,5 +24,5 @@ declare global { */ @customElement('md-focus-ring') export class MdFocusRing extends FocusRing { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/icon/icon.ts b/icon/icon.ts index ab24880ef..2c4018607 100644 --- a/icon/icon.ts +++ b/icon/icon.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Icon} from './internal/icon.js'; @@ -23,5 +23,5 @@ declare global { @customElement('md-icon') export class MdIcon extends Icon { /** @nocollapse */ - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/iconbutton/filled-icon-button.ts b/iconbutton/filled-icon-button.ts index a1da36279..d735513f5 100644 --- a/iconbutton/filled-icon-button.ts +++ b/iconbutton/filled-icon-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {styles} from './internal/filled-styles.css.js'; @@ -37,7 +37,7 @@ declare global { */ @customElement('md-filled-icon-button') export class MdFilledIconButton extends IconButton { - static override styles: CSSResult[] = [sharedStyles, styles]; + static override styles: CSSResultOrNative[] = [sharedStyles, styles]; protected override getRenderClasses() { return { diff --git a/iconbutton/filled-tonal-icon-button.ts b/iconbutton/filled-tonal-icon-button.ts index bc9537efb..35aa4f974 100644 --- a/iconbutton/filled-tonal-icon-button.ts +++ b/iconbutton/filled-tonal-icon-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {styles} from './internal/filled-tonal-styles.css.js'; @@ -37,7 +37,7 @@ declare global { */ @customElement('md-filled-tonal-icon-button') export class MdFilledTonalIconButton extends IconButton { - static override styles: CSSResult[] = [sharedStyles, styles]; + static override styles: CSSResultOrNative[] = [sharedStyles, styles]; protected override getRenderClasses() { return { diff --git a/iconbutton/icon-button.ts b/iconbutton/icon-button.ts index 3a114d4c0..ec41dd0f7 100644 --- a/iconbutton/icon-button.ts +++ b/iconbutton/icon-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {IconButton} from './internal/icon-button.js'; @@ -37,7 +37,7 @@ declare global { */ @customElement('md-icon-button') export class MdIconButton extends IconButton { - static override styles: CSSResult[] = [sharedStyles, styles]; + static override styles: CSSResultOrNative[] = [sharedStyles, styles]; protected override getRenderClasses() { return { diff --git a/iconbutton/outlined-icon-button.ts b/iconbutton/outlined-icon-button.ts index 18405424c..1ed2c145e 100644 --- a/iconbutton/outlined-icon-button.ts +++ b/iconbutton/outlined-icon-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {IconButton} from './internal/icon-button.js'; @@ -37,7 +37,7 @@ declare global { */ @customElement('md-outlined-icon-button') export class MdOutlinedIconButton extends IconButton { - static override styles: CSSResult[] = [sharedStyles, styles]; + static override styles: CSSResultOrNative[] = [sharedStyles, styles]; protected override getRenderClasses() { return { diff --git a/labs/badge/badge.ts b/labs/badge/badge.ts index 9bcd16a37..3baabedb7 100644 --- a/labs/badge/badge.ts +++ b/labs/badge/badge.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Badge} from './internal/badge.js'; @@ -22,5 +22,5 @@ declare global { */ @customElement('md-badge') export class MdBadge extends Badge { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/labs/card/elevated-card.ts b/labs/card/elevated-card.ts index fa0d3c73b..0d8729f3d 100644 --- a/labs/card/elevated-card.ts +++ b/labs/card/elevated-card.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Card} from './internal/card.js'; @@ -23,5 +23,5 @@ declare global { */ @customElement('md-elevated-card') export class MdElevatedCard extends Card { - static override styles: CSSResult[] = [sharedStyles, elevatedStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, elevatedStyles]; } diff --git a/labs/card/filled-card.ts b/labs/card/filled-card.ts index 682f44d97..b01f9d560 100644 --- a/labs/card/filled-card.ts +++ b/labs/card/filled-card.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Card} from './internal/card.js'; @@ -23,5 +23,5 @@ declare global { */ @customElement('md-filled-card') export class MdFilledCard extends Card { - static override styles: CSSResult[] = [sharedStyles, filledStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, filledStyles]; } diff --git a/labs/card/outlined-card.ts b/labs/card/outlined-card.ts index 62f184067..24f36f854 100644 --- a/labs/card/outlined-card.ts +++ b/labs/card/outlined-card.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Card} from './internal/card.js'; @@ -23,5 +23,5 @@ declare global { */ @customElement('md-outlined-card') export class MdOutlinedCard extends Card { - static override styles: CSSResult[] = [sharedStyles, outlinedStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, outlinedStyles]; } diff --git a/labs/item/item.ts b/labs/item/item.ts index 4f3e2dab4..e35e2e46e 100644 --- a/labs/item/item.ts +++ b/labs/item/item.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Item} from './internal/item.js'; @@ -77,5 +77,5 @@ declare global { */ @customElement('md-item') export class MdItem extends Item { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/labs/navigationbar/navigation-bar.ts b/labs/navigationbar/navigation-bar.ts index dc552325e..9f1c6cda8 100644 --- a/labs/navigationbar/navigation-bar.ts +++ b/labs/navigationbar/navigation-bar.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {NavigationBar} from './internal/navigation-bar.js'; @@ -22,5 +22,5 @@ declare global { */ @customElement('md-navigation-bar') export class MdNavigationBar extends NavigationBar { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/labs/navigationtab/navigation-tab.ts b/labs/navigationtab/navigation-tab.ts index 4ab1693a6..c4c3a45a1 100644 --- a/labs/navigationtab/navigation-tab.ts +++ b/labs/navigationtab/navigation-tab.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {NavigationTab} from './internal/navigation-tab.js'; @@ -22,5 +22,5 @@ declare global { */ @customElement('md-navigation-tab') export class MdNavigationTab extends NavigationTab { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/labs/segmentedbutton/outlined-segmented-button.ts b/labs/segmentedbutton/outlined-segmented-button.ts index d4f0a23db..d99f47f24 100644 --- a/labs/segmentedbutton/outlined-segmented-button.ts +++ b/labs/segmentedbutton/outlined-segmented-button.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {OutlinedSegmentedButton} from './internal/outlined-segmented-button.js'; @@ -25,5 +25,5 @@ declare global { */ @customElement('md-outlined-segmented-button') export class MdOutlinedSegmentedButton extends OutlinedSegmentedButton { - static override styles: CSSResult[] = [sharedStyles, outlinedStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, outlinedStyles]; } diff --git a/labs/segmentedbuttonset/outlined-segmented-button-set.ts b/labs/segmentedbuttonset/outlined-segmented-button-set.ts index 82134375d..2744b7d88 100644 --- a/labs/segmentedbuttonset/outlined-segmented-button-set.ts +++ b/labs/segmentedbuttonset/outlined-segmented-button-set.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {OutlinedSegmentedButtonSet} from './internal/outlined-segmented-button-set.js'; @@ -25,5 +25,5 @@ declare global { */ @customElement('md-outlined-segmented-button-set') export class MdOutlinedSegmentedButtonSet extends OutlinedSegmentedButtonSet { - static override styles: CSSResult[] = [sharedStyles, outlinedStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, outlinedStyles]; } diff --git a/list/list-item.ts b/list/list-item.ts index d952c0581..17d641aed 100644 --- a/list/list-item.ts +++ b/list/list-item.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {ListItemEl as ListItem} from './internal/listitem/list-item.js'; @@ -58,5 +58,5 @@ declare global { */ @customElement('md-list-item') export class MdListItem extends ListItem { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/list/list.ts b/list/list.ts index e76a32685..04895eeef 100644 --- a/list/list.ts +++ b/list/list.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {List} from './internal/list.js'; @@ -37,5 +37,5 @@ declare global { */ @customElement('md-list') export class MdList extends List { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/menu/menu-item.ts b/menu/menu-item.ts index d7a7bd15b..24ba77df9 100644 --- a/menu/menu-item.ts +++ b/menu/menu-item.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {MenuItemEl} from './internal/menuitem/menu-item.js'; @@ -36,5 +36,5 @@ declare global { */ @customElement('md-menu-item') export class MdMenuItem extends MenuItemEl { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/menu/menu.ts b/menu/menu.ts index c8abd31f5..d79d4444d 100644 --- a/menu/menu.ts +++ b/menu/menu.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Menu} from './internal/menu.js'; @@ -76,5 +76,5 @@ declare global { */ @customElement('md-menu') export class MdMenu extends Menu { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/menu/sub-menu.ts b/menu/sub-menu.ts index 8a1a27023..df95b2d59 100644 --- a/menu/sub-menu.ts +++ b/menu/sub-menu.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {SubMenu} from './internal/submenu/sub-menu.js'; @@ -66,5 +66,5 @@ declare global { */ @customElement('md-sub-menu') export class MdSubMenu extends SubMenu { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/progress/circular-progress.ts b/progress/circular-progress.ts index 5ef6e47fa..d047316d0 100644 --- a/progress/circular-progress.ts +++ b/progress/circular-progress.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {CircularProgress} from './internal/circular-progress.js'; @@ -31,5 +31,5 @@ declare global { */ @customElement('md-circular-progress') export class MdCircularProgress extends CircularProgress { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/progress/linear-progress.ts b/progress/linear-progress.ts index 111d67994..f334f7fed 100644 --- a/progress/linear-progress.ts +++ b/progress/linear-progress.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {LinearProgress} from './internal/linear-progress.js'; @@ -30,5 +30,5 @@ declare global { */ @customElement('md-linear-progress') export class MdLinearProgress extends LinearProgress { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/radio/radio.ts b/radio/radio.ts index 797d0a97b..d22a2b3d2 100644 --- a/radio/radio.ts +++ b/radio/radio.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Radio} from './internal/radio.js'; @@ -34,5 +34,5 @@ declare global { */ @customElement('md-radio') export class MdRadio extends Radio { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/ripple/ripple.ts b/ripple/ripple.ts index 8a2295b7f..5146b4f2a 100644 --- a/ripple/ripple.ts +++ b/ripple/ripple.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Ripple} from './internal/ripple.js'; @@ -31,5 +31,5 @@ declare global { */ @customElement('md-ripple') export class MdRipple extends Ripple { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/select/filled-select.ts b/select/filled-select.ts index 0056e4b51..67984b34b 100644 --- a/select/filled-select.ts +++ b/select/filled-select.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {FilledSelect} from './internal/filled-select.js'; @@ -46,5 +46,5 @@ declare global { */ @customElement('md-filled-select') export class MdFilledSelect extends FilledSelect { - static override styles: CSSResult[] = [sharedStyles, styles]; + static override styles: CSSResultOrNative[] = [sharedStyles, styles]; } diff --git a/select/outlined-select.ts b/select/outlined-select.ts index 8c99391e4..0d303a8b9 100644 --- a/select/outlined-select.ts +++ b/select/outlined-select.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {OutlinedSelect} from './internal/outlined-select.js'; @@ -46,5 +46,5 @@ declare global { */ @customElement('md-outlined-select') export class MdOutlinedSelect extends OutlinedSelect { - static override styles: CSSResult[] = [sharedStyles, styles]; + static override styles: CSSResultOrNative[] = [sharedStyles, styles]; } diff --git a/select/select-option.ts b/select/select-option.ts index 6ef2d6100..f5d39e540 100644 --- a/select/select-option.ts +++ b/select/select-option.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {styles} from '../menu/internal/menuitem/menu-item-styles.css.js'; @@ -51,5 +51,5 @@ declare global { */ @customElement('md-select-option') export class MdSelectOption extends SelectOptionEl { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/slider/slider.ts b/slider/slider.ts index fd753e646..8473f40ef 100644 --- a/slider/slider.ts +++ b/slider/slider.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {styles as forcedColorsStyles} from './internal/forced-colors-styles.css.js'; @@ -36,5 +36,5 @@ declare global { */ @customElement('md-slider') export class MdSlider extends Slider { - static override styles: CSSResult[] = [styles, forcedColorsStyles]; + static override styles: CSSResultOrNative[] = [styles, forcedColorsStyles]; } diff --git a/switch/switch.ts b/switch/switch.ts index 876911d2d..3a8e174a2 100644 --- a/switch/switch.ts +++ b/switch/switch.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Switch} from './internal/switch.js'; @@ -28,5 +28,5 @@ declare global { */ @customElement('md-switch') export class MdSwitch extends Switch { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/tabs/primary-tab.ts b/tabs/primary-tab.ts index 90e651029..4a638a907 100644 --- a/tabs/primary-tab.ts +++ b/tabs/primary-tab.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {PrimaryTab} from './internal/primary-tab.js'; @@ -26,5 +26,5 @@ declare global { */ @customElement('md-primary-tab') export class MdPrimaryTab extends PrimaryTab { - static override styles: CSSResult[] = [sharedStyles, primaryStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, primaryStyles]; } diff --git a/tabs/secondary-tab.ts b/tabs/secondary-tab.ts index 154f9f603..61f3d186c 100644 --- a/tabs/secondary-tab.ts +++ b/tabs/secondary-tab.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {SecondaryTab} from './internal/secondary-tab.js'; @@ -26,5 +26,5 @@ declare global { */ @customElement('md-secondary-tab') export class MdSecondaryTab extends SecondaryTab { - static override styles: CSSResult[] = [sharedStyles, secondaryStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, secondaryStyles]; } diff --git a/tabs/tabs.ts b/tabs/tabs.ts index 2079b3428..b07bcb151 100644 --- a/tabs/tabs.ts +++ b/tabs/tabs.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {Tabs} from './internal/tabs.js'; @@ -25,5 +25,5 @@ declare global { */ @customElement('md-tabs') export class MdTabs extends Tabs { - static override styles: CSSResult[] = [styles]; + static override styles: CSSResultOrNative[] = [styles]; } diff --git a/testing/table/test-table.ts b/testing/table/test-table.ts index 93599854a..0d9a0508f 100644 --- a/testing/table/test-table.ts +++ b/testing/table/test-table.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {TestTable} from './internal/test-table.js'; @@ -24,5 +24,5 @@ declare global { */ @customElement('md-test-table') export class MdTestTable extends TestTable { - static override styles: CSSResult[] = [testTableStyles]; + static override styles: CSSResultOrNative[] = [testTableStyles]; } diff --git a/testing/tokens.ts b/testing/tokens.ts index d6b4230ce..5e1fb8cd2 100644 --- a/testing/tokens.ts +++ b/testing/tokens.ts @@ -6,7 +6,7 @@ // import 'jasmine'; (google3-only) -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; /** * Create tests for `MdComponent.styles` that checks for undefined or unused @@ -14,7 +14,7 @@ import {CSSResult} from 'lit'; * * @param styles Styles to run tests on. */ -export function createTokenTests(styles: CSSResult[]) { +export function createTokenTests(styles: CSSResultOrNative[]) { it('should not have any undefined tokens', () => { const undefinedTokens = getUndefinedTokens(styles); expect(undefinedTokens).withContext('undefined tokens').toHaveSize(0); @@ -42,7 +42,7 @@ export function createTokenTests(styles: CSSResult[]) { * @param styles Styles to get undefined tokens for. * @return An array of all token names that are undefined. */ -export function getUndefinedTokens(styles: CSSResult[]) { +export function getUndefinedTokens(styles: CSSResultOrNative[]) { let defined = new Set(); let used = new Set(); for (const styleSheet of cssResultsToStyleSheets(styles)) { @@ -77,7 +77,7 @@ export function getUndefinedTokens(styles: CSSResult[]) { * @param styles Styles to get unused tokens for. * @return An array of all token names that are unused. */ -export function getUnusedTokens(styles: CSSResult[]) { +export function getUnusedTokens(styles: CSSResultOrNative[]) { let defined = new Set(); let used = new Set(); for (const styleSheet of cssResultsToStyleSheets(styles)) { @@ -196,7 +196,7 @@ const CSS_SHORTHAND_PROPERTIES = [ 'transition', ]; -function cssResultsToStyleSheets(styles: CSSResult[]): CSSStyleSheet[] { +function cssResultsToStyleSheets(styles: CSSResultOrNative[]): CSSStyleSheet[] { return styles.map((style) => { if (style instanceof CSSStyleSheet) { return style; diff --git a/textfield/filled-text-field.ts b/textfield/filled-text-field.ts index 057a644af..6f55f53bc 100644 --- a/textfield/filled-text-field.ts +++ b/textfield/filled-text-field.ts @@ -6,7 +6,7 @@ import '../field/filled-field.js'; -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {literal} from 'lit/static-html.js'; @@ -29,7 +29,7 @@ declare global { */ @customElement('md-filled-text-field') export class MdFilledTextField extends FilledTextField { - static override styles: CSSResult[] = [sharedStyles, filledStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, filledStyles]; protected override readonly fieldTag = literal`md-filled-field`; } diff --git a/textfield/outlined-text-field.ts b/textfield/outlined-text-field.ts index 4ea31cf0c..a781ecf05 100644 --- a/textfield/outlined-text-field.ts +++ b/textfield/outlined-text-field.ts @@ -6,7 +6,7 @@ import '../field/outlined-field.js'; -import {CSSResult} from 'lit'; +import {CSSResultOrNative} from 'lit'; import {customElement} from 'lit/decorators.js'; import {literal} from 'lit/static-html.js'; @@ -29,7 +29,7 @@ declare global { */ @customElement('md-outlined-text-field') export class MdOutlinedTextField extends OutlinedTextField { - static override styles: CSSResult[] = [sharedStyles, outlinedStyles]; + static override styles: CSSResultOrNative[] = [sharedStyles, outlinedStyles]; protected override readonly fieldTag = literal`md-outlined-field`; }