@fluentui/web-components 3.0.0-beta.39 → 3.0.0-beta.40

package/dist/esm/accordion/accordion.js

@@ -1,15 +1,15 @@
 import { __decorate } from "tslib";
 import { Observable } from '@microsoft/fast-element';
 import { attr, FASTElement, observable } from '@microsoft/fast-element';
-import { keyArrowDown, keyArrowUp, keyEnd, keyHome, wrapInBounds } from '@microsoft/fast-web-utilities';
 import { AccordionItem } from '../accordion-item/accordion-item.js';
 import { AccordionExpandMode } from './accordion.options.js';
 /**
  * An Accordion Custom HTML Element
  * Implements {@link https://www.w3.org/TR/wai-aria-practices-1.1/#accordion | ARIA Accordion}.
  *
+ * @slot - The default slot for the accordion items
  * @fires change - Fires a custom 'change' event when the active item changes
- * @csspart item - The slot for the accordion items
+ *
  * @public
  */
 export class Accordion extends FASTElement {
@@ -25,53 +25,53 @@ export class Accordion extends FASTElement {
          */
         this.expandmode = AccordionExpandMode.multi;
         this.activeItemIndex = 0;
-        this.change = () => {
-            this.$emit('change', this.activeid);
-        };
+        /**
+         * Resets event listeners and sets the `accordionItems` property
+         * then rebinds event listeners to each non-disabled item
+         * @returns {void}
+         */
         this.setItems = () => {
             if (this.slottedAccordionItems.length === 0) {
                 return;
             }
+            // Get all existing children and remove event listeners
             const children = Array.from(this.children);
             this.removeItemListeners(children);
+            // Resubscribe to the `disabled` attribute of all children
             children.forEach((child) => Observable.getNotifier(child).subscribe(this, 'disabled'));
+            // Add event listeners to each non-disabled AccordionItem
             this.accordionItems = children.filter(child => !child.hasAttribute('disabled'));
-            this.accordionIds = this.getItemIds();
             this.accordionItems.forEach((item, index) => {
                 if (item instanceof AccordionItem) {
-                    item.addEventListener('click', this.activeItemChange);
-                    item.addEventListener('keydown', this.handleItemKeyDown);
-                    item.addEventListener('focus', this.handleItemFocus);
+                    item.addEventListener('click', this.expandedChangedHandler);
+                    // Subscribe to the expanded attribute of the item
                     Observable.getNotifier(item).subscribe(this, 'expanded');
                 }
-                const itemId = this.accordionIds[index];
-                item.setAttribute('id', typeof itemId !== 'string' ? `accordion-${index + 1}` : itemId);
-                this.activeid = this.accordionIds[this.activeItemIndex];
             });
             if (this.isSingleExpandMode()) {
                 const expandedItem = this.findExpandedItem();
                 this.setSingleExpandMode(expandedItem);
             }
         };
+        /**
+         * Removes event listeners from the previous accordion items
+         * @param oldValue An array of the previous accordion items
+         */
         this.removeItemListeners = (oldValue) => {
             oldValue.forEach((item, index) => {
                 Observable.getNotifier(item).unsubscribe(this, 'disabled');
                 Observable.getNotifier(item).unsubscribe(this, 'expanded');
-                item.removeEventListener('click', this.activeItemChange);
-                item.removeEventListener('keydown', this.handleItemKeyDown);
-                item.removeEventListener('focus', this.handleItemFocus);
+                item.removeEventListener('click', this.expandedChangedHandler);
             });
         };
-        this.activeItemChange = (event) => {
-            if (event.defaultPrevented || event.target !== event.currentTarget) {
-                return;
-            }
-            event.preventDefault();
-            this.handleExpandedChange(event.target);
-        };
-        this.handleExpandedChange = (item) => {
+        /**
+         * Changes the expanded state of the accordion item
+         * @param evt Click event
+         * @returns
+         */
+        this.expandedChangedHandler = (evt) => {
+            const item = evt.target;
             if (item instanceof AccordionItem) {
-                this.activeid = item.getAttribute('id');
                 if (!this.isSingleExpandMode()) {
                     item.expanded = !item.expanded;
                     // setSingleExpandMode sets activeItemIndex on its own
@@ -80,45 +80,7 @@ export class Accordion extends FASTElement {
                 else {
                     this.setSingleExpandMode(item);
                 }
-                this.change();
-            }
-        };
-        this.handleItemKeyDown = (event) => {
-            // only handle the keydown if the event target is the accordion item
-            // prevents arrow keys from moving focus to accordion headers when focus is on accordion item panel content
-            if (event.target !== event.currentTarget) {
-                return;
-            }
-            this.accordionIds = this.getItemIds();
-            switch (event.key) {
-                case keyArrowUp:
-                    event.preventDefault();
-                    this.adjust(-1);
-                    break;
-                case keyArrowDown:
-                    event.preventDefault();
-                    this.adjust(1);
-                    break;
-                case keyHome:
-                    this.activeItemIndex = 0;
-                    this.focusItem();
-                    break;
-                case keyEnd:
-                    this.activeItemIndex = this.accordionItems.length - 1;
-                    this.focusItem();
-                    break;
-            }
-        };
-        this.handleItemFocus = (event) => {
-            // update the active item index if the focus moves to an accordion item via a different method other than the up and down arrow key actions
-            // only do so if the focus is actually on the accordion item and not on any of its children
-            if (event.target === event.currentTarget) {
-                const focusedItem = event.target;
-                const focusedIndex = (this.activeItemIndex = Array.from(this.accordionItems).indexOf(focusedItem));
-                if (this.activeItemIndex !== focusedIndex && focusedIndex !== -1) {
-                    this.activeItemIndex = focusedIndex;
-                    this.activeid = this.accordionIds[this.activeItemIndex];
-                }
+                this.$emit('change');
             }
         };
     }
@@ -130,12 +92,12 @@ export class Accordion extends FASTElement {
         if (!expandedItem) {
             return;
         }
-        if (next !== AccordionExpandMode.single) {
-            expandedItem === null || expandedItem === void 0 ? void 0 : expandedItem.expandbutton.removeAttribute('aria-disabled');
-        }
-        else {
+        if (next === AccordionExpandMode.single) {
             this.setSingleExpandMode(expandedItem);
+            return;
         }
+        // Clean up single expand mode behavior
+        expandedItem === null || expandedItem === void 0 ? void 0 : expandedItem.expandbutton.removeAttribute('aria-disabled');
     }
     /**
      * @internal
@@ -146,6 +108,7 @@ export class Accordion extends FASTElement {
         }
     }
     /**
+     * Watch for changes to the slotted accordion items `disabled` and `expanded` attributes
      * @internal
      */
     handleChange(source, propertyName) {
@@ -160,6 +123,10 @@ export class Accordion extends FASTElement {
             }
         }
     }
+    /**
+     * Find the first expanded item in the accordion
+     * @returns {void}
+     */
     findExpandedItem() {
         var _a;
         if (this.accordionItems.length === 0) {
@@ -167,6 +134,18 @@ export class Accordion extends FASTElement {
         }
         return ((_a = this.accordionItems.find((item) => item instanceof AccordionItem && item.expanded)) !== null && _a !== void 0 ? _a : this.accordionItems[0]);
     }
+    /**
+     * Checks if the accordion is in single expand mode
+     * @returns {boolean}
+     */
+    isSingleExpandMode() {
+        return this.expandmode === AccordionExpandMode.single;
+    }
+    /**
+     * Controls the behavior of the accordion in single expand mode
+     * @param expandedItem The item to expand in single expand mode
+     * @returns {void}
+     */
     setSingleExpandMode(expandedItem) {
         if (this.accordionItems.length === 0) {
             return;
@@ -188,24 +167,6 @@ export class Accordion extends FASTElement {
             }
         });
     }
-    getItemIds() {
-        return this.slottedAccordionItems.map((accordionItem) => {
-            return accordionItem.id;
-        });
-    }
-    isSingleExpandMode() {
-        return this.expandmode === AccordionExpandMode.single;
-    }
-    adjust(adjustment) {
-        this.activeItemIndex = wrapInBounds(0, this.accordionItems.length - 1, this.activeItemIndex + adjustment);
-        this.focusItem();
-    }
-    focusItem() {
-        const element = this.accordionItems[this.activeItemIndex];
-        if (element instanceof AccordionItem) {
-            element.expandbutton.focus();
-        }
-    }
 }
 __decorate([
     attr({ attribute: 'expand-mode' })

package/dist/esm/accordion/accordion.js.map

@@ -1 +1 @@
-{"version":3,"file":"accordion.js","sourceRoot":"","sources":["../../../src/accordion/accordion.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accordion.js","sourceRoot":"","sources":["../../../src/accordion/accordion.ts"],"names":[],"mappings":"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"}

package/dist/esm/accordion-item/accordion-item.js

@@ -3,26 +3,29 @@ import { attr, FASTElement, nullableNumberConverter } from '@microsoft/fast-elem
 import { uniqueId } from '@microsoft/fast-web-utilities';
 import { StartEnd } from '../patterns/index.js';
 import { applyMixins } from '../utils/apply-mixins.js';
+import { toggleState } from '../utils/element-internals.js';
 /**
  *
- * @slot start - Content which can be provided between the heading and the icon
- * @slot end - Content which can be provided between the start slot and icon
+ * @slot start - Content positioned before heading in the collapsed state
  * @slot heading - Content which serves as the accordion item heading and text of the expand button
  * @slot - The default slot for accordion item content
- * @slot expanded-icon - The expanded icon
- * @slot collapsed-icon - The collapsed icon
- * @fires change - Fires a custom 'change' event when the button is invoked
+ * @slot marker-expanded - The expanded icon
+ * @slot marker-collapsed - The collapsed icon
  * @csspart heading - Wraps the button
  * @csspart button - The button which serves to invoke the item
- * @csspart heading-content - Wraps the slot for the heading content within the button
- * @csspart icon - The icon container
- * @csspart region - The wrapper for the accordion item content
+ * @csspart content - The wrapper for the accordion item content
  *
  * @public
  */
 export class AccordionItem extends FASTElement {
     constructor() {
         super(...arguments);
+        /**
+         * The internal {@link https://developer.mozilla.org/docs/Web/API/ElementInternals | `ElementInternals`} instance for the component.
+         *
+         * @internal
+         */
+        this.elementInternals = this.attachInternals();
         /**
          * Configures the {@link https://www.w3.org/TR/wai-aria-1.1/#aria-level | level} of the
          * heading element.
@@ -64,15 +67,56 @@ export class AccordionItem extends FASTElement {
          * HTML Attribute: block
          */
         this.block = false;
-        /**
-         * @internal
-         */
-        this.clickHandler = (e) => {
-            if (this.disabled) {
-                return;
-            }
-            this.$emit('click', e);
-        };
+    }
+    /**
+     * Handles expanded changes
+     * @param prev - previous value
+     * @param next - next value
+     */
+    expandedChanged(prev, next) {
+        toggleState(this.elementInternals, 'expanded', next);
+    }
+    /**
+     * Handles disabled changes
+     * @param prev - previous value
+     * @param next - next value
+     */
+    disabledChanged(prev, next) {
+        toggleState(this.elementInternals, 'disabled', next);
+    }
+    /**
+     * Handles changes to size attribute
+     * @param prev - previous value
+     * @param next - next value
+     */
+    sizeChanged(prev, next) {
+        if (prev) {
+            toggleState(this.elementInternals, prev, false);
+        }
+        if (next) {
+            toggleState(this.elementInternals, next, true);
+        }
+    }
+    /**
+     * Handles changes to block attribute
+     * @param prev - previous value
+     * @param next - next value
+     */
+    blockChanged(prev, next) {
+        toggleState(this.elementInternals, 'block', next);
+    }
+    /**
+     * Handles changes to marker-position attribute
+     * @param prev - previous value
+     * @param next - next value
+     */
+    markerPositionChanged(prev, next) {
+        if (prev) {
+            toggleState(this.elementInternals, `align-${prev}`, false);
+        }
+        if (next) {
+            toggleState(this.elementInternals, `align-${next}`, true);
+        }
     }
 }
 __decorate([
@@ -98,7 +142,7 @@ __decorate([
     attr({ mode: 'boolean' })
 ], AccordionItem.prototype, "block", void 0);
 __decorate([
-    attr({ attribute: 'expand-icon-position' })
-], AccordionItem.prototype, "expandIconPosition", void 0);
+    attr({ attribute: 'marker-position' })
+], AccordionItem.prototype, "markerPosition", void 0);
 applyMixins(AccordionItem, StartEnd);
 //# sourceMappingURL=accordion-item.js.map

package/dist/esm/accordion-item/accordion-item.js.map

@@ -1 +1 @@
-{"version":3,"file":"accordion-item.js","sourceRoot":"","sources":["../../../src/accordion-item/accordion-item.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAEzD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAYvD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,aAAc,SAAQ,WAAW;IAA9C;;QACE;;;;;;;WAOG;QAMI,iBAAY,GAA0B,CAAC,CAAC;QAE/C;;;;;;WAMG;QAEI,aAAQ,GAAY,KAAK,CAAC;QAEjC;;;;;;WAMG;QAEI,aAAQ,GAAY,KAAK,CAAC;QAEjC;;;;;;WAMG;QAEI,OAAE,GAAW,QAAQ,CAAC,YAAY,CAAC,CAAC;QAY3C;;;;;;WAMG;QAEI,UAAK,GAAY,KAAK,CAAC;QAiB9B;;WAEG;QACI,iBAAY,GAAG,CAAC,CAAa,EAAE,EAAE;YACtC,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,OAAO;aACR;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC;IACJ,CAAC;CAAA;AA7EC;IALC,IAAI,CAAC;QACJ,SAAS,EAAE,eAAe;QAC1B,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,uBAAuB;KACnC,CAAC;mDAC6C;AAU/C;IADC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;+CACO;AAUjC;IADC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;+CACO;AAUjC;IADC,IAAI;yCACsC;AAU3C;IADC,IAAI;2CAC2B;AAUhC;IADC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;4CACI;AAU9B;IADC,IAAI,CAAC,EAAE,SAAS,EAAE,sBAAsB,EAAE,CAAC;yDACgB;AA2B9D,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"accordion-item.js","sourceRoot":"","sources":["../../../src/accordion-item/accordion-item.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAEzD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAY5D;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,aAAc,SAAQ,WAAW;IAA9C;;QACE;;;;WAIG;QACI,qBAAgB,GAAqB,IAAI,CAAC,eAAe,EAAE,CAAC;QAEnE;;;;;;;WAOG;QAMI,iBAAY,GAA0B,CAAC,CAAC;QAE/C;;;;;;WAMG;QAEI,aAAQ,GAAY,KAAK,CAAC;QAWjC;;;;;;WAMG;QAEI,aAAQ,GAAY,KAAK,CAAC;QAWjC;;;;;;WAMG;QAEI,OAAE,GAAW,QAAQ,CAAC,YAAY,CAAC,CAAC;QA0B3C;;;;;;WAMG;QAEI,UAAK,GAAY,KAAK,CAAC;IAuChC,CAAC;IA7GC;;;;OAIG;IACI,eAAe,CAAC,IAAa,EAAE,IAAa;QACjD,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAYD;;;;OAIG;IACI,eAAe,CAAC,IAAa,EAAE,IAAa;QACjD,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAsBD;;;;OAIG;IACI,WAAW,CAAC,IAAuB,EAAE,IAAuB;QACjE,IAAI,IAAI,EAAE;YACR,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SACjD;QACD,IAAI,IAAI,EAAE;YACR,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SAChD;IACH,CAAC;IAYD;;;;OAIG;IACI,YAAY,CAAC,IAAa,EAAE,IAAa;QAC9C,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAYD;;;;OAIG;IACI,qBAAqB,CAAC,IAAiC,EAAE,IAAiC;QAC/F,IAAI,IAAI,EAAE;YACR,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;SAC5D;QACD,IAAI,IAAI,EAAE;YACR,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;SAC3D;IACH,CAAC;CAMF;AAzHC;IALC,IAAI,CAAC;QACJ,SAAS,EAAE,eAAe;QAC1B,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,uBAAuB;KACnC,CAAC;mDAC6C;AAU/C;IADC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;+CACO;AAmBjC;IADC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;+CACO;AAmBjC;IADC,IAAI;yCACsC;AAU3C;IADC,IAAI;2CAC2B;AAwBhC;IADC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;4CACI;AAmB9B;IADC,IAAI,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;qDACa;AA8BtD,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC"}

package/dist/esm/accordion-item/accordion-item.options.js

@@ -10,7 +10,7 @@ export const AccordionItemSize = {
 /**
  * An Accordion Item expand/collapse icon can appear at the start or end of the accordion
  */
-export const AccordionItemExpandIconPosition = {
+export const AccordionItemMarkerPosition = {
     start: 'start',
     end: 'end',
 };

package/dist/esm/accordion-item/accordion-item.options.js.map

@@ -1 +1 @@
-{"version":3,"file":"accordion-item.options.js","sourceRoot":"","sources":["../../../src/accordion-item/accordion-item.options.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,aAAa;CACjB,CAAC;AAQX;;GAEG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;CACF,CAAC"}
+{"version":3,"file":"accordion-item.options.js","sourceRoot":"","sources":["../../../src/accordion-item/accordion-item.options.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,aAAa;CACjB,CAAC;AAQX;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;CACF,CAAC"}

package/dist/esm/accordion-item/accordion-item.styles.js

@@ -1,5 +1,6 @@
 import { css } from '@microsoft/fast-element';
 import { display } from '../utils/index.js';
+import { alignEndState, blockState, disabledState, expandedState, extraLargeState, largeState, smallState, } from '../styles/states/index.js';
 import { borderRadiusMedium, borderRadiusSmall, colorNeutralForeground1, colorNeutralForegroundDisabled, colorStrokeFocus1, colorStrokeFocus2, colorTransparentBackground, fontFamilyBase, fontSizeBase200, fontSizeBase300, fontSizeBase400, fontSizeBase500, fontWeightRegular, lineHeightBase200, lineHeightBase300, lineHeightBase400, lineHeightBase500, spacingHorizontalM, spacingHorizontalMNudge, spacingHorizontalS, } from '../theme/design-tokens.js';
 export const styles = css `
   ${display('block')}
@@ -13,7 +14,6 @@ export const styles = css `
     height: 44px;
     display: grid;
     position: relative;
-    vertical-align: middle;
     padding-inline: ${spacingHorizontalM} ${spacingHorizontalMNudge};
     border-radius: ${borderRadiusMedium};
     font-family: ${fontFamilyBase};
@@ -23,29 +23,20 @@ export const styles = css `
     grid-template-columns: auto auto 1fr auto;
   }
 
-  .heading-content {
-    height: 100%;
-    display: flex;
-    align-items: center;
-  }
-
   .button {
-    box-sizing: border-box;
     appearance: none;
+    background: ${colorTransparentBackground};
     border: none;
-    outline: none;
-    text-align: start;
-    cursor: pointer;
-    font-family: inherit;
-    height: 44px;
+    box-sizing: border-box;
     color: ${colorNeutralForeground1};
-    background: ${colorTransparentBackground};
-    line-height: ${lineHeightBase300};
-    height: auto;
-    padding: 0;
-    font-size: inherit;
+    cursor: pointer;
+    font: inherit;
     grid-column: auto / span 2;
     grid-row: 1;
+    height: 44px;
+    outline: none;
+    padding: 0;
+    text-align: start;
   }
 
   .button::before {
@@ -56,29 +47,30 @@ export const styles = css `
     border-radius: ${borderRadiusSmall};
   }
 
-  .icon {
+  :where(.default-marker-collapsed, .default-marker-expanded),
+  ::slotted(:is([slot='marker-collapsed'], [slot='marker-expanded'])) {
     display: flex;
     align-items: center;
     justify-content: center;
     pointer-events: none;
     position: relative;
     height: 100%;
-    padding-right: ${spacingHorizontalS};
+    padding-inline-end: ${spacingHorizontalS};
     grid-column: 1 / span 1;
     grid-row: 1;
   }
 
-  .region {
+  .content {
     margin: 0 ${spacingHorizontalM};
   }
 
-  ::slotted([slot='start']),
-  ::slotted([slot='end']) {
+  ::slotted([slot='start']) {
+    display: flex;
     justify-content: center;
     align-items: center;
     padding-right: ${spacingHorizontalS};
     grid-column: 2 / span 1;
-    grid-row: 1 / span 1;
+    grid-row: 1;
   }
 
   button:focus-visible::after {
@@ -94,33 +86,29 @@ export const styles = css `
 
   /* --- Disabled attr styles --- */
 
-  :host([disabled]) .button {
+  :host(${disabledState}) .button {
     color: ${colorNeutralForegroundDisabled};
   }
-  :host([disabled]) svg {
+
+  :host(${disabledState}) svg {
     filter: invert(89%) sepia(0%) saturate(569%) hue-rotate(155deg) brightness(88%) contrast(87%);
   }
 
   /* --- Expanded attr styles --- */
 
-  :host([expanded]) .region {
+  :host(${expandedState}) .content {
     display: block;
   }
 
-  :host([expanded]) .default-collapsed-icon,
-  :host([expanded]) ::slotted([slot='collapsed-icon']),
-  :host(:not([expanded])) .default-expanded-icon,
-  :host(:not([expanded])) ::slotted([slot='expanded-icon']),
-  :host([expanded]) ::slotted([slot='end']),
-  ::slotted([slot='start']),
-  .region {
+  :host(${expandedState}) .default-marker-collapsed,
+  :host(${expandedState}) ::slotted([slot='marker-collapsed']),
+  :host(:not(${expandedState})) :is(.default-marker-expanded, .content),
+  :host(:not(${expandedState})) ::slotted([slot='marker-expanded']) {
     display: none;
   }
 
-  :host([expanded]) ::slotted([slot='start']),
-  :host([expanded]) ::slotted([slot='expanded-icon']),
-  :host(:not([expanded])) ::slotted([slot='collapsed-icon']),
-  ::slotted([slot='end']) {
+  :host(${expandedState}) ::slotted([slot='marker-expanded']),
+  :host(:not(${expandedState})) ::slotted([slot='marker-collapsed']) {
     display: flex;
   }
 
@@ -131,46 +119,35 @@ export const styles = css `
     line-height: ${lineHeightBase300};
   }
 
-  :host([size='small']) .heading {
+  :host(${smallState}) .heading {
     font-size: ${fontSizeBase200};
     line-height: ${lineHeightBase200};
   }
 
-  :host([size='large']) .heading {
+  :host(${largeState}) .heading {
     font-size: ${fontSizeBase400};
     line-height: ${lineHeightBase400};
   }
 
-  :host([size='extra-large']) .heading {
+  :host(${extraLargeState}) .heading {
     font-size: ${fontSizeBase500};
     line-height: ${lineHeightBase500};
   }
 
-  /* --- expand-icon-position attr styles --- */
-
-  :host([expand-icon-position='end']) :slotted(span[slot='start']),
-  :host([expand-icon-position='end']) ::slotted(span[slot='end']) {
-    grid-column: 1 / span 1;
-    grid-row: 1;
-  }
+  /* --- marker-position attr styles --- */
 
-  :host([expand-icon-position='end']) ::slotted(span[slot='start']),
-  :host([expand-icon-position='end']) ::slotted(span[slot='end']) {
+  :host(${alignEndState}) :slotted([slot='start']) {
     grid-column: 1 / span 1;
-    grid-row: 1;
   }
 
-  :host([expand-icon-position='end']) .icon {
+  :host(${alignEndState}) :is(.default-marker-collapsed, .default-marker-expanded) {
     grid-column: 4 / span 1;
-    grid-row: 1;
-    display: flex;
-    padding-left: 10px;
-    padding-right: 0;
+    padding-inline-start: ${spacingHorizontalS};
+    padding-inline-end: 0;
   }
 
-  :host([expand-icon-position='end']) .button {
+  :host(${alignEndState}) .button {
     grid-column: 2 / span 3;
-    grid-row: 1;
   }
 
   /* --- Block attr styles --- */
@@ -179,19 +156,20 @@ export const styles = css `
     max-width: 100%;
   }
 
-  :host([expand-icon-position='end']) .heading {
+  :host(${alignEndState}) .heading {
     grid-template-columns: auto auto 28px;
+    padding-inline: ${spacingHorizontalM};
   }
 
-  :host([expand-icon-position='end']) .icon {
-    grid-column: 5 / span 1;
+  :host(${alignEndState}:has([slot='start'])) .heading {
+    padding-inline: ${spacingHorizontalMNudge} ${spacingHorizontalM};
   }
 
-  :host([block][expand-icon-position='end']) .heading {
+  :host(${blockState}${alignEndState}) .heading {
     grid-template-columns: auto 1fr;
   }
 
-  :host([block][expand-icon-position='end']) .icon {
+  :host(${alignEndState}) :is(.default-marker-collapsed, .default-marker-expanded) {
     grid-column: 5 / span 1;
   }
 `;

package/dist/esm/accordion-item/accordion-item.styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"accordion-item.styles.js","sourceRoot":"","sources":["../../../src/accordion-item/accordion-item.styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,EACvB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,0BAA0B,EAC1B,cAAc,EACd,eAAe,EACf,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CAAA;IACrB,OAAO,CAAC,OAAO,CAAC;;;;;;;;;;;;sBAYE,kBAAkB,IAAI,uBAAuB;qBAC9C,kBAAkB;mBACpB,cAAc;iBAChB,eAAe;mBACb,iBAAiB;mBACjB,iBAAiB;;;;;;;;;;;;;;;;;;;aAmBvB,uBAAuB;kBAClB,0BAA0B;mBACzB,iBAAiB;;;;;;;;;;;;;qBAaf,iBAAiB;;;;;;;;;;qBAUjB,kBAAkB;;;;;;gBAMvB,kBAAkB;;;;;;;qBAOb,kBAAkB;;;;;;;;;;qBAUlB,iBAAiB;;wBAEd,iBAAiB;kCACP,iBAAiB;;;;;;aAMtC,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAgC1B,eAAe;mBACb,iBAAiB;;;;iBAInB,eAAe;mBACb,iBAAiB;;;;iBAInB,eAAe;mBACb,iBAAiB;;;;iBAInB,eAAe;mBACb,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmDnC,CAAC"}
+{"version":3,"file":"accordion-item.styles.js","sourceRoot":"","sources":["../../../src/accordion-item/accordion-item.styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,UAAU,EACV,aAAa,EACb,aAAa,EACb,eAAe,EACf,UAAU,EACV,UAAU,GACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,EACvB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,0BAA0B,EAC1B,cAAc,EACd,eAAe,EACf,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CAAA;IACrB,OAAO,CAAC,OAAO,CAAC;;;;;;;;;;;sBAWE,kBAAkB,IAAI,uBAAuB;qBAC9C,kBAAkB;mBACpB,cAAc;iBAChB,eAAe;mBACb,iBAAiB;mBACjB,iBAAiB;;;;;;kBAMlB,0BAA0B;;;aAG/B,uBAAuB;;;;;;;;;;;;;;;;qBAgBf,iBAAiB;;;;;;;;;;;0BAWZ,kBAAkB;;;;;;gBAM5B,kBAAkB;;;;;;;qBAOb,kBAAkB;;;;;;;;;;qBAUlB,iBAAiB;;wBAEd,iBAAiB;kCACP,iBAAiB;;;;;UAKzC,aAAa;aACV,8BAA8B;;;UAGjC,aAAa;;;;;;UAMb,aAAa;;;;UAIb,aAAa;UACb,aAAa;eACR,aAAa;eACb,aAAa;;;;UAIlB,aAAa;eACR,aAAa;;;;;;;iBAOX,eAAe;mBACb,iBAAiB;;;UAG1B,UAAU;iBACH,eAAe;mBACb,iBAAiB;;;UAG1B,UAAU;iBACH,eAAe;mBACb,iBAAiB;;;UAG1B,eAAe;iBACR,eAAe;mBACb,iBAAiB;;;;;UAK1B,aAAa;;;;UAIb,aAAa;;4BAEK,kBAAkB;;;;UAIpC,aAAa;;;;;;;;;;UAUb,aAAa;;sBAED,kBAAkB;;;UAG9B,aAAa;sBACD,uBAAuB,IAAI,kBAAkB;;;UAGzD,UAAU,GAAG,aAAa;;;;UAI1B,aAAa;;;CAGtB,CAAC"}