Required indicator on radio-group, select, combobox, and text-area

change/@ni-nimble-components-b67fa692-e6d5-42b5-b494-b284fe5833fd.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Add `required-visible` attribute to radio-group, combobox, select, and text-area",
+  "packageName": "@ni/nimble-components",
+  "email": "20542556+mollykreis@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

packages/nimble-components/src/combobox/index.ts

@@ -41,6 +41,7 @@ import type { AnchoredRegion } from '../anchored-region';
 import { template } from './template';
 import { FormAssociatedCombobox } from './models/combobox-form-associated';
 import type { ListOption } from '../list-option';
+import { mixinRequiredVisiblePattern } from '../patterns/required-visible/types';
 
 declare global {
     interface HTMLElementTagNameMap {
@@ -52,7 +53,9 @@ declare global {
  * A nimble-styed HTML combobox
  */
 export class Combobox
-    extends mixinErrorPattern(FormAssociatedCombobox)
+    extends mixinErrorPattern(
+        mixinRequiredVisiblePattern(FormAssociatedCombobox)
+    )
     implements DropdownPattern {
     @attr
     public appearance: DropdownAppearance = DropdownAppearance.underline;

packages/nimble-components/src/combobox/styles.ts

@@ -10,6 +10,7 @@ import {
 
 import { styles as dropdownStyles } from '../patterns/dropdown/styles';
 import { styles as errorStyles } from '../patterns/error/styles';
+import { styles as requiredVisibleStyles } from '../patterns/required-visible/styles';
 import { focusVisible } from '../utilities/style/focus';
 import { appearanceBehavior } from '../utilities/style/appearance';
 import { DropdownAppearance } from '../select/types';
@@ -18,6 +19,7 @@ import { userSelectNone } from '../utilities/style/user-select';
 export const styles = css`
     ${dropdownStyles}
     ${errorStyles}
+    ${requiredVisibleStyles}
 
     :host {
         --ni-private-hover-bottom-border-width: 2px;

packages/nimble-components/src/combobox/template.ts

@@ -17,6 +17,13 @@ import { anchoredRegionTag } from '../anchored-region';
 import { DropdownPosition } from '../patterns/dropdown/types';
 import { overflow } from '../utilities/directive/overflow';
 import { filterNoResultsLabel } from '../label-provider/core/label-tokens';
+import { getRequiredVisibleLabelTemplate } from '../patterns/required-visible/template';
+
+const labelTemplate = getRequiredVisibleLabelTemplate(html<Combobox>`
+    <label part="label" class="label">
+        <slot></slot>
+    </label>
+`);
 
 /* eslint-disable @typescript-eslint/indent */
 // prettier-ignore
@@ -34,9 +41,7 @@ ComboboxOptions
         @focusout="${(x, c) => x.focusoutHandler(c.event as FocusEvent)}"
         @keydown="${(x, c) => x.keydownHandler(c.event as KeyboardEvent)}"
     >
-        <label part="label" class="label">
-            <slot></slot>
-        </label>
+        ${labelTemplate}
         <div class="control" part="control" ${ref('controlWrapper')}>
             ${startSlotTemplate(context, definition)}
             <slot name="control">
@@ -46,6 +51,7 @@ ComboboxOptions
                     aria-controls="${x => x.ariaControls}"
                     aria-disabled="${x => x.ariaDisabled}"
                     aria-expanded="${x => x.ariaExpanded}"
+                    aria-required="${x => x.requiredVisible}"
                     aria-haspopup="listbox"
                     class="selected-value"
                     part="selected-value"

packages/nimble-components/src/combobox/tests/combobox.spec.ts

@@ -3,7 +3,10 @@ import { parameterizeSpec, parameterizeSuite } from '@ni/jasmine-parameterized';
 import { fixture, Fixture } from '../../utilities/tests/fixture';
 import { Combobox, comboboxTag } from '..';
 import { ComboboxAutocomplete } from '../types';
-import { waitForUpdatesAsync } from '../../testing/async-helpers';
+import {
+    processUpdates,
+    waitForUpdatesAsync
+} from '../../testing/async-helpers';
 import { checkFullyInViewport } from '../../utilities/tests/intersection-observer';
 import { listOptionTag } from '../../list-option';
 import { ComboboxPageObject } from '../testing/combobox.pageobject';
@@ -106,6 +109,18 @@ describe('Combobox', () => {
             expect(element.control.getAttribute('disabled')).not.toBeNull();
         });
 
+        it('should set "aria-required" to true when "required-visible" is true', () => {
+            element.requiredVisible = true;
+            processUpdates();
+            expect(element.control.getAttribute('aria-required')).toBe('true');
+        });
+
+        it('should set "aria-required" to false when "required-visible" is false', () => {
+            element.requiredVisible = false;
+            processUpdates();
+            expect(element.control.getAttribute('aria-required')).toBe('false');
+        });
+
         it('should forward value property to inner control', async () => {
             element.value = 'foo';
             await waitForUpdatesAsync();

packages/nimble-components/src/icon-base/styles.ts

@@ -42,6 +42,7 @@ export const styles = css`
     }
 
     .icon svg {
+        display: block;
         fill: ${iconColor};
         width: 100%;
         height: 100%;

packages/nimble-components/src/patterns/required-visible/styles.ts

@@ -0,0 +1,17 @@
+import { css } from '@microsoft/fast-element';
+import { smallPadding } from '../../theme-provider/design-tokens';
+
+export const styles = css`
+    .annotated-label {
+        display: flex;
+        flex-direction: row;
+    }
+
+    .required-icon {
+        flex: none;
+        width: 5px;
+        height: 5px;
+        margin-top: 3px;
+        margin-left: ${smallPadding};
+    }
+`;

packages/nimble-components/src/patterns/required-visible/template.ts

@@ -0,0 +1,20 @@
+import { ViewTemplate, html, when } from '@microsoft/fast-element';
+import { iconAsteriskTag } from '../../icons/asterisk';
+import type { RequiredVisiblePattern } from './types';
+
+/* eslint-disable @typescript-eslint/indent */
+export function getRequiredVisibleLabelTemplate(
+    labelTemplate: ViewTemplate<RequiredVisiblePattern>
+): ViewTemplate<RequiredVisiblePattern> {
+    return html`
+        <div class="annotated-label">
+            ${labelTemplate}
+            ${when(
+                x => x.requiredVisible,
+                html`
+                <${iconAsteriskTag} class="required-icon" severity="error"></${iconAsteriskTag}>
+            `
+            )}
+        </div>
+    `;
+}

packages/nimble-components/src/patterns/required-visible/testing/required-visible-pattern.pageobject.ts

@@ -0,0 +1,20 @@
+import type { FoundationElement } from '@microsoft/fast-foundation';
+
+/**
+ * A page object for the elements that use the required-visible mixin.
+ */
+export class RequiredVisiblePatternPageObject {
+    public constructor(private readonly element: FoundationElement) {}
+
+    public isRequiredVisibleIconVisible(): boolean {
+        const icon = this.getRequiredVisibleIcon();
+        if (!icon) {
+            return false;
+        }
+        return getComputedStyle(icon).display !== 'none';
+    }
+
+    private getRequiredVisibleIcon(): HTMLElement | null {
+        return this.element.shadowRoot!.querySelector('.required-icon');
+    }
+}

packages/nimble-components/src/patterns/required-visible/tests/required-visible-pattern-mixin.spec.ts

@@ -0,0 +1,68 @@
+import { customElement, html } from '@microsoft/fast-element';
+import { FoundationElement } from '@microsoft/fast-foundation';
+import {
+    Fixture,
+    fixture,
+    uniqueElementName
+} from '../../../utilities/tests/fixture';
+import { mixinRequiredVisiblePattern } from '../types';
+import { styles } from '../styles';
+import { getRequiredVisibleLabelTemplate } from '../template';
+import { processUpdates } from '../../../testing/async-helpers';
+import { RequiredVisiblePatternPageObject } from '../testing/required-visible-pattern.pageobject';
+
+const labelTemplate = getRequiredVisibleLabelTemplate(
+    html`<slot name="label"></slot>`
+);
+const elementName = uniqueElementName();
+@customElement({
+    name: elementName,
+    template: html`${labelTemplate}`,
+    styles
+})
+class TestErrorPatternElement extends mixinRequiredVisiblePattern(
+        FoundationElement
+    ) {}
+
+async function setup(): Promise<Fixture<TestErrorPatternElement>> {
+    return await fixture(elementName);
+}
+
+describe('RequiredVisiblePatternMixin', () => {
+    let element: TestErrorPatternElement;
+    let connect: () => Promise<void>;
+    let disconnect: () => Promise<void>;
+    let pageObject: RequiredVisiblePatternPageObject;
+
+    beforeEach(async () => {
+        ({ element, connect, disconnect } = await setup());
+        await connect();
+        pageObject = new RequiredVisiblePatternPageObject(element);
+    });
+
+    afterEach(async () => {
+        await disconnect();
+    });
+
+    it('defaults requiredVisible to false', () => {
+        expect(element.requiredVisible).toBeFalse();
+    });
+
+    it('shows icon when requiredVisible is true', () => {
+        element.requiredVisible = true;
+        processUpdates();
+        expect(pageObject.isRequiredVisibleIconVisible()).toBeTrue();
+    });
+
+    it('does not show icon when requiredVisible is false', () => {
+        element.requiredVisible = false;
+        processUpdates();
+        expect(pageObject.isRequiredVisibleIconVisible()).toBeFalse();
+    });
+
+    it('uses boolean "required-visible" attribute to set requiredVisible', () => {
+        element.setAttribute('required-visible', '');
+        processUpdates();
+        expect(element.requiredVisible).toBeTrue();
+    });
+});

packages/nimble-components/src/patterns/required-visible/types.ts

@@ -0,0 +1,36 @@
+import { attr, FASTElement } from '@microsoft/fast-element';
+
+export interface RequiredVisiblePattern {
+    /**
+     * Whether or not to show the required appearance of the control
+     */
+    requiredVisible: boolean;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type FASTElementConstructor = abstract new (...args: any[]) => FASTElement;
+
+// As the returned class is internal to the function, we can't write a signature that uses is directly, so rely on inference
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/explicit-function-return-type
+export function mixinRequiredVisiblePattern<
+    TBase extends FASTElementConstructor
+>(base: TBase) {
+    /**
+     * The Mixin that provides the requiredVisible property and required-visible attribute
+     * to a component.
+     */
+    abstract class RequiredVisibleElement
+        extends base
+        implements RequiredVisiblePattern {
+        /*
+         * Show the required appearance of the control
+         */
+        public requiredVisible = false;
+    }
+
+    attr({ attribute: 'required-visible', mode: 'boolean' })(
+        RequiredVisibleElement.prototype,
+        'requiredVisible'
+    );
+    return RequiredVisibleElement;
+}

packages/nimble-components/src/radio-group/index.ts

@@ -6,6 +6,7 @@ import { Orientation } from '@microsoft/fast-web-utilities';
 import { styles } from './styles';
 import { template } from './template';
 import { mixinErrorPattern } from '../patterns/error/types';
+import { mixinRequiredVisiblePattern } from '../patterns/required-visible/types';
 
 declare global {
     interface HTMLElementTagNameMap {
@@ -18,7 +19,9 @@ export { Orientation };
 /**
  * A nimble-styled grouping element for radio buttons
  */
-export class RadioGroup extends mixinErrorPattern(FoundationRadioGroup) {}
+export class RadioGroup extends mixinErrorPattern(
+    mixinRequiredVisiblePattern(FoundationRadioGroup)
+) {}
 
 const nimbleRadioGroup = RadioGroup.compose({
     baseName: 'radio-group',

packages/nimble-components/src/radio-group/styles.ts

@@ -9,10 +9,12 @@ import {
     standardPadding
 } from '../theme-provider/design-tokens';
 import { styles as errorStyles } from '../patterns/error/styles';
+import { styles as requiredVisibleStyles } from '../patterns/required-visible/styles';
 
 export const styles = css`
     ${display('inline-block')}
     ${errorStyles}
+    ${requiredVisibleStyles}
 
     .positioning-region {
         display: flex;

packages/nimble-components/src/radio-group/template.ts

@@ -3,19 +3,25 @@ import { Orientation } from '@microsoft/fast-web-utilities';
 import type { RadioGroup } from '.';
 import { errorTextTemplate } from '../patterns/error/template';
 import { iconExclamationMarkTag } from '../icons/exclamation-mark';
+import { getRequiredVisibleLabelTemplate } from '../patterns/required-visible/template';
+
+const labelTemplate = getRequiredVisibleLabelTemplate(
+    html<RadioGroup>`<slot name="label"></slot>`
+);
 
 /* eslint-disable @typescript-eslint/indent */
 export const template = html<RadioGroup>`
     <template
         role="radiogroup"
         aria-disabled="${x => x.disabled}"
         aria-readonly="${x => x.readOnly}"
+        aria-required="${x => x.requiredVisible}"
         @click="${(x, c) => x.clickHandler(c.event as MouseEvent)}"
         @keydown="${(x, c) => x.keydownHandler(c.event as KeyboardEvent)}"
         @focusout="${(x, c) => x.focusOutHandler(c.event as FocusEvent)}"
     >
         <div class="label-container">
-            <slot name="label"></slot>            
+            ${labelTemplate}
             <${iconExclamationMarkTag}
                 severity="error"
                 class="error-icon"

packages/nimble-components/src/radio-group/tests/radio-group.spec.ts

@@ -1,9 +1,43 @@
+import { html } from '@microsoft/fast-element';
 import { RadioGroup, radioGroupTag } from '..';
+import { Fixture, fixture } from '../../utilities/tests/fixture';
+import { processUpdates } from '../../testing/async-helpers';
+
+async function setup(): Promise<Fixture<RadioGroup>> {
+    return await fixture<RadioGroup>(
+        html`<${radioGroupTag}></${radioGroupTag}>`
+    );
+}
 
 describe('Radio Group', () => {
+    let element: RadioGroup;
+    let connect: () => Promise<void>;
+    let disconnect: () => Promise<void>;
+
+    beforeEach(async () => {
+        ({ element, connect, disconnect } = await setup());
+        await connect();
+    });
+
+    afterEach(async () => {
+        await disconnect();
+    });
+
     it('can construct an element instance', () => {
         expect(document.createElement(radioGroupTag)).toBeInstanceOf(
             RadioGroup
         );
     });
+
+    it('should set "aria-required" to true when "required-visible" is true', () => {
+        element.requiredVisible = true;
+        processUpdates();
+        expect(element.getAttribute('aria-required')).toBe('true');
+    });
+
+    it('should set "aria-required" to false when "required-visible" is false', () => {
+        element.requiredVisible = false;
+        processUpdates();
+        expect(element.getAttribute('aria-required')).toBe('false');
+    });
 });