@boostdev/design-system-components 2.8.0 → 2.11.0

package/src/web-components/interaction/form/bds-radio.ts

@@ -1,21 +1,31 @@
-import { LitElement, css, html } from 'lit';
+import { LitElement, css, html, nothing } from 'lit';
 
 /**
  * `<bds-radio>` — form-associated Radio custom element.
  *
  * Participates in HTML forms via the Form-Associated Custom Elements API.
- * Use multiple `<bds-radio>` elements with the same `name` to form a group.
+ * Use multiple `<bds-radio>` elements with the same `name` to form a group —
+ * checking one automatically unchecks the others sharing that `name`
+ * (searched within the same document/shadow root), and Arrow Up/Down/Left/Right
+ * move selection between them, mirroring native `<input type="radio">` semantics.
  *
  * Attributes:
- *   name     — form field name (groups radio buttons)
- *   value    — submitted value when selected
- *   checked  — boolean; whether this option is selected
- *   required — boolean
- *   disabled — boolean
+ *   name        — form field name (groups radio buttons)
+ *   value       — submitted value when selected
+ *   checked     — boolean; whether this option is selected
+ *   required    — boolean
+ *   disabled    — boolean
+ *   error       — boolean; visual + aria-invalid error state
+ *   description — optional supporting text rendered below the label
  *
  * Slots:
  *   (default) — label text
  *
+ * Events:
+ *   bds-change — fired when this radio becomes checked via user interaction;
+ *                `detail: { value: string, checked: true }`. Composed so it
+ *                crosses the shadow boundary (unlike the native `change` event).
+ *
  * @example
  * <bds-radio name="size" value="s">Small</bds-radio>
  * <bds-radio name="size" value="m" checked>Medium</bds-radio>
@@ -25,6 +35,16 @@ export class BdsRadio extends LitElement {
   static formAssociated = true;
 
   static styles = css`
+    /* Shadow DOM does not inherit the global box-sizing reset, so set it
+       here; otherwise elements with an explicit size + padding size as
+       content-box and layouts drift from the React (light-DOM) versions. */
+    :host,
+    *,
+    *::before,
+    *::after {
+      box-sizing: border-box;
+    }
+
     :host {
       display: inline-flex;
       align-items: flex-start;
@@ -42,22 +62,25 @@ export class BdsRadio extends LitElement {
     }
 
     .input {
+      box-sizing: border-box;
       --inputSize: calc(var(--bds-space_s) * 2);
-      margin-block-start: 0.25em;
+      margin-block-start: var(--radio_offset, 0.2em);
       inline-size: var(--inputSize);
       block-size: var(--inputSize);
       flex-shrink: 0;
-      --bdc_color: var(--radio_border-color, currentcolor);
+      color: var(--radio_color, var(--radio_border-color, var(--bds-color_on-bg)));
+      border: var(--radio_border, none);
+      --bdc_color: currentcolor;
       --bdc-outline_radius: var(--bds-border_radius--circle);
 
-      border-radius: var(--radio_radius, var(--bds-border_radius--circle));
+      border-radius: var(--radio_radius, var(--bdc-outline_radius));
       box-shadow: inset 0 0 0 var(--bdc-outline_width) var(--bdc_color), var(--radio_shadow, var(--bdc-outline_shadow));
-      border: none;
       appearance: none;
       background-color: var(--radio_color_bg, var(--bds-color_bg));
       cursor: pointer;
       position: relative;
-      transition: --bdc_color 0.3s ease, background-color 0.3s ease;
+      transition: --bdc_color var(--bds-animation_transition-duration) var(--bds-animation_easing),
+        background-color var(--bds-animation_transition-duration) var(--bds-animation_easing);
     }
 
     .input:checked {
@@ -69,23 +92,45 @@ export class BdsRadio extends LitElement {
       --bdc_color: var(--radio_color-active, var(--bdc-color_active));
     }
 
+    .input:focus {
+      --bdc_color: var(--bdc_color--focus);
+    }
+
     .input:focus-visible {
       outline: var(--bds-outline_default);
       outline-offset: var(--bds-outline_offset);
     }
 
+    :host([error]) .input {
+      --bdc_color: var(--bdc_color--error);
+    }
+
+    .textWrapper {
+      display: flex;
+      flex-direction: column;
+      gap: var(--bds-space_xxxs);
+      flex: 1;
+    }
+
     label {
       cursor: pointer;
-      flex: 1;
+    }
+
+    .description {
+      font-size: var(--bds-font_size--body--s);
+      color: var(--radio_description-color, var(--bds-color_on-bg--subtle));
+      line-height: var(--bds-font_line-height--body);
     }
   `;
 
   static properties = {
-    name:     { type: String, reflect: true },
-    value:    { type: String },
-    checked:  { type: Boolean, reflect: true },
-    required: { type: Boolean, reflect: true },
-    disabled: { type: Boolean, reflect: true },
+    name:        { type: String, reflect: true },
+    value:       { type: String },
+    checked:     { type: Boolean, reflect: true },
+    required:    { type: Boolean, reflect: true },
+    disabled:    { type: Boolean, reflect: true },
+    error:       { type: Boolean, reflect: true },
+    description: { type: String },
   };
 
   declare name: string;
@@ -93,9 +138,12 @@ export class BdsRadio extends LitElement {
   declare checked: boolean;
   declare required: boolean;
   declare disabled: boolean;
+  declare error: boolean;
+  declare description: string | undefined;
 
   private _internals!: ElementInternals;
   private readonly _uid = Math.random().toString(36).slice(2, 8);
+  private _initialChecked = false;
 
   constructor() {
     super();
@@ -105,6 +153,12 @@ export class BdsRadio extends LitElement {
     this.checked = false;
     this.required = false;
     this.disabled = false;
+    this.error = false;
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+    this._initialChecked = this.hasAttribute('checked');
   }
 
   updated(changed: Map<string, unknown>) {
@@ -115,16 +169,68 @@ export class BdsRadio extends LitElement {
   }
 
   formResetCallback() {
-    this.checked = false;
-    this._internals.setFormValue?.(null);
+    this.checked = this._initialChecked;
+    this._internals.setFormValue?.(this._initialChecked ? this.value : null);
+  }
+
+  /** All `<bds-radio>` elements sharing this radio's `name`, in document order (including this one). */
+  private _getGroupMembers(): BdsRadio[] {
+    if (!this.name) return [this];
+    const root = this.getRootNode() as Document | ShadowRoot;
+    return Array.from(root.querySelectorAll('bds-radio')).filter(radio => radio.name === this.name);
+  }
+
+  /** Marks `radio` as the sole checked member of its group and notifies listeners. */
+  private _selectRadio(radio: BdsRadio) {
+    this._getGroupMembers().forEach(member => {
+      if (member !== radio) member.checked = false;
+    });
+    radio.checked = true;
+    radio.dispatchEvent(new CustomEvent('bds-change', {
+      detail: { value: radio.value, checked: true },
+      bubbles: true,
+      composed: true,
+    }));
   }
 
   private _handleChange(e: Event) {
-    this.checked = (e.target as HTMLInputElement).checked;
+    const isChecked = (e.target as HTMLInputElement).checked;
+    if (isChecked) {
+      this._selectRadio(this);
+    } else {
+      this.checked = false;
+    }
+  }
+
+  private _handleKeydown = (e: KeyboardEvent) => {
+    if (this.disabled) return;
+    if (!['ArrowDown', 'ArrowRight', 'ArrowUp', 'ArrowLeft'].includes(e.key)) return;
+
+    const group = this._getGroupMembers().filter(member => !member.disabled);
+    if (group.length < 2) return;
+
+    e.preventDefault();
+    const currentIndex = group.indexOf(this);
+    const direction = e.key === 'ArrowDown' || e.key === 'ArrowRight' ? 1 : -1;
+    const next = group[(currentIndex + direction + group.length) % group.length];
+
+    this._selectRadio(next);
+    void next.updateComplete.then(() => {
+      next.shadowRoot?.querySelector<HTMLInputElement>('input')?.focus();
+    });
+  };
+
+  /** Roving tabindex: only the checked member (or the first member if none is checked) is tabbable. */
+  private _isTabbable(): boolean {
+    const group = this._getGroupMembers();
+    if (group.length <= 1) return true;
+    const checkedMember = group.find(member => member.checked);
+    return checkedMember ? checkedMember === this : group[0] === this;
   }
 
   render() {
     const id = `bds-radio-${this._uid}`;
+    const descriptionId = `${id}-description`;
     return html`
       <input
         id=${id}
@@ -135,9 +241,16 @@ export class BdsRadio extends LitElement {
         .checked=${this.checked}
         ?required=${this.required}
         ?disabled=${this.disabled}
+        tabindex=${this._isTabbable() ? 0 : -1}
+        aria-invalid=${this.error ? 'true' : 'false'}
+        aria-describedby=${this.description ? descriptionId : nothing}
         @change=${this._handleChange}
+        @keydown=${this._handleKeydown}
       />
-      <label for=${id}><slot></slot></label>
+      <div class="textWrapper">
+        <label for=${id}><slot></slot></label>
+        ${this.description ? html`<span id=${descriptionId} class="description">${this.description}</span>` : ''}
+      </div>
     `;
   }
 }

package/src/web-components/interaction/form/bds-segmented-control.spec.ts

@@ -71,4 +71,59 @@ describe('bds-segmented-control', () => {
   it('is form-associated', () => {
     expect(BdsSegmentedControl.formAssociated).toBe(true);
   });
+
+  it('fires a bds-change event with the selected value in detail', async () => {
+    const el = await fixture(`<bds-segmented-control name="view" options='${OPTIONS}'></bds-segmented-control>`);
+    const handler = vi.fn();
+    el.addEventListener('bds-change', handler);
+    const radios = [...el.shadowRoot!.querySelectorAll<HTMLInputElement>('input[type="radio"]')];
+    radios[0].dispatchEvent(new Event('change', { bubbles: true }));
+    expect(handler).toHaveBeenCalledOnce();
+    expect((handler.mock.calls[0][0] as CustomEvent).detail).toEqual({ value: 'list' });
+    cleanup(el);
+  });
+
+  it('sets a string aria-disabled value on disabled link-mode options', async () => {
+    const navOptions = JSON.stringify([
+      { value: 'home', label: 'Home', href: '/' },
+      { value: 'about', label: 'About', href: '/about', disabled: true },
+    ]);
+    const el = await fixture(`<bds-segmented-control value="home" options='${navOptions}'></bds-segmented-control>`);
+    const links = [...el.shadowRoot!.querySelectorAll('a')];
+    const disabledLink = links.find(a => a.textContent?.trim() === 'About')!;
+    const enabledLink = links.find(a => a.textContent?.trim() === 'Home')!;
+    expect(disabledLink.getAttribute('aria-disabled')).toBe('true');
+    expect(enabledLink.hasAttribute('aria-disabled')).toBe(false);
+    cleanup(el);
+  });
+
+  it('restores the initial value attribute on form reset', async () => {
+    const el = await fixture(`<bds-segmented-control name="view" value="grid" options='${OPTIONS}'></bds-segmented-control>`) as BdsSegmentedControl;
+    el.value = 'list';
+    el.formResetCallback();
+    expect(el.value).toBe('grid');
+    cleanup(el);
+  });
+
+  it('falls back to the first option on form reset when no initial value was set', async () => {
+    const el = await fixture(`<bds-segmented-control name="view" options='${OPTIONS}'></bds-segmented-control>`) as BdsSegmentedControl;
+    el.value = 'grid';
+    el.formResetCallback();
+    expect(el.value).toBe('list');
+    cleanup(el);
+  });
+
+  it('exposes --control_count and --control_selected-index on the control for CSS-driven positioning', async () => {
+    const el = await fixture(`<bds-segmented-control name="view" value="grid" options='${OPTIONS}'></bds-segmented-control>`);
+    const control = el.shadowRoot!.querySelector<HTMLElement>('.control')!;
+    expect(control.style.getPropertyValue('--control_count')).toBe('3');
+    expect(control.style.getPropertyValue('--control_selected-index')).toBe('1');
+    cleanup(el);
+  });
+
+  it('uses a focus-visible selector that can actually match (label wrapping the radio)', () => {
+    const cssText = BdsSegmentedControl.styles.toString();
+    expect(cssText).not.toContain('.item-label');
+    expect(cssText).toContain(':has(> .radio:focus-visible)');
+  });
 });

package/src/web-components/interaction/form/bds-segmented-control.ts

@@ -23,7 +23,8 @@ export interface SegmentedOption {
  *   variant  — "outline" (inset border on active item, default) | "filled" (sliding thumb)
  *
  * Events:
- *   change — fired when a new segment is selected (radio mode only)
+ *   bds-change — fired when a new segment is selected (radio mode only); detail: { value }
+ *   change     — deprecated alias for bds-change, kept for backward compatibility (radio mode only)
  *
  * @example
  * <bds-segmented-control
@@ -43,6 +44,16 @@ export class BdsSegmentedControl extends LitElement {
   static formAssociated = true;
 
   static styles = css`
+    /* Shadow DOM does not inherit the global box-sizing reset, so set it
+       here; otherwise elements with an explicit size + padding size as
+       content-box and layouts drift from the React (light-DOM) versions. */
+    :host,
+    *,
+    *::before,
+    *::after {
+      box-sizing: border-box;
+    }
+
     :host {
       display: inline-flex;
     }
@@ -53,25 +64,35 @@ export class BdsSegmentedControl extends LitElement {
     }
 
     .control {
-      display: inline-flex;
       position: relative;
-      border-radius: var(--bds-border_radius--s);
-      background-color: var(--segmented_color_bg, var(--bds-color_bg--subtle));
-      padding: 0.25rem;
+      display: inline-grid;
+      grid-auto-flow: column;
+      grid-auto-columns: 1fr;
+      padding: var(--control_track-pad, var(--bds-space_xxs));
+      background-color: var(--control_track-bg, var(--segmented_color_bg, var(--bds-color_bg--subtle)));
+      border-radius: var(--control_radius, var(--bds-border_radius--full));
       gap: 0;
+      --control_dir: 1;
+    }
+
+    :host(:dir(rtl)) .control {
+      --control_dir: -1;
     }
 
-    /* Sliding thumb */
+    /* Sliding thumb (filled variant) — positioned entirely via CSS custom properties
+       (--control_count / --control_selected-index, set inline from render()) so it
+       stays correct across RTL and resize without any JS measurement. */
     .thumb {
       position: absolute;
-      inset-block: 0.25rem;
-      border-radius: calc(var(--bds-border_radius--s) - 2px);
-      background-color: var(--segmented_thumb-color, var(--bds-color_interactive));
-      box-shadow: var(--bds-shadow_m);
-      transition: inset-inline-start var(--bds-animation_transition-duration) var(--bds-animation_easing),
-                  inline-size var(--bds-animation_transition-duration) var(--bds-animation_easing);
+      inset-block: var(--control_track-pad, var(--bds-space_xxs));
+      inset-inline-start: var(--control_track-pad, var(--bds-space_xxs));
+      inline-size: calc((100% - 2 * var(--control_track-pad, var(--bds-space_xxs))) / var(--control_count, 1));
+      border-radius: var(--control_thumb-radius, var(--bds-border_radius--full));
+      background-color: var(--control_thumb-bg, var(--segmented_thumb-color, var(--bds-color_interactive)));
+      box-shadow: var(--control_thumb-shadow, var(--bds-shadow_s));
       pointer-events: none;
-      /* Position set via JS in updated() */
+      transform: translateX(calc(var(--control_selected-index, 0) * var(--control_dir, 1) * 100%));
+      transition: transform var(--bds-animation_transition-duration) var(--bds-animation_easing);
     }
 
     .radio {
@@ -84,6 +105,7 @@ export class BdsSegmentedControl extends LitElement {
 
     .item {
       position: relative;
+      z-index: 1;
       display: inline-flex;
       align-items: center;
       justify-content: center;
@@ -91,9 +113,9 @@ export class BdsSegmentedControl extends LitElement {
       font-size: var(--bds-font_size--body--s);
       font-family: var(--bds-font_family--body);
       font-weight: var(--bds-font_weight--semibold);
-      color: var(--segmented_color, var(--bds-color_on-bg));
+      color: var(--control_label-color, var(--segmented_color, var(--bds-color_on-bg)));
       cursor: pointer;
-      border-radius: calc(var(--bds-border_radius--s) - 2px);
+      border-radius: var(--control_thumb-radius, var(--bds-border_radius--full));
       transition: color var(--bds-animation_transition-duration) var(--bds-animation_easing);
       user-select: none;
       white-space: nowrap;
@@ -101,7 +123,7 @@ export class BdsSegmentedControl extends LitElement {
     }
 
     .item.--active {
-      color: var(--segmented_color--active, var(--bds-color_on-interactive));
+      color: var(--control_label-color--active, var(--segmented_color--active, var(--bds-color_on-interactive)));
     }
 
     .item.--disabled {
@@ -109,21 +131,34 @@ export class BdsSegmentedControl extends LitElement {
       cursor: not-allowed;
     }
 
-    .radio:focus-visible + .item-label {
+    /* Radio-mode items aren't directly focusable (the input is visually hidden inside
+       the label), so match focus-visible on the input itself via :has(); link-mode
+       items are focusable directly. */
+    .item:focus-visible,
+    .item:has(> .radio:focus-visible) {
       outline: var(--bds-outline_default);
-      outline-offset: var(--bds-outline_offset);
+      outline-offset: calc(var(--bds-outline_offset) * -1);
+      border-radius: var(--control_thumb-radius, var(--bds-border_radius--full));
     }
 
-    /* Outline variant: sliding inset-border indicator (positioned via JS like .thumb) */
+    @media (hover: hover) and (pointer: fine) {
+      .item:not(.--active, .--disabled):hover {
+        color: var(--control_label-color--hover, var(--bds-color_on-bg));
+      }
+    }
+
+    /* Outline variant: sliding inset-border indicator (positioned like .thumb) */
     .indicator {
       position: absolute;
-      inset-block: 0.25rem;
-      border-radius: calc(var(--bds-border_radius--s) - 2px);
+      inset-block: var(--control_track-pad, var(--bds-space_xxs));
+      inset-inline-start: var(--control_track-pad, var(--bds-space_xxs));
+      inline-size: calc((100% - 2 * var(--control_track-pad, var(--bds-space_xxs))) / var(--control_count, 1));
+      border-radius: var(--control_thumb-radius, var(--bds-border_radius--full));
       pointer-events: none;
       z-index: 2;
       display: none;
-      transition: inset-inline-start var(--bds-animation_transition-duration) var(--bds-animation_easing),
-                  inline-size var(--bds-animation_transition-duration) var(--bds-animation_easing);
+      transform: translateX(calc(var(--control_selected-index, 0) * var(--control_dir, 1) * 100%));
+      transition: transform var(--bds-animation_transition-duration) var(--bds-animation_easing);
     }
 
     /* Outline variant — no thumb, sliding inset-border indicator, interactive active color */
@@ -132,17 +167,17 @@ export class BdsSegmentedControl extends LitElement {
     }
 
     :host([variant='outline']) .item {
-      background-color: var(--segmented_item-bg, transparent);
+      background-color: var(--control_item-bg, var(--segmented_item-bg, transparent));
     }
 
     :host([variant='outline']) .item.--active {
-      color: var(--segmented_color--active, var(--bds-color_interactive));
-      background-color: var(--segmented_item-bg--active, var(--bds-color_bg));
+      color: var(--control_label-color--active, var(--segmented_color--active, var(--bds-color_interactive)));
+      background-color: var(--control_item-bg--active, var(--segmented_item-bg--active, var(--bds-color_bg)));
     }
 
     :host([variant='outline']) .indicator {
       display: block;
-      box-shadow: inset 0 0 0 2px var(--bds-color_interactive);
+      box-shadow: inset 0 0 0 var(--control_indicator-width, 2px) var(--control_indicator-color, var(--bds-color_interactive));
     }
 
     @media (prefers-reduced-motion: reduce) {
@@ -169,6 +204,7 @@ export class BdsSegmentedControl extends LitElement {
 
   private _internals!: ElementInternals;
   private readonly _uid = Math.random().toString(36).slice(2, 8);
+  private _initialValue = '';
 
   constructor() {
     super();
@@ -180,6 +216,11 @@ export class BdsSegmentedControl extends LitElement {
     this.variant = 'outline';
   }
 
+  connectedCallback() {
+    super.connectedCallback();
+    this._initialValue = this.value;
+  }
+
   private get _options(): SegmentedOption[] {
     try {
       return JSON.parse(this.options) as SegmentedOption[];
@@ -192,52 +233,33 @@ export class BdsSegmentedControl extends LitElement {
     super.updated(changed);
     if (changed.has('value') || changed.has('options')) {
       this._internals.setFormValue?.(this.value || null);
-      if (this.variant === 'filled') this._updateThumb();
-      if (this.variant === 'outline') this._updateIndicator();
-    }
-    if (changed.has('variant')) {
-      if (this.variant === 'filled') this._updateThumb();
-      if (this.variant === 'outline') this._updateIndicator();
     }
   }
 
-  private _positionSlider(el: HTMLElement | null | undefined, items: NodeListOf<HTMLElement>, selectedIndex: number) {
-    if (!el || items.length === 0) return;
-    const item = items[selectedIndex];
-    if (!item) return;
-    const controlRect = (item.parentElement as HTMLElement).getBoundingClientRect();
-    const itemRect = item.getBoundingClientRect();
-    el.style.insetInlineStart = `${itemRect.left - controlRect.left}px`;
-    el.style.inlineSize = `${itemRect.width}px`;
-  }
-
-  private _updateThumb() {
-    const selectedIndex = Math.max(0, this._options.findIndex(o => o.value === this.value));
-    const items = this.shadowRoot?.querySelectorAll<HTMLElement>('.item');
-    this._positionSlider(this.shadowRoot?.querySelector<HTMLElement>('.thumb'), items!, selectedIndex);
-  }
-
-  private _updateIndicator() {
-    const selectedIndex = Math.max(0, this._options.findIndex(o => o.value === this.value));
-    const items = this.shadowRoot?.querySelectorAll<HTMLElement>('.item');
-    this._positionSlider(this.shadowRoot?.querySelector<HTMLElement>('.indicator'), items!, selectedIndex);
-  }
-
   formResetCallback() {
-    const firstOption = this._options[0];
-    this.value = firstOption?.value ?? '';
+    const fallback = this._options[0]?.value ?? '';
+    this.value = this._initialValue || fallback;
     this._internals.setFormValue?.(this.value || null);
   }
 
   private _handleChange(optionValue: string) {
     this.value = optionValue;
+    this.dispatchEvent(new CustomEvent('bds-change', {
+      detail: { value: optionValue },
+      bubbles: true,
+      composed: true,
+    }));
+    // Deprecated: kept for backward compatibility, prefer 'bds-change'.
     this.dispatchEvent(new Event('change', { bubbles: true, composed: true }));
   }
 
   render() {
     const opts = this._options;
+    const selectedIndex = Math.max(0, opts.findIndex(o => o.value === this.value));
+    const controlStyle = `--control_count: ${Math.max(opts.length, 1)}; --control_selected-index: ${selectedIndex}`;
+
     return html`
-      <div class="control" role="group">
+      <div class="control" role="group" style=${controlStyle}>
         <span class="thumb" aria-hidden="true"></span>
         <span class="indicator" aria-hidden="true"></span>
         ${opts.map((opt, i) => {
@@ -251,7 +273,7 @@ export class BdsSegmentedControl extends LitElement {
                 class=${itemClass}
                 href=${isDisabled ? nothing : opt.href}
                 aria-current=${isActive ? 'page' : nothing}
-                ?aria-disabled=${isDisabled}
+                aria-disabled=${isDisabled ? 'true' : nothing}
               >${opt.label}</a>
             `;
           }

package/src/web-components/interaction/form/bds-select.spec.ts

@@ -71,4 +71,61 @@ describe('bds-select', () => {
   it('is form-associated', () => {
     expect(BdsSelect.formAssociated).toBe(true);
   });
+
+  it('fires a composed bds-change event that reaches a host-level listener', async () => {
+    const el = await fixture(`<bds-select name="country" options='${OPTIONS}'></bds-select>`);
+    const values: string[] = [];
+    let composed = false;
+    el.addEventListener('bds-change', (e: Event) => {
+      composed = (e as CustomEvent).composed;
+      values.push((e as CustomEvent).detail.value);
+    });
+    const select = el.shadowRoot!.querySelector<HTMLSelectElement>('select')!;
+    select.value = 'be';
+    select.dispatchEvent(new Event('change', { bubbles: true }));
+    expect(values).toEqual(['be']);
+    expect(composed).toBe(true);
+    cleanup(el);
+  });
+
+  it('renders a label when label attribute is set, associated via for/id', async () => {
+    const el = await fixture(`<bds-select name="country" label="Country" options='${OPTIONS}'></bds-select>`);
+    const label = el.shadowRoot!.querySelector('label')!;
+    const select = el.shadowRoot!.querySelector('select')!;
+    expect(label.textContent?.trim()).toContain('Country');
+    expect(select.id).toBeTruthy();
+    expect(label.getAttribute('for')).toBe(select.id);
+    cleanup(el);
+  });
+
+  it('forwards a host aria-label to the inner select when no label attribute is set', async () => {
+    const el = await fixture(`<bds-select name="country" aria-label="Country" options='${OPTIONS}'></bds-select>`);
+    const select = el.shadowRoot!.querySelector('select')!;
+    expect(select.getAttribute('aria-label')).toBe('Country');
+    cleanup(el);
+  });
+
+  it('does not set aria-label on the inner select when a label attribute is present', async () => {
+    const el = await fixture(`<bds-select name="country" label="Country" aria-label="Ignored" options='${OPTIONS}'></bds-select>`);
+    const select = el.shadowRoot!.querySelector('select')!;
+    expect(select.hasAttribute('aria-label')).toBe(false);
+    cleanup(el);
+  });
+
+  it('renders error message and sets aria-invalid/aria-describedby when error is set', async () => {
+    const el = await fixture(`<bds-select name="country" error="Please choose a country" options='${OPTIONS}'></bds-select>`);
+    const select = el.shadowRoot!.querySelector('select')!;
+    const errorMsg = el.shadowRoot!.querySelector('.message--error');
+    expect(select.getAttribute('aria-invalid')).toBe('true');
+    expect(errorMsg?.textContent?.trim()).toBe('Please choose a country');
+    expect(select.getAttribute('aria-describedby')).toContain('-error');
+    cleanup(el);
+  });
+
+  it('renders hint message when hint is set (no error)', async () => {
+    const el = await fixture(`<bds-select name="country" hint="Pick your country" options='${OPTIONS}'></bds-select>`);
+    const hint = el.shadowRoot!.querySelector('.message--hint');
+    expect(hint?.textContent?.trim()).toBe('Pick your country');
+    cleanup(el);
+  });
 });