@spectrum-web-components/overlay 0.34.1-rc.0 → 0.35.1-rc.15

package/src/OverlayNoPopover.dev.js

@@ -3,37 +3,18 @@ import {
   firstFocusableIn,
   firstFocusableSlottedIn
 } from "@spectrum-web-components/shared/src/first-focusable-in.js";
+import { VirtualTrigger } from "./VirtualTrigger.dev.js";
 import {
   BeforetoggleClosedEvent,
   BeforetoggleOpenEvent,
-  guaranteedTransitionend,
+  guaranteedAllTransitionend,
+  nextFrame,
   overlayTimer
-} from "./OverlayBase.dev.js";
-import { VirtualTrigger } from "./VirtualTrigger.dev.js";
-function nextFrame() {
-  return new Promise((res) => requestAnimationFrame(() => res()));
-}
+} from "./AbstractOverlay.dev.js";
 export function OverlayNoPopover(constructor) {
   class OverlayWithNoPopover extends constructor {
     async managePopoverOpen() {
-      const targetOpenState = this.open;
       await this.managePosition();
-      if (this.open !== targetOpenState) {
-        return;
-      }
-      await this.manageDelay(targetOpenState);
-      if (this.open !== targetOpenState) {
-        return;
-      }
-      await this.ensureOnDOM();
-      if (this.open !== targetOpenState) {
-        return;
-      }
-      const focusEl = await this.makeTransition(targetOpenState);
-      if (this.open !== targetOpenState) {
-        return;
-      }
-      await this.applyFocus(targetOpenState, focusEl);
     }
     async manageDelay(targetOpenState) {
       if (targetOpenState === false || targetOpenState !== this.open) {
@@ -47,7 +28,7 @@ export function OverlayNoPopover(constructor) {
         }
       }
     }
-    async ensureOnDOM() {
+    async ensureOnDOM(_targetOpenState) {
       await nextFrame();
       await nextFrame();
     }
@@ -86,6 +67,7 @@ export function OverlayNoPopover(constructor) {
           return;
         }
         const eventName = targetOpenState ? "sp-opened" : "sp-closed";
+        this.isVisible = this.isVisible && targetOpenState;
         el.dispatchEvent(
           new CustomEvent(eventName, {
             bubbles: false,
@@ -114,7 +96,7 @@ export function OverlayNoPopover(constructor) {
         }
       };
       this.elements.forEach((el, index) => {
-        guaranteedTransitionend(
+        guaranteedAllTransitionend(
           el,
           start(el, index),
           finish(el, index)
@@ -122,27 +104,6 @@ export function OverlayNoPopover(constructor) {
       });
       return focusEl;
     }
-    async applyFocus(targetOpenState, focusEl) {
-      if (this.receivesFocus === "false" || this.type === "hint") {
-        return;
-      }
-      await nextFrame();
-      await nextFrame();
-      if (targetOpenState === this.open && !this.open) {
-        if (
-          // Only return focus when the trigger is not "virtual"
-          this.triggerElement && !(this.triggerElement instanceof VirtualTrigger)
-        ) {
-          if (this.contains(
-            this.getRootNode().activeElement
-          )) {
-            this.triggerElement.focus();
-          }
-        }
-        return;
-      }
-      focusEl == null ? void 0 : focusEl.focus();
-    }
   }
   return OverlayWithNoPopover;
 }

package/src/OverlayNoPopover.dev.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["OverlayNoPopover.ts"],
-  "sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport {\n    firstFocusableIn,\n    firstFocusableSlottedIn,\n} from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport { ReactiveElement } from 'lit';\nimport {\n    BeforetoggleClosedEvent,\n    BeforetoggleOpenEvent,\n    guaranteedTransitionend,\n    OpenableElement,\n    OverlayBase,\n    overlayTimer,\n} from './OverlayBase.dev.js'\nimport { VirtualTrigger } from './VirtualTrigger.dev.js'\nimport { OverlayOpenCloseDetail } from './overlay-types.dev.js'\n\ntype Constructor<T = Record<string, unknown>> = {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    new (...args: any[]): T;\n    prototype: T;\n};\n\nfunction nextFrame(): Promise<void> {\n    return new Promise((res) => requestAnimationFrame(() => res()));\n}\n\nexport function OverlayNoPopover<T extends Constructor<OverlayBase>>(\n    constructor: T\n): T & Constructor<ReactiveElement> {\n    class OverlayWithNoPopover extends constructor {\n        protected override async managePopoverOpen(): Promise<void> {\n            const targetOpenState = this.open;\n            await this.managePosition();\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.manageDelay(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.ensureOnDOM();\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            const focusEl = await this.makeTransition(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.applyFocus(targetOpenState, focusEl);\n        }\n\n        private async manageDelay(targetOpenState: boolean): Promise<void> {\n            if (targetOpenState === false || targetOpenState !== this.open) {\n                overlayTimer.close(this);\n                return;\n            }\n            if (this.delayed) {\n                const cancelled = await overlayTimer.openTimer(this);\n                if (cancelled) {\n                    this.open = !targetOpenState;\n                }\n            }\n        }\n\n        private async ensureOnDOM(): Promise<void> {\n            await nextFrame();\n            await nextFrame();\n        }\n\n        private async makeTransition(\n            targetOpenState: boolean\n        ): Promise<HTMLElement | null> {\n            if (this.open !== targetOpenState) {\n                return null;\n            }\n            let focusEl = null as HTMLElement | null;\n            const start = (el: OpenableElement, index: number) => (): void => {\n                if (targetOpenState !== this.open) {\n                    return;\n                }\n                if (typeof el.open !== 'undefined') {\n                    el.open = targetOpenState;\n                }\n                if (index === 0) {\n                    const event = targetOpenState\n                        ? BeforetoggleOpenEvent\n                        : BeforetoggleClosedEvent;\n                    this.dispatchEvent(new event());\n                }\n                if (targetOpenState !== true) {\n                    return;\n                }\n                focusEl = focusEl || firstFocusableIn(el);\n                if (focusEl) {\n                    return;\n                }\n                const childSlots = el.querySelectorAll('slot');\n                childSlots.forEach((slot) => {\n                    if (!focusEl) {\n                        focusEl = firstFocusableSlottedIn(slot);\n                    }\n                });\n            };\n            const finish = (el: OpenableElement, index: number) => (): void => {\n                if (this.open !== targetOpenState) {\n                    return;\n                }\n                const eventName = targetOpenState ? 'sp-opened' : 'sp-closed';\n                el.dispatchEvent(\n                    new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                        bubbles: false,\n                        composed: false,\n                        detail: { interaction: this.type },\n                    })\n                );\n                if (index > 0) {\n                    return;\n                }\n                const hasVirtualTrigger =\n                    this.triggerElement instanceof VirtualTrigger;\n                this.dispatchEvent(\n                    new Event(eventName, {\n                        bubbles: hasVirtualTrigger,\n                        composed: hasVirtualTrigger,\n                    })\n                );\n                if (this.triggerElement && !hasVirtualTrigger) {\n                    (this.triggerElement as HTMLElement).dispatchEvent(\n                        new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                            bubbles: true,\n                            composed: true,\n                            detail: { interaction: this.type },\n                        })\n                    );\n                }\n            };\n            this.elements.forEach((el, index) => {\n                guaranteedTransitionend(\n                    el,\n                    start(el, index),\n                    finish(el, index)\n                );\n            });\n            return focusEl;\n        }\n\n        private async applyFocus(\n            targetOpenState: boolean,\n            focusEl: HTMLElement | null\n        ): Promise<void> {\n            // Do not move focus when explicitly told not to\n            // and when the Overlay is a \"hint\"\n            if (this.receivesFocus === 'false' || this.type === 'hint') {\n                return;\n            }\n\n            await nextFrame();\n            await nextFrame();\n            if (targetOpenState === this.open && !this.open) {\n                if (\n                    // Only return focus when the trigger is not \"virtual\"\n                    this.triggerElement &&\n                    !(this.triggerElement instanceof VirtualTrigger)\n                ) {\n                    if (\n                        this.contains(\n                            (this.getRootNode() as Document).activeElement\n                        )\n                    ) {\n                        this.triggerElement.focus();\n                    }\n                }\n                return;\n            }\n\n            focusEl?.focus();\n        }\n    }\n    return OverlayWithNoPopover;\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport {\n    firstFocusableIn,\n    firstFocusableSlottedIn,\n} from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport { ReactiveElement } from 'lit';\nimport { VirtualTrigger } from './VirtualTrigger.dev.js'\nimport {\n    Constructor,\n    OpenableElement,\n    OverlayOpenCloseDetail,\n} from './overlay-types.dev.js'\nimport {\n    BeforetoggleClosedEvent,\n    BeforetoggleOpenEvent,\n    guaranteedAllTransitionend,\n    nextFrame,\n    overlayTimer,\n} from './AbstractOverlay.dev.js'\nimport type { AbstractOverlay } from './AbstractOverlay.dev.js'\n\nexport function OverlayNoPopover<T extends Constructor<AbstractOverlay>>(\n    constructor: T\n): T & Constructor<ReactiveElement> {\n    class OverlayWithNoPopover extends constructor {\n        protected override async managePopoverOpen(): Promise<void> {\n            await this.managePosition();\n        }\n\n        protected override async manageDelay(\n            targetOpenState: boolean\n        ): Promise<void> {\n            if (targetOpenState === false || targetOpenState !== this.open) {\n                overlayTimer.close(this);\n                return;\n            }\n            if (this.delayed) {\n                const cancelled = await overlayTimer.openTimer(this);\n                if (cancelled) {\n                    this.open = !targetOpenState;\n                }\n            }\n        }\n\n        protected override async ensureOnDOM(\n            _targetOpenState: boolean\n        ): Promise<void> {\n            await nextFrame();\n            await nextFrame();\n        }\n\n        protected override async makeTransition(\n            targetOpenState: boolean\n        ): Promise<HTMLElement | null> {\n            if (this.open !== targetOpenState) {\n                return null;\n            }\n            let focusEl = null as HTMLElement | null;\n            const start = (el: OpenableElement, index: number) => (): void => {\n                if (targetOpenState !== this.open) {\n                    return;\n                }\n                if (typeof el.open !== 'undefined') {\n                    el.open = targetOpenState;\n                }\n                if (index === 0) {\n                    const event = targetOpenState\n                        ? BeforetoggleOpenEvent\n                        : BeforetoggleClosedEvent;\n                    this.dispatchEvent(new event());\n                }\n                if (targetOpenState !== true) {\n                    return;\n                }\n                focusEl = focusEl || firstFocusableIn(el);\n                if (focusEl) {\n                    return;\n                }\n                const childSlots = el.querySelectorAll('slot');\n                childSlots.forEach((slot) => {\n                    if (!focusEl) {\n                        focusEl = firstFocusableSlottedIn(slot);\n                    }\n                });\n            };\n            const finish = (el: OpenableElement, index: number) => (): void => {\n                if (this.open !== targetOpenState) {\n                    return;\n                }\n                const eventName = targetOpenState ? 'sp-opened' : 'sp-closed';\n                this.isVisible = this.isVisible && targetOpenState;\n                el.dispatchEvent(\n                    new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                        bubbles: false,\n                        composed: false,\n                        detail: { interaction: this.type },\n                    })\n                );\n                if (index > 0) {\n                    return;\n                }\n                const hasVirtualTrigger =\n                    this.triggerElement instanceof VirtualTrigger;\n                this.dispatchEvent(\n                    new Event(eventName, {\n                        bubbles: hasVirtualTrigger,\n                        composed: hasVirtualTrigger,\n                    })\n                );\n                if (this.triggerElement && !hasVirtualTrigger) {\n                    (this.triggerElement as HTMLElement).dispatchEvent(\n                        new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                            bubbles: true,\n                            composed: true,\n                            detail: { interaction: this.type },\n                        })\n                    );\n                }\n            };\n            this.elements.forEach((el, index) => {\n                guaranteedAllTransitionend(\n                    el,\n                    start(el, index),\n                    finish(el, index)\n                );\n            });\n            return focusEl;\n        }\n    }\n    return OverlayWithNoPopover;\n}\n"],
+  "mappings": ";AAWA;AAAA,EACI;AAAA,EACA;AAAA,OACG;AAEP,SAAS,sBAAsB;AAM/B;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AAGA,gBAAS,iBACZ,aACgC;AAChC,QAAM,6BAA6B,YAAY;AAAA,IAC3C,MAAyB,oBAAmC;AACxD,YAAM,KAAK,eAAe;AAAA,IAC9B;AAAA,IAEA,MAAyB,YACrB,iBACa;AACb,UAAI,oBAAoB,SAAS,oBAAoB,KAAK,MAAM;AAC5D,qBAAa,MAAM,IAAI;AACvB;AAAA,MACJ;AACA,UAAI,KAAK,SAAS;AACd,cAAM,YAAY,MAAM,aAAa,UAAU,IAAI;AACnD,YAAI,WAAW;AACX,eAAK,OAAO,CAAC;AAAA,QACjB;AAAA,MACJ;AAAA,IACJ;AAAA,IAEA,MAAyB,YACrB,kBACa;AACb,YAAM,UAAU;AAChB,YAAM,UAAU;AAAA,IACpB;AAAA,IAEA,MAAyB,eACrB,iBAC2B;AAC3B,UAAI,KAAK,SAAS,iBAAiB;AAC/B,eAAO;AAAA,MACX;AACA,UAAI,UAAU;AACd,YAAM,QAAQ,CAAC,IAAqB,UAAkB,MAAY;AAC9D,YAAI,oBAAoB,KAAK,MAAM;AAC/B;AAAA,QACJ;AACA,YAAI,OAAO,GAAG,SAAS,aAAa;AAChC,aAAG,OAAO;AAAA,QACd;AACA,YAAI,UAAU,GAAG;AACb,gBAAM,QAAQ,kBACR,wBACA;AACN,eAAK,cAAc,IAAI,MAAM,CAAC;AAAA,QAClC;AACA,YAAI,oBAAoB,MAAM;AAC1B;AAAA,QACJ;AACA,kBAAU,WAAW,iBAAiB,EAAE;AACxC,YAAI,SAAS;AACT;AAAA,QACJ;AACA,cAAM,aAAa,GAAG,iBAAiB,MAAM;AAC7C,mBAAW,QAAQ,CAAC,SAAS;AACzB,cAAI,CAAC,SAAS;AACV,sBAAU,wBAAwB,IAAI;AAAA,UAC1C;AAAA,QACJ,CAAC;AAAA,MACL;AACA,YAAM,SAAS,CAAC,IAAqB,UAAkB,MAAY;AAC/D,YAAI,KAAK,SAAS,iBAAiB;AAC/B;AAAA,QACJ;AACA,cAAM,YAAY,kBAAkB,cAAc;AAClD,aAAK,YAAY,KAAK,aAAa;AACnC,WAAG;AAAA,UACC,IAAI,YAAoC,WAAW;AAAA,YAC/C,SAAS;AAAA,YACT,UAAU;AAAA,YACV,QAAQ,EAAE,aAAa,KAAK,KAAK;AAAA,UACrC,CAAC;AAAA,QACL;AACA,YAAI,QAAQ,GAAG;AACX;AAAA,QACJ;AACA,cAAM,oBACF,KAAK,0BAA0B;AACnC,aAAK;AAAA,UACD,IAAI,MAAM,WAAW;AAAA,YACjB,SAAS;AAAA,YACT,UAAU;AAAA,UACd,CAAC;AAAA,QACL;AACA,YAAI,KAAK,kBAAkB,CAAC,mBAAmB;AAC3C,UAAC,KAAK,eAA+B;AAAA,YACjC,IAAI,YAAoC,WAAW;AAAA,cAC/C,SAAS;AAAA,cACT,UAAU;AAAA,cACV,QAAQ,EAAE,aAAa,KAAK,KAAK;AAAA,YACrC,CAAC;AAAA,UACL;AAAA,QACJ;AAAA,MACJ;AACA,WAAK,SAAS,QAAQ,CAAC,IAAI,UAAU;AACjC;AAAA,UACI;AAAA,UACA,MAAM,IAAI,KAAK;AAAA,UACf,OAAO,IAAI,KAAK;AAAA,QACpB;AAAA,MACJ,CAAC;AACD,aAAO;AAAA,IACX;AAAA,EACJ;AACA,SAAO;AACX;",
   "names": []
 }

package/src/OverlayNoPopover.js

@@ -1,2 +1,2 @@
-"use strict";import{firstFocusableIn as h,firstFocusableSlottedIn as f}from"@spectrum-web-components/shared/src/first-focusable-in.js";import{BeforetoggleClosedEvent as v,BeforetoggleOpenEvent as d,guaranteedTransitionend as y,overlayTimer as l}from"./OverlayBase.js";import{VirtualTrigger as c}from"./VirtualTrigger.js";function r(){return new Promise(a=>requestAnimationFrame(()=>a()))}export function OverlayNoPopover(a){class m extends a{async managePopoverOpen(){const e=this.open;if(await this.managePosition(),this.open!==e||(await this.manageDelay(e),this.open!==e)||(await this.ensureOnDOM(),this.open!==e))return;const t=await this.makeTransition(e);this.open===e&&await this.applyFocus(e,t)}async manageDelay(e){if(e===!1||e!==this.open){l.close(this);return}this.delayed&&await l.openTimer(this)&&(this.open=!e)}async ensureOnDOM(){await r(),await r()}async makeTransition(e){if(this.open!==e)return null;let t=null;const p=(i,o)=>()=>{if(e!==this.open)return;if(typeof i.open!="undefined"&&(i.open=e),o===0){const n=e?d:v;this.dispatchEvent(new n)}if(e!==!0||(t=t||h(i),t))return;i.querySelectorAll("slot").forEach(n=>{t||(t=f(n))})},u=(i,o)=>()=>{if(this.open!==e)return;const s=e?"sp-opened":"sp-closed";if(i.dispatchEvent(new CustomEvent(s,{bubbles:!1,composed:!1,detail:{interaction:this.type}})),o>0)return;const n=this.triggerElement instanceof c;this.dispatchEvent(new Event(s,{bubbles:n,composed:n})),this.triggerElement&&!n&&this.triggerElement.dispatchEvent(new CustomEvent(s,{bubbles:!0,composed:!0,detail:{interaction:this.type}}))};return this.elements.forEach((i,o)=>{y(i,p(i,o),u(i,o))}),t}async applyFocus(e,t){if(!(this.receivesFocus==="false"||this.type==="hint")){if(await r(),await r(),e===this.open&&!this.open){this.triggerElement&&!(this.triggerElement instanceof c)&&this.contains(this.getRootNode().activeElement)&&this.triggerElement.focus();return}t==null||t.focus()}}}return m}
+"use strict";import{firstFocusableIn as p,firstFocusableSlottedIn as u}from"@spectrum-web-components/shared/src/first-focusable-in.js";import{VirtualTrigger as f}from"./VirtualTrigger.js";import{BeforetoggleClosedEvent as v,BeforetoggleOpenEvent as h,guaranteedAllTransitionend as b,nextFrame as s,overlayTimer as l}from"./AbstractOverlay.js";export function OverlayNoPopover(a){class c extends a{async managePopoverOpen(){await this.managePosition()}async manageDelay(e){if(e===!1||e!==this.open){l.close(this);return}this.delayed&&await l.openTimer(this)&&(this.open=!e)}async ensureOnDOM(e){await s(),await s()}async makeTransition(e){if(this.open!==e)return null;let o=null;const m=(t,n)=>()=>{if(e!==this.open)return;if(typeof t.open!="undefined"&&(t.open=e),n===0){const i=e?h:v;this.dispatchEvent(new i)}if(e!==!0||(o=o||p(t),o))return;t.querySelectorAll("slot").forEach(i=>{o||(o=u(i))})},d=(t,n)=>()=>{if(this.open!==e)return;const r=e?"sp-opened":"sp-closed";if(this.isVisible=this.isVisible&&e,t.dispatchEvent(new CustomEvent(r,{bubbles:!1,composed:!1,detail:{interaction:this.type}})),n>0)return;const i=this.triggerElement instanceof f;this.dispatchEvent(new Event(r,{bubbles:i,composed:i})),this.triggerElement&&!i&&this.triggerElement.dispatchEvent(new CustomEvent(r,{bubbles:!0,composed:!0,detail:{interaction:this.type}}))};return this.elements.forEach((t,n)=>{b(t,m(t,n),d(t,n))}),o}}return c}
 //# sourceMappingURL=OverlayNoPopover.js.map

package/src/OverlayNoPopover.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["OverlayNoPopover.ts"],
-  "sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport {\n    firstFocusableIn,\n    firstFocusableSlottedIn,\n} from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport { ReactiveElement } from 'lit';\nimport {\n    BeforetoggleClosedEvent,\n    BeforetoggleOpenEvent,\n    guaranteedTransitionend,\n    OpenableElement,\n    OverlayBase,\n    overlayTimer,\n} from './OverlayBase.js';\nimport { VirtualTrigger } from './VirtualTrigger.js';\nimport { OverlayOpenCloseDetail } from './overlay-types.js';\n\ntype Constructor<T = Record<string, unknown>> = {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    new (...args: any[]): T;\n    prototype: T;\n};\n\nfunction nextFrame(): Promise<void> {\n    return new Promise((res) => requestAnimationFrame(() => res()));\n}\n\nexport function OverlayNoPopover<T extends Constructor<OverlayBase>>(\n    constructor: T\n): T & Constructor<ReactiveElement> {\n    class OverlayWithNoPopover extends constructor {\n        protected override async managePopoverOpen(): Promise<void> {\n            const targetOpenState = this.open;\n            await this.managePosition();\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.manageDelay(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.ensureOnDOM();\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            const focusEl = await this.makeTransition(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.applyFocus(targetOpenState, focusEl);\n        }\n\n        private async manageDelay(targetOpenState: boolean): Promise<void> {\n            if (targetOpenState === false || targetOpenState !== this.open) {\n                overlayTimer.close(this);\n                return;\n            }\n            if (this.delayed) {\n                const cancelled = await overlayTimer.openTimer(this);\n                if (cancelled) {\n                    this.open = !targetOpenState;\n                }\n            }\n        }\n\n        private async ensureOnDOM(): Promise<void> {\n            await nextFrame();\n            await nextFrame();\n        }\n\n        private async makeTransition(\n            targetOpenState: boolean\n        ): Promise<HTMLElement | null> {\n            if (this.open !== targetOpenState) {\n                return null;\n            }\n            let focusEl = null as HTMLElement | null;\n            const start = (el: OpenableElement, index: number) => (): void => {\n                if (targetOpenState !== this.open) {\n                    return;\n                }\n                if (typeof el.open !== 'undefined') {\n                    el.open = targetOpenState;\n                }\n                if (index === 0) {\n                    const event = targetOpenState\n                        ? BeforetoggleOpenEvent\n                        : BeforetoggleClosedEvent;\n                    this.dispatchEvent(new event());\n                }\n                if (targetOpenState !== true) {\n                    return;\n                }\n                focusEl = focusEl || firstFocusableIn(el);\n                if (focusEl) {\n                    return;\n                }\n                const childSlots = el.querySelectorAll('slot');\n                childSlots.forEach((slot) => {\n                    if (!focusEl) {\n                        focusEl = firstFocusableSlottedIn(slot);\n                    }\n                });\n            };\n            const finish = (el: OpenableElement, index: number) => (): void => {\n                if (this.open !== targetOpenState) {\n                    return;\n                }\n                const eventName = targetOpenState ? 'sp-opened' : 'sp-closed';\n                el.dispatchEvent(\n                    new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                        bubbles: false,\n                        composed: false,\n                        detail: { interaction: this.type },\n                    })\n                );\n                if (index > 0) {\n                    return;\n                }\n                const hasVirtualTrigger =\n                    this.triggerElement instanceof VirtualTrigger;\n                this.dispatchEvent(\n                    new Event(eventName, {\n                        bubbles: hasVirtualTrigger,\n                        composed: hasVirtualTrigger,\n                    })\n                );\n                if (this.triggerElement && !hasVirtualTrigger) {\n                    (this.triggerElement as HTMLElement).dispatchEvent(\n                        new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                            bubbles: true,\n                            composed: true,\n                            detail: { interaction: this.type },\n                        })\n                    );\n                }\n            };\n            this.elements.forEach((el, index) => {\n                guaranteedTransitionend(\n                    el,\n                    start(el, index),\n                    finish(el, index)\n                );\n            });\n            return focusEl;\n        }\n\n        private async applyFocus(\n            targetOpenState: boolean,\n            focusEl: HTMLElement | null\n        ): Promise<void> {\n            // Do not move focus when explicitly told not to\n            // and when the Overlay is a \"hint\"\n            if (this.receivesFocus === 'false' || this.type === 'hint') {\n                return;\n            }\n\n            await nextFrame();\n            await nextFrame();\n            if (targetOpenState === this.open && !this.open) {\n                if (\n                    // Only return focus when the trigger is not \"virtual\"\n                    this.triggerElement &&\n                    !(this.triggerElement instanceof VirtualTrigger)\n                ) {\n                    if (\n                        this.contains(\n                            (this.getRootNode() as Document).activeElement\n                        )\n                    ) {\n                        this.triggerElement.focus();\n                    }\n                }\n                return;\n            }\n\n            focusEl?.focus();\n        }\n    }\n    return OverlayWithNoPopover;\n}\n"],
-  "mappings": "aAWA,OACI,oBAAAA,EACA,2BAAAC,MACG,4DAEP,OACI,2BAAAC,EACA,yBAAAC,EACA,2BAAAC,EAGA,gBAAAC,MACG,mBACP,OAAS,kBAAAC,MAAsB,sBAS/B,SAASC,GAA2B,CAChC,OAAO,IAAI,QAASC,GAAQ,sBAAsB,IAAMA,EAAI,CAAC,CAAC,CAClE,CAEO,gBAAS,iBACZC,EACgC,CAChC,MAAMC,UAA6BD,CAAY,CAC3C,MAAyB,mBAAmC,CACxD,MAAME,EAAkB,KAAK,KAU7B,GATA,MAAM,KAAK,eAAe,EACtB,KAAK,OAASA,IAGlB,MAAM,KAAK,YAAYA,CAAe,EAClC,KAAK,OAASA,KAGlB,MAAM,KAAK,YAAY,EACnB,KAAK,OAASA,GACd,OAEJ,MAAMC,EAAU,MAAM,KAAK,eAAeD,CAAe,EACrD,KAAK,OAASA,GAGlB,MAAM,KAAK,WAAWA,EAAiBC,CAAO,CAClD,CAEA,MAAc,YAAYD,EAAyC,CAC/D,GAAIA,IAAoB,IAASA,IAAoB,KAAK,KAAM,CAC5DN,EAAa,MAAM,IAAI,EACvB,OAEA,KAAK,SACa,MAAMA,EAAa,UAAU,IAAI,IAE/C,KAAK,KAAO,CAACM,EAGzB,CAEA,MAAc,aAA6B,CACvC,MAAMJ,EAAU,EAChB,MAAMA,EAAU,CACpB,CAEA,MAAc,eACVI,EAC2B,CAC3B,GAAI,KAAK,OAASA,EACd,OAAO,KAEX,IAAIC,EAAU,KACd,MAAMC,EAAQ,CAACC,EAAqBC,IAAkB,IAAY,CAC9D,GAAIJ,IAAoB,KAAK,KACzB,OAKJ,GAHI,OAAOG,EAAG,MAAS,cACnBA,EAAG,KAAOH,GAEVI,IAAU,EAAG,CACb,MAAMC,EAAQL,EACRR,EACAD,EACN,KAAK,cAAc,IAAIc,CAAO,EAMlC,GAJIL,IAAoB,KAGxBC,EAAUA,GAAWZ,EAAiBc,CAAE,EACpCF,GACA,OAEeE,EAAG,iBAAiB,MAAM,EAClC,QAASG,GAAS,CACpBL,IACDA,EAAUX,EAAwBgB,CAAI,EAE9C,CAAC,CACL,EACMC,EAAS,CAACJ,EAAqBC,IAAkB,IAAY,CAC/D,GAAI,KAAK,OAASJ,EACd,OAEJ,MAAMQ,EAAYR,EAAkB,YAAc,YAQlD,GAPAG,EAAG,cACC,IAAI,YAAoCK,EAAW,CAC/C,QAAS,GACT,SAAU,GACV,OAAQ,CAAE,YAAa,KAAK,IAAK,CACrC,CAAC,CACL,EACIJ,EAAQ,EACR,OAEJ,MAAMK,EACF,KAAK,0BAA0Bd,EACnC,KAAK,cACD,IAAI,MAAMa,EAAW,CACjB,QAASC,EACT,SAAUA,CACd,CAAC,CACL,EACI,KAAK,gBAAkB,CAACA,GACvB,KAAK,eAA+B,cACjC,IAAI,YAAoCD,EAAW,CAC/C,QAAS,GACT,SAAU,GACV,OAAQ,CAAE,YAAa,KAAK,IAAK,CACrC,CAAC,CACL,CAER,EACA,YAAK,SAAS,QAAQ,CAACL,EAAIC,IAAU,CACjCX,EACIU,EACAD,EAAMC,EAAIC,CAAK,EACfG,EAAOJ,EAAIC,CAAK,CACpB,CACJ,CAAC,EACMH,CACX,CAEA,MAAc,WACVD,EACAC,EACa,CAGb,GAAI,OAAK,gBAAkB,SAAW,KAAK,OAAS,QAMpD,IAFA,MAAML,EAAU,EAChB,MAAMA,EAAU,EACZI,IAAoB,KAAK,MAAQ,CAAC,KAAK,KAAM,CAGzC,KAAK,gBACL,EAAE,KAAK,0BAA0BL,IAG7B,KAAK,SACA,KAAK,YAAY,EAAe,aACrC,GAEA,KAAK,eAAe,MAAM,EAGlC,OAGJM,GAAA,MAAAA,EAAS,QACb,CACJ,CACA,OAAOF,CACX",
-  "names": ["firstFocusableIn", "firstFocusableSlottedIn", "BeforetoggleClosedEvent", "BeforetoggleOpenEvent", "guaranteedTransitionend", "overlayTimer", "VirtualTrigger", "nextFrame", "res", "constructor", "OverlayWithNoPopover", "targetOpenState", "focusEl", "start", "el", "index", "event", "slot", "finish", "eventName", "hasVirtualTrigger"]
+  "sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport {\n    firstFocusableIn,\n    firstFocusableSlottedIn,\n} from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport { ReactiveElement } from 'lit';\nimport { VirtualTrigger } from './VirtualTrigger.js';\nimport {\n    Constructor,\n    OpenableElement,\n    OverlayOpenCloseDetail,\n} from './overlay-types.js';\nimport {\n    BeforetoggleClosedEvent,\n    BeforetoggleOpenEvent,\n    guaranteedAllTransitionend,\n    nextFrame,\n    overlayTimer,\n} from './AbstractOverlay.js';\nimport type { AbstractOverlay } from './AbstractOverlay.js';\n\nexport function OverlayNoPopover<T extends Constructor<AbstractOverlay>>(\n    constructor: T\n): T & Constructor<ReactiveElement> {\n    class OverlayWithNoPopover extends constructor {\n        protected override async managePopoverOpen(): Promise<void> {\n            await this.managePosition();\n        }\n\n        protected override async manageDelay(\n            targetOpenState: boolean\n        ): Promise<void> {\n            if (targetOpenState === false || targetOpenState !== this.open) {\n                overlayTimer.close(this);\n                return;\n            }\n            if (this.delayed) {\n                const cancelled = await overlayTimer.openTimer(this);\n                if (cancelled) {\n                    this.open = !targetOpenState;\n                }\n            }\n        }\n\n        protected override async ensureOnDOM(\n            _targetOpenState: boolean\n        ): Promise<void> {\n            await nextFrame();\n            await nextFrame();\n        }\n\n        protected override async makeTransition(\n            targetOpenState: boolean\n        ): Promise<HTMLElement | null> {\n            if (this.open !== targetOpenState) {\n                return null;\n            }\n            let focusEl = null as HTMLElement | null;\n            const start = (el: OpenableElement, index: number) => (): void => {\n                if (targetOpenState !== this.open) {\n                    return;\n                }\n                if (typeof el.open !== 'undefined') {\n                    el.open = targetOpenState;\n                }\n                if (index === 0) {\n                    const event = targetOpenState\n                        ? BeforetoggleOpenEvent\n                        : BeforetoggleClosedEvent;\n                    this.dispatchEvent(new event());\n                }\n                if (targetOpenState !== true) {\n                    return;\n                }\n                focusEl = focusEl || firstFocusableIn(el);\n                if (focusEl) {\n                    return;\n                }\n                const childSlots = el.querySelectorAll('slot');\n                childSlots.forEach((slot) => {\n                    if (!focusEl) {\n                        focusEl = firstFocusableSlottedIn(slot);\n                    }\n                });\n            };\n            const finish = (el: OpenableElement, index: number) => (): void => {\n                if (this.open !== targetOpenState) {\n                    return;\n                }\n                const eventName = targetOpenState ? 'sp-opened' : 'sp-closed';\n                this.isVisible = this.isVisible && targetOpenState;\n                el.dispatchEvent(\n                    new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                        bubbles: false,\n                        composed: false,\n                        detail: { interaction: this.type },\n                    })\n                );\n                if (index > 0) {\n                    return;\n                }\n                const hasVirtualTrigger =\n                    this.triggerElement instanceof VirtualTrigger;\n                this.dispatchEvent(\n                    new Event(eventName, {\n                        bubbles: hasVirtualTrigger,\n                        composed: hasVirtualTrigger,\n                    })\n                );\n                if (this.triggerElement && !hasVirtualTrigger) {\n                    (this.triggerElement as HTMLElement).dispatchEvent(\n                        new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                            bubbles: true,\n                            composed: true,\n                            detail: { interaction: this.type },\n                        })\n                    );\n                }\n            };\n            this.elements.forEach((el, index) => {\n                guaranteedAllTransitionend(\n                    el,\n                    start(el, index),\n                    finish(el, index)\n                );\n            });\n            return focusEl;\n        }\n    }\n    return OverlayWithNoPopover;\n}\n"],
+  "mappings": "aAWA,OACI,oBAAAA,EACA,2BAAAC,MACG,4DAEP,OAAS,kBAAAC,MAAsB,sBAM/B,OACI,2BAAAC,EACA,yBAAAC,EACA,8BAAAC,EACA,aAAAC,EACA,gBAAAC,MACG,uBAGA,gBAAS,iBACZC,EACgC,CAChC,MAAMC,UAA6BD,CAAY,CAC3C,MAAyB,mBAAmC,CACxD,MAAM,KAAK,eAAe,CAC9B,CAEA,MAAyB,YACrBE,EACa,CACb,GAAIA,IAAoB,IAASA,IAAoB,KAAK,KAAM,CAC5DH,EAAa,MAAM,IAAI,EACvB,OAEA,KAAK,SACa,MAAMA,EAAa,UAAU,IAAI,IAE/C,KAAK,KAAO,CAACG,EAGzB,CAEA,MAAyB,YACrBC,EACa,CACb,MAAML,EAAU,EAChB,MAAMA,EAAU,CACpB,CAEA,MAAyB,eACrBI,EAC2B,CAC3B,GAAI,KAAK,OAASA,EACd,OAAO,KAEX,IAAIE,EAAU,KACd,MAAMC,EAAQ,CAACC,EAAqBC,IAAkB,IAAY,CAC9D,GAAIL,IAAoB,KAAK,KACzB,OAKJ,GAHI,OAAOI,EAAG,MAAS,cACnBA,EAAG,KAAOJ,GAEVK,IAAU,EAAG,CACb,MAAMC,EAAQN,EACRN,EACAD,EACN,KAAK,cAAc,IAAIa,CAAO,EAMlC,GAJIN,IAAoB,KAGxBE,EAAUA,GAAWZ,EAAiBc,CAAE,EACpCF,GACA,OAEeE,EAAG,iBAAiB,MAAM,EAClC,QAASG,GAAS,CACpBL,IACDA,EAAUX,EAAwBgB,CAAI,EAE9C,CAAC,CACL,EACMC,EAAS,CAACJ,EAAqBC,IAAkB,IAAY,CAC/D,GAAI,KAAK,OAASL,EACd,OAEJ,MAAMS,EAAYT,EAAkB,YAAc,YASlD,GARA,KAAK,UAAY,KAAK,WAAaA,EACnCI,EAAG,cACC,IAAI,YAAoCK,EAAW,CAC/C,QAAS,GACT,SAAU,GACV,OAAQ,CAAE,YAAa,KAAK,IAAK,CACrC,CAAC,CACL,EACIJ,EAAQ,EACR,OAEJ,MAAMK,EACF,KAAK,0BAA0BlB,EACnC,KAAK,cACD,IAAI,MAAMiB,EAAW,CACjB,QAASC,EACT,SAAUA,CACd,CAAC,CACL,EACI,KAAK,gBAAkB,CAACA,GACvB,KAAK,eAA+B,cACjC,IAAI,YAAoCD,EAAW,CAC/C,QAAS,GACT,SAAU,GACV,OAAQ,CAAE,YAAa,KAAK,IAAK,CACrC,CAAC,CACL,CAER,EACA,YAAK,SAAS,QAAQ,CAACL,EAAIC,IAAU,CACjCV,EACIS,EACAD,EAAMC,EAAIC,CAAK,EACfG,EAAOJ,EAAIC,CAAK,CACpB,CACJ,CAAC,EACMH,CACX,CACJ,CACA,OAAOH,CACX",
+  "names": ["firstFocusableIn", "firstFocusableSlottedIn", "VirtualTrigger", "BeforetoggleClosedEvent", "BeforetoggleOpenEvent", "guaranteedAllTransitionend", "nextFrame", "overlayTimer", "constructor", "OverlayWithNoPopover", "targetOpenState", "_targetOpenState", "focusEl", "start", "el", "index", "event", "slot", "finish", "eventName", "hasVirtualTrigger"]
 }

package/src/OverlayPopover.d.ts

@@ -1,8 +1,4 @@
 import { ReactiveElement } from 'lit';
-import { OverlayBase } from './OverlayBase.js';
-declare type Constructor<T = Record<string, unknown>> = {
-    new (...args: any[]): T;
-    prototype: T;
-};
-export declare function OverlayPopover<T extends Constructor<OverlayBase>>(constructor: T): T & Constructor<ReactiveElement>;
-export {};
+import { Constructor } from './overlay-types.js';
+import type { AbstractOverlay } from './AbstractOverlay.js';
+export declare function OverlayPopover<T extends Constructor<AbstractOverlay>>(constructor: T): T & Constructor<ReactiveElement>;

package/src/OverlayPopover.dev.js

@@ -3,37 +3,16 @@ import {
   firstFocusableIn,
   firstFocusableSlottedIn
 } from "@spectrum-web-components/shared/src/first-focusable-in.js";
+import { VirtualTrigger } from "./VirtualTrigger.dev.js";
 import {
   BeforetoggleClosedEvent,
   BeforetoggleOpenEvent,
-  guaranteedTransitionend,
+  guaranteedAllTransitionend,
+  nextFrame,
   overlayTimer
-} from "./OverlayBase.dev.js";
-import { VirtualTrigger } from "./VirtualTrigger.dev.js";
-function nextFrame() {
-  return new Promise((res) => requestAnimationFrame(() => res()));
-}
+} from "./AbstractOverlay.dev.js";
 export function OverlayPopover(constructor) {
   class OverlayWithPopover extends constructor {
-    async managePopoverOpen() {
-      const targetOpenState = this.open;
-      if (this.open !== targetOpenState) {
-        return;
-      }
-      await this.manageDelay(targetOpenState);
-      if (this.open !== targetOpenState) {
-        return;
-      }
-      await this.ensureOnDOM(targetOpenState);
-      if (this.open !== targetOpenState) {
-        return;
-      }
-      const focusEl = await this.makeTransition(targetOpenState);
-      if (this.open !== targetOpenState) {
-        return;
-      }
-      await this.applyFocus(targetOpenState, focusEl);
-    }
     async manageDelay(targetOpenState) {
       if (targetOpenState === false || targetOpenState !== this.open) {
         overlayTimer.close(this);
@@ -46,8 +25,13 @@ export function OverlayPopover(constructor) {
         }
       }
     }
-    async ensureOnDOM(targetOpenState) {
-      await nextFrame();
+    async shouldHidePopover(targetOpenState) {
+      if (targetOpenState && this.open !== targetOpenState) {
+        return;
+      }
+      await this.placementController.resetOverlayPosition();
+    }
+    async shouldShowPopover(targetOpenState) {
       let popoverOpen = false;
       try {
         popoverOpen = this.dialogEl.matches(":popover-open");
@@ -62,6 +46,11 @@ export function OverlayPopover(constructor) {
         this.dialogEl.showPopover();
         await this.managePosition();
       }
+    }
+    async ensureOnDOM(targetOpenState) {
+      await nextFrame();
+      await this.shouldHidePopover(targetOpenState);
+      await this.shouldShowPopover(targetOpenState);
       await nextFrame();
     }
     async makeTransition(targetOpenState) {
@@ -96,6 +85,7 @@ export function OverlayPopover(constructor) {
           return;
         }
         const eventName = targetOpenState ? "sp-opened" : "sp-closed";
+        this.isVisible = this.isVisible && targetOpenState;
         if (index > 0) {
           el.dispatchEvent(
             new CustomEvent(eventName, {
@@ -164,7 +154,7 @@ export function OverlayPopover(constructor) {
         }
       };
       this.elements.forEach((el, index) => {
-        guaranteedTransitionend(
+        guaranteedAllTransitionend(
           el,
           start(el, index),
           finish(el, index)
@@ -172,27 +162,6 @@ export function OverlayPopover(constructor) {
       });
       return focusEl;
     }
-    async applyFocus(targetOpenState, focusEl) {
-      if (this.receivesFocus === "false" || this.type === "hint") {
-        return;
-      }
-      await nextFrame();
-      await nextFrame();
-      if (targetOpenState === this.open && !this.open) {
-        if (
-          // Only return focus when the trigger is not "virtual"
-          this.triggerElement && !(this.triggerElement instanceof VirtualTrigger)
-        ) {
-          if (this.contains(
-            this.getRootNode().activeElement
-          )) {
-            this.triggerElement.focus();
-          }
-        }
-        return;
-      }
-      focusEl == null ? void 0 : focusEl.focus();
-    }
   }
   return OverlayWithPopover;
 }

package/src/OverlayPopover.dev.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["OverlayPopover.ts"],
-  "sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport {\n    firstFocusableIn,\n    firstFocusableSlottedIn,\n} from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport { ReactiveElement } from 'lit';\nimport {\n    BeforetoggleClosedEvent,\n    BeforetoggleOpenEvent,\n    guaranteedTransitionend,\n    OpenableElement,\n    OverlayBase,\n    overlayTimer,\n} from './OverlayBase.dev.js'\nimport { VirtualTrigger } from './VirtualTrigger.dev.js'\nimport { OverlayOpenCloseDetail } from './overlay-types.dev.js'\n\ntype Constructor<T = Record<string, unknown>> = {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    new (...args: any[]): T;\n    prototype: T;\n};\n\nfunction nextFrame(): Promise<void> {\n    return new Promise((res) => requestAnimationFrame(() => res()));\n}\n\nexport function OverlayPopover<T extends Constructor<OverlayBase>>(\n    constructor: T\n): T & Constructor<ReactiveElement> {\n    class OverlayWithPopover extends constructor {\n        protected override async managePopoverOpen(): Promise<void> {\n            const targetOpenState = this.open;\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.manageDelay(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.ensureOnDOM(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            const focusEl = await this.makeTransition(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.applyFocus(targetOpenState, focusEl);\n        }\n\n        private async manageDelay(targetOpenState: boolean): Promise<void> {\n            if (targetOpenState === false || targetOpenState !== this.open) {\n                overlayTimer.close(this);\n                return;\n            }\n            if (this.delayed) {\n                const cancelled = await overlayTimer.openTimer(this);\n                if (cancelled) {\n                    this.open = !targetOpenState;\n                }\n            }\n        }\n\n        private async ensureOnDOM(targetOpenState: boolean): Promise<void> {\n            await nextFrame();\n            let popoverOpen = false;\n            try {\n                popoverOpen = this.dialogEl.matches(':popover-open');\n                // eslint-disable-next-line no-empty\n            } catch (error) {}\n            let open = false;\n            try {\n                open = this.dialogEl.matches(':open');\n                // eslint-disable-next-line no-empty\n            } catch (error) {}\n            if (\n                targetOpenState &&\n                this.open === targetOpenState &&\n                !popoverOpen &&\n                !open &&\n                this.isConnected\n            ) {\n                this.dialogEl.showPopover();\n                await this.managePosition();\n            }\n            await nextFrame();\n        }\n\n        private async makeTransition(\n            targetOpenState: boolean\n        ): Promise<HTMLElement | null> {\n            if (this.open !== targetOpenState) {\n                return null;\n            }\n            let focusEl = null as HTMLElement | null;\n            const start = (el: OpenableElement, index: number) => (): void => {\n                if (typeof el.open !== 'undefined') {\n                    el.open = targetOpenState;\n                }\n                if (index === 0) {\n                    const event = targetOpenState\n                        ? BeforetoggleOpenEvent\n                        : BeforetoggleClosedEvent;\n                    this.dispatchEvent(new event());\n                }\n                if (!targetOpenState) {\n                    return;\n                }\n                focusEl = focusEl || firstFocusableIn(el);\n                if (focusEl) {\n                    return;\n                }\n                const childSlots = el.querySelectorAll('slot');\n                childSlots.forEach((slot) => {\n                    if (!focusEl) {\n                        focusEl = firstFocusableSlottedIn(slot);\n                    }\n                });\n            };\n            const finish =\n                (el: OpenableElement, index: number) =>\n                async (): Promise<void> => {\n                    if (this.open !== targetOpenState) {\n                        return;\n                    }\n                    const eventName = targetOpenState\n                        ? 'sp-opened'\n                        : 'sp-closed';\n                    if (index > 0) {\n                        el.dispatchEvent(\n                            new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                                bubbles: false,\n                                composed: false,\n                                detail: { interaction: this.type },\n                            })\n                        );\n                        return;\n                    }\n                    const reportChange = async (): Promise<void> => {\n                        if (this.open !== targetOpenState) {\n                            return;\n                        }\n                        await nextFrame();\n                        const hasVirtualTrigger =\n                            this.triggerElement instanceof VirtualTrigger;\n                        this.dispatchEvent(\n                            new Event(eventName, {\n                                bubbles: hasVirtualTrigger,\n                                composed: hasVirtualTrigger,\n                            })\n                        );\n                        el.dispatchEvent(\n                            new Event(eventName, {\n                                bubbles: false,\n                                composed: false,\n                            })\n                        );\n                        if (this.triggerElement && !hasVirtualTrigger) {\n                            (this.triggerElement as HTMLElement).dispatchEvent(\n                                new CustomEvent<OverlayOpenCloseDetail>(\n                                    eventName,\n                                    {\n                                        bubbles: true,\n                                        composed: true,\n                                        detail: { interaction: this.type },\n                                    }\n                                )\n                            );\n                        }\n                    };\n                    if (this.open !== targetOpenState) {\n                        return;\n                    }\n                    let popoverOpen = false;\n                    try {\n                        popoverOpen = this.dialogEl.matches(':popover-open');\n                        // eslint-disable-next-line no-empty\n                    } catch (error) {}\n                    let open = false;\n                    try {\n                        open = this.dialogEl.matches(':open');\n                        // eslint-disable-next-line no-empty\n                    } catch (error) {}\n                    if (\n                        targetOpenState !== true &&\n                        (popoverOpen || open) &&\n                        this.isConnected\n                    ) {\n                        this.dialogEl.addEventListener(\n                            'beforetoggle',\n                            () => {\n                                reportChange();\n                            },\n                            { once: true }\n                        );\n                        this.dialogEl.hidePopover();\n                    } else {\n                        reportChange();\n                    }\n                };\n            this.elements.forEach((el, index) => {\n                guaranteedTransitionend(\n                    el,\n                    start(el, index),\n                    finish(el, index)\n                );\n            });\n            return focusEl;\n        }\n\n        private async applyFocus(\n            targetOpenState: boolean,\n            focusEl: HTMLElement | null\n        ): Promise<void> {\n            // Do not move focus when explicitly told not to\n            // and when the Overlay is a \"hint\"\n            if (this.receivesFocus === 'false' || this.type === 'hint') {\n                return;\n            }\n\n            await nextFrame();\n            await nextFrame();\n            if (targetOpenState === this.open && !this.open) {\n                if (\n                    // Only return focus when the trigger is not \"virtual\"\n                    this.triggerElement &&\n                    !(this.triggerElement instanceof VirtualTrigger)\n                ) {\n                    if (\n                        this.contains(\n                            (this.getRootNode() as Document).activeElement\n                        )\n                    ) {\n                        this.triggerElement.focus();\n                    }\n                }\n                return;\n            }\n\n            focusEl?.focus();\n        }\n    }\n    return OverlayWithPopover;\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport {\n    firstFocusableIn,\n    firstFocusableSlottedIn,\n} from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport { ReactiveElement } from 'lit';\nimport { VirtualTrigger } from './VirtualTrigger.dev.js'\nimport {\n    Constructor,\n    OpenableElement,\n    OverlayOpenCloseDetail,\n} from './overlay-types.dev.js'\nimport {\n    BeforetoggleClosedEvent,\n    BeforetoggleOpenEvent,\n    guaranteedAllTransitionend,\n    nextFrame,\n    overlayTimer,\n} from './AbstractOverlay.dev.js'\nimport type { AbstractOverlay } from './AbstractOverlay.dev.js'\n\nexport function OverlayPopover<T extends Constructor<AbstractOverlay>>(\n    constructor: T\n): T & Constructor<ReactiveElement> {\n    class OverlayWithPopover extends constructor {\n        protected override async manageDelay(\n            targetOpenState: boolean\n        ): Promise<void> {\n            if (targetOpenState === false || targetOpenState !== this.open) {\n                overlayTimer.close(this);\n                return;\n            }\n            if (this.delayed) {\n                const cancelled = await overlayTimer.openTimer(this);\n                if (cancelled) {\n                    this.open = !targetOpenState;\n                }\n            }\n        }\n\n        private async shouldHidePopover(\n            targetOpenState: boolean\n        ): Promise<void> {\n            if (targetOpenState && this.open !== targetOpenState) {\n                return;\n            }\n            // When in a parent Overlay, this Overlay may need to position itself\n            // while closing in due to the parent _also_ closing which means the\n            // location can no longer rely on \"top layer over transform\" math.\n            await this.placementController.resetOverlayPosition();\n        }\n\n        private async shouldShowPopover(\n            targetOpenState: boolean\n        ): Promise<void> {\n            let popoverOpen = false;\n            try {\n                popoverOpen = this.dialogEl.matches(':popover-open');\n                // eslint-disable-next-line no-empty\n            } catch (error) {}\n            let open = false;\n            try {\n                open = this.dialogEl.matches(':open');\n                // eslint-disable-next-line no-empty\n            } catch (error) {}\n            if (\n                targetOpenState &&\n                this.open === targetOpenState &&\n                !popoverOpen &&\n                !open &&\n                this.isConnected\n            ) {\n                this.dialogEl.showPopover();\n                await this.managePosition();\n            }\n        }\n\n        protected override async ensureOnDOM(\n            targetOpenState: boolean\n        ): Promise<void> {\n            await nextFrame();\n            await this.shouldHidePopover(targetOpenState);\n            await this.shouldShowPopover(targetOpenState);\n            await nextFrame();\n        }\n\n        protected override async makeTransition(\n            targetOpenState: boolean\n        ): Promise<HTMLElement | null> {\n            if (this.open !== targetOpenState) {\n                return null;\n            }\n            let focusEl = null as HTMLElement | null;\n            const start = (el: OpenableElement, index: number) => (): void => {\n                if (typeof el.open !== 'undefined') {\n                    el.open = targetOpenState;\n                }\n                if (index === 0) {\n                    const event = targetOpenState\n                        ? BeforetoggleOpenEvent\n                        : BeforetoggleClosedEvent;\n                    this.dispatchEvent(new event());\n                }\n                if (!targetOpenState) {\n                    return;\n                }\n                focusEl = focusEl || firstFocusableIn(el);\n                if (focusEl) {\n                    return;\n                }\n                const childSlots = el.querySelectorAll('slot');\n                childSlots.forEach((slot) => {\n                    if (!focusEl) {\n                        focusEl = firstFocusableSlottedIn(slot);\n                    }\n                });\n            };\n            const finish =\n                (el: OpenableElement, index: number) =>\n                async (): Promise<void> => {\n                    if (this.open !== targetOpenState) {\n                        return;\n                    }\n                    const eventName = targetOpenState\n                        ? 'sp-opened'\n                        : 'sp-closed';\n                    this.isVisible = this.isVisible && targetOpenState;\n                    if (index > 0) {\n                        el.dispatchEvent(\n                            new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                                bubbles: false,\n                                composed: false,\n                                detail: { interaction: this.type },\n                            })\n                        );\n                        return;\n                    }\n                    const reportChange = async (): Promise<void> => {\n                        if (this.open !== targetOpenState) {\n                            return;\n                        }\n                        await nextFrame();\n                        const hasVirtualTrigger =\n                            this.triggerElement instanceof VirtualTrigger;\n                        this.dispatchEvent(\n                            new Event(eventName, {\n                                bubbles: hasVirtualTrigger,\n                                composed: hasVirtualTrigger,\n                            })\n                        );\n                        el.dispatchEvent(\n                            new Event(eventName, {\n                                bubbles: false,\n                                composed: false,\n                            })\n                        );\n                        if (this.triggerElement && !hasVirtualTrigger) {\n                            (this.triggerElement as HTMLElement).dispatchEvent(\n                                new CustomEvent<OverlayOpenCloseDetail>(\n                                    eventName,\n                                    {\n                                        bubbles: true,\n                                        composed: true,\n                                        detail: { interaction: this.type },\n                                    }\n                                )\n                            );\n                        }\n                    };\n                    if (this.open !== targetOpenState) {\n                        return;\n                    }\n                    let popoverOpen = false;\n                    try {\n                        popoverOpen = this.dialogEl.matches(':popover-open');\n                        // eslint-disable-next-line no-empty\n                    } catch (error) {}\n                    let open = false;\n                    try {\n                        open = this.dialogEl.matches(':open');\n                        // eslint-disable-next-line no-empty\n                    } catch (error) {}\n                    if (\n                        targetOpenState !== true &&\n                        (popoverOpen || open) &&\n                        this.isConnected\n                    ) {\n                        this.dialogEl.addEventListener(\n                            'beforetoggle',\n                            () => {\n                                reportChange();\n                            },\n                            { once: true }\n                        );\n                        this.dialogEl.hidePopover();\n                    } else {\n                        reportChange();\n                    }\n                };\n            this.elements.forEach((el, index) => {\n                guaranteedAllTransitionend(\n                    el,\n                    start(el, index),\n                    finish(el, index)\n                );\n            });\n            return focusEl;\n        }\n    }\n    return OverlayWithPopover;\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/src/OverlayPopover.js

@@ -1,2 +1,2 @@
-"use strict";import{firstFocusableIn as v,firstFocusableSlottedIn as E}from"@spectrum-web-components/shared/src/first-focusable-in.js";import{BeforetoggleClosedEvent as y,BeforetoggleOpenEvent as g,guaranteedTransitionend as b,overlayTimer as u}from"./OverlayBase.js";import{VirtualTrigger as f}from"./VirtualTrigger.js";function a(){return new Promise(c=>requestAnimationFrame(()=>c()))}export function OverlayPopover(c){class d extends c{async managePopoverOpen(){const e=this.open;if(this.open!==e||(await this.manageDelay(e),this.open!==e)||(await this.ensureOnDOM(e),this.open!==e))return;const t=await this.makeTransition(e);this.open===e&&await this.applyFocus(e,t)}async manageDelay(e){if(e===!1||e!==this.open){u.close(this);return}this.delayed&&await u.openTimer(this)&&(this.open=!e)}async ensureOnDOM(e){await a();let t=!1;try{t=this.dialogEl.matches(":popover-open")}catch(p){}let l=!1;try{l=this.dialogEl.matches(":open")}catch(p){}e&&this.open===e&&!t&&!l&&this.isConnected&&(this.dialogEl.showPopover(),await this.managePosition()),await a()}async makeTransition(e){if(this.open!==e)return null;let t=null;const l=(i,o)=>()=>{if(typeof i.open!="undefined"&&(i.open=e),o===0){const n=e?g:y;this.dispatchEvent(new n)}if(!e||(t=t||v(i),t))return;i.querySelectorAll("slot").forEach(n=>{t||(t=E(n))})},p=(i,o)=>async()=>{if(this.open!==e)return;const s=e?"sp-opened":"sp-closed";if(o>0){i.dispatchEvent(new CustomEvent(s,{bubbles:!1,composed:!1,detail:{interaction:this.type}}));return}const n=async()=>{if(this.open!==e)return;await a();const r=this.triggerElement instanceof f;this.dispatchEvent(new Event(s,{bubbles:r,composed:r})),i.dispatchEvent(new Event(s,{bubbles:!1,composed:!1})),this.triggerElement&&!r&&this.triggerElement.dispatchEvent(new CustomEvent(s,{bubbles:!0,composed:!0,detail:{interaction:this.type}}))};if(this.open!==e)return;let h=!1;try{h=this.dialogEl.matches(":popover-open")}catch(r){}let m=!1;try{m=this.dialogEl.matches(":open")}catch(r){}e!==!0&&(h||m)&&this.isConnected?(this.dialogEl.addEventListener("beforetoggle",()=>{n()},{once:!0}),this.dialogEl.hidePopover()):n()};return this.elements.forEach((i,o)=>{b(i,l(i,o),p(i,o))}),t}async applyFocus(e,t){if(!(this.receivesFocus==="false"||this.type==="hint")){if(await a(),await a(),e===this.open&&!this.open){this.triggerElement&&!(this.triggerElement instanceof f)&&this.contains(this.getRootNode().activeElement)&&this.triggerElement.focus();return}t==null||t.focus()}}}return d}
+"use strict";import{firstFocusableIn as f,firstFocusableSlottedIn as u}from"@spectrum-web-components/shared/src/first-focusable-in.js";import{VirtualTrigger as E}from"./VirtualTrigger.js";import{BeforetoggleClosedEvent as b,BeforetoggleOpenEvent as y,guaranteedAllTransitionend as P,nextFrame as c,overlayTimer as d}from"./AbstractOverlay.js";export function OverlayPopover(m){class v extends m{async manageDelay(e){if(e===!1||e!==this.open){d.close(this);return}this.delayed&&await d.openTimer(this)&&(this.open=!e)}async shouldHidePopover(e){e&&this.open!==e||await this.placementController.resetOverlayPosition()}async shouldShowPopover(e){let i=!1;try{i=this.dialogEl.matches(":popover-open")}catch(a){}let l=!1;try{l=this.dialogEl.matches(":open")}catch(a){}e&&this.open===e&&!i&&!l&&this.isConnected&&(this.dialogEl.showPopover(),await this.managePosition())}async ensureOnDOM(e){await c(),await this.shouldHidePopover(e),await this.shouldShowPopover(e),await c()}async makeTransition(e){if(this.open!==e)return null;let i=null;const l=(o,s)=>()=>{if(typeof o.open!="undefined"&&(o.open=e),s===0){const t=e?y:b;this.dispatchEvent(new t)}if(!e||(i=i||f(o),i))return;o.querySelectorAll("slot").forEach(t=>{i||(i=u(t))})},a=(o,s)=>async()=>{if(this.open!==e)return;const r=e?"sp-opened":"sp-closed";if(this.isVisible=this.isVisible&&e,s>0){o.dispatchEvent(new CustomEvent(r,{bubbles:!1,composed:!1,detail:{interaction:this.type}}));return}const t=async()=>{if(this.open!==e)return;await c();const n=this.triggerElement instanceof E;this.dispatchEvent(new Event(r,{bubbles:n,composed:n})),o.dispatchEvent(new Event(r,{bubbles:!1,composed:!1})),this.triggerElement&&!n&&this.triggerElement.dispatchEvent(new CustomEvent(r,{bubbles:!0,composed:!0,detail:{interaction:this.type}}))};if(this.open!==e)return;let h=!1;try{h=this.dialogEl.matches(":popover-open")}catch(n){}let p=!1;try{p=this.dialogEl.matches(":open")}catch(n){}e!==!0&&(h||p)&&this.isConnected?(this.dialogEl.addEventListener("beforetoggle",()=>{t()},{once:!0}),this.dialogEl.hidePopover()):t()};return this.elements.forEach((o,s)=>{P(o,l(o,s),a(o,s))}),i}}return v}
 //# sourceMappingURL=OverlayPopover.js.map

package/src/OverlayPopover.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["OverlayPopover.ts"],
-  "sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport {\n    firstFocusableIn,\n    firstFocusableSlottedIn,\n} from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport { ReactiveElement } from 'lit';\nimport {\n    BeforetoggleClosedEvent,\n    BeforetoggleOpenEvent,\n    guaranteedTransitionend,\n    OpenableElement,\n    OverlayBase,\n    overlayTimer,\n} from './OverlayBase.js';\nimport { VirtualTrigger } from './VirtualTrigger.js';\nimport { OverlayOpenCloseDetail } from './overlay-types.js';\n\ntype Constructor<T = Record<string, unknown>> = {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    new (...args: any[]): T;\n    prototype: T;\n};\n\nfunction nextFrame(): Promise<void> {\n    return new Promise((res) => requestAnimationFrame(() => res()));\n}\n\nexport function OverlayPopover<T extends Constructor<OverlayBase>>(\n    constructor: T\n): T & Constructor<ReactiveElement> {\n    class OverlayWithPopover extends constructor {\n        protected override async managePopoverOpen(): Promise<void> {\n            const targetOpenState = this.open;\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.manageDelay(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.ensureOnDOM(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            const focusEl = await this.makeTransition(targetOpenState);\n            if (this.open !== targetOpenState) {\n                return;\n            }\n            await this.applyFocus(targetOpenState, focusEl);\n        }\n\n        private async manageDelay(targetOpenState: boolean): Promise<void> {\n            if (targetOpenState === false || targetOpenState !== this.open) {\n                overlayTimer.close(this);\n                return;\n            }\n            if (this.delayed) {\n                const cancelled = await overlayTimer.openTimer(this);\n                if (cancelled) {\n                    this.open = !targetOpenState;\n                }\n            }\n        }\n\n        private async ensureOnDOM(targetOpenState: boolean): Promise<void> {\n            await nextFrame();\n            let popoverOpen = false;\n            try {\n                popoverOpen = this.dialogEl.matches(':popover-open');\n                // eslint-disable-next-line no-empty\n            } catch (error) {}\n            let open = false;\n            try {\n                open = this.dialogEl.matches(':open');\n                // eslint-disable-next-line no-empty\n            } catch (error) {}\n            if (\n                targetOpenState &&\n                this.open === targetOpenState &&\n                !popoverOpen &&\n                !open &&\n                this.isConnected\n            ) {\n                this.dialogEl.showPopover();\n                await this.managePosition();\n            }\n            await nextFrame();\n        }\n\n        private async makeTransition(\n            targetOpenState: boolean\n        ): Promise<HTMLElement | null> {\n            if (this.open !== targetOpenState) {\n                return null;\n            }\n            let focusEl = null as HTMLElement | null;\n            const start = (el: OpenableElement, index: number) => (): void => {\n                if (typeof el.open !== 'undefined') {\n                    el.open = targetOpenState;\n                }\n                if (index === 0) {\n                    const event = targetOpenState\n                        ? BeforetoggleOpenEvent\n                        : BeforetoggleClosedEvent;\n                    this.dispatchEvent(new event());\n                }\n                if (!targetOpenState) {\n                    return;\n                }\n                focusEl = focusEl || firstFocusableIn(el);\n                if (focusEl) {\n                    return;\n                }\n                const childSlots = el.querySelectorAll('slot');\n                childSlots.forEach((slot) => {\n                    if (!focusEl) {\n                        focusEl = firstFocusableSlottedIn(slot);\n                    }\n                });\n            };\n            const finish =\n                (el: OpenableElement, index: number) =>\n                async (): Promise<void> => {\n                    if (this.open !== targetOpenState) {\n                        return;\n                    }\n                    const eventName = targetOpenState\n                        ? 'sp-opened'\n                        : 'sp-closed';\n                    if (index > 0) {\n                        el.dispatchEvent(\n                            new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                                bubbles: false,\n                                composed: false,\n                                detail: { interaction: this.type },\n                            })\n                        );\n                        return;\n                    }\n                    const reportChange = async (): Promise<void> => {\n                        if (this.open !== targetOpenState) {\n                            return;\n                        }\n                        await nextFrame();\n                        const hasVirtualTrigger =\n                            this.triggerElement instanceof VirtualTrigger;\n                        this.dispatchEvent(\n                            new Event(eventName, {\n                                bubbles: hasVirtualTrigger,\n                                composed: hasVirtualTrigger,\n                            })\n                        );\n                        el.dispatchEvent(\n                            new Event(eventName, {\n                                bubbles: false,\n                                composed: false,\n                            })\n                        );\n                        if (this.triggerElement && !hasVirtualTrigger) {\n                            (this.triggerElement as HTMLElement).dispatchEvent(\n                                new CustomEvent<OverlayOpenCloseDetail>(\n                                    eventName,\n                                    {\n                                        bubbles: true,\n                                        composed: true,\n                                        detail: { interaction: this.type },\n                                    }\n                                )\n                            );\n                        }\n                    };\n                    if (this.open !== targetOpenState) {\n                        return;\n                    }\n                    let popoverOpen = false;\n                    try {\n                        popoverOpen = this.dialogEl.matches(':popover-open');\n                        // eslint-disable-next-line no-empty\n                    } catch (error) {}\n                    let open = false;\n                    try {\n                        open = this.dialogEl.matches(':open');\n                        // eslint-disable-next-line no-empty\n                    } catch (error) {}\n                    if (\n                        targetOpenState !== true &&\n                        (popoverOpen || open) &&\n                        this.isConnected\n                    ) {\n                        this.dialogEl.addEventListener(\n                            'beforetoggle',\n                            () => {\n                                reportChange();\n                            },\n                            { once: true }\n                        );\n                        this.dialogEl.hidePopover();\n                    } else {\n                        reportChange();\n                    }\n                };\n            this.elements.forEach((el, index) => {\n                guaranteedTransitionend(\n                    el,\n                    start(el, index),\n                    finish(el, index)\n                );\n            });\n            return focusEl;\n        }\n\n        private async applyFocus(\n            targetOpenState: boolean,\n            focusEl: HTMLElement | null\n        ): Promise<void> {\n            // Do not move focus when explicitly told not to\n            // and when the Overlay is a \"hint\"\n            if (this.receivesFocus === 'false' || this.type === 'hint') {\n                return;\n            }\n\n            await nextFrame();\n            await nextFrame();\n            if (targetOpenState === this.open && !this.open) {\n                if (\n                    // Only return focus when the trigger is not \"virtual\"\n                    this.triggerElement &&\n                    !(this.triggerElement instanceof VirtualTrigger)\n                ) {\n                    if (\n                        this.contains(\n                            (this.getRootNode() as Document).activeElement\n                        )\n                    ) {\n                        this.triggerElement.focus();\n                    }\n                }\n                return;\n            }\n\n            focusEl?.focus();\n        }\n    }\n    return OverlayWithPopover;\n}\n"],
-  "mappings": "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",
-  "names": ["firstFocusableIn", "firstFocusableSlottedIn", "BeforetoggleClosedEvent", "BeforetoggleOpenEvent", "guaranteedTransitionend", "overlayTimer", "VirtualTrigger", "nextFrame", "res", "constructor", "OverlayWithPopover", "targetOpenState", "focusEl", "popoverOpen", "error", "open", "start", "el", "index", "event", "slot", "finish", "eventName", "reportChange", "hasVirtualTrigger"]
+  "sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport {\n    firstFocusableIn,\n    firstFocusableSlottedIn,\n} from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport { ReactiveElement } from 'lit';\nimport { VirtualTrigger } from './VirtualTrigger.js';\nimport {\n    Constructor,\n    OpenableElement,\n    OverlayOpenCloseDetail,\n} from './overlay-types.js';\nimport {\n    BeforetoggleClosedEvent,\n    BeforetoggleOpenEvent,\n    guaranteedAllTransitionend,\n    nextFrame,\n    overlayTimer,\n} from './AbstractOverlay.js';\nimport type { AbstractOverlay } from './AbstractOverlay.js';\n\nexport function OverlayPopover<T extends Constructor<AbstractOverlay>>(\n    constructor: T\n): T & Constructor<ReactiveElement> {\n    class OverlayWithPopover extends constructor {\n        protected override async manageDelay(\n            targetOpenState: boolean\n        ): Promise<void> {\n            if (targetOpenState === false || targetOpenState !== this.open) {\n                overlayTimer.close(this);\n                return;\n            }\n            if (this.delayed) {\n                const cancelled = await overlayTimer.openTimer(this);\n                if (cancelled) {\n                    this.open = !targetOpenState;\n                }\n            }\n        }\n\n        private async shouldHidePopover(\n            targetOpenState: boolean\n        ): Promise<void> {\n            if (targetOpenState && this.open !== targetOpenState) {\n                return;\n            }\n            // When in a parent Overlay, this Overlay may need to position itself\n            // while closing in due to the parent _also_ closing which means the\n            // location can no longer rely on \"top layer over transform\" math.\n            await this.placementController.resetOverlayPosition();\n        }\n\n        private async shouldShowPopover(\n            targetOpenState: boolean\n        ): Promise<void> {\n            let popoverOpen = false;\n            try {\n                popoverOpen = this.dialogEl.matches(':popover-open');\n                // eslint-disable-next-line no-empty\n            } catch (error) {}\n            let open = false;\n            try {\n                open = this.dialogEl.matches(':open');\n                // eslint-disable-next-line no-empty\n            } catch (error) {}\n            if (\n                targetOpenState &&\n                this.open === targetOpenState &&\n                !popoverOpen &&\n                !open &&\n                this.isConnected\n            ) {\n                this.dialogEl.showPopover();\n                await this.managePosition();\n            }\n        }\n\n        protected override async ensureOnDOM(\n            targetOpenState: boolean\n        ): Promise<void> {\n            await nextFrame();\n            await this.shouldHidePopover(targetOpenState);\n            await this.shouldShowPopover(targetOpenState);\n            await nextFrame();\n        }\n\n        protected override async makeTransition(\n            targetOpenState: boolean\n        ): Promise<HTMLElement | null> {\n            if (this.open !== targetOpenState) {\n                return null;\n            }\n            let focusEl = null as HTMLElement | null;\n            const start = (el: OpenableElement, index: number) => (): void => {\n                if (typeof el.open !== 'undefined') {\n                    el.open = targetOpenState;\n                }\n                if (index === 0) {\n                    const event = targetOpenState\n                        ? BeforetoggleOpenEvent\n                        : BeforetoggleClosedEvent;\n                    this.dispatchEvent(new event());\n                }\n                if (!targetOpenState) {\n                    return;\n                }\n                focusEl = focusEl || firstFocusableIn(el);\n                if (focusEl) {\n                    return;\n                }\n                const childSlots = el.querySelectorAll('slot');\n                childSlots.forEach((slot) => {\n                    if (!focusEl) {\n                        focusEl = firstFocusableSlottedIn(slot);\n                    }\n                });\n            };\n            const finish =\n                (el: OpenableElement, index: number) =>\n                async (): Promise<void> => {\n                    if (this.open !== targetOpenState) {\n                        return;\n                    }\n                    const eventName = targetOpenState\n                        ? 'sp-opened'\n                        : 'sp-closed';\n                    this.isVisible = this.isVisible && targetOpenState;\n                    if (index > 0) {\n                        el.dispatchEvent(\n                            new CustomEvent<OverlayOpenCloseDetail>(eventName, {\n                                bubbles: false,\n                                composed: false,\n                                detail: { interaction: this.type },\n                            })\n                        );\n                        return;\n                    }\n                    const reportChange = async (): Promise<void> => {\n                        if (this.open !== targetOpenState) {\n                            return;\n                        }\n                        await nextFrame();\n                        const hasVirtualTrigger =\n                            this.triggerElement instanceof VirtualTrigger;\n                        this.dispatchEvent(\n                            new Event(eventName, {\n                                bubbles: hasVirtualTrigger,\n                                composed: hasVirtualTrigger,\n                            })\n                        );\n                        el.dispatchEvent(\n                            new Event(eventName, {\n                                bubbles: false,\n                                composed: false,\n                            })\n                        );\n                        if (this.triggerElement && !hasVirtualTrigger) {\n                            (this.triggerElement as HTMLElement).dispatchEvent(\n                                new CustomEvent<OverlayOpenCloseDetail>(\n                                    eventName,\n                                    {\n                                        bubbles: true,\n                                        composed: true,\n                                        detail: { interaction: this.type },\n                                    }\n                                )\n                            );\n                        }\n                    };\n                    if (this.open !== targetOpenState) {\n                        return;\n                    }\n                    let popoverOpen = false;\n                    try {\n                        popoverOpen = this.dialogEl.matches(':popover-open');\n                        // eslint-disable-next-line no-empty\n                    } catch (error) {}\n                    let open = false;\n                    try {\n                        open = this.dialogEl.matches(':open');\n                        // eslint-disable-next-line no-empty\n                    } catch (error) {}\n                    if (\n                        targetOpenState !== true &&\n                        (popoverOpen || open) &&\n                        this.isConnected\n                    ) {\n                        this.dialogEl.addEventListener(\n                            'beforetoggle',\n                            () => {\n                                reportChange();\n                            },\n                            { once: true }\n                        );\n                        this.dialogEl.hidePopover();\n                    } else {\n                        reportChange();\n                    }\n                };\n            this.elements.forEach((el, index) => {\n                guaranteedAllTransitionend(\n                    el,\n                    start(el, index),\n                    finish(el, index)\n                );\n            });\n            return focusEl;\n        }\n    }\n    return OverlayWithPopover;\n}\n"],
+  "mappings": "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",
+  "names": ["firstFocusableIn", "firstFocusableSlottedIn", "VirtualTrigger", "BeforetoggleClosedEvent", "BeforetoggleOpenEvent", "guaranteedAllTransitionend", "nextFrame", "overlayTimer", "constructor", "OverlayWithPopover", "targetOpenState", "popoverOpen", "error", "open", "focusEl", "start", "el", "index", "event", "slot", "finish", "eventName", "reportChange", "hasVirtualTrigger"]
 }

package/src/OverlayStack.d.ts

@@ -1,17 +1,24 @@
-import { OverlayBase as Overlay } from './OverlayBase.js';
+import { Overlay } from './Overlay.js';
 declare class OverlayStack {
     private get document();
+    private pointerdownPath?;
     private root;
     stack: Overlay[];
     constructor();
     bindEvents(): void;
     private closeOverlay;
+    /**
+     * Cach the `pointerdownTarget` for later testing
+     *
+     * @param event {ClickEvent}
+     */
+    handlePointerdown: (event: Event) => void;
     /**
      * Close all overlays that are not ancestors of this click event
      *
      * @param event {ClickEvent}
      */
-    handleClick: (event: Event) => void;
+    handlePointerup: () => void;
     handleBeforetoggle: (event: Event) => void;
     private handleKeydown;
     /**

package/src/OverlayStack.dev.js

@@ -4,15 +4,27 @@ class OverlayStack {
   constructor() {
     this.root = document.body;
     this.stack = [];
+    /**
+     * Cach the `pointerdownTarget` for later testing
+     *
+     * @param event {ClickEvent}
+     */
+    this.handlePointerdown = (event) => {
+      this.pointerdownPath = event.composedPath();
+    };
     /**
      * Close all overlays that are not ancestors of this click event
      *
      * @param event {ClickEvent}
      */
-    this.handleClick = (event) => {
+    this.handlePointerup = () => {
+      var _a;
       if (!this.stack.length)
         return;
-      const composedPath = event.composedPath();
+      if (!((_a = this.pointerdownPath) == null ? void 0 : _a.length))
+        return;
+      const composedPath = this.pointerdownPath;
+      this.pointerdownPath = void 0;
       const nonAncestorOverlays = this.stack.filter((overlay) => {
         const inStack = composedPath.find(
           (el) => el === overlay || el === (overlay == null ? void 0 : overlay.triggerElement)
@@ -57,7 +69,8 @@ class OverlayStack {
     return this.root.ownerDocument || document;
   }
   bindEvents() {
-    this.document.addEventListener("pointerup", this.handleClick);
+    this.document.addEventListener("pointerdown", this.handlePointerdown);
+    this.document.addEventListener("pointerup", this.handlePointerup);
     this.document.addEventListener("keydown", this.handleKeydown);
   }
   closeOverlay(overlay) {