@lion/ui 0.22.0 → 0.24.0

package/components/overlays/src/OverlayController.js

@@ -3,6 +3,7 @@ import { deepContains } from './utils/deep-contains.js';
 import { overlayShadowDomStyle } from './overlayShadowDomStyle.js';
 import { _adoptStyleUtils } from './utils/adopt-styles.js';
 import { getFocusableElements } from './utils/get-focusable-elements.js';
+import { isEqualConfig } from './utils/is-equal-config.js';
 
 /**
  * @typedef {import('@lion/ui/types/overlays.js').OverlayPhase} OverlayPhase
@@ -32,41 +33,43 @@ import { getFocusableElements } from './utils/get-focusable-elements.js';
  * `<slot name="my-content">` belonging to `<div slot="content"/>` will be wrapped with wrappingDialogNodeL1 and contentWrapperNodeL2
  * inside shadow dom. With the help of temp markers, `<slot name="my-content">`'s original position will be respected.
  *
- * @param {{ wrappingDialogNodeL1:HTMLDialogElement|HTMLDivElement; contentWrapperNodeL2:Element; contentNodeL3: Element }} opts
+ * @param {{
+ *  wrappingDialogNodeL1: HTMLDialogElement|HTMLDivElement;
+ *  contentWrapperNodeL2:Element;
+ *  contentNodeL3: Element;
+ * }} opts
  */
 function rearrangeNodes({ wrappingDialogNodeL1, contentWrapperNodeL2, contentNodeL3 }) {
-  if (!(contentWrapperNodeL2.isConnected || contentNodeL3.isConnected)) {
+  // if contentWrapperNode is provided by the user,
+  // we assume it lives in shadow dom around a slot.
+  const hasLegacyMethodOfProvidingWrapperNode = Boolean(contentWrapperNodeL2.parentNode);
+  // We could be initialized via a directive (in offline dom). It's important that we know about the parents,
+  // as we cannot deal with single content nodes
+  const hasContentNodeAttachmentPoints = Boolean(contentNodeL3.parentNode);
+  if (!hasLegacyMethodOfProvidingWrapperNode && !hasContentNodeAttachmentPoints) {
     throw new Error(
-      '[OverlayController] Could not find a render target, since the provided contentNode is not connected to the DOM. Make sure that it is connected, e.g. by doing "document.body.appendChild(contentNode)", before passing it on.',
+      '[OverlayController] Could not find a render target, makes sure contentNode has a parent element (or contentWrapperNode is connected)',
     );
   }
 
+  /** @type {Node} */
   let parentElement;
-  const tempMarker = document.createComment('tempMarker');
-
-  if (contentWrapperNodeL2.isConnected) {
+  const tempMarker = document.createComment('overlay-insertion-marker');
+  // Moving the wrapper can change slot assignment, so capture the node we relocate up front
+  // and restore that same node during cleanup.
+  const contentNodeOrSlot = contentNodeL3.assignedSlot || contentNodeL3;
+  if (hasLegacyMethodOfProvidingWrapperNode) {
     // This is the case when contentWrapperNode (living in shadow dom, wrapping <slot name="my-content-outlet">) is already provided via controller.
     parentElement = contentWrapperNodeL2.parentElement || contentWrapperNodeL2.getRootNode();
     parentElement.insertBefore(tempMarker, contentWrapperNodeL2);
     // Wrap...
     wrappingDialogNodeL1.appendChild(contentWrapperNodeL2);
-  }
-  // if contentNodeL3.isConnected
-  else {
-    const contentIsProjected = contentNodeL3.assignedSlot;
-    if (contentIsProjected) {
-      parentElement =
-        contentNodeL3.assignedSlot.parentElement || contentNodeL3.assignedSlot.getRootNode();
-      parentElement.insertBefore(tempMarker, contentNodeL3.assignedSlot);
-      wrappingDialogNodeL1.appendChild(contentWrapperNodeL2);
-      // Important: we do not move around contentNodeL3, but the assigned slot
-      contentWrapperNodeL2.appendChild(contentNodeL3.assignedSlot);
-    } else {
-      parentElement = contentNodeL3.parentElement || contentNodeL3.getRootNode();
-      parentElement.insertBefore(tempMarker, contentNodeL3);
-      wrappingDialogNodeL1.appendChild(contentWrapperNodeL2);
-      contentWrapperNodeL2.appendChild(contentNodeL3);
-    }
+  } else {
+    parentElement = contentNodeOrSlot.parentElement || contentNodeOrSlot.getRootNode();
+    parentElement.insertBefore(tempMarker, contentNodeOrSlot);
+    wrappingDialogNodeL1.appendChild(contentWrapperNodeL2);
+    // Important: for projected content we do not move contentNodeL3, but its assigned slot
+    contentWrapperNodeL2.appendChild(contentNodeOrSlot);
   }
 
   /**
@@ -93,7 +96,20 @@ function rearrangeNodes({ wrappingDialogNodeL1, contentWrapperNodeL2, contentNod
    * ```
    */
   parentElement.insertBefore(wrappingDialogNodeL1, tempMarker);
-  parentElement?.removeChild(tempMarker);
+  return function cleanup() {
+    if (hasLegacyMethodOfProvidingWrapperNode) {
+      parentElement?.insertBefore(contentWrapperNodeL2, tempMarker);
+    } else {
+      parentElement?.insertBefore(contentNodeOrSlot, tempMarker);
+      if (parentElement.contains(contentWrapperNodeL2)) {
+        contentWrapperNodeL2.remove();
+      }
+    }
+    parentElement?.removeChild(tempMarker);
+    if (parentElement.contains(wrappingDialogNodeL1)) {
+      parentElement?.removeChild(wrappingDialogNodeL1);
+    }
+  };
 }
 
 /**
@@ -101,11 +117,25 @@ function rearrangeNodes({ wrappingDialogNodeL1, contentWrapperNodeL2, contentNod
  */
 async function preloadPopper() {
   // @ts-ignore [external]: import complains about untyped module, but we typecast it ourselves
-  return /** @type {* & Promise<PopperModule>} */ (import('@popperjs/core/dist/esm/popper.js'));
+  return /** @type {* & Promise<PopperModule>} */ import('@popperjs/core/dist/esm/popper.js');
 }
-
 const childDialogsClosedInEventLoopWeakmap = new WeakMap();
 
+/**
+ * @param {HTMLElement | null} el
+ * @param {string} selector
+ * @returns {HTMLElement | null}
+ */
+function deepClosest(el, selector) {
+  // @ts-ignore - comparing HTMLElement to document/window for safety
+  return (
+    // @ts-ignore - type comparison check
+    (el && el !== document && el !== window && el.closest(selector)) ||
+    // @ts-ignore - host property on ShadowRoot
+    deepClosest(el.getRootNode().host, selector)
+  );
+}
+
 /**
  * OverlayController is the fundament for every single type of overlay. With the right
  * configuration, it can be used to build (modal) dialogs, tooltips, dropdowns, popovers,
@@ -173,12 +203,10 @@ export class OverlayController extends EventTarget {
     super();
     this.manager = manager;
     this.__sharedConfig = config;
-
     this.__activeElementRightBeforeHide = null;
 
     /** @type {OverlayConfig} */
     this.config = {};
-
     this._defaultConfig = {
       placementMode: undefined,
       contentNode: config.contentNode,
@@ -236,8 +264,20 @@ export class OverlayController extends EventTarget {
         placement: 'center',
       },
       zIndex: 9999,
+      isActivated: true,
+      elementToFocusOnShow: false,
+      // This means that content will have visually-hidden / sr-only styles. This is handy for:
+      // - hidden menus that should be "indexable" by screen readers (like the Links list in VO: https://support.apple.com/en-gb/guide/voiceover/mchlp2719/mac)
+      // - "more" menus that put content in a dropdown that do not fit in the current row
+      // - menus that should generally open on tab.
+      // @ts-ignore - hideVisually is an extension property
+      hideVisually: false,
+      requireConnectedNodes: true,
+      // hides children overlays when parent is closed...
+      syncChildrenCloseState: false,
+      // // In next major, we remove this prop. Now we disable it for backwards compatibility and enable it in the places we need it internally
+      // _shouldTeardownDomStructure: false,
     };
-
     this._contentId = `overlay-content--${Math.random().toString(36).slice(2, 10)}`;
     this.__originalAttrs = new Map();
     /** @private */
@@ -248,6 +288,7 @@ export class OverlayController extends EventTarget {
     this.__cancelHandler = this.__cancelHandler.bind(this);
     this.__escKeyHandlerCalled = false;
   }
+  __hasSetup = false;
 
   /**
    * The invokerNode
@@ -262,12 +303,12 @@ export class OverlayController extends EventTarget {
    * @type {HTMLDialogElement | HTMLDivElement}
    */
   get content() {
-    return /** @type {HTMLDialogElement | HTMLDivElement} */ (this.__wrappingDialogNode);
+    return /** @type {HTMLDialogElement | HTMLDivElement} */ this.__wrappingDialogNode;
   }
 
   /**
    * Determines the connection point in DOM (body vs next to invoker).
-   * @type {'global' | 'local' | undefined}
+   * @type {'global' | 'local' | 'custom' | undefined}
    */
   get placementMode() {
     return this.config?.placementMode;
@@ -288,7 +329,7 @@ export class OverlayController extends EventTarget {
    * @type {HTMLElement}
    */
   get referenceNode() {
-    return /** @type {HTMLElement} */ (this.config?.referenceNode);
+    return /** @type {HTMLElement} */ this.config?.referenceNode;
   }
 
   /**
@@ -296,7 +337,7 @@ export class OverlayController extends EventTarget {
    * @type {HTMLElement}
    */
   get contentNode() {
-    return /** @type {HTMLElement} */ (this.config?.contentNode);
+    return /** @type {HTMLElement} */ this.config?.contentNode;
   }
 
   /**
@@ -307,9 +348,7 @@ export class OverlayController extends EventTarget {
    * @type {HTMLElement}
    */
   get contentWrapperNode() {
-    return /** @type {HTMLElement} */ (
-      this.__contentWrapperNode || this.config?.contentWrapperNode
-    );
+    return /** @type {HTMLElement} */ this.__contentWrapperNode || this.config?.contentWrapperNode;
   }
 
   /**
@@ -318,7 +357,7 @@ export class OverlayController extends EventTarget {
    * @type {HTMLElement}
    */
   get backdropNode() {
-    return /** @type {HTMLElement} */ (this.__backdropNode || this.config?.backdropNode);
+    return /** @type {HTMLElement} */ this.__backdropNode || this.config?.backdropNode;
   }
 
   /**
@@ -326,8 +365,9 @@ export class OverlayController extends EventTarget {
    * @type {HTMLElement}
    */
   get elementToFocusAfterHide() {
-    return /** @type {HTMLElement} */ (
-      this.__elementToFocusAfterHide || this.config?.elementToFocusAfterHide
+    return (
+      /** @type {HTMLElement} */ this.__elementToFocusAfterHide ||
+      this.config?.elementToFocusAfterHide
     );
   }
 
@@ -336,7 +376,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get hasBackdrop() {
-    return /** @type {boolean} */ (!!this.backdropNode || this.config?.hasBackdrop);
+    return /** @type {boolean} */ !!this.backdropNode || this.config?.hasBackdrop;
   }
 
   /**
@@ -344,7 +384,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get isBlocking() {
-    return /** @type {boolean} */ (this.config?.isBlocking);
+    return /** @type {boolean} */ this.config?.isBlocking;
   }
 
   /**
@@ -352,7 +392,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get preventsScroll() {
-    return /** @type {boolean} */ (this.config?.preventsScroll);
+    return /** @type {boolean} */ this.config?.preventsScroll;
   }
 
   /**
@@ -360,7 +400,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get trapsKeyboardFocus() {
-    return /** @type {boolean} */ (this.config?.trapsKeyboardFocus);
+    return /** @type {boolean} */ this.config?.trapsKeyboardFocus;
   }
 
   /**
@@ -368,7 +408,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get hidesOnEsc() {
-    return /** @type {boolean} */ (this.config?.hidesOnEsc);
+    return /** @type {boolean} */ this.config?.hidesOnEsc;
   }
 
   /**
@@ -376,7 +416,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get hidesOnOutsideClick() {
-    return /** @type {boolean} */ (this.config?.hidesOnOutsideClick);
+    return /** @type {boolean} */ this.config?.hidesOnOutsideClick;
   }
 
   /**
@@ -384,7 +424,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get hidesOnOutsideEsc() {
-    return /** @type {boolean} */ (this.config?.hidesOnOutsideEsc);
+    return /** @type {boolean} */ this.config?.hidesOnOutsideEsc;
   }
 
   /**
@@ -411,7 +451,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get handlesAccessibility() {
-    return /** @type {boolean} */ (this.config?.handlesAccessibility);
+    return /** @type {boolean} */ this.config?.handlesAccessibility;
   }
 
   /**
@@ -420,7 +460,7 @@ export class OverlayController extends EventTarget {
    * @type {boolean}
    */
   get isTooltip() {
-    return /** @type {boolean} */ (this.config?.isTooltip);
+    return /** @type {boolean} */ this.config?.isTooltip;
   }
 
   /**
@@ -428,7 +468,7 @@ export class OverlayController extends EventTarget {
    * to communicate an important message and require a response.
    */
   get isAlertDialog() {
-    return /** @type {boolean} */ (this.config?.isAlertDialog);
+    return /** @type {boolean} */ this.config?.isAlertDialog;
   }
 
   /**
@@ -445,7 +485,7 @@ export class OverlayController extends EventTarget {
    * @type {PopperOptions}
    */
   get popperConfig() {
-    return /** @type {PopperOptions} */ (this.config?.popperConfig);
+    return /** @type {PopperOptions} */ this.config?.popperConfig;
   }
 
   /**
@@ -453,11 +493,10 @@ export class OverlayController extends EventTarget {
    * @type {ViewportConfig}
    */
   get viewportConfig() {
-    return /** @type {ViewportConfig} */ (this.config?.viewportConfig);
+    return /** @type {ViewportConfig} */ this.config?.viewportConfig;
   }
-
   get visibilityTriggerFunction() {
-    return /** @type {function} */ (this.config?.visibilityTriggerFunction);
+    return /** @type {function} */ this.config?.visibilityTriggerFunction;
   }
 
   /**
@@ -492,20 +531,20 @@ export class OverlayController extends EventTarget {
    * @param { OverlayConfig } cfgToAdd
    */
   updateConfig(cfgToAdd) {
-    // Teardown all previous configs
-    this.teardown();
-
     /**
      * @type {OverlayConfig}
      * @private
      */
-    this.__prevConfig = this.config;
+    const prevConfig = this.config;
 
     /** @type {OverlayConfig} */
-    this.config = {
-      ...this._defaultConfig, // our basic ingredients
-      ...this.__sharedConfig, // the initial configured overlayController
-      ...cfgToAdd, // the added config
+    const newConfig = {
+      ...this._defaultConfig,
+      // our basic ingredients
+      ...this.__sharedConfig,
+      // the initial configured overlayController
+      ...cfgToAdd,
+      // the added config
       popperConfig: {
         ...(this._defaultConfig.popperConfig || {}),
         ...(this.__sharedConfig.popperConfig || {}),
@@ -517,21 +556,23 @@ export class OverlayController extends EventTarget {
         ],
       },
     };
+    const shouldUpdate = !this.__hasSetup || !isEqualConfig(prevConfig, newConfig);
+    if (!shouldUpdate) return;
+    // Teardown all previous configs
+
+    this.teardown();
+    this.config = newConfig;
 
     /** @private */
     this.__validateConfiguration(this.config);
     /** @protected */
     this._init();
-    /** @private */
-    this.__elementToFocusAfterHide = undefined;
-
     if (!this.#isRegisteredOnManager()) {
       this.manager.add(this);
     }
   }
-
   #isRegisteredOnManager() {
-    return Boolean(this.manager.list.find(ctrl => this === ctrl));
+    return Boolean(this.manager.list.find((ctrl) => this === ctrl));
   }
 
   /**
@@ -545,7 +586,7 @@ export class OverlayController extends EventTarget {
         '[OverlayController] You need to provide a .placementMode ("global"|"local")',
       );
     }
-    if (!['global', 'local'].includes(newConfig.placementMode)) {
+    if (!['global', 'local', 'custom'].includes(newConfig.placementMode)) {
       throw new Error(
         `[OverlayController] "${newConfig.placementMode}" is not a valid .placementMode, use ("global"|"local")`,
       );
@@ -564,35 +605,64 @@ export class OverlayController extends EventTarget {
    * @protected
    */
   _init() {
-    if (!this.__contentHasBeenInitialized) {
-      this.__initContentDomStructure();
-      this.__contentHasBeenInitialized = true;
-    }
+    if (!this.config.isActivated) return;
+
+    // TODO: should not be behind a flag when we are fully tearing down...
+    // TODO 2: When we move away from dialog (use popover to paint to top layer)
+    // and popper.js, (use popover and anchor positioning and popperjs as fallback, but we can put styles on contentNode),
+    // we dont need to create complex wrappers
+    // if (!this.__contentHasBeenInitialized) {
+    this.__initContentDomStructure();
+    // this.__contentHasBeenInitialized = true;
+    // }
+    this.__initVisibility();
 
     // Reset all positioning styles (local, c.q. Popper) and classes (global)
-    this.contentWrapperNode.removeAttribute('style');
-    this.contentWrapperNode.removeAttribute('class');
-
+    if (this.contentWrapperNode !== this.contentNode) {
+      this.contentWrapperNode.removeAttribute('style');
+      this.contentWrapperNode.removeAttribute('class');
+    }
     if (this.placementMode === 'local') {
       // Lazily load Popper as soon as the first local overlay is used...
       if (!OverlayController.popperModule) {
         OverlayController.popperModule = preloadPopper();
       }
     }
-    this.__handleOverlayStyles({ phase: 'init' });
-    this._handleFeatures({ phase: 'init' });
+    this.__handleOverlayStyles({
+      phase: 'init',
+    });
+    this._handleFeatures({
+      phase: 'init',
+    });
+
+    /** @private */
+    this.__elementToFocusAfterHide = undefined;
+    this.contentNode.dataset.content = '';
+
+    // Use event delegation to listen for clicks on close buttons...
+    this.contentNode.addEventListener('click', this.#hideOnCloseButtonClick);
+    this.__hasSetup = true;
   }
+  #hideOnCloseButtonClick = (/** @type {{ target: any; }} */ ev) => {
+    const isOurCloseButton =
+      ev.target.hasAttribute('data-close') &&
+      deepClosest(ev.target, '[data-content]') === this.contentNode;
+    if (!isOurCloseButton) return;
+    this.hide();
+  };
 
   /**
    * @param {{ phase: OverlayPhase }} config
    * @private
    */
   __handleOverlayStyles({ phase }) {
-    const rootNode = /** @type {ShadowRoot} */ (this.contentWrapperNode?.getRootNode());
+    const rootNode = /** @type {ShadowRoot} */ this.contentWrapperNode?.getRootNode();
     if (phase === 'init') {
       _adoptStyleUtils.adoptStyle(rootNode, overlayShadowDomStyle);
     } else if (phase === 'teardown') {
-      _adoptStyleUtils.adoptStyle(rootNode, overlayShadowDomStyle, { teardown: true });
+      _adoptStyleUtils.adoptStyle(rootNode, overlayShadowDomStyle, {
+        teardown: true,
+      });
     }
   }
 
@@ -623,84 +693,107 @@ export class OverlayController extends EventTarget {
    * @private
    */
   __initContentDomStructure() {
-    const wrappingDialogElement = document.createElement('dialog');
-    // We use a dialog for its visual capabilities: it renders to the top layer.
-    // A11y will depend on the type of overlay and is arranged on contentNode level.
-    // Also see: https://www.scottohara.me/blog/2019/03/05/open-dialog.html
-    //
-    // The role="dialog" is set on the contentNode (or another role), so role="none"
-    // is valid here, although AXE complains about this setup.
-    // For now we need to add `ignoredRules: ['aria-allowed-role']` in your AXE tests.
-    // see: https://lion.js.org/fundamentals/systems/overlays/rationale/#considerations
-    wrappingDialogElement.setAttribute('role', 'none');
-    wrappingDialogElement.setAttribute('data-overlay-outer-wrapper', '');
-    // N.B. position: fixed is needed to escape out of 'overflow: hidden'
-    // We give a high z-index for non-modal dialogs, so that we at least win from all siblings of our
-    // parent stacking context
-    // padding reset so we don't get a weird dialog visual square showing up
-    wrappingDialogElement.style.cssText = `display:none; z-index: ${this.config.zIndex}; padding: 0;`;
-    this.__wrappingDialogNode = wrappingDialogElement;
-
-    /**
-     * Based on the configuration of the developer, multiple scenarios are accounted for
-     * A. We already have a contentWrapperNode ()
-     */
-    if (!this.config?.contentWrapperNode) {
-      this.__contentWrapperNode = document.createElement('div');
-    }
-    this.contentWrapperNode.setAttribute('data-id', 'content-wrapper');
-    // 'hack' that makes sure popperjs (that is applied one level lower) works correctly in deeply nested shadow roots
-    this.contentWrapperNode.style.transform = 'translateZ(0px)';
+    if (this.placementMode !== 'custom') {
+      const wrappingDialogElement = document.createElement('dialog');
+      // We use a dialog for its visual capabilities: it renders to the top layer.
+      // A11y will depend on the type of overlay and is arranged on contentNode level.
+      // Also see: https://www.scottohara.me/blog/2019/03/05/open-dialog.html
+      //
+      // The role="dialog" is set on the contentNode (or another role), so role="none"
+      // is valid here, although AXE complains about this setup.
+      // For now we need to add `ignoredRules: ['aria-allowed-role']` in your AXE tests.
+      // see: https://lion.js.org/fundamentals/systems/overlays/rationale/#considerations
+      wrappingDialogElement.setAttribute('role', 'none');
+      wrappingDialogElement.setAttribute('data-overlay-outer-wrapper', '');
+      // N.B. position: fixed is needed to escape out of 'overflow: hidden'
+      // We give a high z-index for non-modal dialogs, so that we at least win from all siblings of our
+      // parent stacking context
+      // padding reset so we don't get a weird dialog visual square showing up
+      wrappingDialogElement.style.cssText = `display:none; z-index: ${this.config.zIndex}; padding: 0;`;
+      // @ts-ignore - 'custom' is a valid extension of placementMode
+      if (this.config.placementMode === 'custom') {
+        // The user should have full freedom to control the content node, so its wrapper nodes should remain neutral.
+        wrappingDialogElement.style.cssText += `position: static;`;
+      }
+      this.__wrappingDialogNode = wrappingDialogElement;
 
-    rearrangeNodes({
-      wrappingDialogNodeL1: wrappingDialogElement,
-      contentWrapperNodeL2: this.contentWrapperNode,
-      contentNodeL3: this.contentNode,
-    });
-    wrappingDialogElement.open = true;
+      /**
+       * Based on the configuration of the developer, multiple scenarios are accounted for
+       * A. We already have a contentWrapperNode ()
+       */
+      if (!this.config?.contentWrapperNode) {
+        this.__contentWrapperNode = document.createElement('div');
+      }
+      this.contentWrapperNode.setAttribute('data-id', 'content-wrapper');
+      // 'hack' that makes sure popperjs (that is applied one level lower) works correctly in deeply nested shadow roots
+      this.contentWrapperNode.style.transform = 'translateZ(0px)';
+      this.__rearrangeNodesCleanup = rearrangeNodes({
+        wrappingDialogNodeL1: wrappingDialogElement,
+        contentWrapperNodeL2: this.contentWrapperNode,
+        contentNodeL3: this.contentNode,
+        // requireConnectedNodes: Boolean(this.config.requireConnectedNodes),
+      });
+      wrappingDialogElement.open = true;
+      if (this.isTooltip) {
+        // needed to prevent tooltip getting focus in Safari and Firefox
+        wrappingDialogElement.setAttribute('tabindex', '-1');
+      }
+      this.contentWrapperNode.style.zIndex = '1';
+      if (getComputedStyle(this.contentNode).position === 'absolute') {
+        // Having a _contWrapperNode and a contentNode with 'position:absolute' results in
+        // computed height of 0...
+        this.contentNode.style.position = 'static';
+      }
 
-    if (this.isTooltip) {
-      // needed to prevent tooltip getting focus in Safari and Firefox
-      wrappingDialogElement.setAttribute('tabindex', '-1');
+      // Here we prevent any interference of the native <dialog> element with the keyboard behavior
+      // as defined by the OverlayController. This is needed until we can configure `closedby="none"`
+      // on the native dialog for all browsers: https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/dialog#closedby
+      const hasClosedBySupport = HTMLDialogElement && 'closedBy' in HTMLDialogElement.prototype;
+      if (hasClosedBySupport) {
+        // @ts-ignore - closedBy is a newer property not in all TypeScript versions
+        wrappingDialogElement.closedBy = 'none';
+      } else {
+        wrappingDialogElement.addEventListener(
+          'keydown',
+          (/** @type {* & KeyboardEvent} */ event) => {
+            if (event.key === 'Escape') {
+              event.preventDefault();
+            }
+          },
+        );
+        wrappingDialogElement.addEventListener(
+          'keyup',
+          (/** @type {* & KeyboardEvent} */ event) => {
+            if (event.key === 'Escape') {
+              event.preventDefault();
+            }
+          },
+        );
+        wrappingDialogElement.addEventListener('cancel', (event) => {
+          event.stopPropagation();
+        });
+        wrappingDialogElement.addEventListener('close', (event) => {
+          event.stopPropagation();
+        });
+      }
+    } else {
+      // quick hack to make none-popper/global flows work...
+      this.__contentWrapperNode = this.contentNode;
+      this.__wrappingDialogNode = this.contentNode;
     }
-
+  }
+  __initVisibility() {
+    // TODO: allow defaultOpen?
+    /** @type {HTMLDialogElement} */
     this.__wrappingDialogNode.style.display = 'none';
-    this.contentWrapperNode.style.zIndex = '1';
-
-    if (getComputedStyle(this.contentNode).position === 'absolute') {
-      // Having a _contWrapperNode and a contentNode with 'position:absolute' results in
-      // computed height of 0...
-      this.contentNode.style.position = 'static';
-    }
+  }
 
-    // Here we prevent any interference of the native <dialog> element with the keyboard behavior
-    // as defined by the OverlayController. This is needed until we can configure `closedby="none"`
-    // on the native dialog for all browsers: https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/dialog#closedby
-    const hasClosedBySupport = HTMLDialogElement && 'closedBy' in HTMLDialogElement.prototype;
-    if (hasClosedBySupport) {
-      // @ts-ignore [closedBy is feature-detected above]
-      wrappingDialogElement.closedBy = 'none';
-    } else {
-      wrappingDialogElement.addEventListener(
-        'keydown',
-        (/** @type {* & KeyboardEvent} */ event) => {
-          if (event.key === 'Escape') {
-            event.preventDefault();
-          }
-        },
-      );
-      wrappingDialogElement.addEventListener('keyup', (/** @type {* & KeyboardEvent} */ event) => {
-        if (event.key === 'Escape') {
-          event.preventDefault();
-        }
-      });
-      wrappingDialogElement.addEventListener('cancel', event => {
-        event.stopPropagation();
-      });
-      wrappingDialogElement.addEventListener('close', event => {
-        event.stopPropagation();
-      });
-    }
+  // Clean up the DOM structure, leaving it as we found it.
+  // TODO: __teardownContentDomStructure method... use Resettable (rename ro Restorable) found in VisibilitToggleCtrl
+  __teardownVisibility() {
+    // TODO: full structure. For now we just reset display prop...
+    /** @type {HTMLDialogElement} */
+    this.__wrappingDialogNode.style.display = '';
   }
 
   /**
@@ -712,7 +805,6 @@ export class OverlayController extends EventTarget {
     if (this.placementMode !== 'local') {
       return;
     }
-
     if (phase === 'setup') {
       const zIndexNumber = Number(getComputedStyle(this.contentNode).zIndex);
       if (zIndexNumber < 1 || Number.isNaN(zIndexNumber)) {
@@ -729,7 +821,6 @@ export class OverlayController extends EventTarget {
     if (phase === 'init') {
       this.__storeOriginalAttrs(this.contentNode, ['role', 'id']);
       const isModal = this.trapsKeyboardFocus;
-
       if (this.invokerNode) {
         const attributesToStore = ['aria-labelledby', 'aria-describedby'];
         if (!isModal) {
@@ -737,7 +828,6 @@ export class OverlayController extends EventTarget {
         }
         this.__storeOriginalAttrs(this.invokerNode, attributesToStore);
       }
-
       if (!this.contentNode.id) {
         this.contentNode.setAttribute('id', this._contentId);
       }
@@ -773,7 +863,7 @@ export class OverlayController extends EventTarget {
   __storeOriginalAttrs(node, attrs) {
     /** @type {Record<string, any>} */
     const attrMap = {};
-    attrs.forEach(attrName => {
+    attrs.forEach((attrName) => {
       attrMap[attrName] = node.getAttribute(attrName);
     });
     this.__originalAttrs.set(node, attrMap);
@@ -792,9 +882,8 @@ export class OverlayController extends EventTarget {
     }
     this.__originalAttrs.clear();
   }
-
   get isShown() {
-    return Boolean(this.__wrappingDialogNode?.style.display !== 'none');
+    return Boolean(this.__wrappingDialogNode && this.__wrappingDialogNode.style.display !== 'none');
   }
 
   /**
@@ -808,32 +897,47 @@ export class OverlayController extends EventTarget {
     if (this._showComplete) {
       await this._showComplete;
     }
-    this._showComplete = new Promise(resolve => {
+    this._showComplete = new Promise((resolve) => {
       this._showResolve = resolve;
     });
 
+    // Teardown() removes the content dom structure we created (contentWrapperNode +
+    // wrapping <dialog>). Make sure it exists again before the manager (which sets
+    // our elevation on the wrapping node) and the show logic below touch it.
+    if (!this.__wrappingDialogNode) {
+      this._init();
+    }
     if (this.manager) {
       this.manager.show(this);
     }
-
     if (this.isShown) {
       /** @type {function} */
-      (this._showResolve)();
+      this._showResolve();
       return;
     }
-
-    const event = new CustomEvent('before-show', { cancelable: true });
+    const event = new CustomEvent('before-show', {
+      cancelable: true,
+    });
     this.dispatchEvent(event);
     if (!event.defaultPrevented) {
       if ('HTMLDialogElement' in window && this.__wrappingDialogNode instanceof HTMLDialogElement) {
         this.__wrappingDialogNode.open = true;
       }
+
       // @ts-ignore
       this.__wrappingDialogNode.style.display = '';
-      this._keepBodySize({ phase: 'before-show' });
-      await this._handleFeatures({ phase: 'show' });
-      this._keepBodySize({ phase: 'show' });
-      await this._handlePosition({ phase: 'show' });
+      this._keepBodySize({
+        phase: 'before-show',
+      });
+      await this._handleFeatures({
+        phase: 'show',
+      });
+      this._keepBodySize({
+        phase: 'show',
+      });
+      await this._handlePosition({
+        phase: 'show',
+      });
       this.__elementToFocusAfterHide = elementToFocusAfterHide;
       this.dispatchEvent(new Event('show'));
       await this._transitionShow({
@@ -841,8 +945,17 @@ export class OverlayController extends EventTarget {
         contentNode: this.contentNode,
       });
     }
+
+    // a styling/debug hook for open state
+    this.contentNode.setAttribute('data-open', '');
+    if (this.config.elementToFocusOnShow) {
+      this.contentNode.focus({
+        preventScroll: true,
+      });
+    }
+
     /** @type {function} */
-    (this._showResolve)();
+    this._showResolve();
   }
 
   /**
@@ -852,7 +965,6 @@ export class OverlayController extends EventTarget {
   async _handlePosition({ phase }) {
     if (this.placementMode === 'global') {
       const placementClass = `overlays__overlay-container--${this.viewportConfig.placement}`;
-
       if (phase === 'show') {
         this.contentWrapperNode.classList.add('overlays__overlay-container');
         this.contentWrapperNode.classList.add(placementClass);
@@ -871,8 +983,10 @@ export class OverlayController extends EventTarget {
        * This is however necessary for initial placement.
        */
       await this.__createPopperInstance();
-      /** @type {import('@popperjs/core').Instance} */ (this._popper).forceUpdate();
+      /** @type {import('@popperjs/core').Instance} */
+      this._popper.forceUpdate();
     }
+    // N.B. leave it up to the user if placementMode === 'custom'
   }
 
   /**
@@ -880,11 +994,10 @@ export class OverlayController extends EventTarget {
    * @protected
    */
   _keepBodySize({ phase }) {
-    if (!this.preventsScroll) {
-      return;
-    }
-
-    this.manager.requestToKeepBodySize({ phase });
+    if (!this.preventsScroll) return;
+    this.manager.requestToKeepBodySize({
+      phase,
+    });
   }
 
   /**
@@ -892,7 +1005,9 @@ export class OverlayController extends EventTarget {
    * @event hide right after the overlay is hidden
    */
   async hide() {
-    this._hideComplete = new Promise(resolve => {
+    // Function like a no-op for dynamic edge cases...
+    if (!this.config.isActivated) return;
+    this._hideComplete = new Promise((resolve) => {
       this._hideResolve = resolve;
     });
 
@@ -900,39 +1015,41 @@ export class OverlayController extends EventTarget {
     // while the dialog was open.
     // We need this in the _restoreFocus method to determine if we should focus this.elementToFocusAfterHide when the
     // dialog is closed or keep focus on the element that the user deliberately gave focus
-    this.__activeElementRightBeforeHide = /** @type {ShadowRoot} */ (
-      this.contentNode.getRootNode()
-    ).activeElement;
-
+    this.__activeElementRightBeforeHide =
+      /** @type {ShadowRoot} */ this.contentNode.getRootNode().activeElement;
     if (this.manager && this.#isRegisteredOnManager()) {
       this.manager.hide(this);
     }
-
     if (!this.isShown) {
-      /** @type {function} */ (this._hideResolve)();
+      /** @type {function} */ this._hideResolve();
       return;
     }
-
-    const event = new CustomEvent('before-hide', { cancelable: true });
+    const event = new CustomEvent('before-hide', {
+      cancelable: true,
+    });
     this.dispatchEvent(event);
     if (!event.defaultPrevented) {
       await this._transitionHide({
         backdropNode: this.backdropNode,
         contentNode: this.contentNode,
       });
-
       if ('HTMLDialogElement' in window && this.__wrappingDialogNode instanceof HTMLDialogElement) {
         this.__wrappingDialogNode.close();
       }
-
       // @ts-ignore
       this.__wrappingDialogNode.style.display = 'none';
-      this._handleFeatures({ phase: 'hide' });
-      this._keepBodySize({ phase: 'hide' });
+      this._handleFeatures({
+        phase: 'hide',
+      });
+      this._keepBodySize({
+        phase: 'hide',
+      });
       this.dispatchEvent(new Event('hide'));
       this._restoreFocus();
     }
-    /** @type {function} */ (this._hideResolve)();
+    /** @type {function} */
+    this._hideResolve();
+    this.contentNode.removeAttribute('data-open');
   }
 
   /**
@@ -951,8 +1068,13 @@ export class OverlayController extends EventTarget {
   // eslint-disable-next-line class-methods-use-this, no-empty-function, no-unused-vars
   async _transitionHide({ backdropNode, contentNode }) {
     // `this.transitionHide` is a hook for our users
-    await this.transitionHide({ backdropNode, contentNode });
-    this._handlePosition({ phase: 'hide' });
+    await this.transitionHide({
+      backdropNode,
+      contentNode,
+    });
+    this._handlePosition({
+      phase: 'hide',
+    });
     if (!backdropNode) {
       return;
     }
@@ -974,8 +1096,10 @@ export class OverlayController extends EventTarget {
   // eslint-disable-next-line class-methods-use-this, no-empty-function, no-unused-vars
   async _transitionShow(showConfig) {
     // `this.transitionShow` is a hook for our users
-    await this.transitionShow({ backdropNode: this.backdropNode, contentNode: this.contentNode });
-
+    await this.transitionShow({
+      backdropNode: this.backdropNode,
+      contentNode: this.contentNode,
+    });
     if (showConfig.backdropNode) {
       showConfig.backdropNode.classList.add(`overlays__backdrop--animation-in`);
     }
@@ -988,19 +1112,18 @@ export class OverlayController extends EventTarget {
     const weStillOwnActiveElement =
       this.__activeElementRightBeforeHide instanceof HTMLElement &&
       this.contentNode.contains(this.__activeElementRightBeforeHide);
-
     if (!weStillOwnActiveElement) {
       return;
     }
-
     if (this.elementToFocusAfterHide instanceof HTMLElement) {
       this.elementToFocusAfterHide.focus();
-      this.elementToFocusAfterHide.scrollIntoView({ block: 'nearest' });
+      this.elementToFocusAfterHide.scrollIntoView({
+        block: 'nearest',
+      });
     } else {
-      /** @type {HTMLElement} */ (this.__activeElementRightBeforeHide).blur();
+      /** @type {HTMLElement} */ this.__activeElementRightBeforeHide.blur();
     }
   }
-
   async toggle() {
     return this.isShown ? this.hide() : this.show();
   }
@@ -1011,55 +1134,109 @@ export class OverlayController extends EventTarget {
    * @protected
    */
   _handleFeatures({ phase }) {
-    this._handleZIndex({ phase });
-
+    this._handleZIndex({
+      phase,
+    });
     if (this.preventsScroll) {
-      this._handlePreventsScroll({ phase });
+      this._handlePreventsScroll({
+        phase,
+      });
     }
     if (this.isBlocking) {
-      this._handleBlocking({ phase });
+      this._handleBlocking({
+        phase,
+      });
     }
     if (this.hasBackdrop) {
-      this._handleBackdrop({ phase });
+      this._handleBackdrop({
+        phase,
+      });
     }
     if (this.trapsKeyboardFocus) {
-      this._handleTrapsKeyboardFocus({ phase });
+      this._handleTrapsKeyboardFocus({
+        phase,
+      });
     }
     if (this.hidesOnEsc) {
-      this._handleHidesOnEsc({ phase });
+      this._handleHidesOnEsc({
+        phase,
+      });
     }
     if (this.hidesOnOutsideEsc) {
-      this._handleHidesOnOutsideEsc({ phase });
+      this._handleHidesOnOutsideEsc({
+        phase,
+      });
     }
     if (this.hidesOnOutsideClick) {
-      this._handleHidesOnOutsideClick({ phase });
+      this._handleHidesOnOutsideClick({
+        phase,
+      });
     }
     if (this.handlesAccessibility) {
-      this._handleAccessibility({ phase });
+      this._handleAccessibility({
+        phase,
+      });
     }
     if (this.inheritsReferenceWidth) {
       this._handleInheritsReferenceWidth();
     }
     if (this.visibilityTriggerFunction) {
-      this._handleVisibilityTriggers({ phase });
+      this._handleVisibilityTriggers({
+        phase,
+      });
+    }
+    if (this.config.syncChildrenCloseState) {
+      this._handleSyncChildrenCloseState({
+        phase,
+      });
+    }
+    if (this.config.elementToFocusOnShow) {
+      this._handleElementToFocusOnShow({
+        phase,
+      });
+    }
+  }
+
+  /**
+   * @param {{phase: OverlayPhase}} opts
+   * @returns {void}
+   */
+  _handleElementToFocusOnShow({ phase }) {
+    if (phase === 'init') {
+      this.contentNode?.setAttribute('tabindex', '-1');
+    } else if (phase === 'teardown') {
+      // TODO: capture initial attr, use Resettable mechanism of VisibilityToggleCtrl in whole Controller
+      this.contentNode?.removeAttribute('tabindex');
     }
   }
 
+  /**
+   * @param {{phase: OverlayPhase}} opts
+   * @returns {void}
+   */
+  _handleSyncChildrenCloseState({ phase }) {
+    if (phase !== 'hide') return;
+    const visibleChildren = this.manager.shownList.filter(
+      (ctrl) => ctrl !== this && deepContains(this.contentNode, ctrl.contentNode),
+    );
+    visibleChildren.forEach((ctrl) => ctrl.hide());
+  }
+
   /**
    * @param {{ phase: OverlayPhase }} config
    */
   _handleVisibilityTriggers({ phase }) {
-    if (typeof this.visibilityTriggerFunction === 'function') {
-      if (phase === 'init') {
-        this.__visibilityTriggerHandler = this.visibilityTriggerFunction({
-          phase,
-          controller: this,
-        });
-      }
-      if (this.__visibilityTriggerHandler[phase]) {
-        this.__visibilityTriggerHandler[phase]();
-      }
+    if (typeof this.visibilityTriggerFunction !== 'function') return;
+
+    // Here we initialize the __visibilityTriggerHandler of our invokerNode. It's important that we ONLY do this on init,
+    // otherwise we risk not being able to properly clean up listeners...
+    if (phase === 'init') {
+      this.__visibilityTriggerHandler = this.visibilityTriggerFunction({
+        controller: this,
+      });
     }
+    // Here we run the appropriate lifecycle, if defined in our handler
+    this.__visibilityTriggerHandler[phase]?.();
   }
 
   /**
@@ -1096,7 +1273,6 @@ export class OverlayController extends EventTarget {
       /* no default */
     }
   }
-
   get hasActiveBackdrop() {
     return this.__hasActiveBackdrop;
   }
@@ -1141,7 +1317,7 @@ export class OverlayController extends EventTarget {
   /**
    * @param {KeyboardEvent} event
    */
-  #isShiftPressedOnKeyDownHandler = event => {
+  #isShiftPressedOnKeyDownHandler = (event) => {
     if (event.key === 'Shift') {
       this.#isShiftPressed = true;
     }
@@ -1150,26 +1326,23 @@ export class OverlayController extends EventTarget {
   /**
    * @param {KeyboardEvent} event
    */
-  #isShiftPressedOnKeyUpHandler = event => {
+  #isShiftPressedOnKeyUpHandler = (event) => {
     if (event.key === 'Shift') {
       this.#isShiftPressed = false;
     }
   };
-
   #handleShiftKeyPress = () => {
     window.addEventListener('keydown', this.#isShiftPressedOnKeyDownHandler);
     window.addEventListener('keyup', this.#isShiftPressedOnKeyUpHandler);
   };
-
   #stopHandlingShiftKeyPress = () => {
     window.removeEventListener('keydown', this.#isShiftPressedOnKeyDownHandler);
     window.removeEventListener('keyup', this.#isShiftPressedOnKeyUpHandler);
   };
-
   #getInitialElementToFocus = () => {
     const focusableElements = getFocusableElements(this.contentNode);
     // Initial focus goes to first element with autofocus, or `contentNode`
-    return focusableElements.find(e => e.hasAttribute('autofocus')) || this.contentNode;
+    return focusableElements.find((e) => e.hasAttribute('autofocus')) || this.contentNode;
   };
 
   /**
@@ -1204,7 +1377,6 @@ export class OverlayController extends EventTarget {
     if (phase === 'init') {
       this.contentNode.style.outline = 'none';
       this.contentNode.tabIndex = -1;
-
       const isContentShadowHost = Boolean(this.contentNode.shadowRoot);
       if (isContentShadowHost) {
         // eslint-disable-next-line no-console
@@ -1216,7 +1388,9 @@ export class OverlayController extends EventTarget {
     if (phase === 'show') {
       this.#handleShiftKeyPress();
       this.#handleFocusInsideDialog();
+      // @ts-ignore - HTMLDialogElement methods
       this.__wrappingDialogNode?.close();
+      // @ts-ignore - HTMLDialogElement methods
       this.__wrappingDialogNode?.showModal();
       /**
        * At this moment `#handleFocusInsideDialog` should handle the focus.
@@ -1255,7 +1429,6 @@ export class OverlayController extends EventTarget {
     ) {
       return;
     }
-
     if (this.#hasPressedInside(event)) {
       this.__escKeyHandlerCalled = true;
       this.hide();
@@ -1270,18 +1443,17 @@ export class OverlayController extends EventTarget {
    * @param {KeyboardEvent} event
    * @returns {boolean}
    */
-  #hasPressedInside = event =>
-    event.composedPath().includes(/** @type {EventTarget} */ (this.__wrappingDialogNode)) ||
+  #hasPressedInside = (event) =>
+    event.composedPath().includes(/** @type {EventTarget} */ this.__wrappingDialogNode) ||
     (this.invokerNode && event.composedPath().includes(this.invokerNode)) ||
-    deepContains(this.contentNode, /** @type {HTMLElement|ShadowRoot} */ (event.target));
+    deepContains(this.contentNode, /** @type {HTMLElement|ShadowRoot} */ event.target);
 
   /**
    * @param {KeyboardEvent} event
    * @returns {void}
    */
-  #outsideEscKeyHandler = event => {
+  #outsideEscKeyHandler = (event) => {
     if (event.key !== 'Escape') return;
-
     if (this.#hasPressedInside(event)) return;
     this.hide();
   };
@@ -1353,7 +1525,6 @@ export class OverlayController extends EventTarget {
    */
   _handleHidesOnOutsideClick({ phase }) {
     const addOrRemoveListener = phase === 'show' ? 'addEventListener' : 'removeEventListener';
-
     if (phase === 'show') {
       /**
        * We listen to click (more specifically mouseup and mousedown) events
@@ -1381,7 +1552,6 @@ export class OverlayController extends EventTarget {
         // [1]. was mousedown inside content or invoker
         wasMouseDownInside = true;
       };
-
       this.__onInsideMouseUp = () => {
         // [3]. was mouseup inside content or invoker
         wasMouseUpInside = true;
@@ -1410,7 +1580,6 @@ export class OverlayController extends EventTarget {
         });
       };
     }
-
     this.contentWrapperNode[addOrRemoveListener](
       'mousedown',
       /** @type {EventListenerOrEventListenerObject} */
@@ -1421,7 +1590,7 @@ export class OverlayController extends EventTarget {
     this.contentWrapperNode[addOrRemoveListener](
       'mouseup',
       /** @type {EventListenerOrEventListenerObject} */
-      (this.__onInsideMouseUp),
+      this.__onInsideMouseUp,
       true,
     );
     if (this.invokerNode) {
@@ -1437,7 +1606,7 @@ export class OverlayController extends EventTarget {
       this.invokerNode[addOrRemoveListener](
         'mouseup',
         /** @type {EventListenerOrEventListenerObject} */
-        (this.__onInsideMouseUp),
+        this.__onInsideMouseUp,
         true,
       );
     }
@@ -1462,23 +1631,50 @@ export class OverlayController extends EventTarget {
    */
   _handleAccessibility({ phase }) {
     if (phase === 'init' || phase === 'teardown') {
-      this.__setupTeardownAccessibility({ phase });
+      this.__setupTeardownAccessibility({
+        phase,
+      });
     }
     const isModal = this.trapsKeyboardFocus;
     if (this.invokerNode && !this.isTooltip && !isModal) {
       this.invokerNode.setAttribute('aria-expanded', `${phase === 'show'}`);
     }
   }
-
   teardown() {
-    this.__handleOverlayStyles({ phase: 'teardown' });
+    if (!this.__hasSetup) return;
+    this.__handleOverlayStyles({
+      phase: 'teardown',
+    });
     if (this.isShown) {
-      this._keepBodySize({ phase: 'teardown' });
+      this._keepBodySize({
+        phase: 'teardown',
+      });
     }
-    this._handleFeatures({ phase: 'teardown' });
+    this._handleFeatures({
+      phase: 'teardown',
+    });
     if (this.#isRegisteredOnManager()) {
       this.manager.remove(this);
     }
+    this.contentNode?.removeEventListener('click', this.#hideOnCloseButtonClick);
+
+    // if (this.config._shouldTeardownDomStructure) {
+    this.__rearrangeNodesCleanup?.();
+    this.__rearrangeNodesCleanup = undefined;
+    // }
+    this.__teardownVisibility();
+
+    // When we created the contentWrapperNode/wrapping <dialog> ourselves, restore the
+    // original dom structure and drop the (now detached) references, so that a
+    // subsequent setup recreates them and `contentWrapperNode`/`content` no longer
+    // expose stale nodes.
+    if (this.contentWrapperNode !== this.contentNode) {
+      this.contentWrapperNode?.removeAttribute('style');
+      this.contentWrapperNode?.removeAttribute('class');
+      this.__contentWrapperNode = undefined;
+      this.__wrappingDialogNode = undefined;
+    }
+    this.__hasSetup = false;
   }
 
   /** @private */
@@ -1487,11 +1683,10 @@ export class OverlayController extends EventTarget {
       this._popper.destroy();
       this._popper = undefined;
     }
-
     if (OverlayController.popperModule !== undefined) {
       const { createPopper } = await OverlayController.popperModule;
       this._popper = createPopper(
-        /** @type {HTMLElement} */ (this._referenceNode),
+        /** @type {HTMLElement} */ this._referenceNode,
         this.contentWrapperNode,
         {
           ...this.config?.popperConfig,
@@ -1499,11 +1694,10 @@ export class OverlayController extends EventTarget {
       );
     }
   }
-
   _hasDisabledInvoker() {
     if (this.invokerNode) {
       return (
-        /** @type {HTMLElement & { disabled: boolean }} */ (this.invokerNode).disabled ||
+        /** @type {HTMLElement & { disabled: boolean }} */ this.invokerNode.disabled ||
         this.invokerNode.getAttribute('aria-disabled') === 'true'
       );
     }