@spectrum-web-components/overlay 0.35.1-rc.41 → 0.36.0

package/src/ActiveOverlay.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["ActiveOverlay.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*/\n\nimport {\n    CSSResultArray,\n    html,\n    SpectrumElement,\n    TemplateResult,\n} from '@spectrum-web-components/base';\nimport { ifDefined } from '@spectrum-web-components/base/src/directives.js';\nimport { property } from '@spectrum-web-components/base/src/decorators.js';\nimport { reparentChildren } from '@spectrum-web-components/shared/src/reparent-children.js';\nimport { firstFocusableIn } from '@spectrum-web-components/shared/src/first-focusable-in.js';\nimport type {\n    Color,\n    Scale,\n    ThemeVariant,\n} from '@spectrum-web-components/theme/src/Theme.js';\nimport styles from './active-overlay.css.js';\nimport { parentOverlayOf } from './overlay-utils.js';\nimport {\n    OverlayOpenCloseDetail,\n    OverlayOpenDetail,\n    Placement,\n    TriggerInteractions,\n} from './overlay-types.js';\nimport type { VirtualTrigger } from './VirtualTrigger.js';\nimport {\n    arrow,\n    autoUpdate,\n    computePosition,\n    flip,\n    Placement as FloatingUIPlacement,\n    offset,\n    shift,\n    size,\n} from '@floating-ui/dom';\n\nexport interface PositionResult {\n    arrowOffsetLeft: number;\n    arrowOffsetTop: number;\n    maxHeight: number;\n    placement: string;\n    positionLeft: number;\n    positionTop: number;\n}\n\ntype OverlayStateType = 'idle' | 'active' | 'hiding' | 'dispose' | 'disposed';\ntype ContentAnimation = 'sp-overlay-fade-in' | 'sp-overlay-fade-out';\n\nconst stateMachine: {\n    initial: OverlayStateType;\n    states: {\n        [stateName: string]: {\n            on: {\n                [transitionName: string]: OverlayStateType;\n            };\n        };\n    };\n} = {\n    initial: 'idle',\n    states: {\n        idle: {\n            on: {\n                active: 'active',\n            },\n        },\n        active: {\n            on: {\n                hiding: 'hiding',\n                idle: 'idle',\n            },\n        },\n        hiding: {\n            on: {\n                dispose: 'dispose',\n            },\n        },\n        dispose: {\n            on: {\n                disposed: 'disposed',\n            },\n        },\n        disposed: {\n            on: {},\n        },\n    },\n};\n\nconst stateTransition = (\n    state?: OverlayStateType,\n    event?: string\n): OverlayStateType => {\n    if (!state) return stateMachine.initial;\n    /* c8 ignore next */\n    if (!event) return state;\n    return stateMachine.states[state].on[event] || state;\n};\n\nconst getFallbackPlacements = (\n    placement: FloatingUIPlacement\n): FloatingUIPlacement[] => {\n    const fallbacks: Record<FloatingUIPlacement, FloatingUIPlacement[]> = {\n        left: ['right', 'bottom', 'top'],\n        'left-start': ['right-start', 'bottom', 'top'],\n        'left-end': ['right-end', 'bottom', 'top'],\n        right: ['left', 'bottom', 'top'],\n        'right-start': ['left-start', 'bottom', 'top'],\n        'right-end': ['left-end', 'bottom', 'top'],\n        top: ['bottom', 'left', 'right'],\n        'top-start': ['bottom-start', 'left', 'right'],\n        'top-end': ['bottom-end', 'left', 'right'],\n        bottom: ['top', 'left', 'right'],\n        'bottom-start': ['top-start', 'left', 'right'],\n        'bottom-end': ['top-end', 'left', 'right'],\n    };\n    return fallbacks[placement] ?? [placement];\n};\n\n/**\n * @element active-overlay\n *\n * @slot - content to display in the overlay\n */\nexport class ActiveOverlay extends SpectrumElement {\n    public overlayContent!: HTMLElement;\n    public overlayContentTip?: HTMLElement;\n    public trigger!: HTMLElement;\n    public root?: HTMLElement;\n    public virtualTrigger?: VirtualTrigger;\n    private cleanup?: () => void;\n\n    protected contentAnimationPromise: Promise<boolean> = Promise.resolve(true);\n    protected resolveContentAnimationPromise = (): void => {\n        return;\n    };\n\n    @property()\n    public _state = stateTransition();\n    public get state(): OverlayStateType {\n        return this._state;\n    }\n    public set state(state: OverlayStateType) {\n        const nextState = stateTransition(this.state, state);\n        if (nextState === this.state) {\n            return;\n        }\n        this._state = nextState;\n        if (this.state === 'active' || this.state === 'hiding') {\n            this.setAttribute('state', this.state);\n        } else {\n            this.removeAttribute('state');\n        }\n    }\n\n    @property({ reflect: true, type: Boolean })\n    public animating = false;\n\n    @property({ reflect: true })\n    public placement?: Placement;\n    @property({ attribute: false })\n    public theme: {\n        color?: Color;\n        scale?: Scale;\n        lang?: string;\n        theme?: ThemeVariant;\n    } = {};\n    @property({ attribute: false })\n    public receivesFocus?: 'auto';\n\n    public tabbingAway = false;\n    private originalPlacement?: Placement;\n    private restoreContent?: () => Element[];\n\n    public override async focus(): Promise<void> {\n        const firstFocusable = firstFocusableIn(this);\n        if (firstFocusable) {\n            if ((firstFocusable as SpectrumElement).updateComplete) {\n                await firstFocusable.updateComplete;\n            }\n            const activeElement = (this.getRootNode() as Document)\n                .activeElement;\n            if (activeElement === this || !this.contains(activeElement)) {\n                firstFocusable.focus();\n            }\n            /* c8 ignore next 3 */\n        } else {\n            super.focus();\n        }\n        this.removeAttribute('tabindex');\n    }\n\n    private get hasTheme(): boolean {\n        return !!this.theme.color || !!this.theme.scale || !!this.theme.lang;\n    }\n\n    public offset = 6;\n    public skidding = 0;\n    public interaction: TriggerInteractions = 'hover';\n    private positionAnimationFrame = 0;\n\n    private timeout?: number;\n\n    public static override get styles(): CSSResultArray {\n        return [styles];\n    }\n\n    public constructor() {\n        super();\n        this.stealOverlayContentPromise = new Promise(\n            (res) => (this.stealOverlayContentResolver = res)\n        );\n    }\n\n    private _modalRoot?: ActiveOverlay;\n\n    public get hasModalRoot(): boolean {\n        return !!this._modalRoot;\n    }\n\n    public feature(): void {\n        // eslint-disable-next-line @spectrum-web-components/document-active-element\n        if (!this.contains(document.activeElement)) {\n            this.tabIndex = -1;\n        }\n        const parentOverlay = parentOverlayOf(this.trigger);\n        const parentIsModal = parentOverlay && parentOverlay.slot === 'open';\n        if (parentIsModal) {\n            this._modalRoot = parentOverlay._modalRoot || parentOverlay;\n        }\n        // If an overlay it triggered from within a \"modal\" overlay, it needs to continue\n        // to act like one to get treated correctly in regards to tab trapping.\n        if (this.interaction === 'modal' || this._modalRoot) {\n            this.slot = 'open';\n            if (this.interaction === 'modal') {\n                this.setAttribute('aria-modal', 'true');\n            }\n            // If this isn't a modal root, walk up the overlays to the next modal root\n            // and \"feature\" each on of the intervening overlays.\n            if (this._modalRoot) {\n                parentOverlay?.feature();\n            }\n        }\n    }\n\n    public obscure(\n        nextOverlayInteraction: TriggerInteractions\n    ): ActiveOverlay | undefined {\n        if (this.slot && nextOverlayInteraction === 'modal') {\n            this.removeAttribute('slot');\n            this.removeAttribute('aria-modal');\n            // Obscure upto and including the next modal root.\n            if (this.interaction !== 'modal') {\n                const parentOverlay = parentOverlayOf(this.trigger);\n                this._modalRoot = parentOverlay?.obscure(\n                    nextOverlayInteraction\n                );\n                return this._modalRoot;\n            }\n            return this;\n        }\n        return undefined;\n    }\n\n    public override async willUpdate(): Promise<void> {\n        if (this.hasUpdated) return;\n\n        /* c8 ignore next */\n        if (!this.overlayContent || !this.trigger) return;\n\n        this.stealOverlayContent(\n            this.overlayContent as HTMLElement & { placement: Placement }\n        );\n\n        this.state = 'active';\n\n        this.feature();\n        if (this.placement && this.placement !== 'none') {\n            await this.updateOverlayPosition();\n            document.addEventListener(\n                'sp-update-overlays',\n                this.resetOverlayPosition\n            );\n        }\n        if (this.placement && this.placement !== 'none') {\n            this.contentAnimationPromise =\n                this.applyContentAnimation('sp-overlay-fade-in');\n        }\n    }\n\n    public async openCallback(\n        lifecycleCallback: () => Promise<void> | void\n    ): Promise<void> {\n        await this.updateComplete;\n        if (this.receivesFocus) {\n            await this.focus();\n        }\n\n        await lifecycleCallback();\n\n        this.trigger.dispatchEvent(\n            new CustomEvent<OverlayOpenCloseDetail>('sp-opened', {\n                bubbles: true,\n                composed: true,\n                cancelable: true,\n                detail: {\n                    interaction: this.interaction,\n                },\n            })\n        );\n    }\n\n    private open(openDetail: OverlayOpenDetail): void {\n        this.extractDetail(openDetail);\n    }\n\n    private extractDetail(detail: OverlayOpenDetail): void {\n        this.overlayContent = detail.content;\n        this.overlayContentTip = detail.contentTip;\n        this.trigger = detail.trigger;\n        this.virtualTrigger = detail.virtualTrigger;\n        this.placement = detail.placement;\n        this.offset = detail.offset;\n        this.skidding = detail.skidding || 0;\n        this.interaction = detail.interaction;\n        this.theme = detail.theme;\n        this.receivesFocus = detail.receivesFocus;\n        this.root = detail.root;\n    }\n\n    public dispose(): void {\n        /* c8 ignore next */\n        if (this.state !== 'dispose') return;\n\n        /* c8 ignore next 4 */\n        if (this.timeout) {\n            clearTimeout(this.timeout);\n            delete this.timeout;\n        }\n\n        this.trigger.removeEventListener(\n            'keydown',\n            this.handleInlineTriggerKeydown\n        );\n\n        this.returnOverlayContent();\n        this.state = 'disposed';\n\n        if (this.willNotifyClosed) {\n            this.overlayContent.dispatchEvent(new Event('sp-overlay-closed'));\n            this.willNotifyClosed = false;\n        }\n\n        if (this.cleanup) {\n            this.cleanup();\n        }\n    }\n\n    private stealOverlayContent(\n        element: HTMLElement & { placement: Placement }\n    ): void {\n        this.originalPlacement = element.getAttribute('placement') as Placement;\n        this.restoreContent = reparentChildren([element], this, {\n            position: 'beforeend',\n            prepareCallback: (el) => {\n                const slotName = el.slot;\n                const placement = el.placement;\n                el.removeAttribute('slot');\n                return (el) => {\n                    el.slot = slotName;\n                    el.placement = placement;\n                };\n            },\n        });\n        this.stealOverlayContentResolver();\n    }\n\n    private willNotifyClosed = false;\n\n    private returnOverlayContent(): void {\n        /* c8 ignore next */\n        if (!this.restoreContent) return;\n\n        const [element] = this.restoreContent();\n        this.restoreContent = undefined;\n        this.willNotifyClosed = true;\n\n        if (this.originalPlacement) {\n            element.setAttribute('placement', this.originalPlacement);\n            delete this.originalPlacement;\n        }\n    }\n\n    private initialHeight: number | undefined;\n    private isConstrained = false;\n\n    public async placeOverlay(): Promise<void> {\n        if (!this.placement || this.placement === 'none') {\n            return;\n        }\n\n        this.cleanup = autoUpdate(\n            this.virtualTrigger || this.trigger,\n            this,\n            this.updateOverlayPosition,\n            {\n                elementResize: false,\n            }\n        );\n    }\n\n    public updateOverlayPosition = (): void => {\n        if (this.interaction !== 'modal' && this.cleanup) {\n            this.dispatchEvent(new Event('close'));\n            return;\n        }\n        this.setOverlayPosition();\n    };\n\n    public resetOverlayPosition = (): void => {\n        this.style.removeProperty('max-height');\n        this.style.removeProperty('height');\n        this.initialHeight = undefined;\n        this.isConstrained = false;\n        // force paint\n        this.offsetHeight;\n        this.setOverlayPosition();\n    };\n\n    public setOverlayPosition = async (): Promise<void> => {\n        if (!this.placement || this.placement === 'none') {\n            return;\n        }\n        await (document.fonts ? document.fonts.ready : Promise.resolve());\n\n        function roundByDPR(num: number): number {\n            const dpr = window.devicePixelRatio || 1;\n            return Math.round(num * dpr) / dpr || -10000;\n        }\n\n        // See: https://spectrum.adobe.com/page/popover/#Container-padding\n        const REQUIRED_DISTANCE_TO_EDGE = 8;\n        // See: https://github.com/adobe/spectrum-web-components/issues/910\n        const MIN_OVERLAY_HEIGHT = 100;\n\n        const flipMiddleware = this.virtualTrigger\n            ? flip({\n                  padding: REQUIRED_DISTANCE_TO_EDGE,\n                  fallbackPlacements: getFallbackPlacements(this.placement),\n              })\n            : flip({\n                  padding: REQUIRED_DISTANCE_TO_EDGE,\n              });\n\n        const middleware = [\n            offset({\n                mainAxis: this.offset,\n                crossAxis: this.skidding,\n            }),\n            shift({ padding: REQUIRED_DISTANCE_TO_EDGE }),\n            flipMiddleware,\n            size({\n                padding: REQUIRED_DISTANCE_TO_EDGE,\n                apply: ({\n                    availableWidth,\n                    availableHeight,\n                    rects: { floating },\n                }) => {\n                    const maxHeight = Math.max(\n                        MIN_OVERLAY_HEIGHT,\n                        Math.floor(availableHeight)\n                    );\n                    const actualHeight = floating.height;\n                    this.initialHeight =\n                        !this.isConstrained && !this.virtualTrigger\n                            ? actualHeight\n                            : this.initialHeight || actualHeight;\n                    this.isConstrained =\n                        actualHeight < this.initialHeight ||\n                        maxHeight <= actualHeight;\n                    const appliedHeight = this.isConstrained\n                        ? `${maxHeight}px`\n                        : '';\n                    Object.assign(this.style, {\n                        maxWidth: `${Math.floor(availableWidth)}px`,\n                        maxHeight: appliedHeight,\n                        height: appliedHeight,\n                    });\n                },\n            }),\n        ];\n        if (this.overlayContentTip) {\n            middleware.push(arrow({ element: this.overlayContentTip }));\n        }\n        const { x, y, placement, middlewareData } = await computePosition(\n            this.virtualTrigger || this.trigger,\n            this,\n            {\n                placement: this.placement,\n                middleware,\n                strategy: 'fixed',\n            }\n        );\n\n        Object.assign(this.style, {\n            top: '0px',\n            left: '0px',\n            transform: `translate(${roundByDPR(x)}px, ${roundByDPR(y)}px)`,\n        });\n\n        if (placement !== this.getAttribute('actual-placement')) {\n            this.setAttribute('actual-placement', placement);\n            this.overlayContent.setAttribute('placement', placement);\n        }\n\n        if (this.overlayContentTip && middlewareData.arrow) {\n            const { x: arrowX, y: arrowY } = middlewareData.arrow;\n\n            Object.assign(this.overlayContentTip.style, {\n                left: arrowX != null ? `${roundByDPR(arrowX)}px` : '',\n                top: arrowY != null ? `${roundByDPR(arrowY)}px` : '',\n                right: '',\n                bottom: '',\n            });\n        }\n    };\n\n    public async hide(animated = true): Promise<void> {\n        if (this.state !== 'active') return;\n        this.state = 'hiding';\n        if (animated) {\n            await this.applyContentAnimation('sp-overlay-fade-out');\n        }\n        this.state = 'dispose';\n    }\n\n    private schedulePositionUpdate(): void {\n        // Edge needs a little time to update the DOM before computing the layout\n        cancelAnimationFrame(this.positionAnimationFrame);\n        this.positionAnimationFrame = requestAnimationFrame(() => {\n            if (this.cleanup) {\n                this.updateOverlayPosition();\n            } else {\n                this.placeOverlay();\n            }\n        });\n    }\n\n    private onSlotChange(): void {\n        this.schedulePositionUpdate();\n    }\n\n    public handleInlineTriggerKeydown = (event: KeyboardEvent): void => {\n        const { code, shiftKey } = event;\n        /* c8 ignore next */\n        if (code !== 'Tab') return;\n        if (shiftKey) {\n            this.tabbingAway = true;\n            this.dispatchEvent(new Event('close'));\n            return;\n        }\n\n        event.stopPropagation();\n        event.preventDefault();\n        this.focus();\n    };\n\n    public applyContentAnimation(\n        animation: ContentAnimation\n    ): Promise<boolean> {\n        if (this.placement === 'none') {\n            return Promise.resolve(true);\n        }\n        this.resolveContentAnimationPromise();\n        return new Promise((resolve): void => {\n            this.resolveContentAnimationPromise = () => {\n                resolve(false);\n            };\n            const contents = this.shadowRoot.querySelector(\n                '#contents'\n            ) as HTMLElement;\n            const doneHandler = (event: AnimationEvent): void => {\n                if (animation !== event.animationName) return;\n                contents.removeEventListener('animationend', doneHandler);\n                contents.removeEventListener('animationcancel', doneHandler);\n                this.animating = false;\n                resolve(event.type === 'animationcancel');\n            };\n            contents.addEventListener('animationend', doneHandler);\n            contents.addEventListener('animationcancel', doneHandler);\n\n            contents.style.animationName = animation;\n            this.animating = true;\n        });\n    }\n\n    public renderTheme(content: TemplateResult): TemplateResult {\n        const { color, scale, lang, theme } = this.theme;\n        return html`\n            <sp-theme\n                theme=${ifDefined(theme)}\n                color=${ifDefined(color)}\n                scale=${ifDefined(scale)}\n                lang=${ifDefined(lang)}\n                part=\"theme\"\n            >\n                ${content}\n            </sp-theme>\n        `;\n    }\n\n    public override render(): TemplateResult {\n        const content = html`\n            <div id=\"contents\">\n                <slot @slotchange=${this.onSlotChange}></slot>\n            </div>\n        `;\n        return this.hasTheme ? this.renderTheme(content) : content;\n    }\n\n    public static create(details: OverlayOpenDetail): ActiveOverlay {\n        const overlay = new ActiveOverlay();\n\n        if (details.content) {\n            overlay.open(details);\n        }\n\n        return overlay;\n    }\n\n    private stealOverlayContentPromise = Promise.resolve();\n    private stealOverlayContentResolver!: () => void;\n\n    protected override async getUpdateComplete(): Promise<boolean> {\n        const actions: Promise<unknown>[] = [\n            super.getUpdateComplete(),\n            this.stealOverlayContentPromise,\n        ];\n        actions.push(this.contentAnimationPromise);\n        if (\n            typeof (this.overlayContent as SpectrumElement).updateComplete !==\n            'undefined'\n        ) {\n            actions.push(\n                (this.overlayContent as SpectrumElement).updateComplete\n            );\n        }\n        const [complete] = await Promise.all(actions);\n        return complete as boolean;\n    }\n\n    override disconnectedCallback(): void {\n        document.removeEventListener(\n            'sp-update-overlays',\n            this.resetOverlayPosition\n        );\n        super.disconnectedCallback();\n    }\n}\n"],
+  "mappings": "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",
+  "names": ["html", "SpectrumElement", "ifDefined", "property", "reparentChildren", "firstFocusableIn", "styles", "parentOverlayOf", "arrow", "autoUpdate", "computePosition", "flip", "offset", "shift", "size", "stateMachine", "stateTransition", "state", "event", "getFallbackPlacements", "placement", "_a", "_ActiveOverlay", "roundByDPR", "num", "dpr", "REQUIRED_DISTANCE_TO_EDGE", "MIN_OVERLAY_HEIGHT", "flipMiddleware", "middleware", "availableWidth", "availableHeight", "floating", "maxHeight", "actualHeight", "appliedHeight", "x", "y", "middlewareData", "arrowX", "arrowY", "code", "shiftKey", "res", "nextState", "firstFocusable", "activeElement", "parentOverlay", "nextOverlayInteraction", "lifecycleCallback", "openDetail", "detail", "element", "el", "slotName", "animated", "animation", "resolve", "contents", "doneHandler", "content", "color", "scale", "lang", "theme", "details", "overlay", "actions", "complete", "__decorateClass"]
+}

package/src/OverlayTrigger.d.ts

@@ -1,9 +1,11 @@
 import { CSSResultArray, PropertyValues, SpectrumElement, TemplateResult } from '@spectrum-web-components/base';
-import { OverlayTriggerInteractions } from './overlay-types';
-import '../sp-overlay.js';
-import { Placement } from '@floating-ui/dom';
-import type { Overlay } from './Overlay.js';
+import { OverlayOptions, OverlayTriggerInteractions, Placement, TriggerInteractions } from './overlay-types';
 export declare type OverlayContentTypes = 'click' | 'hover' | 'longpress';
+export declare const LONGPRESS_INSTRUCTIONS: {
+    touch: string;
+    keyboard: string;
+    mouse: string;
+};
 /**
  * @element overlay-trigger
  *
@@ -16,35 +18,50 @@ export declare type OverlayContentTypes = 'click' | 'hover' | 'longpress';
  * @fires sp-closed - Announces that the overlay has been closed
  */
 export declare class OverlayTrigger extends SpectrumElement {
+    private closeClickOverlay?;
+    private closeLongpressOverlay?;
+    private closeHoverOverlay?;
     static get styles(): CSSResultArray;
     /**
-     * @type {"auto" | "auto-start" | "auto-end" | "top" | "bottom" | "right" | "left" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "right-start" | "right-end" | "left-start" | "left-end" }
+     * @type {"auto" | "auto-start" | "auto-end" | "top" | "bottom" | "right" | "left" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "right-start" | "right-end" | "left-start" | "left-end" | "none"}
      * @attr
      */
-    placement?: Placement;
+    placement: Placement;
     type?: OverlayTriggerInteractions;
     offset: number;
     open?: OverlayContentTypes;
     disabled: boolean;
-    private clickContent;
-    private clickPlacement?;
-    private longpressContent;
-    private longpressPlacement?;
-    private hoverContent;
-    private hoverPlacement?;
-    private targetContent;
-    clickOverlayElement: Overlay;
-    longpressOverlayElement: Overlay;
-    hoverOverlayElement: Overlay;
+    hasLongpressContent: boolean;
+    private longpressDescriptor?;
+    private clickContent?;
+    private longpressContent?;
+    private hoverContent?;
+    private targetContent?;
+    private overlaidContent?;
     private _longpressId;
-    private getAssignedElementsFromSlot;
-    private handleTriggerContent;
-    private handleClickContent;
-    private handleLongpressContent;
-    private handleHoverContent;
-    private handleBeforetoggle;
-    protected update(changes: PropertyValues): void;
+    private handleClose;
     protected render(): TemplateResult;
-    protected updated(changes: PropertyValues): void;
+    protected updated(changes: PropertyValues<this>): void;
+    protected manageLongpressDescriptor(): void;
+    private closeAllOverlays;
+    private manageOpen;
+    private openOverlay;
+    static openOverlay: (target: HTMLElement, interaction: TriggerInteractions, content: HTMLElement, options: OverlayOptions) => Promise<() => void>;
+    private get overlayOptions();
+    private onTrigger;
+    private prepareToFocusOverlayContent;
+    onTriggerClick(): Promise<void>;
+    private _longpressEvent?;
+    private onTriggerLongpress;
+    private abortOverlay;
+    onTriggerMouseEnter(): Promise<void>;
+    private onClickSlotChange;
+    private onLongpressSlotChange;
+    private onHoverSlotChange;
+    private onTargetSlotChange;
+    private extractSlotContentFromEvent;
+    private openStatePromise;
+    private openStateResolver;
     protected getUpdateComplete(): Promise<boolean>;
+    disconnectedCallback(): void;
 }

package/src/OverlayTrigger.dev.js

@@ -16,134 +16,69 @@ import {
 } from "@spectrum-web-components/base";
 import {
   property,
-  query,
   state
 } from "@spectrum-web-components/base/src/decorators.js";
+import { firstFocusableIn } from "@spectrum-web-components/shared/src/first-focusable-in.js";
+import {
+  isAndroid,
+  isIOS
+} from "@spectrum-web-components/shared/src/platform.js";
+import { openOverlay } from "./loader.dev.js";
 import overlayTriggerStyles from "./overlay-trigger.css.js";
-import "../sp-overlay.dev.js";
-export class OverlayTrigger extends SpectrumElement {
+export const LONGPRESS_INSTRUCTIONS = {
+  touch: "Double tap and long press for additional options",
+  keyboard: "Press Space or Alt+Down Arrow for additional options",
+  mouse: "Click and hold for additional options"
+};
+const _OverlayTrigger = class _OverlayTrigger extends SpectrumElement {
   constructor() {
     super(...arguments);
+    this.placement = "bottom";
     this.offset = 6;
     this.disabled = false;
-    this.clickContent = [];
-    this.longpressContent = [];
-    this.hoverContent = [];
-    this.targetContent = [];
+    this.hasLongpressContent = false;
     this._longpressId = `longpress-describedby-descriptor`;
+    this.abortOverlay = () => {
+      return;
+    };
+    this.openStatePromise = Promise.resolve();
   }
   static get styles() {
     return [overlayTriggerStyles];
   }
-  getAssignedElementsFromSlot(slot) {
-    return slot.assignedElements({ flatten: true });
-  }
-  handleTriggerContent(event) {
-    this.targetContent = this.getAssignedElementsFromSlot(event.target);
-  }
-  handleClickContent(event) {
-    this.clickContent = this.getAssignedElementsFromSlot(event.target);
-  }
-  handleLongpressContent(event) {
-    this.longpressContent = this.getAssignedElementsFromSlot(event.target);
-  }
-  handleHoverContent(event) {
-    this.hoverContent = this.getAssignedElementsFromSlot(event.target);
-  }
-  handleBeforetoggle(event) {
-    const { target } = event;
-    let type;
-    if (target === this.clickOverlayElement) {
-      type = "click";
-    } else if (target === this.longpressOverlayElement) {
-      type = "longpress";
-    } else if (target === this.hoverOverlayElement) {
-      type = "hover";
-    } else {
+  handleClose(event) {
+    if (event && event.detail.interaction !== this.open && event.detail.interaction !== this.type) {
       return;
     }
-    if (event.newState === "open") {
-      this.open = type;
-    } else if (this.open === type) {
-      this.open = void 0;
-    }
-  }
-  update(changes) {
-    var _a, _b, _c, _d, _e, _f;
-    if (changes.has("clickContent")) {
-      this.clickPlacement = ((_a = this.clickContent[0]) == null ? void 0 : _a.getAttribute("placement")) || ((_b = this.clickContent[0]) == null ? void 0 : _b.getAttribute(
-        "direction"
-      )) || void 0;
-    }
-    if (changes.has("hoverContent")) {
-      this.hoverPlacement = ((_c = this.hoverContent[0]) == null ? void 0 : _c.getAttribute("placement")) || ((_d = this.hoverContent[0]) == null ? void 0 : _d.getAttribute(
-        "direction"
-      )) || void 0;
-    }
-    if (changes.has("longpressContent")) {
-      this.longpressPlacement = ((_e = this.longpressContent[0]) == null ? void 0 : _e.getAttribute("placement")) || ((_f = this.longpressContent[0]) == null ? void 0 : _f.getAttribute(
-        "direction"
-      )) || void 0;
-    }
-    super.update(changes);
+    this.removeAttribute("open");
   }
   render() {
     return html`
             <slot
                 id="trigger"
+                @click=${this.onTrigger}
+                @longpress=${this.onTrigger}
+                @mouseenter=${this.onTrigger}
+                @mouseleave=${this.onTrigger}
+                @focusin=${this.onTrigger}
+                @focusout=${this.onTrigger}
+                @sp-closed=${this.handleClose}
+                @slotchange=${this.onTargetSlotChange}
                 name="trigger"
-                @slotchange=${this.handleTriggerContent}
             ></slot>
             <div id="overlay-content">
-                <sp-overlay
-                    id="click-overlay"
-                    ?disabled=${this.disabled || !this.clickContent.length}
-                    ?open=${this.open === "click" && !!this.clickContent.length}
-                    .offset=${this.offset}
-                    .placement=${this.clickPlacement || this.placement}
-                    .triggerElement=${this.targetContent[0]}
-                    .triggerInteraction=${"click"}
-                    .type=${this.type !== "modal" ? "auto" : "modal"}
-                    @beforetoggle=${this.handleBeforetoggle}
-                >
-                    <slot
-                        name="click-content"
-                        @slotchange=${this.handleClickContent}
-                    ></slot>
-                </sp-overlay>
-                <sp-overlay
-                    id="longpress-overlay"
-                    ?disabled=${this.disabled || !this.longpressContent.length}
-                    ?open=${this.open === "longpress" && !!this.longpressContent.length}
-                    .offset=${this.offset}
-                    .placement=${this.longpressPlacement || this.placement}
-                    .triggerElement=${this.targetContent[0]}
-                    .triggerInteraction=${"longpress"}
-                    .type=${"auto"}
-                    @beforetoggle=${this.handleBeforetoggle}
-                >
-                    <slot
-                        name="longpress-content"
-                        @slotchange=${this.handleLongpressContent}
-                    ></slot>
-                    <slot name="longpress-describedby-descriptor"></slot>
-                </sp-overlay>
-                <sp-overlay
-                    id="hover-overlay"
-                    ?disabled=${this.disabled || !this.hoverContent.length || !!this.open && this.open !== "hover"}
-                    ?open=${this.open === "hover" && !!this.hoverContent.length}
-                    .offset=${this.offset}
-                    .placement=${this.hoverPlacement || this.placement}
-                    .triggerElement=${this.targetContent[0]}
-                    .triggerInteraction=${"hover"}
-                    .type=${"hint"}
-                    @beforetoggle=${this.handleBeforetoggle}
-                >
-                    <slot
-                        name="hover-content"
-                        @slotchange=${this.handleHoverContent}
-                    ></slot>
-                </sp-overlay>
+                <slot
+                    @slotchange=${this.onClickSlotChange}
+                    name="click-content"
+                ></slot>
+                <slot
+                    @slotchange=${this.onLongpressSlotChange}
+                    name="longpress-content"
+                ></slot>
+                <slot
+                    @slotchange=${this.onHoverSlotChange}
+                    name="hover-content"
+                ></slot>
                 <slot name=${this._longpressId}></slot>
             </div>
         `;
@@ -151,49 +86,276 @@ export class OverlayTrigger extends SpectrumElement {
   updated(changes) {
     super.updated(changes);
     if (this.disabled && changes.has("disabled")) {
-      this.open = void 0;
+      this.closeAllOverlays();
+      return;
+    }
+    if (changes.has("open")) {
+      this.manageOpen();
+    }
+    if (changes.has("hasLongpressContent")) {
+      this.manageLongpressDescriptor();
+    }
+  }
+  manageLongpressDescriptor() {
+    const trigger = this.querySelector(
+      '[slot="trigger"]'
+    );
+    const ariaDescribedby = trigger.getAttribute("aria-describedby");
+    let descriptors = ariaDescribedby ? ariaDescribedby.split(/\s+/) : [];
+    if (this.hasLongpressContent) {
+      if (!this.longpressDescriptor) {
+        this.longpressDescriptor = document.createElement(
+          "div"
+        );
+        this.longpressDescriptor.id = this._longpressId;
+        this.longpressDescriptor.slot = this._longpressId;
+      }
+      const messageType = isIOS() || isAndroid() ? "touch" : "keyboard";
+      this.longpressDescriptor.textContent = LONGPRESS_INSTRUCTIONS[messageType];
+      this.appendChild(this.longpressDescriptor);
+      descriptors.push(this._longpressId);
+    } else {
+      if (this.longpressDescriptor)
+        this.longpressDescriptor.remove();
+      descriptors = descriptors.filter(
+        (descriptor) => descriptor !== this._longpressId
+      );
+    }
+    if (descriptors.length) {
+      trigger.setAttribute("aria-describedby", descriptors.join(" "));
+    } else {
+      trigger.removeAttribute("aria-describedby");
+    }
+  }
+  closeAllOverlays() {
+    if (this.abortOverlay)
+      this.abortOverlay(true);
+    [
+      "closeClickOverlay",
+      "closeHoverOverlay",
+      "closeLongpressOverlay"
+    ].forEach(async (name) => {
+      const canClose = this[name];
+      if (canClose == null)
+        return;
+      delete this[name];
+      (await canClose)();
+    });
+    this.overlaidContent = void 0;
+  }
+  manageOpen() {
+    var _a;
+    const openHandlers = {
+      click: () => this.onTriggerClick(),
+      hover: () => this.onTriggerMouseEnter(),
+      longpress: () => this.onTriggerLongpress(),
+      none: () => this.closeAllOverlays()
+    };
+    openHandlers[(_a = this.open) != null ? _a : "none"]();
+  }
+  async openOverlay(target, interaction, content, options) {
+    this.openStatePromise = new Promise(
+      (res) => this.openStateResolver = res
+    );
+    this.addEventListener(
+      "sp-opened",
+      () => {
+        this.openStateResolver();
+      },
+      { once: true }
+    );
+    this.overlaidContent = content;
+    return _OverlayTrigger.openOverlay(
+      target,
+      interaction,
+      content,
+      options
+    );
+  }
+  get overlayOptions() {
+    return {
+      offset: this.offset,
+      placement: this.placement,
+      receivesFocus: !this.type || this.type === "inline" || this.open === "hover" ? void 0 : "auto"
+    };
+  }
+  onTrigger(event) {
+    const mouseIsEnteringHoverContent = event.type === "mouseleave" && this.open === "hover" && event.relatedTarget === this.overlaidContent;
+    if (mouseIsEnteringHoverContent && this.overlaidContent) {
+      this.overlaidContent.addEventListener(
+        "mouseleave",
+        (event2) => {
+          const mouseIsEnteringTrigger = event2.relatedTarget === this.targetContent;
+          if (mouseIsEnteringTrigger) {
+            return;
+          }
+          this.onTrigger(
+            event2
+          );
+        },
+        { once: true }
+      );
+      return;
+    }
+    if (this.disabled)
+      return;
+    switch (event.type) {
+      case "mouseenter":
+      case "focusin":
+        if (!this.open && this.hoverContent) {
+          this.open = "hover";
+        }
+        return;
+      case "mouseleave":
+      case "focusout":
+        if (this.open === "hover") {
+          this.handleClose();
+        }
+        return;
+      case "click":
+        if (this.clickContent) {
+          this.open = event.type;
+        }
+        return;
+      case "longpress":
+        if (this.longpressContent) {
+          this._longpressEvent = event;
+          this.open = event.type;
+        }
+        return;
+    }
+  }
+  prepareToFocusOverlayContent(overlayContent) {
+    if (this.type !== "modal") {
       return;
     }
+    const firstFocusable = firstFocusableIn(overlayContent);
+    if (!firstFocusable) {
+      overlayContent.tabIndex = 0;
+    }
+  }
+  async onTriggerClick() {
+    if (!this.targetContent || !this.clickContent || this.closeClickOverlay) {
+      return;
+    }
+    const { targetContent, clickContent } = this;
+    this.closeAllOverlays();
+    this.prepareToFocusOverlayContent(clickContent);
+    if (true) {
+      window.__swc.ignoreWarningLevels.deprecation = true;
+    }
+    this.closeClickOverlay = this.openOverlay(
+      targetContent,
+      this.type ? this.type : "click",
+      clickContent,
+      this.overlayOptions
+    );
+    if (true) {
+      window.__swc.ignoreWarningLevels.deprecation = false;
+    }
+  }
+  async onTriggerLongpress() {
+    var _a, _b;
+    if (!this.targetContent || !this.longpressContent || this.closeLongpressOverlay) {
+      return;
+    }
+    const { targetContent, longpressContent } = this;
+    this.closeAllOverlays();
+    this.prepareToFocusOverlayContent(longpressContent);
+    const notImmediatelyClosable = ((_b = (_a = this._longpressEvent) == null ? void 0 : _a.detail) == null ? void 0 : _b.source) !== "keyboard";
+    if (true) {
+      window.__swc.ignoreWarningLevels.deprecation = true;
+    }
+    this.closeLongpressOverlay = this.openOverlay(
+      targetContent,
+      this.type ? this.type : "longpress",
+      longpressContent,
+      {
+        ...this.overlayOptions,
+        receivesFocus: "auto",
+        notImmediatelyClosable
+      }
+    );
+    if (true) {
+      window.__swc.ignoreWarningLevels.deprecation = false;
+    }
+    this._longpressEvent = void 0;
+  }
+  async onTriggerMouseEnter() {
+    if (!this.targetContent || !this.hoverContent || this.closeHoverOverlay) {
+      return;
+    }
+    const abortPromise = new Promise((res) => {
+      this.abortOverlay = res;
+    });
+    const { targetContent, hoverContent } = this;
+    if (true) {
+      window.__swc.ignoreWarningLevels.deprecation = true;
+    }
+    this.closeHoverOverlay = this.openOverlay(
+      targetContent,
+      "hover",
+      hoverContent,
+      {
+        abortPromise,
+        ...this.overlayOptions
+      }
+    );
+    if (true) {
+      window.__swc.ignoreWarningLevels.deprecation = false;
+    }
+  }
+  onClickSlotChange(event) {
+    this.clickContent = this.extractSlotContentFromEvent(event);
+    this.manageOpen();
+  }
+  onLongpressSlotChange(event) {
+    this.longpressContent = this.extractSlotContentFromEvent(event);
+    this.hasLongpressContent = !!this.longpressContent || !!this.closeLongpressOverlay;
+    this.manageOpen();
+  }
+  onHoverSlotChange(event) {
+    this.hoverContent = this.extractSlotContentFromEvent(event);
+    this.manageOpen();
+  }
+  onTargetSlotChange(event) {
+    this.targetContent = this.extractSlotContentFromEvent(event);
+  }
+  extractSlotContentFromEvent(event) {
+    const slot = event.target;
+    const nodes = slot.assignedNodes({ flatten: true });
+    return nodes.find((node) => node instanceof HTMLElement);
   }
   async getUpdateComplete() {
     const complete = await super.getUpdateComplete();
+    await this.openStatePromise;
     return complete;
   }
-}
+  disconnectedCallback() {
+    this.closeAllOverlays();
+    super.disconnectedCallback();
+  }
+};
+_OverlayTrigger.openOverlay = async (target, interaction, content, options) => {
+  return openOverlay(target, interaction, content, options);
+};
 __decorateClass([
   property({ reflect: true })
-], OverlayTrigger.prototype, "placement", 2);
+], _OverlayTrigger.prototype, "placement", 2);
 __decorateClass([
   property()
-], OverlayTrigger.prototype, "type", 2);
+], _OverlayTrigger.prototype, "type", 2);
 __decorateClass([
-  property({ type: Number })
-], OverlayTrigger.prototype, "offset", 2);
+  property({ type: Number, reflect: true })
+], _OverlayTrigger.prototype, "offset", 2);
 __decorateClass([
   property({ reflect: true })
-], OverlayTrigger.prototype, "open", 2);
+], _OverlayTrigger.prototype, "open", 2);
 __decorateClass([
   property({ type: Boolean, reflect: true })
-], OverlayTrigger.prototype, "disabled", 2);
-__decorateClass([
-  state()
-], OverlayTrigger.prototype, "clickContent", 2);
-__decorateClass([
-  state()
-], OverlayTrigger.prototype, "longpressContent", 2);
-__decorateClass([
-  state()
-], OverlayTrigger.prototype, "hoverContent", 2);
+], _OverlayTrigger.prototype, "disabled", 2);
 __decorateClass([
   state()
-], OverlayTrigger.prototype, "targetContent", 2);
-__decorateClass([
-  query("#click-overlay", true)
-], OverlayTrigger.prototype, "clickOverlayElement", 2);
-__decorateClass([
-  query("#longpress-overlay", true)
-], OverlayTrigger.prototype, "longpressOverlayElement", 2);
-__decorateClass([
-  query("#hover-overlay", true)
-], OverlayTrigger.prototype, "hoverOverlayElement", 2);
+], _OverlayTrigger.prototype, "hasLongpressContent", 2);
+export let OverlayTrigger = _OverlayTrigger;
 //# sourceMappingURL=OverlayTrigger.dev.js.map