@aceshooting/lyra-ui 1.2.0 → 2.1.0

package/dist/components/select/select.js

@@ -4,34 +4,102 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { html } from 'lit';
+import { html, nothing } from 'lit';
 import { property, state } from 'lit/decorators.js';
 import { LyraElement } from '../../internal/lyra-element.js';
 import { defineElement } from '../../internal/prefix.js';
 import { place } from '../../internal/positioner.js';
 import { nextId } from '../../internal/a11y.js';
 import { chevronIcon } from '../../internal/icons.js';
+import { AnchoredValidityController, VALIDITY_ANCHOR } from '../../internal/anchored-validity.js';
 import { styles } from './select.styles.js';
 import { LyraOption } from '../combobox/option.js';
 import '../combobox/option.js';
+/**
+ * `<lyra-select>` — a plain closed-list dropdown: a direct `<lyra-*>`
+ * counterpart to `<wa-select>`/`<wa-option>`. Trigger is a button (not a text
+ * input) -- click/Enter/Space/ArrowDown opens it, there's no typing-to-filter.
+ * A printable keypress instead jumps (or, while closed, directly selects) the
+ * next option whose label starts with what's been typed, like a native
+ * `<select>`'s type-ahead.
+ *
+ * Options are `<lyra-option value>` children, the same element `<lyra-combobox>`
+ * uses. Unlike `lyra-combobox` this is single-select only, with no filter/
+ * source/with-clear/max-options-visible/empty-text/max-render/multiple surface
+ * -- see `<lyra-combobox>` for the filterable/multi-select case.
+ *
+ * Reuses `lyra-combobox`'s popup positioning (`internal/positioner.js`) and
+ * click-outside/Escape/Home/End/Arrow-key listbox navigation patterns,
+ * adapted to a trigger button that keeps DOM focus throughout (the listbox's
+ * "active" row is conveyed via `aria-activedescendant`, never actual focus),
+ * matching the WAI-ARIA "select-only combobox" pattern.
+ *
+ * When `autoCommitSingleOption` is set and exactly one option is enabled
+ * (regardless of how many disabled ones exist alongside it), the popup never
+ * opens at all: a click, Enter, Space, ArrowDown, or ArrowUp on the trigger
+ * commits that sole option directly, and the trigger renders as a plain
+ * `role="button"` with no chevron/`aria-haspopup`/`aria-expanded` rather than
+ * a combobox with a permanently inert popup state — opening a one-row list to
+ * pick the only available choice is pure friction with no real decision
+ * behind it. This never changes `value`/validity defaults on its own — an
+ * unselected single-option select stays unselected (and a `required` one
+ * stays invalid) exactly like the multi-option case, until the trigger is
+ * actually activated. `autoCommitSingleOption` defaults to `false`: by
+ * default a select always renders the normal combobox/listbox/chevron
+ * trigger no matter how many options are enabled, matching pre-1.3.0
+ * behavior — opt in explicitly if a narrowing-to-one option list should
+ * auto-commit.
+ *
+ * @customElement lyra-select
+ * @slot - `<lyra-option>` elements.
+ * @slot label - Custom label content.
+ * @slot hint - Custom hint content.
+ * @slot error - Custom error content.
+ * @event change - The selection changed.
+ * @event input - Fired alongside `change` on every selection change (native
+ *   `<select>` doesn't meaningfully distinguish the two either).
+ * @event lyra-show - The listbox opened.
+ * @event lyra-hide - The listbox closed.
+ * @csspart form-control - The outer wrapper around label, trigger, listbox, error and hint.
+ * @csspart form-control-label - The `<label>` element.
+ * @csspart trigger - The trigger button (positioning anchor).
+ * @csspart listbox - The options popover.
+ * @csspart option - An option row.
+ * @csspart option-dot - An option row's leading status dot (when `dot-color` is set).
+ * @csspart option-label - An option row's label/sub wrapper.
+ * @csspart option-sub - An option row's secondary line (when `sub` is set).
+ * @csspart expand-icon - The dropdown indicator.
+ * @csspart error - The error message.
+ * @csspart hint - The hint message.
+ */
 export class LyraSelect extends LyraElement {
     static { this.formAssociated = true; }
     static { this.styles = [LyraElement.styles, styles]; }
     static { this.properties = {
+        disabled: { type: Boolean, reflect: true, noAccessor: true },
+        required: { type: Boolean, reflect: true, noAccessor: true },
         value: { noAccessor: true },
+        name: { reflect: true, noAccessor: true },
     }; }
     constructor() {
         super();
         this.placeholder = '';
-        this.disabled = false;
-        this.required = false;
-        this.name = '';
         this.label = '';
         this.hint = '';
         this.errorText = '';
         this.open = false;
         /** Visual size — same `xs`–`xl` scale as `lyra-toast-item`'s `size`. */
         this.size = 'm';
+        /**
+         * Opt-in: when `true` and exactly one `<lyra-option>` is enabled, the
+         * trigger commits that option directly (click/Enter/Space/ArrowDown/
+         * ArrowUp) instead of opening the listbox, and renders as a plain
+         * `role="button"` with no chevron. Defaults to `false`, which always
+         * renders the normal combobox/listbox/chevron trigger regardless of how
+         * many options are enabled — the pre-1.3.0 behavior. See the class doc
+         * above and `onlyOption` below for the full rationale.
+         */
+        this.autoCommitSingleOption = false;
         this.activeIndex = -1;
         this.options = [];
         // Set on the trigger button's first `blur`; gates the `data-invalid`
@@ -44,10 +112,17 @@ export class LyraSelect extends LyraElement {
         this.hasHintSlot = false;
         this.hasErrorSlot = false;
         this.hasLabelSlot = false;
+        // Tracked separately from the consumer's own `disabled` -- a native
+        // `<input>`'s own `disabled` IDL property/attribute is never mutated by
+        // fieldset cascading, so a consumer's explicit `disabled` must survive the
+        // fieldset re-enabling (see `formDisabledCallback` below).
+        this._fieldsetDisabled = false;
         this.listId = nextId('select-list');
         this.triggerId = nextId('select-trigger');
         this._isFirstUpdate = true;
         this._selected = '';
+        this._disabled = false;
+        this._required = false;
         // What `form.reset()` restores to. Captured exactly once, from whatever
         // `<lyra-option selected>` markup was present the first time slotted
         // options are collected (mirrors native `<select><option selected>`) --
@@ -56,10 +131,22 @@ export class LyraSelect extends LyraElement {
         // the reset default. See lyra-combobox's identical `_defaultSelected`.
         this._defaultSelected = '';
         this._defaultCaptured = false;
+        // A restored value must win over declarative selected markup collected by
+        // the first asynchronous slotchange. Cleared by the next ordinary value write.
+        this._restoredStateActive = false;
         // Standard listbox type-ahead: printable keystrokes accumulate into this
         // buffer and reset ~500ms after the last one, so "b" then "a" narrows to
         // "ba" instead of restarting the search on every keystroke.
         this.typeAheadBuffer = '';
+        // Hand-written accessor (mirrors the `value` accessor below, and Task 2's
+        // `FormAssociated.name` in `../../internal/form-associated.ts`): a
+        // form-associated custom element's submitted entry name is resolved by the
+        // browser from the live `name` *content attribute*, read synchronously at
+        // FormData-construction/submit time (see `syncFormValue()` below) -- Lit's
+        // async (microtask-deferred) `reflect: true` alone would leave a
+        // property-only assignment like `el.name = 'b'` invisible to a same-tick
+        // `new FormData(form)`/submit, so the attribute write happens here instead.
+        this._name = '';
         this.collectOptions = (e) => {
             const slot = e.target;
             const previous = new Set(this.options);
@@ -77,7 +164,7 @@ export class LyraSelect extends LyraElement {
                 // the reset default.
                 const declared = this.options.filter((o) => o.selected).map((o) => o.value);
                 this._defaultSelected = declared[0] ?? '';
-                if (declared.length) {
+                if (declared.length && !this._restoredStateActive) {
                     this.value = declared[0];
                     return; // `value=`'s setter already called reflectSelected()
                 }
@@ -89,20 +176,31 @@ export class LyraSelect extends LyraElement {
                 // into the live selection instead of letting reflectSelected() below
                 // strip its `selected` attribute back off.
                 const newlySelected = this.options.filter((o) => !previous.has(o) && o.selected).map((o) => o.value);
-                if (newlySelected.length) {
+                if (newlySelected.length && !this._restoredStateActive) {
                     this.value = newlySelected[newlySelected.length - 1];
                     return; // `value=`'s setter already called reflectSelected()
                 }
             }
             this.reflectSelected();
         };
+        // Fired by `option.ts`'s `lyra-option-change` (a MutationObserver on the
+        // option's own light-DOM content/attributes) when an already-slotted
+        // `<lyra-option>` mutates its own data in place -- `collectOptions()` only
+        // re-runs on `slotchange`, which never fires for such a mutation, so
+        // without this the rendered listbox row would go stale. Reassigning (not
+        // mutating) `options` gives Lit a new array reference to diff against.
+        this.onOptionChange = () => {
+            this.options = [...this.options];
+        };
         this.onDocPointer = (e) => {
             if (!e.composedPath().includes(this))
                 this.hide();
         };
         this.onTriggerClick = () => {
-            if (this.disabled)
+            if (this.effectiveDisabled)
                 return;
+            if (this.onlyOption)
+                return this.selectOption(this.onlyOption);
             this.open ? this.hide() : this.show();
         };
         this.onTriggerBlur = () => {
@@ -127,12 +225,16 @@ export class LyraSelect extends LyraElement {
             switch (e.key) {
                 case 'ArrowDown':
                     e.preventDefault();
+                    if (this.onlyOption)
+                        return this.selectOption(this.onlyOption);
                     if (!this.open)
                         return this.show();
                     this.activeIndex = Math.min(navigable.length - 1, this.activeIndex + 1);
                     break;
                 case 'ArrowUp':
                     e.preventDefault();
+                    if (this.onlyOption)
+                        return this.selectOption(this.onlyOption);
                     if (!this.open)
                         return this.show();
                     this.activeIndex = Math.max(0, this.activeIndex - 1);
@@ -195,6 +297,27 @@ export class LyraSelect extends LyraElement {
                 this.selectOption(option);
         };
         this.internals = this.attachInternals();
+        this.validityController = new AnchoredValidityController(this, this.internals, () => this[VALIDITY_ANCHOR]());
+        this.syncFormValue();
+    }
+    get form() {
+        return this.internals.form;
+    }
+    get labels() {
+        return this.internals.labels;
+    }
+    get validity() {
+        return this.internals.validity;
+    }
+    get validationMessage() {
+        return this.internals.validationMessage;
+    }
+    get willValidate() {
+        return this.internals.willValidate;
+    }
+    /** @internal */
+    [VALIDITY_ANCHOR]() {
+        return this.renderRoot?.querySelector('[part="trigger"]') ?? null;
     }
     connectedCallback() {
         super.connectedCallback();
@@ -212,12 +335,48 @@ export class LyraSelect extends LyraElement {
             this.hasLabelSlot = Array.from(this.children).some((el) => el.getAttribute('slot') === 'label');
         }
     }
+    get name() {
+        return this._name;
+    }
+    set name(next) {
+        const old = this._name;
+        this._name = next ?? '';
+        if (this._name) {
+            this.setAttribute('name', this._name);
+        }
+        else {
+            this.removeAttribute('name');
+        }
+        this.requestUpdate('name', old);
+    }
+    get disabled() {
+        return this._disabled;
+    }
+    set disabled(next) {
+        const old = this._disabled;
+        this._disabled = Boolean(next);
+        this.toggleAttribute('disabled', this._disabled);
+        if (this._disabled)
+            this.hide();
+        this.requestUpdate('disabled', old);
+    }
+    get required() {
+        return this._required;
+    }
+    set required(next) {
+        const old = this._required;
+        this._required = Boolean(next);
+        this.toggleAttribute('required', this._required);
+        this.updateValidity();
+        this.requestUpdate('required', old);
+    }
     /** The selected value: a single string (empty when nothing is selected). */
     get value() {
         return this._selected;
     }
     set value(next) {
         const old = this._selected;
+        this._restoredStateActive = false;
         this._selected = next ?? '';
         this.syncFormValue();
         this.reflectSelected();
@@ -226,20 +385,39 @@ export class LyraSelect extends LyraElement {
     }
     updateValidity() {
         if (this.required && !this._selected) {
-            this.internals.setValidity({ valueMissing: true }, 'Please select an option.');
+            this.validityController.setValidity({ valueMissing: true }, 'Please select an option.');
         }
         else {
-            this.internals.setValidity({});
+            this.validityController.setValidity({});
         }
     }
     syncFormValue() {
         this.internals.setFormValue(this._selected);
     }
+    /** Effective disabled state: this element's own `disabled` OR an ancestor
+     *  `<fieldset disabled>`'s inherited state -- mirrors native `<input>`, whose
+     *  own `disabled` IDL property/attribute is never mutated by a fieldset. */
+    get effectiveDisabled() {
+        return this.disabled || this._fieldsetDisabled;
+    }
     formResetCallback() {
         this.value = this._defaultSelected;
     }
+    formStateRestoreCallback(state, _mode) {
+        this.value = typeof state === 'string' ? state : '';
+        this._restoredStateActive = true;
+    }
+    /**
+     * Called by the browser when an ancestor `<fieldset disabled>` toggles.
+     * Tracked separately from the consumer's own `disabled` (see
+     * `effectiveDisabled`) so a consumer's explicit `disabled` survives the
+     * fieldset re-enabling instead of being permanently overwritten.
+     */
     formDisabledCallback(disabled) {
-        this.disabled = disabled;
+        this._fieldsetDisabled = disabled;
+        if (disabled)
+            this.hide();
+        this.requestUpdate();
     }
     checkValidity() {
         return this.internals.checkValidity();
@@ -250,15 +428,41 @@ export class LyraSelect extends LyraElement {
     disconnectedCallback() {
         super.disconnectedCallback();
         this.cleanup?.();
+        this.cleanup = undefined;
         clearTimeout(this.typeAheadTimer);
         document.removeEventListener('pointerdown', this.onDocPointer);
+        // Reset so a reconnect (e.g. a drag-drop reparent) re-triggers
+        // `updated()`'s `open`-driven branch -- without this, `open` stays
+        // `true` across the disconnect/reconnect and `changed.has('open')` never
+        // fires again, leaving the listbox rendered open with no positioning and
+        // no outside-click listener.
+        this.open = false;
     }
     reflectSelected() {
         for (const o of this.options)
             o.selected = o.value === this._selected;
     }
+    /**
+     * The sole navigable (non-disabled) option, when `autoCommitSingleOption` is set and
+     * there's exactly one. Opening a one-row popup to pick the only available choice is pure
+     * friction with no real decision behind it, so an opted-in single-option select skips the
+     * popup entirely -- see `onTriggerClick`/`onKeyDown`, which commit this option directly on
+     * activation instead of opening the listbox, and `render()`, which drops the popup-trigger
+     * ARIA semantics (`role="combobox"`, `aria-haspopup`, `aria-expanded`, the chevron) in favor
+     * of a plain button's, since no popup can ever appear while this getter returns a value.
+     * Returns `undefined` whenever `autoCommitSingleOption` is `false` (the default), regardless
+     * of option count, so the normal combobox trigger renders unconditionally. Does not affect
+     * `value`/validity defaults in any way -- an unselected single-option select stays unselected
+     * until the trigger is actually activated, exactly like the multi-option case.
+     */
+    get onlyOption() {
+        if (!this.autoCommitSingleOption)
+            return undefined;
+        const navigable = this.options.filter((o) => !o.disabled);
+        return navigable.length === 1 ? navigable[0] : undefined;
+    }
     show() {
-        if (this.open || this.disabled)
+        if (this.open || this.effectiveDisabled)
             return;
         this.open = true;
     }
@@ -295,19 +499,26 @@ export class LyraSelect extends LyraElement {
                     this.emit('lyra-hide');
             }
         }
-        if (changed.has('required'))
-            this.updateValidity();
         if (changed.has('touched') || changed.has('required') || changed.has('value')) {
             this.toggleAttribute('data-invalid', this.touched && !this.internals.validity.valid);
         }
     }
     selectOption(option) {
-        if (option.disabled)
+        if (this.effectiveDisabled || option.disabled)
             return;
+        // Reopening the listbox (or, on a single-option select, simply
+        // reactivating the trigger) and landing back on the already-selected
+        // row is not a selection change -- `change`/`input` are documented as
+        // firing when "the selection changed", so only emit them when the
+        // value actually moves, matching a native <select> (which never fires
+        // `change` for re-picking the currently-selected <option>).
+        const changed = option.value !== this._selected;
         this.value = option.value;
         this.hide();
-        this.emit('input');
-        this.emit('change');
+        if (changed) {
+            this.emit('input');
+            this.emit('change');
+        }
     }
     /**
      * Standard listbox type-ahead: moves to the next non-disabled option whose
@@ -385,6 +596,15 @@ export class LyraSelect extends LyraElement {
         const hasHint = this.hasHintSlot || this.hint.length > 0;
         const hasError = this.hasErrorSlot || this.errorText.length > 0;
         const hasLabel = this.hasLabelSlot || this.label.length > 0;
+        const describedBy = [hasError ? 'select-error' : '', hasHint ? 'select-hint' : ''].filter(Boolean).join(' ');
+        // A single navigable option has no popup to expand into -- when opted in via
+        // autoCommitSingleOption, the trigger commits it directly on activation (see
+        // onTriggerClick/onKeyDown) instead of opening the listbox, so it's exposed as a plain
+        // button rather than a combobox with a permanently-closed popup: no aria-haspopup/
+        // aria-expanded/aria-controls/aria-activedescendant (all meaningless without a popup that
+        // can ever appear) and no chevron. Without the opt-in (the default), this is always
+        // `false` and the normal combobox/listbox/chevron trigger renders regardless of option count.
+        const isSingleOption = this.autoCommitSingleOption && navigable.length === 1;
         return html `
       <div part="form-control">
         <label part="form-control-label" for=${this.triggerId} ?hidden=${!hasLabel}>
@@ -394,15 +614,16 @@ export class LyraSelect extends LyraElement {
           id=${this.triggerId}
           part="trigger"
           type="button"
-          role="combobox"
-          aria-haspopup="listbox"
-          aria-expanded=${this.open ? 'true' : 'false'}
-          aria-controls=${this.listId}
-          aria-activedescendant=${activeId}
-          aria-label=${this.getAttribute('aria-label') || this.label || this.placeholder || 'Select'}
+          role=${isSingleOption ? 'button' : 'combobox'}
+          aria-haspopup=${isSingleOption ? nothing : 'listbox'}
+          aria-expanded=${isSingleOption ? nothing : this.open ? 'true' : 'false'}
+          aria-controls=${isSingleOption ? nothing : this.listId}
+          aria-activedescendant=${isSingleOption ? nothing : activeId}
+          aria-label=${this.getAttribute('aria-label') || (hasLabel ? nothing : this.placeholder || 'Select')}
+          aria-describedby=${describedBy || nothing}
           aria-required=${this.required ? 'true' : 'false'}
           aria-invalid=${this.touched && !this.internals.validity.valid ? 'true' : 'false'}
-          ?disabled=${this.disabled}
+          ?disabled=${this.effectiveDisabled}
           @click=${this.onTriggerClick}
           @keydown=${this.onKeyDown}
           @blur=${this.onTriggerBlur}
@@ -410,7 +631,7 @@ export class LyraSelect extends LyraElement {
           <span class="trigger-label" ?data-placeholder=${!hasValue}
             >${hasValue ? selectedLabel : this.placeholder}</span
           >
-          <span part="expand-icon" aria-hidden="true">${chevronIcon()}</span>
+          ${isSingleOption ? nothing : html `<span part="expand-icon" aria-hidden="true">${chevronIcon()}</span>`}
         </button>
         <div
           part="listbox"
@@ -421,29 +642,20 @@ export class LyraSelect extends LyraElement {
         >
           ${this.renderRows(options, activeId)}
         </div>
-        <div part="error" ?hidden=${!hasError}>
+        <div id="select-error" part="error" ?hidden=${!hasError}>
           ${this.errorText}<slot name="error" @slotchange=${this.onErrorSlotChange}></slot>
         </div>
-        <div part="hint" ?hidden=${!hasHint}>
+        <div id="select-hint" part="hint" ?hidden=${!hasHint}>
           ${this.hint}<slot name="hint" @slotchange=${this.onHintSlotChange}></slot>
         </div>
       </div>
-      <slot @slotchange=${this.collectOptions} hidden></slot>
+      <slot @slotchange=${this.collectOptions} @lyra-option-change=${this.onOptionChange} hidden></slot>
     `;
     }
 }
 __decorate([
     property()
 ], LyraSelect.prototype, "placeholder", void 0);
-__decorate([
-    property({ type: Boolean, reflect: true })
-], LyraSelect.prototype, "disabled", void 0);
-__decorate([
-    property({ type: Boolean, reflect: true })
-], LyraSelect.prototype, "required", void 0);
-__decorate([
-    property()
-], LyraSelect.prototype, "name", void 0);
 __decorate([
     property()
 ], LyraSelect.prototype, "label", void 0);
@@ -459,6 +671,9 @@ __decorate([
 __decorate([
     property({ reflect: true })
 ], LyraSelect.prototype, "size", void 0);
+__decorate([
+    property({ type: Boolean, attribute: 'auto-commit-single-option' })
+], LyraSelect.prototype, "autoCommitSingleOption", void 0);
 __decorate([
     state()
 ], LyraSelect.prototype, "activeIndex", void 0);

package/dist/components/skeleton/skeleton.d.ts

@@ -15,6 +15,9 @@ export declare class LyraSkeleton extends LyraElement {
     effect: SkeletonEffect;
     width?: string;
     height?: string;
+    /** Accessible name announced via `role="status"`. Override with a
+     *  description of what is actually loading (e.g. "Loading chart"). */
+    label: string;
     protected willUpdate(): void;
     protected updated(changed: PropertyValues): void;
     render(): TemplateResult;

package/dist/components/skeleton/skeleton.js

@@ -22,6 +22,9 @@ export class LyraSkeleton extends LyraElement {
         super(...arguments);
         this.variant = 'text';
         this.effect = 'pulse';
+        /** Accessible name announced via `role="status"`. Override with a
+         *  description of what is actually loading (e.g. "Loading chart"). */
+        this.label = 'Loading…';
     }
     static { this.styles = [LyraElement.styles, styles, srOnly]; }
     willUpdate() {
@@ -44,7 +47,7 @@ export class LyraSkeleton extends LyraElement {
         }
     }
     render() {
-        return html `<span part="base"><span class="sr-only">Loading…</span></span>`;
+        return html `<span part="base"><span class="sr-only">${this.label}</span></span>`;
     }
 }
 __decorate([
@@ -59,4 +62,7 @@ __decorate([
 __decorate([
     property()
 ], LyraSkeleton.prototype, "height", void 0);
+__decorate([
+    property()
+], LyraSkeleton.prototype, "label", void 0);
 defineElement('skeleton', LyraSkeleton);

package/dist/components/skeleton/skeleton.styles.js

@@ -10,15 +10,13 @@ export const styles = css `
     block-size: 100%;
     background: var(--lyra-color-border);
   }
-  :host([variant='text']) [part='base'] {
+  :host([variant='text']) [part='base'],
+  :host([variant='rect']) [part='base'] {
     border-radius: var(--lyra-radius);
   }
   :host([variant='circle']) [part='base'] {
     border-radius: 50%;
   }
-  :host([variant='rect']) [part='base'] {
-    border-radius: var(--lyra-radius);
-  }
   :host([effect='pulse']) [part='base'] {
     animation: lyra-skeleton-pulse 1.5s ease-in-out infinite;
   }
@@ -53,5 +51,8 @@ export const styles = css `
     [part='base'] {
       animation: none !important;
     }
+    :host([effect='sheen']) [part='base'] {
+      background-image: none;
+    }
   }
 `;