Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

POC | rework styles to leverage BEM classes in rendering #4954

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

POC | rework styles to leverage BEM classes in rendering #4954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions packages/accordion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
"development": "./src/AccordionItem.dev.js",
"default": "./src/AccordionItem.js"
},
"./src/accordion-item-overrides.css.js": "./src/accordion-item-overrides.css.js",
"./src/accordion-item.css.js": "./src/accordion-item.css.js",
"./src/accordion-overrides.css.js": "./src/accordion-overrides.css.js",
"./src/accordion.css.js": "./src/accordion.css.js",
"./src/index.js": {
"development": "./src/index.dev.js",
Expand Down Expand Up @@ -75,7 +73,7 @@
"@spectrum-web-components/shared": "1.3.0"
},
"devDependencies": {
"@spectrum-css/accordion": "6.0.0-s2-foundations.16"
"@spectrum-css/accordion": "7.1.0"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
20 changes: 16 additions & 4 deletions packages/accordion/src/Accordion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
property,
queryAssignedNodes,
} from '@spectrum-web-components/base/src/decorators.js';
import { classMap } from '@spectrum-web-components/base/src/directives.js';
import { FocusGroupController } from '@spectrum-web-components/reactive-controllers/src/FocusGroup.js';

import { AccordionItem } from './AccordionItem.js';
Expand Down Expand Up @@ -114,10 +115,21 @@ export class Accordion extends SizedMixin(SpectrumElement, {

protected override render(): TemplateResult {
return html`
<slot
@slotchange=${this.handleSlotchange}
@sp-accordion-item-toggle=${this.onToggle}
></slot>
<div
class=${classMap({
'spectrum-Accordion': true,
[`spectrum-Accordion--size${this.size?.toUpperCase()}`]:
typeof this.size !== 'undefined',
'spectrum-Accordion--compact': this.density === 'compact',
'spectrum-Accordion--spacious': this.density === 'spacious',
})}
role="region"
>
<slot
@slotchange=${this.handleSlotchange}
@sp-accordion-item-toggle=${this.onToggle}
></slot>
</div>
`;
}
}
92 changes: 53 additions & 39 deletions packages/accordion/src/AccordionItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,44 +19,39 @@ import {
} from '@spectrum-web-components/base';
import { property } from '@spectrum-web-components/base/src/decorators.js';
import { Focusable } from '@spectrum-web-components/shared/src/focusable.js';
import { when } from '@spectrum-web-components/base/src/directives.js';
import {
classMap,
when,
} from '@spectrum-web-components/base/src/directives.js';
import '@spectrum-web-components/icons-ui/icons/sp-icon-chevron100.js';
import chevronIconStyles from '@spectrum-web-components/icon/src/spectrum-icon-chevron.css.js';

import styles from './accordion-item.css.js';

const chevronIcon: Record<string, () => TemplateResult> = {
s: () => html`
<span class="iconContainer">
<sp-icon-chevron100
class="indicator spectrum-UIIcon-ChevronRight75"
slot="icon"
></sp-icon-chevron100>
</span>
<sp-icon-chevron100
class="spectrum-Accordion-itemIndicator spectrum-UIIcon-ChevronRight75"
slot="icon"
></sp-icon-chevron100>
`,
m: () => html`
<span class="iconContainer">
<sp-icon-chevron100
class="indicator spectrum-UIIcon-ChevronRight100"
slot="icon"
></sp-icon-chevron100>
</span>
<sp-icon-chevron100
class="spectrum-Accordion-itemIndicator spectrum-UIIcon-ChevronRight100"
slot="icon"
></sp-icon-chevron100>
`,
l: () => html`
<span class="iconContainer">
<sp-icon-chevron100
class="indicator spectrum-UIIcon-ChevronRight200"
slot="icon"
></sp-icon-chevron100>
</span>
<sp-icon-chevron100
class="spectrum-Accordion-itemIndicator spectrum-UIIcon-ChevronRight200"
slot="icon"
></sp-icon-chevron100>
`,
xl: () => html`
<span class="iconContainer">
<sp-icon-chevron100
class="indicator spectrum-UIIcon-ChevronRight300"
slot="icon"
></sp-icon-chevron100>
</span>
<sp-icon-chevron100
class="spectrum-Accordion-itemIndicator spectrum-UIIcon-ChevronRight300"
slot="icon"
></sp-icon-chevron100>
`,
};

Expand Down Expand Up @@ -108,25 +103,44 @@ export class AccordionItem extends SizedMixin(Focusable, {
}

protected renderChevronIcon = (): TemplateResult => {
return chevronIcon[this.size || 'm']();
return html`
<span class="spectrum-Accordion-itemIconContainer">
${chevronIcon[this.size || 'm']()}
</span>
`;
};

protected override render(): TemplateResult {
return html`
<h3 id="heading">
${when(this.size, this.renderChevronIcon)}
<button
id="header"
@click=${this.onClick}
aria-expanded=${this.open}
aria-controls="content"
?disabled=${this.disabled}
<div
class=${classMap({
'spectrum-Accordion-item': true,
'is-open': this.open && !this.disabled,
'is-disabled': this.disabled,
})}
role="presentation"
>
<h3 id="heading" class="spectrum-Accordion-itemHeading">
<button
id="header"
class="spectrum-Accordion-itemHeader"
@click=${this.onClick}
aria-expanded=${this.open ? 'true' : 'false'}
aria-controls="content"
?disabled=${this.disabled}
>
${this.label}
</button>
${when(this.size, this.renderChevronIcon)}
</h3>
<div
id="content"
role="region"
aria-labelledby="header"
class="spectrum-Accordion-itemContent"
>
${this.label}
</button>
</h3>
<div id="content" role="region" aria-labelledby="header">
<slot></slot>
<slot></slot>
</div>
</div>
`;
}
Expand Down
23 changes: 0 additions & 23 deletions packages/accordion/src/accordion-item-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,3 @@ governing permissions and limitations under the License.
*/

/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
.spectrum-Accordion--sizeM {
--spectrum-accordion-item-height: var(
--system-accordion-size-m-item-height
);
--spectrum-accordion-disclosure-indicator-height: var(
--system-accordion-size-m-disclosure-indicator-height
);
--spectrum-accordion-component-edge-to-text: var(
--system-accordion-size-m-component-edge-to-text
);
--spectrum-accordion-item-header-font-size: var(
--system-accordion-size-m-item-header-font-size
);
--spectrum-accordion-item-content-font-size: var(
--system-accordion-size-m-item-content-font-size
);
--spectrum-accordion-item-header-top-to-text-space: var(
--system-accordion-size-m-item-header-top-to-text-space
);
--spectrum-accordion-item-header-bottom-to-text-space: var(
--system-accordion-size-m-item-header-bottom-to-text-space
);
}
17 changes: 0 additions & 17 deletions packages/accordion/src/accordion-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,3 @@ governing permissions and limitations under the License.
*/

@import url('./spectrum-accordion-item.css');

:host {
display: block;
}

#heading {
/* .spectrum-Accordion-itemHeading */
height: auto;
position: relative;
}

:host([disabled]) #heading .indicator {
color: var(
--mod-accordion-item-header-disabled-color,
var(--spectrum-accordion-item-header-disabled-color)
);
}
Loading
Loading