feat(pagination, split-button, dropdown, date-picker) action-group): …

…add setFocus method (#6405) **Related Issue:** #5147 ## Summary Adds the public `setFocus` method to the `delegatesFocus` components that didn't have it. See #5147 (comment)
Esri · Feb 4, 2023 · 59de7a5 · 59de7a5
1 parent 0840e82
commit 59de7a5
Show file tree

Hide file tree

Showing 11 changed files with 207 additions and 64 deletions.
diff --git a/src/components/action-group/action-group.e2e.ts b/src/components/action-group/action-group.e2e.ts
@@ -1,31 +1,26 @@
-import { accessible, hidden, renders, slots, t9n } from "../../tests/commonTests";
 import { newE2EPage } from "@stencil/core/testing";
+import { accessible, focusable, hidden, renders, slots, t9n } from "../../tests/commonTests";
 import { SLOTS } from "./resources";
 
+const actionGroupHTML = `<calcite-action-group scale="l">
+      <calcite-action id="plus" slot="menu-actions" text="Add" icon="plus"></calcite-action>
+      <calcite-action id="banaa" slot="menu-actions" text="Banana" icon="banana"></calcite-action>
+      </calcite-action-group>`;
+
 describe("calcite-action-group", () => {
   it("renders", async () => renders("calcite-action-group", { display: "flex" }));
 
+  it("focusable", async () => focusable(actionGroupHTML, { shadowFocusTargetSelector: "calcite-action" }));
+
   it("honors hidden attribute", async () => hidden("calcite-action-group"));
 
-  it("should be accessible", async () =>
-    accessible(`
-    <calcite-action-group>
-      <calcite-action text="Add" icon="plus"></calcite-action>
-    </calcite-action-group>
-    `));
+  it("should be accessible", async () => accessible(actionGroupHTML));
 
   it("has slots", () => slots("calcite-action-group", SLOTS));
 
   it("should honor scale of expand icon", async () => {
-    const page = await newE2EPage({
-      html: `<calcite-action-group scale="l">
-      <calcite-action slot="menu-actions" text="Add" icon="plus"></calcite-action>
-      <calcite-action slot="menu-actions" text="Add" icon="plus"></calcite-action>
-      </calcite-action-group>`
-    });
-
+    const page = await newE2EPage({ html: actionGroupHTML });
     const menu = await page.find(`calcite-action-group >>> calcite-action-menu`);
-
     expect(await menu.getProperty("scale")).toBe("l");
   });
 

diff --git a/src/components/action-group/action-group.tsx b/src/components/action-group/action-group.tsx
@@ -1,12 +1,17 @@
-import { Component, Element, h, Prop, Watch } from "@stencil/core";
-import { Fragment, State, VNode } from "@stencil/core/internal";
+import { Component, Element, Fragment, h, Method, Prop, State, VNode, Watch } from "@stencil/core";
 import { CalciteActionMenuCustomEvent } from "../../components";
 import {
   ConditionalSlotComponent,
   connectConditionalSlotComponent,
   disconnectConditionalSlotComponent
 } from "../../utils/conditionalSlot";
 import { getSlotted } from "../../utils/dom";
+import {
+  componentLoaded,
+  LoadableComponent,
+  setComponentLoaded,
+  setUpLoadableComponent
+} from "../../utils/loadable";
 import { connectLocalized, disconnectLocalized, LocalizedComponent } from "../../utils/locale";
 import {
   connectMessages,
@@ -33,7 +38,9 @@ import { ICONS, SLOTS } from "./resources";
   },
   assetsDirs: ["assets"]
 })
-export class ActionGroup implements ConditionalSlotComponent, LocalizedComponent, T9nComponent {
+export class ActionGroup
+  implements ConditionalSlotComponent, LoadableComponent, LocalizedComponent, T9nComponent
+{
   // --------------------------------------------------------------------------
   //
   //  Properties
@@ -103,6 +110,18 @@ export class ActionGroup implements ConditionalSlotComponent, LocalizedComponent
 
   @State() defaultMessages: ActionGroupMessages;
 
+  //--------------------------------------------------------------------------
+  //
+  //  Public Methods
+  //
+  //--------------------------------------------------------------------------
+
+  /** Sets focus on the component's first focusable element. */
+  @Method()
+  async setFocus(): Promise<void> {
+    await componentLoaded(this);
+    this.el.focus();
+  }
   // --------------------------------------------------------------------------
   //
   //  Lifecycle
@@ -122,9 +141,14 @@ export class ActionGroup implements ConditionalSlotComponent, LocalizedComponent
   }
 
   async componentWillLoad(): Promise<void> {
+    setUpLoadableComponent(this);
     await setUpMessages(this);
   }
 
+  componentDidLoad(): void {
+    setComponentLoaded(this);
+  }
+
   // --------------------------------------------------------------------------
   //
   //  Component Methods

diff --git a/src/components/date-picker/date-picker.e2e.ts b/src/components/date-picker/date-picker.e2e.ts
@@ -1,8 +1,7 @@
 import { E2EPage, newE2EPage } from "@stencil/core/testing";
 import { html } from "../../../support/formatting";
-import { defaults, hidden, renders, t9n } from "../../tests/commonTests";
+import { defaults, focusable, hidden, renders, t9n } from "../../tests/commonTests";
 import { skipAnimations } from "../../tests/utils";
-import { dateFromISO } from "../../utils/date";
 import { formatTimePart } from "../../utils/time";
 
 describe("calcite-date-picker", () => {
@@ -18,6 +17,11 @@ describe("calcite-date-picker", () => {
       }
     ]));
 
+  it("focusable", async () =>
+    focusable("<calcite-date-picker></calcite-date-picker>", {
+      shadowFocusTargetSelector: "calcite-date-picker-month-header"
+    }));
+
   const animationDurationInMs = 200;
 
   it("fires a calciteDatePickerChange event when changing year in header", async () => {
@@ -209,7 +213,8 @@ describe("calcite-date-picker", () => {
     await page.setContent("<calcite-date-picker value='2000-11-27'></calcite-date-picker>");
     const date = await page.find("calcite-date-picker");
     const changedEvent = await page.spyOnEvent("calciteDatePickerChange");
-    await date.setProperty("value", "2001-10-28");
+    date.setProperty("value", "2001-10-28");
+    await page.waitForChanges();
     expect(changedEvent).toHaveReceivedEventTimes(0);
   });
 

diff --git a/src/components/date-picker/date-picker.tsx b/src/components/date-picker/date-picker.tsx
@@ -6,6 +6,7 @@ import {
   EventEmitter,
   h,
   Host,
+  Method,
   Prop,
   State,
   VNode,
@@ -19,6 +20,12 @@ import {
   HoverRange,
   setEndOfDay
 } from "../../utils/date";
+import {
+  componentLoaded,
+  LoadableComponent,
+  setComponentLoaded,
+  setUpLoadableComponent
+} from "../../utils/loadable";
 import {
   connectLocalized,
   disconnectLocalized,
@@ -46,7 +53,7 @@ import { DateLocaleData, getLocaleData, getValueAsDateRange } from "./utils";
     delegatesFocus: true
   }
 })
-export class DatePicker implements LocalizedComponent, T9nComponent {
+export class DatePicker implements LocalizedComponent, LoadableComponent, T9nComponent {
   //--------------------------------------------------------------------------
   //
   //  Element
@@ -188,6 +195,19 @@ export class DatePicker implements LocalizedComponent, T9nComponent {
 
   @State() endAsDate: Date;
 
+  //--------------------------------------------------------------------------
+  //
+  //  Public Methods
+  //
+  //--------------------------------------------------------------------------
+
+  /** Sets focus on the component's first focusable element. */
+  @Method()
+  async setFocus(): Promise<void> {
+    await componentLoaded(this);
+    this.el.focus();
+  }
+
   // --------------------------------------------------------------------------
   //
   //  Lifecycle
@@ -218,12 +238,17 @@ export class DatePicker implements LocalizedComponent, T9nComponent {
   }
 
   async componentWillLoad(): Promise<void> {
+    setUpLoadableComponent(this);
     await this.loadLocaleData();
     this.onMinChanged(this.min);
     this.onMaxChanged(this.max);
     await setUpMessages(this);
   }
 
+  componentDidLoad(): void {
+    setComponentLoaded(this);
+  }
+
   render(): VNode {
     const date = dateFromRange(
       this.range && Array.isArray(this.valueAsDate) ? this.valueAsDate[0] : this.valueAsDate,

diff --git a/src/components/dropdown/dropdown.e2e.ts b/src/components/dropdown/dropdown.e2e.ts
@@ -1,23 +1,26 @@
 import { E2EPage, newE2EPage } from "@stencil/core/testing";
 import dedent from "dedent";
 import { html } from "../../../support/formatting";
-import { accessible, defaults, disabled, floatingUIOwner, hidden, renders } from "../../tests/commonTests";
+import { focusable, accessible, defaults, disabled, floatingUIOwner, hidden, renders } from "../../tests/commonTests";
 import { GlobalTestProps } from "../../tests/utils";
 import { CSS } from "./resources";
 
+const simpleDropdownHTML = html`<calcite-dropdown>
+  <calcite-button slot="trigger">Open dropdown</calcite-button>
+  <calcite-dropdown-group id="group-1">
+    <calcite-dropdown-item id="item-1"> Dropdown Item Content </calcite-dropdown-item>
+    <calcite-dropdown-item id="item-2" selected> Dropdown Item Content </calcite-dropdown-item>
+    <calcite-dropdown-item id="item-3"> Dropdown Item Content </calcite-dropdown-item>
+  </calcite-dropdown-group>
+</calcite-dropdown>`;
+
 describe("calcite-dropdown", () => {
-  it("renders", () =>
-    renders(
-      html`<calcite-dropdown>
-        <calcite-button slot="trigger">Open dropdown</calcite-button>
-        <calcite-dropdown-group id="group-1">
-          <calcite-dropdown-item id="item-1"> Dropdown Item Content </calcite-dropdown-item>
-          <calcite-dropdown-item id="item-2" selected> Dropdown Item Content </calcite-dropdown-item>
-          <calcite-dropdown-item id="item-3"> Dropdown Item Content </calcite-dropdown-item>
-        </calcite-dropdown-group>
-      </calcite-dropdown>`,
-      { display: "inline-flex" }
-    ));
+  it("focusable", async () =>
+    focusable(simpleDropdownHTML, {
+      focusTargetSelector: '[slot="trigger"]'
+    }));
+
+  it("renders", () => renders(simpleDropdownHTML, { display: "inline-flex" }));
 
   it("honors hidden attribute", async () => hidden("calcite-dropdown"));
 
@@ -33,18 +36,7 @@ describe("calcite-dropdown", () => {
       }
     ]));
 
-  it("can be disabled", () =>
-    disabled(
-      html`<calcite-dropdown>
-        <calcite-button slot="trigger">Open dropdown</calcite-button>
-        <calcite-dropdown-group id="group-1">
-          <calcite-dropdown-item id="item-1"> Dropdown Item Content </calcite-dropdown-item>
-          <calcite-dropdown-item id="item-2" selected> Dropdown Item Content </calcite-dropdown-item>
-          <calcite-dropdown-item id="item-3"> Dropdown Item Content </calcite-dropdown-item>
-        </calcite-dropdown-group>
-      </calcite-dropdown>`,
-      { focusTarget: "child" }
-    ));
+  it("can be disabled", () => disabled(simpleDropdownHTML, { focusTarget: "child" }));
 
   interface SelectedItemsAssertionOptions {
     /**
@@ -748,7 +740,7 @@ describe("calcite-dropdown", () => {
       expect(calciteDropdownOpen).toHaveReceivedEventTimes(1);
       expect(calciteDropdownClose).toHaveReceivedEventTimes(0);
 
-      await trigger.focus();
+      await element.callMethod("setFocus");
       await page.keyboard.press("Space");
       await page.waitForChanges();
       expect(await dropdownWrapper.isVisible()).toBe(false);
@@ -793,7 +785,7 @@ describe("calcite-dropdown", () => {
       expect(calciteDropdownOpen).toHaveReceivedEventTimes(1);
       expect(calciteDropdownClose).toHaveReceivedEventTimes(0);
 
-      await trigger.focus();
+      await element.callMethod("setFocus");
       await page.keyboard.press("Space");
       await page.waitForChanges();
       expect(await dropdownWrapper.isVisible()).toBe(false);

diff --git a/src/components/dropdown/dropdown.tsx b/src/components/dropdown/dropdown.tsx
@@ -35,6 +35,12 @@ import {
 import { guid } from "../../utils/guid";
 import { InteractiveComponent, updateHostInteraction } from "../../utils/interactive";
 import { isActivationKey } from "../../utils/key";
+import {
+  componentLoaded,
+  LoadableComponent,
+  setComponentLoaded,
+  setUpLoadableComponent
+} from "../../utils/loadable";
 import { createObserver } from "../../utils/observers";
 import {
   connectOpenCloseComponent,
@@ -56,7 +62,9 @@ import { SLOTS } from "./resources";
     delegatesFocus: true
   }
 })
-export class Dropdown implements InteractiveComponent, OpenCloseComponent, FloatingUIComponent {
+export class Dropdown
+  implements InteractiveComponent, LoadableComponent, OpenCloseComponent, FloatingUIComponent
+{
   //--------------------------------------------------------------------------
   //
   //  Element
@@ -185,6 +193,19 @@ export class Dropdown implements InteractiveComponent, OpenCloseComponent, Float
    */
   @Prop({ reflect: true }) width: Scale;
 
+  //--------------------------------------------------------------------------
+  //
+  //  Public Methods
+  //
+  //--------------------------------------------------------------------------
+
+  /** Sets focus on the component's first focusable element. */
+  @Method()
+  async setFocus(): Promise<void> {
+    await componentLoaded(this);
+    this.el.focus();
+  }
+
   //--------------------------------------------------------------------------
   //
   //  Lifecycle
@@ -201,7 +222,12 @@ export class Dropdown implements InteractiveComponent, OpenCloseComponent, Float
     connectOpenCloseComponent(this);
   }
 
+  componentWillLoad(): void {
+    setUpLoadableComponent(this);
+  }
+
   componentDidLoad(): void {
+    setComponentLoaded(this);
     this.reposition(true);
   }
 

diff --git a/src/components/pagination/pagination.e2e.ts b/src/components/pagination/pagination.e2e.ts
@@ -1,11 +1,21 @@
-import { newE2EPage, E2EElement, E2EPage } from "@stencil/core/testing";
-import { accessible, hidden, renders, t9n } from "../../tests/commonTests";
-import { CSS } from "./resources";
+import { E2EElement, E2EPage, newE2EPage } from "@stencil/core/testing";
 import { html } from "../../../support/formatting";
+import { accessible, focusable, hidden, renders, t9n } from "../../tests/commonTests";
+import { CSS } from "./resources";
 
 describe("calcite-pagination", () => {
   it("renders", async () => renders("calcite-pagination", { display: "flex" }));
 
+  it("focuses previous button when not on the first page", async () =>
+    focusable('<calcite-pagination page-size="1" start-item="2" total-items="10"></calcite-pagination>', {
+      shadowFocusTargetSelector: `.${CSS.previous}`
+    }));
+
+  it("focuses page number 1 when on the first page", async () =>
+    focusable('<calcite-pagination page-size="1" start-item="1" total-items="10"></calcite-pagination>', {
+      shadowFocusTargetSelector: `.${CSS.page}`
+    }));
+
   it("honors hidden attribute", async () => hidden("calcite-pagination"));
 
   it("is accessible", async () => accessible(`<calcite-pagination></calcite-pagination>`));