fix(panel): tweak focusable content area

packages/calcite-components/src/components/checkbox/checkbox.e2e.ts

@@ -36,7 +36,15 @@ describe("calcite-checkbox", () => {
   });
 
   describe("disabled", () => {
-    disabled("calcite-checkbox");
+    disabled("calcite-checkbox", {
+      focusTarget: {
+        tab: "calcite-checkbox",
+        click: {
+          pointer: "calcite-checkbox",
+          method: "calcite-checkbox",
+        },
+      },
+    });
   });
 
   it("renders with correct default attributes", async () => {

packages/calcite-components/src/components/combobox/combobox.e2e.ts

@@ -164,7 +164,15 @@ describe("calcite-combobox", () => {
   });
 
   describe("disabled", () => {
-    disabled("calcite-combobox");
+    disabled("calcite-combobox", {
+      focusTarget: {
+        tab: "calcite-combobox",
+        click: {
+          pointer: "calcite-combobox",
+          method: "calcite-combobox",
+        },
+      },
+    });
   });
 
   const simpleComboboxHTML = html`

packages/calcite-components/src/components/flow-item/flow-item.e2e.ts

@@ -13,6 +13,7 @@ import {
 } from "../../tests/commonTests";
 import { html } from "../../../support/formatting";
 import { GlobalTestProps } from "../../tests/utils";
+import { scrollingContentHtml, scrollingHeightStyle } from "../panel/panel.e2e";
 import { IDS as PanelIDS } from "../panel/resources";
 import { CSS, SLOTS } from "./resources";
 
@@ -124,7 +125,24 @@ describe("calcite-flow-item", () => {
   });
 
   describe("disabled", () => {
-    disabled(`<calcite-flow-item closable>scrolling content</calcite-flow-item>`);
+    disabled(html`<calcite-flow-item style="${scrollingHeightStyle}">${scrollingContentHtml}</calcite-flow-item>`, {
+      focusTarget: {
+        tab: "calcite-flow-item",
+        click: "body",
+      },
+    });
+
+    describe("closable", () => {
+      disabled(
+        html`<calcite-flow-item closable style="${scrollingHeightStyle}">${scrollingContentHtml}</calcite-flow-item>`,
+        {
+          focusTarget: {
+            tab: "calcite-flow-item",
+            click: "body",
+          },
+        },
+      );
+    });
   });
 
   describe("accessible", () => {

packages/calcite-components/src/components/input-date-picker/input-date-picker.e2e.ts

@@ -66,7 +66,15 @@ describe("calcite-input-date-picker", () => {
   });
 
   describe("disabled", () => {
-    disabled("calcite-input-date-picker");
+    disabled("calcite-input-date-picker", {
+      focusTarget: {
+        tab: "calcite-input-date-picker",
+        click: {
+          pointer: "calcite-input-date-picker",
+          method: "calcite-input-date-picker",
+        },
+      },
+    });
   });
 
   describe("openClose", () => {

packages/calcite-components/src/components/panel/panel.e2e.ts

@@ -30,6 +30,55 @@ const panelTemplate = (scrollable = false) =>
     </calcite-panel>
   </div>`;
 
+export const scrollingContentHtml = html`
+  <p>
+    Enim nascetur erat faucibus ornare varius arcu fames bibendum habitant felis elit ante. Nibh morbi massa curae; leo
+    semper diam aenean congue taciti eu porta. Varius faucibus ridiculus donec. Montes sit ligula purus porta ante lacus
+    habitasse libero cubilia purus! In quis congue arcu maecenas felis cursus pellentesque nascetur porta donec non.
+    Quisque, rutrum ligula pharetra justo habitasse facilisis rutrum neque. Magnis nostra nec nulla dictumst taciti
+    consectetur. Non porttitor tempor orci dictumst magna porta vitae.
+  </p>
+  <p>
+    Ipsum nostra tempus etiam augue ullamcorper scelerisque sapien potenti erat nisi gravida. Vehicula sem tristique
+    sed. Nullam, sociis imperdiet ullamcorper? Dapibus fames primis ridiculus vulputate, habitant inceptos! Nunc
+    torquent lorem urna vehicula volutpat donec nec. Orci massa eu nec donec enim fames, faucibus quam aenean. Laoreet
+    tellus tempor quisque ornare lobortis praesent erat senectus natoque consectetur donec imperdiet. Quis sem cum
+    gravida dictumst a pretium purus aptent amet id. Orci habitasse, praesent facilisis condimentum. Nec elit turpis
+    leo.
+  </p>
+  <p>
+    Tempus per volutpat diam tempor mauris parturient vulputate leo id libero quisque. Mattis aliquam dictum venenatis
+    fringilla. Taciti venenatis, ultrices sollicitudin consequat. Sapien fusce est iaculis potenti ut auctor potenti.
+    Nisi malesuada feugiat vulputate vitae porttitor. Nullam nullam nullam accumsan quis magna in. Elementum, nascetur
+    gravida cras scelerisque inceptos aenean inceptos potenti. Lobortis condimentum accumsan posuere curabitur fermentum
+    diam, natoque quisque. Eget placerat sed aptent orci urna fusce magnis. Vel lacus magnis nunc.
+  </p>
+  <p>
+    Enim nascetur erat faucibus ornare varius arcu fames bibendum habitant felis elit ante. Nibh morbi massa curae; leo
+    semper diam aenean congue taciti eu porta. Varius faucibus ridiculus donec. Montes sit ligula purus porta ante lacus
+    habitasse libero cubilia purus! In quis congue arcu maecenas felis cursus pellentesque nascetur porta donec non.
+    Quisque, rutrum ligula pharetra justo habitasse facilisis rutrum neque. Magnis nostra nec nulla dictumst taciti
+    consectetur. Non porttitor tempor orci dictumst magna porta vitae.
+  </p>
+  <p>
+    Ipsum nostra tempus etiam augue ullamcorper scelerisque sapien potenti erat nisi gravida. Vehicula sem tristique
+    sed. Nullam, sociis imperdiet ullamcorper? Dapibus fames primis ridiculus vulputate, habitant inceptos! Nunc
+    torquent lorem urna vehicula volutpat donec nec. Orci massa eu nec donec enim fames, faucibus quam aenean. Laoreet
+    tellus tempor quisque ornare lobortis praesent erat senectus natoque consectetur donec imperdiet. Quis sem cum
+    gravida dictumst a pretium purus aptent amet id. Orci habitasse, praesent facilisis condimentum. Nec elit turpis
+    leo.
+  </p>
+  <p>
+    Tempus per volutpat diam tempor mauris parturient vulputate leo id libero quisque. Mattis aliquam dictum venenatis
+    fringilla. Taciti venenatis, ultrices sollicitudin consequat. Sapien fusce est iaculis potenti ut auctor potenti.
+    Nisi malesuada feugiat vulputate vitae porttitor. Nullam nullam nullam accumsan quis magna in. Elementum, nascetur
+    gravida cras scelerisque inceptos aenean inceptos potenti. Lobortis condimentum accumsan posuere curabitur fermentum
+    diam, natoque quisque. Eget placerat sed aptent orci urna fusce magnis. Vel lacus magnis nunc.
+  </p>
+`;
+
+export const scrollingHeightStyle = "height: 200px;";
+
 describe("calcite-panel", () => {
   describe("renders", () => {
     renders("calcite-panel", { display: "flex" });
@@ -102,7 +151,38 @@ describe("calcite-panel", () => {
   });
 
   describe("disabled", () => {
-    disabled(`<calcite-panel closable>scrolling content</calcite-panel>`);
+    describe("with scrolling content", () => {
+      disabled(html`<calcite-panel style="${scrollingHeightStyle}">${scrollingContentHtml}</calcite-panel>`, {
+        focusTarget: {
+          tab: "calcite-panel",
+          click: "body",
+        },
+      });
+
+      describe("closable", () => {
+        disabled(
+          html`<calcite-panel closable style="${scrollingHeightStyle}">${scrollingContentHtml}</calcite-panel>`,
+          {
+            focusTarget: {
+              tab: "calcite-panel",
+              click: "body",
+            },
+          },
+        );
+      });
+    });
+
+    describe("without scrolling content", () => {
+      disabled(html`<calcite-panel>non-scrolling content</calcite-panel>`, {
+        focusTarget: "none",
+      });
+
+      describe("closable", () => {
+        disabled(html`<calcite-panel closable>non-scrolling content</calcite-panel>`, {
+          focusTarget: "none",
+        });
+      });
+    });
   });
 
   describe("translation support", () => {
@@ -252,9 +332,9 @@ describe("calcite-panel", () => {
       <calcite-panel>
         <calcite-action-bar slot="${SLOTS.actionBar}">
           <calcite-action-group>
-            <calcite-action text="Add" icon="plus"> </calcite-action>
-            <calcite-action text="Save" icon="save"> </calcite-action>
-            <calcite-action text="Layers" icon="layers"> </calcite-action>
+            <calcite-action text="Add" icon="plus"></calcite-action>
+            <calcite-action text="Save" icon="save"></calcite-action>
+            <calcite-action text="Layers" icon="layers"></calcite-action>
           </calcite-action-group>
         </calcite-action-bar>
         <div slot="${SLOTS.headerActionsStart}">test start</div>
@@ -270,9 +350,9 @@ describe("calcite-panel", () => {
       <calcite-panel collapsible closable>
         <calcite-action-bar slot="${SLOTS.actionBar}">
           <calcite-action-group>
-            <calcite-action text="Add" icon="plus"> </calcite-action>
-            <calcite-action text="Save" icon="save"> </calcite-action>
-            <calcite-action text="Layers" icon="layers"> </calcite-action>
+            <calcite-action text="Add" icon="plus"></calcite-action>
+            <calcite-action text="Save" icon="save"></calcite-action>
+            <calcite-action text="Layers" icon="layers"></calcite-action>
           </calcite-action-group>
         </calcite-action-bar>
         <div slot="${SLOTS.headerActionsStart}">test start</div>
@@ -285,15 +365,36 @@ describe("calcite-panel", () => {
     `);
   });
 
-  describe("should focus on close button", () => {
-    focusable(`<calcite-panel closable>test</calcite-panel>`, {
-      shadowFocusTargetSelector: "calcite-action",
+  describe("is focusable", () => {
+    describe("with scrolling content", () => {
+      describe("closable", () => {
+        focusable(
+          html`<calcite-panel closable style="${scrollingHeightStyle}">${scrollingContentHtml}</calcite-panel>`,
+          {
+            shadowFocusTargetSelector: "calcite-action",
+          },
+        );
+      });
+
+      describe("should focus on container", () => {
+        focusable(html`<calcite-panel style="${scrollingHeightStyle}">${scrollingContentHtml}</calcite-panel>`, {
+          shadowFocusTargetSelector: `.${CSS.contentWrapper}`,
+        });
+      });
     });
-  });
 
-  describe("should focus on container", () => {
-    focusable(`<calcite-panel>test</calcite-panel>`, {
-      shadowFocusTargetSelector: "article",
+    describe("without scrolling content", () => {
+      describe("closable", () => {
+        focusable(html`<calcite-panel closable>non-scrolling content</calcite-panel>`, {
+          shadowFocusTargetSelector: "calcite-action",
+        });
+      });
+
+      describe("should not focus on container", () => {
+        focusable(html`<calcite-panel>non-scrolling-content</calcite-panel>`, {
+          focusTargetSelector: "body",
+        });
+      });
     });
   });
 
@@ -456,51 +557,83 @@ describe("calcite-panel", () => {
     expect(await scrollEl.getProperty("scrollTop")).toBe(100);
   });
 
-  it("should close when Escape key is pressed and closable is true", async () => {
-    const page = await newE2EPage();
-    await page.setContent("<calcite-panel>test</calcite-panel>");
-    const panel = await page.find("calcite-panel");
-    const calcitePanelClose = await panel.spyOnEvent("calcitePanelClose");
-    const container = await page.find(`calcite-panel >>> .${CSS.container}`);
-    expect(await panel.getProperty("closed")).toBe(false);
-    expect(await container.isVisible()).toBe(true);
-    await container.press("Escape");
-    await page.waitForChanges();
-    expect(await panel.getProperty("closed")).toBe(false);
-    expect(await container.isVisible()).toBe(true);
-    panel.setProperty("closable", true);
-    await page.waitForChanges();
-    await container.press("Escape");
-    await page.waitForChanges();
-    expect(await panel.getProperty("closed")).toBe(true);
-    expect(await container.isVisible()).toBe(false);
-    expect(calcitePanelClose).toHaveReceivedEventTimes(1);
-  });
-
-  it("should not close when Escape key is prevented and closable is true", async () => {
-    const page = await newE2EPage();
-    await page.setContent("<calcite-panel closable>test</calcite-panel>");
-    const panel = await page.find("calcite-panel");
-    const calcitePanelClose = await panel.spyOnEvent("calcitePanelClose");
-    const container = await page.find(`calcite-panel >>> .${CSS.container}`);
-
-    expect(await panel.getProperty("closed")).toBe(false);
-    expect(await container.isVisible()).toBe(true);
+  describe("closable", () => {
+    describe("with scrollable content (Escape emits from scroll container)", () => {
+      it("should close when Escape key is pressed and closable is true", async () => {
+        const page = await newE2EPage();
+        await page.setContent(
+          html`<calcite-panel style="${scrollingHeightStyle}">${scrollingContentHtml}</calcite-panel>`,
+        );
+        const panel = await page.find("calcite-panel");
+        const calcitePanelClose = await panel.spyOnEvent("calcitePanelClose");
+        const contentWrapper = await page.find(`calcite-panel >>> .${CSS.contentWrapper}`);
+        const container = await page.find(`calcite-panel >>> .${CSS.container}`);
+        expect(await panel.getProperty("closed")).toBe(false);
+        expect(await container.isVisible()).toBe(true);
+        await contentWrapper.press("Escape");
+        await page.waitForChanges();
+        expect(await panel.getProperty("closed")).toBe(false);
+        expect(await container.isVisible()).toBe(true);
+        panel.setProperty("closable", true);
+        await page.waitForChanges();
+
+        await contentWrapper.press("Escape");
+        await page.waitForChanges();
+        expect(await panel.getProperty("closed")).toBe(true);
+        expect(await container.isVisible()).toBe(false);
+        expect(calcitePanelClose).toHaveReceivedEventTimes(1);
+      });
 
-    await page.$eval("calcite-panel", (panel: HTMLCalcitePanelElement) => {
-      panel.addEventListener("keydown", (event) => {
-        if (event.key === "Escape") {
-          event.preventDefault();
-        }
+      it("should not close when Escape key is prevented and closable is true", async () => {
+        const page = await newE2EPage();
+        await page.setContent(
+          html`<calcite-panel closable style="${scrollingHeightStyle}">${scrollingContentHtml}</calcite-panel>`,
+        );
+        const panel = await page.find("calcite-panel");
+        const calcitePanelClose = await panel.spyOnEvent("calcitePanelClose");
+        const container = await page.find(`calcite-panel >>> .${CSS.container}`);
+
+        expect(await panel.getProperty("closed")).toBe(false);
+        expect(await container.isVisible()).toBe(true);
+
+        await page.$eval("calcite-panel", (panel: HTMLCalcitePanelElement) => {
+          panel.addEventListener("keydown", (event) => {
+            if (event.key === "Escape") {
+              event.preventDefault();
+            }
+          });
+        });
+
+        await panel.press("Escape");
+        await page.waitForChanges();
+
+        expect(await panel.getProperty("closed")).toBe(false);
+        expect(await container.isVisible()).toBe(true);
+        expect(calcitePanelClose).toHaveReceivedEventTimes(0);
       });
     });
 
-    await panel.press("Escape");
-    await page.waitForChanges();
-
-    expect(await panel.getProperty("closed")).toBe(false);
-    expect(await container.isVisible()).toBe(true);
-    expect(calcitePanelClose).toHaveReceivedEventTimes(0);
+    describe("without scrollable content (Escape emits from close button)", () => {
+      it("should close when Escape key is pressed and closable is true", async () => {
+        const page = await newE2EPage();
+        await page.setContent(html`<calcite-panel closable>non-scrolling content</calcite-panel>`);
+        const panel = await page.find("calcite-panel");
+        const calcitePanelClose = await panel.spyOnEvent("calcitePanelClose");
+        const closeButton = await page.find(`calcite-panel >>> #${IDS.close}`);
+        const container = await page.find(`calcite-panel >>> .${CSS.container}`);
+        expect(await panel.getProperty("closed")).toBe(false);
+        expect(await container.isVisible()).toBe(true);
+        expect(calcitePanelClose).toHaveReceivedEventTimes(0);
+
+        await closeButton.callMethod("setFocus");
+        await closeButton.press("Escape");
+        await page.waitForChanges();
+
+        expect(await panel.getProperty("closed")).toBe(true);
+        expect(await container.isVisible()).toBe(false);
+        expect(calcitePanelClose).toHaveReceivedEventTimes(1);
+      });
+    });
   });
 
   describe("theme", () => {