npm - @watermarkinsights/ripple - Versions diffs - 5.7.0-8 → 5.7.0 - Mend

@watermarkinsights/ripple 5.7.0-8 → 5.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (383) hide show

package/dist/collection/components/datepickers/wm-datepicker.e2e.js ADDED Viewed

@@ -0,0 +1,382 @@
+import { newE2EPage } from "@stencil/core/testing";
+import { AxePuppeteer } from "@axe-core/puppeteer";
+describe("wm-datepicker", () => {
+    let page, component, input, btn, popup, popupTitleDay;
+    beforeEach(async () => {
+        page = await newE2EPage();
+        await page.setContent(`<html lang='en'><head><title>Page</title></head><body><main><h1>Title</h1>
+      <wm-datepicker id="dp" label="label"></wm-datepicker>
+      </main></body></html>`);
+        component = await page.find("wm-datepicker");
+        input = await page.find("wm-datepicker >>> input");
+        btn = await page.find("wm-datepicker >>> #toggle");
+        popup = await page.find("wm-datepicker >>> #popup");
+        popupTitleDay = await page.find("wm-datepicker >>> #popup-title-month");
+        // await page.keyboard.press("Tab");
+        // await page.waitForChanges();
+    });
+    it("passes Axe checks", async () => {
+        const results = await new AxePuppeteer(page).analyze();
+        expect(results.violations.length).toBe(0);
+    });
+    // TODO
+    // see https://dequeuniversity.com/checklists/web/form-validation-feedback
+    // for Dynamic Error Detection / Error messages
+    // see also role="alert"
+    /* INPUT */
+    // See datepicker-input.e2e.ts
+    /* BUTTON */
+    // Opening and closing the date picker
+    it("opens at today's date by default", async () => {
+        const popup = await page.find("wm-datepicker >>> .popup");
+        const today = new Date();
+        const year = today.getUTCFullYear();
+        const month = (today.getUTCMonth() + 1).toString().padStart(2, "0");
+        const day = today.getUTCDate().toString();
+        const dateTable = await popup.find("[role='grid']");
+        // await page.waitForChanges();
+        const selDate = await dateTable.find("[aria-selected='true']");
+        expect(selDate).toEqualAttribute("data-year", year);
+        expect(selDate).toEqualAttribute("data-month", month);
+        expect(selDate.textContent).toBe(day);
+    });
+    it("opens at the date in the input if there is one", async () => {
+        const input = await page.find("wm-datepicker >>> input");
+        const popup = await page.find("wm-datepicker >>> .popup");
+        await input.type("02/01/2030");
+        await component.setProperty("calendarDate", "2030-02-01");
+        await page.waitForChanges();
+        await page.keyboard.press("Tab");
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        const dateTable = await popup.find("[role='grid']");
+        const selDate = await dateTable.find("[aria-selected='true']");
+        expect(selDate).toEqualAttribute("data-year", "2030");
+        expect(selDate).toEqualAttribute("data-month", "02");
+        expect(selDate.textContent).toBe("1");
+    });
+    it("Closes the popup when user triggers the calendar button", async () => {
+        const popup = await page.find("wm-datepicker >>> .popup");
+        await page.keyboard.press("Tab"); // in input
+        await page.keyboard.press("Tab"); // on btn
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        expect(popup).toHaveClass("open");
+        await page.keyboard.press("Escape");
+        await page.waitForChanges();
+        expect(popup).not.toHaveClass("open");
+    });
+    /* POPUP */
+    it("closes the calendar popup when the user presses ESCAPE", async () => {
+        await input.type("02/03/2019");
+        await component.setProperty("calendarDate", "2019-02-03");
+        await page.waitForChanges();
+        await page.keyboard.press("Tab");
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        await page.keyboard.press("Escape");
+        await page.waitForChanges();
+        expect(popup).not.toHaveClass("open");
+    });
+    it("shows the next month on PAGE DOWN and shows the previous month on PAGE UP", async () => {
+        await input.type("02/03/2019");
+        await component.setProperty("calendarDate", "2019-02-03");
+        await page.waitForChanges();
+        await page.keyboard.press("Tab");
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        await page.keyboard.press("PageDown");
+        await page.waitForChanges();
+        expect(popupTitleDay.textContent).toBe("March 2019");
+        let activeElId = await page.evaluate(() => document.activeElement.shadowRoot.activeElement.id);
+        expect(activeElId).toEqual("cell-20190303");
+        await page.keyboard.press("PageUp");
+        await page.waitForChanges();
+        await page.keyboard.press("PageUp");
+        await page.waitForChanges();
+        await page.keyboard.press("PageUp");
+        await page.waitForChanges();
+        activeElId = await page.evaluate(() => document.activeElement.shadowRoot.activeElement.id);
+        expect(activeElId).toEqual("cell-20181203");
+    });
+    it("handles HOME and END keys", async () => {
+        await input.type("02/15/2020");
+        await component.setProperty("calendarDate", "2020-02-15");
+        await page.waitForChanges();
+        await page.keyboard.press("Tab");
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        await page.keyboard.press("Home");
+        await page.waitForChanges();
+        const firstDayOfMonth = await page.evaluate(() => document.activeElement.shadowRoot.activeElement.id);
+        expect(firstDayOfMonth).toEqual("cell-20200201");
+        await page.keyboard.press("End");
+        await page.waitForChanges();
+        const lastDayOfMonth = await page.evaluate(() => document.activeElement.shadowRoot.activeElement.id);
+        expect(lastDayOfMonth).toEqual("cell-20200229"); // 2020 is a leap year
+    });
+    it("navigates the calendar with keyboard (day view)", async () => {
+        // left/right: -1 / +1 in the row
+        // up/down
+        await input.type("08/15/2024");
+        await component.setProperty("calendarDate", "2024-08-15");
+        await page.keyboard.press("Tab"); // on the toggle popup btn
+        await page.waitForChanges();
+        await page.keyboard.press("Enter"); // open popup
+        await page.waitForChanges();
+        await page.keyboard.press("ArrowLeft");
+        await page.waitForChanges();
+        let focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        await page.waitForChanges();
+        expect(focusedCell).toEqualAttribute("id", "cell-20240814");
+        await page.keyboard.press("ArrowUp");
+        await page.waitForChanges();
+        focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        expect(focusedCell).toEqualAttribute("id", "cell-20240807");
+        await page.keyboard.press("ArrowRight");
+        await page.waitForChanges();
+        focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        expect(focusedCell).toEqualAttribute("id", "cell-20240808");
+        await page.keyboard.press("ArrowDown");
+        await page.waitForChanges();
+        focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        expect(focusedCell).toEqualAttribute("id", "cell-20240815");
+    });
+    it("navigates the calendar with keyboard (month view)", async () => {
+        await input.type("08/15/2024");
+        await component.setProperty("calendarDate", "2024-08-15");
+        await page.keyboard.press("Tab"); // on the toggle popup btn
+        await page.waitForChanges();
+        await page.keyboard.press("Enter"); // open popup
+        await page.keyboard.down("Shift");
+        await page.waitForChanges();
+        await page.keyboard.press("Tab"); // next btn
+        await page.waitForChanges();
+        await page.keyboard.press("Tab"); // popup-title (month + year)
+        await page.waitForChanges();
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        await page.keyboard.up("Shift");
+        await page.waitForChanges();
+        await page.keyboard.press("ArrowLeft");
+        await page.waitForChanges();
+        let focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        await page.waitForChanges();
+        expect(focusedCell).toEqualAttribute("id", "month-6"); // month is july (7), 0-indexed
+        await page.keyboard.press("ArrowUp");
+        await page.waitForChanges();
+        focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        expect(focusedCell).toEqualAttribute("id", "month-3");
+        await page.keyboard.press("ArrowRight");
+        await page.waitForChanges();
+        focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        expect(focusedCell).toEqualAttribute("id", "month-4");
+        await page.keyboard.press("ArrowDown");
+        await page.waitForChanges();
+        focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        expect(focusedCell).toEqualAttribute("id", "month-7");
+    });
+    // it("goes to the year view when the month name is clicked", async () => {
+    //  // (i.e. allows selection of a month)
+    // });
+    it("goes to the previous/next month when the arrow button is triggered in day view", async () => {
+        await input.type("11/29/1999");
+        await component.setProperty("calendarDate", "1999-11-29");
+        await page.keyboard.press("Tab"); // on the toggle popup btn
+        await page.waitForChanges();
+        await page.keyboard.press("Enter"); // open popup
+        await page.waitForChanges();
+        await page.keyboard.down("Shift");
+        await page.waitForChanges();
+        await page.keyboard.press("Tab"); // next btn
+        await page.waitForChanges();
+        await page.keyboard.press("Tab"); // popup-title (month + year)
+        await page.waitForChanges();
+        await page.keyboard.press("Tab"); // prev btn
+        await page.waitForChanges();
+        await page.keyboard.up("Shift");
+        await page.waitForChanges();
+        await page.keyboard.press("Enter"); // press prev btn
+        await page.waitForChanges();
+        expect(popup).toHaveClasses(["open", "day-view"]);
+        expect(popupTitleDay.textContent).toBe("October 1999");
+        await page.keyboard.press("Tab"); // popup title btn
+        await page.keyboard.press("Tab"); // next btn
+        await page.keyboard.press("Enter"); // press next btn
+        await page.waitForChanges();
+        await page.keyboard.press("Enter"); // press next btn
+        await page.waitForChanges();
+        expect(popupTitleDay.textContent).toBe("December 1999");
+    });
+    it("goes to the previous/next year when the arrow button is clicked in month view", async () => {
+        await input.type("11/29/1999");
+        await component.setProperty("calendarDate", "1999-11-29");
+        await page.waitForChanges();
+        await page.keyboard.press("Tab"); // on the toggle popup btn
+        await page.waitForChanges();
+        await page.keyboard.press("Enter"); // open popup
+        await page.waitForChanges();
+        await page.keyboard.down("Shift");
+        await page.keyboard.press("Tab"); // next btn
+        await page.waitForChanges();
+        await page.keyboard.press("Tab"); // month view btn
+        await page.waitForChanges();
+        await page.keyboard.up("Shift");
+        await page.waitForChanges();
+        await page.keyboard.press("Enter"); // press month view btn
+        await page.waitForChanges();
+        expect(popup).toHaveClasses(["open", "month-view"]);
+        const title = await popup.find("#popup-title-year");
+        expect(title.textContent).toBe("1999");
+        await page.keyboard.down("Shift");
+        await page.keyboard.press("Tab"); // next btn
+        await page.keyboard.up("Shift");
+        await page.keyboard.press("Enter"); // press next btn
+        await page.waitForChanges();
+        expect(title.textContent).toBe("2000");
+        await page.keyboard.down("Shift");
+        await page.keyboard.press("Tab"); // year btn
+        await page.keyboard.down("Shift");
+        await page.keyboard.press("Tab"); // prev btn
+        await page.keyboard.up("Shift");
+        await page.keyboard.press("Enter"); // press prev btn
+        await page.waitForChanges();
+        expect(title.textContent).toBe("1999");
+        await page.keyboard.press("Enter"); // press prev btn
+        await page.waitForChanges();
+        await page.keyboard.press("Enter"); // press prev btn
+        await page.waitForChanges();
+        expect(title.textContent).toBe("1997");
+    });
+    it("has the aria attributes related to the popup", async () => {
+        // NB "If the element with the aria-expanded attribute controls the expansion of another grouping container
+        // that is not 'owned by' the element, the author SHOULD reference the container by using the aria-controls attribute."
+        // src: https://www.w3.org/TR/wai-aria-1.1/#aria-expanded
+        expect(btn).toHaveAttribute("aria-expanded");
+        // Not sure is aria-haspopup is necessary. If it is present the popup should have a role
+        // if that role is grid (the only role that seems to correspond) then the cells must have
+        // a role of gridcell
+        // https://www.w3.org/TR/wai-aria/#aria-haspopup
+        // expect(btn).toHaveAttribute("aria-haspopup");
+        //Removed aria-controls since the popup comes immediately after the aria-expanded controller:
+        //https://www.heydonworks.com/article/aria-controls-is-poop
+    });
+    it("toggles aria-expanded attribute", async () => {
+        expect(btn).toEqualAttribute("aria-expanded", "false");
+        await page.keyboard.press("Tab");
+        await page.keyboard.press("Tab");
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        expect(btn).toEqualAttribute("aria-expanded", "true");
+    });
+    it("properly fills the-label on table cells", async () => {
+        // screen reader should read "Thursday, May 10 2018" on focus
+        // screen reader should read "Thursday, May 10 2018, selected" on select
+        await input.type("05/10/2018");
+        await component.setProperty("calendarDate", "2018-05-10");
+        await page.waitForChanges();
+        await page.keyboard.press("Tab");
+        await page.waitForChanges();
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        const focusedCell = await popup.find("[role='gridcell'][tabindex='0']");
+        await page.waitForChanges();
+        // day of the week is read by sr bcse it's the table column
+        expect(focusedCell).toEqualAttribute("aria-label", "Thursday, May 10, 2018");
+        // screen reader should read "Thursday, May 10 2018, selected" on select
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        const selCell = await popup.find("[aria-selected='true']");
+        // day of the week is read by sr bcse it's the table column
+        expect(selCell).toEqualAttribute("aria-label", "Thursday, May 10, 2018");
+    });
+    it("aligns dates properly", async () => {
+        // -> check that both 01/01/1999 and 12/31/2100 are in the Friday column
+        // couldn't figure this one out...
+    });
+    it("emits event on input blur", async () => {
+        page = await newE2EPage();
+        await page.setContent(`<html lang='en'><head><title>Page</title></head><body><main><h1>Title</h1>
+      <wm-datepicker id="dp" label="label"></wm-datepicker>
+      <div id="indicator">no event heard</div>
+      </main></body></html>`);
+        component = await page.find("wm-datepicker");
+        input = await page.find("wm-datepicker >>> input");
+        await page.waitForChanges();
+        await page.evaluate(async () => {
+            const indicator = document.querySelector("#indicator");
+            await document.addEventListener("wmDatepickerInputBlurred", () => (indicator.textContent = "event heard"));
+        });
+        await page.waitForChanges;
+        const indicator = await page.find("#indicator");
+        expect(indicator.textContent).toBe("no event heard");
+        await input.type("05/10/2018");
+        await page.keyboard.press("Tab");
+        await page.waitForChanges();
+        expect(indicator.textContent).toBe("event heard");
+    });
+    it("emits event on change", async () => {
+        page = await newE2EPage();
+        await page.setContent(`<html lang='en'><head><title>Page</title></head><body><main><h1>Title</h1>
+      <wm-datepicker id="dp" label="label"></wm-datepicker>
+      <div id="indicator">events heard: 0</div>
+      </main></body></html>`);
+        component = await page.find("wm-datepicker");
+        input = await page.find("wm-datepicker >>> input");
+        await page.waitForChanges();
+        await page.evaluate(async () => {
+            const indicator = document.querySelector("#indicator");
+            await document
+                .querySelector("wm-datepicker")
+                .addEventListener("change", () => (indicator.textContent =
+                indicator.textContent.slice(0, -1) + (parseInt(indicator.textContent.slice(-1)) + 1)));
+        });
+        await page.waitForChanges;
+        const indicator = await page.find("#indicator");
+        expect(indicator.textContent).toBe("events heard: 0");
+        // user types date
+        await input.type("05/10/2018");
+        await page.keyboard.press("Tab");
+        await page.waitForChanges();
+        expect(indicator.textContent).toBe("events heard: 1");
+        // user selects date from calendar
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        await page.keyboard.press("ArrowRight");
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        expect(indicator.textContent).toBe("events heard: 2");
+    });
+    it("emits event with date on cell selection", async () => {
+        page = await newE2EPage();
+        await page.setContent(`<html lang='en'><head><title>Page</title></head><body><main><h1>Title</h1>
+      <wm-datepicker id="dp" value="12/30/1999" label="label"></wm-datepicker>
+      <div id="indicator"></div>
+      </main></body></html>`);
+        component = await page.find("wm-datepicker");
+        input = await page.find("wm-datepicker >>> input");
+        await page.waitForChanges();
+        await page.evaluate(async () => {
+            const indicator = document.querySelector("#indicator");
+            await document.querySelector("wm-datepicker").addEventListener("wmDatepickerDateSelected", (ev) => (indicator.textContent =
+                //@ts-ignore
+                `date received: ${ev.detail.date}`));
+        });
+        await page.waitForChanges;
+        const indicator = await page.find("#indicator");
+        // user types date
+        await page.keyboard.press("Tab");
+        await page.keyboard.press("Tab");
+        await page.waitForChanges();
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        await page.keyboard.press("Enter");
+        await page.waitForChanges();
+        expect(indicator.textContent).toBe("date received: 1999-12-30");
+    });
+});
+// Sources:
+// https://watermarkinsights.atlassian.net/browse/DNP-3411
+// https://watermarkinsights.atlassian.net/browse/DNP-4318
+// https://axesslab.com/accessible-datepickers/
+// https://www.w3.org/WAI/PF/HTML/wiki/Datepickers

package/dist/collection/components/datepickers/wm-datepicker.js CHANGED Viewed

@@ -212,23 +212,23 @@ export class DatePicker {
         this.liveRegionEl.textContent = message;
     }
     render() {
-        return (h(Host, { key: 'daac54e642a4c00b37dff5167cf0fd3322b98874', "aria-busy": "false", class: `${this.errorMessage ? "invalid" : ""}` }, h("div", { key: '0633196770bcd3965a8fe60ecd1972653ed3e25c', ref: (d) => (this.dpWrapperEl = d), class: `wrapper label-${this.labelPosition} ${this.errorMessage ? "invalid" : ""}` }, h("div", { key: 'ba80e128d0345635d90c4641c508d05eb4d3794e', class: "label-wrapper", ref: (e) => (this.labelWrapperEl = e) }, this.labelPosition !== "none" && (h("label", { key: '4905e937c7e6249537c5ed43f77331883d006794', id: "datepickerLabel", htmlFor: "date-input", class: "label", title: `${this.label} (${this.dateFormat})` }, this.label, this.requiredField && (h("span", { key: '637e35c7f255629aa75cf177822154a1e6e6e7b3', "aria-hidden": "true", class: "required" }, "*"))))), h("div", { key: '8676b6e03022cd8787d0a77a0b3e6c4dd8419b59' }, h("div", { key: 'e9f24478e3beb32f38ef65aff197d7872e1f3d67', class: "single-wrapper input" }, h("input", { key: '4661fedeafd62c45e1aec2aad699faede4d750b6', disabled: this.isDisabled, type: "text", id: "single-date-input", class: "date-input", name: "date", placeholder: this.dateFormat, value: this.value, onFocus: () => this.handleInputFocus(), onInput: (ev) => this.handleInput(ev), onBlur: () => this.handleInputBlur(), onChange: () => this.handleInputChange(), ref: (input) => (this.inputEl = input), "aria-describedby": "error", "aria-label": this.label, "aria-required": this.requiredField ? "true" : null }), h("div", { key: '0a2afc12a5e44bcb8a9deb92c7171945c67289f4', class: "container", id: "wm-container" }, h("button", { key: 'b6b63ef23dee93ff470de4d5a5d2769086bcb808', disabled: this.disabled, onClick: this.togglePopup.bind(this), "aria-label": intl.formatMessage({
+        return (h(Host, { "aria-busy": "false", class: `${this.errorMessage ? "invalid" : ""}` }, h("div", { ref: (d) => (this.dpWrapperEl = d), class: `wrapper label-${this.labelPosition} ${this.errorMessage ? "invalid" : ""}` }, h("div", { class: "label-wrapper", ref: (e) => (this.labelWrapperEl = e) }, this.labelPosition !== "none" && (h("label", { id: "datepickerLabel", htmlFor: "date-input", class: "label", title: `${this.label} (${this.dateFormat})` }, this.label, this.requiredField && (h("span", { "aria-hidden": "true", class: "required" }, "*"))))), h("div", null, h("div", { class: "single-wrapper input" }, h("input", { disabled: this.isDisabled, type: "text", id: "single-date-input", class: "date-input", name: "date", placeholder: this.dateFormat, value: this.value, onFocus: () => this.handleInputFocus(), onInput: (ev) => this.handleInput(ev), onBlur: () => this.handleInputBlur(), onChange: () => this.handleInputChange(), ref: (input) => (this.inputEl = input), "aria-describedby": "error", "aria-label": this.label, "aria-required": this.requiredField ? "true" : null }), h("div", { class: "container", id: "wm-container" }, h("button", { disabled: this.disabled, onClick: this.togglePopup.bind(this), "aria-label": intl.formatMessage({
                 id: "date.selectDate",
                 defaultMessage: "Select date",
                 description: "Button text for screen readers.",
-            }), "aria-describedby": "single-date-input", ref: (el) => (this.toggleEl = el), "aria-expanded": `${this.isExpanded}`, class: "toggle", id: "toggle" }, h("span", { key: 'debb3ae89f32960a7a269b9f6c951f5bb7bfd874', class: "calendar", title: intl.formatMessage({
+            }), "aria-describedby": "single-date-input", ref: (el) => (this.toggleEl = el), "aria-expanded": `${this.isExpanded}`, class: "toggle", id: "toggle" }, h("span", { class: "calendar", title: intl.formatMessage({
                 id: "date.calendarView",
                 defaultMessage: "Calendar View",
                 description: "Calendar button",
-            }) })), h("div", { key: '87ff9723a2960d5725f5f731dcc0d30719a8bb09', class: `popup-wrapper ${this.calEl && this.calEl.view}-view ${this.openUp ? "expand-upwards" : ""}`, id: "popup-wrapper", ref: (el) => (this.popupEl = el), onClick: () => (this.popupClicked = true) }, h("div", { key: '989a9bc4bd537394bfb2fe1ecd83311bb57187d4', tabIndex: 0, onFocus: () => this.calEl.focusLastFocusable() }), h("priv-calendar", { key: '3253b7e256dc7137aae2c4c2a79099e0093ecc65', ref: (el) => (this.calEl = el), startDate: this.calendarDate, focusDate: this.calendarDate, class: "inside" }), h("div", { key: '9cacded01a3163bebd249d6ed4601ca9a6c3dfd0', tabIndex: 0, onFocus: () => this.calEl.focusFirstFocusable() })), h("div", { key: 'fe890d55779f0619bc6c144d1fd47cc2cb26fe04', id: "live-region", "aria-live": "polite", "aria-relevant": "text", class: "sr-only" }), h("div", { key: '71e28a0c1aaa2c1ddce511bfbf0d9cf6794382ab', id: "month-title", class: "sr-only" }, intl.formatMessage({
+            }) })), h("div", { class: `popup-wrapper ${this.calEl && this.calEl.view}-view ${this.openUp ? "expand-upwards" : ""}`, id: "popup-wrapper", ref: (el) => (this.popupEl = el), onClick: () => (this.popupClicked = true) }, h("div", { tabIndex: 0, onFocus: () => this.calEl.focusLastFocusable() }), h("priv-calendar", { ref: (el) => (this.calEl = el), startDate: this.calendarDate, focusDate: this.calendarDate, class: "inside" }), h("div", { tabIndex: 0, onFocus: () => this.calEl.focusFirstFocusable() })), h("div", { id: "live-region", "aria-live": "polite", "aria-relevant": "text", class: "sr-only" }), h("div", { id: "month-title", class: "sr-only" }, intl.formatMessage({
             id: "date.selectMonth",
             defaultMessage: "Activate to select a month.",
             description: "Calendar button",
-        })), h("div", { key: '2df13fae273fd2186e35d50ab58d888b45bf0b40', id: "year-title", class: "sr-only" }, intl.formatMessage({
+        })), h("div", { id: "year-title", class: "sr-only" }, intl.formatMessage({
             id: "date.selectYear",
             defaultMessage: "Activate to select a year.",
             description: "Calendar button",
-        })))), h("div", { key: '71ca47b61c3ffd7e19c273ae3e4c68a7f3ef1afd', id: "error", class: "error" }, this.errorMessage), h("div", { key: '5adc31a91d03cd34d01e48a88617481051905341', ref: (el) => (this.liveRegionEl = el), class: "sr-only", "aria-live": "polite", "aria-atomic": "true" })))));
+        })))), h("div", { id: "error", class: "error" }, this.errorMessage), h("div", { ref: (el) => (this.liveRegionEl = el), class: "sr-only", "aria-live": "polite", "aria-atomic": "true" })))));
     }
     static get is() { return "wm-datepicker"; }
     static get encapsulation() { return "shadow"; }
@@ -433,17 +433,14 @@ export class DatePicker {
                 "complexType": {
                     "signature": "(inputFormat: string, outputFormat: string, date?: string) => Promise<string>",
                     "parameters": [{
-                            "name": "inputFormat",
-                            "type": "string",
-                            "docs": ""
+                            "tags": [],
+                            "text": ""
                         }, {
-                            "name": "outputFormat",
-                            "type": "string",
-                            "docs": ""
+                            "tags": [],
+                            "text": ""
                         }, {
-                            "name": "date",
-                            "type": "string | undefined",
-                            "docs": ""
+                            "tags": [],
+                            "text": ""
                         }],
                     "references": {
                         "Promise": {
@@ -462,9 +459,8 @@ export class DatePicker {
                 "complexType": {
                     "signature": "(input?: string) => Promise<boolean>",
                     "parameters": [{
-                            "name": "input",
-                            "type": "string | undefined",
-                            "docs": ""
+                            "tags": [],
+                            "text": ""
                         }],
                     "references": {
                         "Promise": {

package/dist/collection/components/datepickers/wm-datepicker.spec.js ADDED Viewed

@@ -0,0 +1,21 @@
+import { newSpecPage } from "@stencil/core/testing";
+import * as globalFunctions from "../../global/functions";
+jest.spyOn(globalFunctions, "generateId").mockReturnValue("random-id");
+import { DatePicker } from "./wm-datepicker";
+describe("wm-datepicker", () => {
+    it("builds", async () => {
+        const comp = await newSpecPage({
+            components: [DatePicker],
+            html: '<wm-datepicker label="mock label"></wm-datepicker>',
+        });
+        expect(comp.root).toMatchSnapshot();
+    });
+    it("sets input to required", async () => {
+        const page = await newSpecPage({
+            components: [DatePicker],
+            html: `<wm-datepicker label='datepicker' required-field='true'></wm-datepicker>`,
+        });
+        const input = await page.root.shadowRoot.querySelector("input");
+        expect(input).toEqualAttribute("aria-required", "true");
+    });
+});

package/dist/collection/components/selects/priv-option-list/priv-option-list.css CHANGED Viewed

@@ -31,8 +31,6 @@
    -------------------------------------- */
 .search {
   box-sizing: border-box;
-  border-bottom: 2px solid;
-  border-color: var(--wmcolor-select-option-border);
   padding: 1.25rem;
 }
 .search .searchfield-wrapper {
@@ -86,10 +84,7 @@
   width: 100%;
   cursor: pointer;
   padding: 1.25rem;
-  border: none;
   margin: 0;
-  border-bottom: 2px solid;
-  border-color: var(--wmcolor-select-option-border);
   background: var(--wmcolor-select-option-background);
   font-family: inherit;
   font-size: inherit;
@@ -110,17 +105,32 @@
   background: var(--wmcolor-select-option-background-focus);
 }
+.return-btn,
+.select-all,
+.search {
+  border: none;
+}
+.return-btn:not(:last-child),
+.select-all:not(:last-child),
+.search:not(:last-child) {
+  border-bottom: 2px solid;
+  border-color: var(--wmcolor-select-option-border);
+}
 .options-wrapper {
   overflow-y: auto;
   max-height: var(--max-height);
 }
+.non-options-wrapper {
+  border-bottom: 1px solid var(--wmcolor-border-dark);
+}
 .return-btn {
   display: flex;
   align-items: center;
   font-weight: 600;
   font-size: 0.875rem;
-  border-bottom: 1px solid #4a4a4a;
 }
 .return-btn:before {
   display: inline-block;
@@ -132,5 +142,15 @@
   -moz-osx-font-smoothing: grayscale;
   content: "\f141";
   pointer-events: none;
+  padding-right: 0.5rem;
   font-size: 1.28rem;
+}
+.return-btn .return-btn-label {
+  display: flex;
+  flex-grow: 1;
+  justify-content: space-between;
+}
+.return-btn .return-btn-label .selection-count {
+  font-weight: 400;
+  font-style: italic;
 }

package/dist/collection/components/selects/priv-option-list/priv-option-list.js CHANGED Viewed

@@ -285,6 +285,7 @@ export class PrivOptionList {
         }
     }
     close() {
+        this.listboxEl.scrollTop = 0;
         if (this.multiple) {
             this.updateOptionVisibility();
         }
@@ -368,10 +369,21 @@ export class PrivOptionList {
         this.announcement = message;
     }
     renderReturnBtn() {
+        const selectionCount = this.childOptions.filter((o) => o.selected).length;
+        const singleSelectionCountMessage = intl.formatMessage({
+            id: "select.optgroupSingleSelectionCount",
+            defaultMessage: "Item Selected",
+            description: "Text indicating number of selected in a group, where only a single selection is possible.",
+        }, { numSelected: selectionCount });
+        const multipleSelectionCountMessage = intl.formatMessage({
+            id: "select.optgroupMultipleSelectionCount",
+            defaultMessage: "{numSelected} Selected",
+            description: "Text indicating number of selected in a group, where multiple selections are possible.",
+        }, { numSelected: selectionCount });
         return (h("button", { ref: (el) => (this.returnBtnEl = el), id: "return-btn", class: "return-btn", onKeyDown: (ev) => this.handleKeyDown(ev), onClick: () => {
                 //@ts-ignore -- Check out this one weird trick TypeScript doesn't want you to know about
                 this.el.getRootNode().host.isExpanded = false;
-            } }, this.optgroupLabel));
+            } }, h("div", { class: "return-btn-label" }, this.optgroupLabel, selectionCount > 0 && (h("span", { class: "selection-count" }, this.multiple ? multipleSelectionCountMessage : singleSelectionCountMessage)))));
     }
     renderSearchField() {
         return (h("div", { class: "search" }, h("div", { class: "searchfield-wrapper", ref: (el) => (this.searchFieldWrapperEl = el) }, h("div", { class: "icon" }), h("input", { ref: (el) => (this.searchFieldEl = el), class: "searchfield", role: "combobox", "aria-controls": "list",
@@ -390,8 +402,11 @@ export class PrivOptionList {
             return (h("wm-option", { class: "clone", subinfo: option.subinfo, selected: option.selected }, option.textContent));
         });
     }
+    renderNonOptions() {
+        return (h("div", { class: "non-options-wrapper" }, this.isInNestedSelect && this.renderReturnBtn(), this.search && this.renderSearchField(), this.visibleSelectAllButton && this.renderSelectAllButton()));
+    }
     render() {
-        return (h("div", { key: '7597806482ea7bf73439a41c22b2dc2d0e3047ff', class: "list-wrapper" }, this.isInNestedSelect && this.renderReturnBtn(), this.search && this.renderSearchField(), this.visibleSelectAllButton && this.renderSelectAllButton(), h("div", { key: '5a74fb5303a7631bf76dc5be9ef637d03f9bc132', id: "list", class: "options-wrapper", tabindex: -1, role: "listbox", "aria-multiselectable": this.multiple ? "true" : null, "aria-labelledby": "label", ref: (el) => (this.listboxEl = el), style: { "--max-height": this.effectiveMaxHeight } }, this.searchTerm && this.filteredOptions.length === 0 && this.renderSearchFailedMessage(), this.multiple && this.renderCloneOptions(), h("slot", { key: 'bcb6e4c35ebd1ee5a9a4295f5eff61072e2dd8a1' })), h("div", { key: 'c1c11fb35beca1207598239727a61939fe996697', id: "optionlist-announcement", "aria-live": "polite", "aria-atomic": "true", class: "sr-only", ref: (el) => (this.liveRegionEl = el) }, this.announcement)));
+        return (h("div", { class: "list-wrapper" }, (this.isInNestedSelect || this.search || this.visibleSelectAllButton) && this.renderNonOptions(), h("div", { id: "list", class: "options-wrapper", tabindex: -1, role: "listbox", "aria-multiselectable": this.multiple ? "true" : null, "aria-labelledby": "label", ref: (el) => (this.listboxEl = el), style: { "--max-height": this.effectiveMaxHeight } }, this.searchTerm && this.filteredOptions.length === 0 && this.renderSearchFailedMessage(), this.multiple && this.renderCloneOptions(), h("slot", null)), h("div", { id: "optionlist-announcement", "aria-live": "polite", "aria-atomic": "true", class: "sr-only", ref: (el) => (this.liveRegionEl = el) }, this.announcement)));
     }
     static get is() { return "priv-option-list"; }
     static get originalStyleUrls() {
@@ -675,9 +690,8 @@ export class PrivOptionList {
                 "complexType": {
                     "signature": "(option: HTMLElement) => Promise<void>",
                     "parameters": [{
-                            "name": "option",
-                            "type": "HTMLElement",
-                            "docs": ""
+                            "tags": [],
+                            "text": ""
                         }],
                     "references": {
                         "Promise": {
@@ -700,9 +714,8 @@ export class PrivOptionList {
                 "complexType": {
                     "signature": "(optionToSelect?: \"next\" | \"previous\") => Promise<void>",
                     "parameters": [{
-                            "name": "optionToSelect",
-                            "type": "\"next\" | \"previous\" | undefined",
-                            "docs": ""
+                            "tags": [],
+                            "text": ""
                         }],
                     "references": {
                         "Promise": {

package/dist/collection/components/selects/wm-nested-select/wm-nested-select.css CHANGED Viewed

@@ -218,9 +218,9 @@
   margin-left: 0.5rem;
 }
 .button-wrapper > .displayedoption[disabled] {
-  color: #6b6b6b;
-  border-color: #8a8a8a;
-  background: #f0f0f0;
+  color: var(--wmcolor-select-option-text-disabled);
+  border-color: var(--wmcolor-border-dark);
+  background: var(--wmcolor-select-option-background-disabled);
   cursor: default;
 }
@@ -353,11 +353,11 @@
   padding-right: 0.5rem;
   font-size: 1.12rem;
 }
-.menu :focus-visible {
+.menu .menuitem:focus-visible {
   outline: none;
   background: var(--wmcolor-interactive-background-focus);
 }
-.menu :hover {
+.menu .menuitem:hover {
   background: var(--wmcolor-select-option-background-hover);
   outline: none;
 }