diff --git a/1st-gen/packages/field-label/package.json b/1st-gen/packages/field-label/package.json index e872bf7940e..023da4a93cc 100644 --- a/1st-gen/packages/field-label/package.json +++ b/1st-gen/packages/field-label/package.json @@ -33,6 +33,7 @@ "development": "./src/FieldLabelMixin.dev.js", "default": "./src/FieldLabelMixin.js" }, + "./src/field-label-mixin.css.js": "./src/field-label-mixin.css.js", "./src/field-label-overrides.css.js": "./src/field-label-overrides.css.js", "./src/field-label.css.js": "./src/field-label.css.js", "./sp-field-label-mixin.js": { diff --git a/1st-gen/packages/field-label/src/FieldLabelMixin.ts b/1st-gen/packages/field-label/src/FieldLabelMixin.ts index df23ecbb2b1..803032422f6 100644 --- a/1st-gen/packages/field-label/src/FieldLabelMixin.ts +++ b/1st-gen/packages/field-label/src/FieldLabelMixin.ts @@ -20,7 +20,7 @@ import { import { property } from '@spectrum-web-components/base/src/decorators.js'; import '@spectrum-web-components/icons-ui/icons/sp-icon-asterisk100.js'; -import styles from './field-label.css.js'; +import styles from './field-label-mixin.css.js'; import asteriskIconStyles from '@spectrum-web-components/icon/src/spectrum-icon-asterisk.css.js'; import { ifDefined } from '@spectrum-web-components/base/src/directives.js'; import { ObserveSlotText } from '@spectrum-web-components/shared'; @@ -65,7 +65,10 @@ export const FieldLabelMixin = >( excludedSelectors ) { public static get styles(): CSSResultArray { - return [styles, asteriskIconStyles]; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const parent = Object.getPrototypeOf(this) as any; + const parentStyles = (parent.styles || []) as CSSResultArray; + return [...parentStyles, styles, asteriskIconStyles]; } @property({ type: Boolean, reflect: true }) @@ -80,7 +83,7 @@ export const FieldLabelMixin = >( public renderFieldLabel(fieldId: string): TemplateResult { return html`