Support tabindex overriding for Button, MenuButton, ToggleButton, Checkbox, and Anchor

change/@ni-nimble-components-573fc816-eaa7-4e07-b0ef-8bfd5ccff19e.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Support tabindex overriding for Button, MenuButton, ToggleButton, Checkbox, and Anchor",
+  "packageName": "@ni/nimble-components",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

packages/eslint-config-nimble/typescript.js

@@ -111,6 +111,15 @@ module.exports = {
                 ]
             }
         },
+        {
+            files: ['*.foundation.spec.ts'],
+            rules: {
+                'no-restricted-imports': [
+                    'error',
+                    { paths: restrictedImportsPaths() }
+                ]
+            }
+        },
         {
             files: ['styles.ts'],
             rules: {

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

@@ -1,4 +1,4 @@
-import { attr } from '@microsoft/fast-element';
+import { attr, nullableNumberConverter } from '@microsoft/fast-element';
 import {
     DesignSystem,
     Anchor as FoundationAnchor,
@@ -35,6 +35,14 @@ export class Anchor extends AnchorBase {
     @attr
     public appearance: AnchorAppearance;
 
+    /**
+     * @public
+     * @remarks
+     * HTML Attribute: tabindex
+     */
+    @attr({ attribute: 'tabindex', converter: nullableNumberConverter })
+    public override tabIndex!: number;
+
     /**
      * @public
      * @remarks

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

@@ -27,6 +27,7 @@ AnchorOptions
         rel="${x => x.rel}"
         target="${x => x.target}"
         type="${x => x.type}"
+        tabindex="${x => x.tabIndex}"
         aria-atomic="${x => x.ariaAtomic}"
         aria-busy="${x => x.ariaBusy}"
         aria-controls="${x => x.ariaControls}"

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

@@ -80,6 +80,25 @@ describe('Anchor', () => {
                 expect(element.control!.getAttribute(name)).toBe('foo');
             });
         });
+
+        it('for attribute tabindex', async () => {
+            await connect();
+
+            element.setAttribute('tabindex', '-1');
+            await waitForUpdatesAsync();
+
+            expect(element.control!.getAttribute('tabindex')).toBe('-1');
+        });
+    });
+
+    it('should clear tabindex attribute from the internal control when changed to null', async () => {
+        await connect();
+
+        element.setAttribute('tabindex', '-1');
+        element.setAttribute('tabindex', 'null');
+        await waitForUpdatesAsync();
+
+        expect(element.control!.hasAttribute('tabindex')).toBeFalse();
     });
 
     describe('contenteditable behavior', () => {

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

@@ -1,15 +1,15 @@
-import { attr } from '@microsoft/fast-element';
+import { attr, nullableNumberConverter } from '@microsoft/fast-element';
 import {
     Button as FoundationButton,
     ButtonOptions,
-    buttonTemplate as template,
     DesignSystem
 } from '@microsoft/fast-foundation';
 import type {
     ButtonPattern,
     ButtonAppearanceVariantPattern
 } from '../patterns/button/types';
 import { styles } from './styles';
+import { template } from './template';
 import { ButtonAppearance, ButtonAppearanceVariant } from './types';
 
 declare global {
@@ -47,6 +47,14 @@ export class Button
      */
     @attr({ attribute: 'content-hidden', mode: 'boolean' })
     public contentHidden = false;
+
+    /**
+     * @public
+     * @remarks
+     * HTML Attribute: tabindex
+     */
+    @attr({ attribute: 'tabindex', converter: nullableNumberConverter })
+    public override tabIndex!: number;
 }
 
 /**

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

@@ -0,0 +1,59 @@
+import { html, ref, slotted } from '@microsoft/fast-element';
+import type { ViewTemplate } from '@microsoft/fast-element';
+import {
+    ButtonOptions,
+    endSlotTemplate,
+    FoundationElementTemplate,
+    startSlotTemplate
+} from '@microsoft/fast-foundation';
+import type { Button } from '.';
+
+export const template: FoundationElementTemplate<
+ViewTemplate<Button>,
+ButtonOptions
+> = (context, definition) => html`
+    <button
+        class="control"
+        part="control"
+        ?autofocus="${x => x.autofocus}"
+        ?disabled="${x => x.disabled}"
+        form="${x => x.formId}"
+        formaction="${x => x.formaction}"
+        formenctype="${x => x.formenctype}"
+        formmethod="${x => x.formmethod}"
+        formnovalidate="${x => x.formnovalidate}"
+        formtarget="${x => x.formtarget}"
+        name="${x => x.name}"
+        type="${x => x.type}"
+        value="${x => x.value}"
+        tabindex="${x => x.tabIndex}"
+        aria-atomic="${x => x.ariaAtomic}"
+        aria-busy="${x => x.ariaBusy}"
+        aria-controls="${x => x.ariaControls}"
+        aria-current="${x => x.ariaCurrent}"
+        aria-describedby="${x => x.ariaDescribedby}"
+        aria-details="${x => x.ariaDetails}"
+        aria-disabled="${x => x.ariaDisabled}"
+        aria-errormessage="${x => x.ariaErrormessage}"
+        aria-expanded="${x => x.ariaExpanded}"
+        aria-flowto="${x => x.ariaFlowto}"
+        aria-haspopup="${x => x.ariaHaspopup}"
+        aria-hidden="${x => x.ariaHidden}"
+        aria-invalid="${x => x.ariaInvalid}"
+        aria-keyshortcuts="${x => x.ariaKeyshortcuts}"
+        aria-label="${x => x.ariaLabel}"
+        aria-labelledby="${x => x.ariaLabelledby}"
+        aria-live="${x => x.ariaLive}"
+        aria-owns="${x => x.ariaOwns}"
+        aria-pressed="${x => x.ariaPressed}"
+        aria-relevant="${x => x.ariaRelevant}"
+        aria-roledescription="${x => x.ariaRoledescription}"
+        ${ref('control')}
+    >
+        ${startSlotTemplate(context, definition)}
+        <span class="content" part="content">
+            <slot ${slotted('defaultSlottedContent')}></slot>
+        </span>
+        ${endSlotTemplate(context, definition)}
+    </button>
+`;