@react-aria/overlays 3.8.2 → 3.10.0

package/dist/types.d.ts

@@ -1,27 +1,27 @@
-import React, { HTMLAttributes, RefObject, AriaAttributes, ReactNode } from "react";
+import { DOMAttributes, AriaLabelingProps, DOMProps } from "@react-types/shared";
 import { PlacementAxis, PositionProps } from "@react-types/overlays";
+import React, { RefObject, AriaAttributes, ReactNode } from "react";
 import { AriaButtonProps } from "@react-types/button";
 import { OverlayTriggerState } from "@react-stately/overlays";
-import { AriaLabelingProps, DOMProps } from "@react-types/shared";
-interface AriaPositionProps extends PositionProps {
+export interface AriaPositionProps extends PositionProps {
     /**
      * Element that that serves as the positioning boundary.
      * @default document.body
      */
-    boundaryElement?: HTMLElement;
+    boundaryElement?: Element;
     /**
      * The ref for the element which the overlay positions itself with respect to.
      */
-    targetRef: RefObject<HTMLElement>;
+    targetRef: RefObject<Element>;
     /**
      * The ref for the overlay element.
      */
-    overlayRef: RefObject<HTMLElement>;
+    overlayRef: RefObject<Element>;
     /**
      * A ref for the scrollable region within the overlay.
      * @default overlayRef
      */
-    scrollRef?: RefObject<HTMLElement>;
+    scrollRef?: RefObject<Element>;
     /**
      * Whether the overlay should update its position automatically.
      * @default true
@@ -35,11 +35,11 @@ interface AriaPositionProps extends PositionProps {
      */
     maxHeight?: number;
 }
-interface PositionAria {
+export interface PositionAria {
     /** Props for the overlay container element. */
-    overlayProps: HTMLAttributes<Element>;
+    overlayProps: DOMAttributes;
     /** Props for the overlay tip arrow if any. */
-    arrowProps: HTMLAttributes<Element>;
+    arrowProps: DOMAttributes;
     /** Placement of the overlay with respect to the overlay trigger. */
     placement: PlacementAxis;
     /** Updates the position of the overlay. */
@@ -50,7 +50,7 @@ interface PositionAria {
  * element, and updating the position when the window resizes.
  */
 export function useOverlayPosition(props: AriaPositionProps): PositionAria;
-interface OverlayProps {
+export interface AriaOverlayProps {
     /** Whether the overlay is currently open. */
     isOpen?: boolean;
     /** Handler that is called when the overlay should close. */
@@ -73,35 +73,35 @@ interface OverlayProps {
      * out interaction with elements that should not dismiss the overlay.
      * By default, onClose will always be called on interaction outside the overlay ref.
      */
-    shouldCloseOnInteractOutside?: (element: HTMLElement) => boolean;
+    shouldCloseOnInteractOutside?: (element: Element) => boolean;
 }
-interface OverlayAria {
+export interface OverlayAria {
     /** Props to apply to the overlay container element. */
-    overlayProps: HTMLAttributes<HTMLElement>;
+    overlayProps: DOMAttributes;
     /** Props to apply to the underlay element, if any. */
-    underlayProps: HTMLAttributes<HTMLElement>;
+    underlayProps: DOMAttributes;
 }
 /**
  * Provides the behavior for overlays such as dialogs, popovers, and menus.
  * Hides the overlay when the user interacts outside it, when the Escape key is pressed,
  * or optionally, on blur. Only the top-most overlay will close at once.
  */
-export function useOverlay(props: OverlayProps, ref: RefObject<HTMLElement>): OverlayAria;
-interface OverlayTriggerProps {
+export function useOverlay(props: AriaOverlayProps, ref: RefObject<Element>): OverlayAria;
+export interface OverlayTriggerProps {
     /** Type of overlay that is opened by the trigger. */
     type: 'dialog' | 'menu' | 'listbox' | 'tree' | 'grid';
 }
-interface OverlayTriggerAria {
+export interface OverlayTriggerAria {
     /** Props for the trigger element. */
     triggerProps: AriaButtonProps;
     /** Props for the overlay container element. */
-    overlayProps: HTMLAttributes<HTMLElement>;
+    overlayProps: DOMAttributes;
 }
 /**
  * Handles the behavior and accessibility for an overlay trigger, e.g. a button
  * that opens a popover, menu, or other overlay that is positioned relative to the trigger.
  */
-export function useOverlayTrigger(props: OverlayTriggerProps, state: OverlayTriggerState, ref: RefObject<HTMLElement>): OverlayTriggerAria;
+export function useOverlayTrigger(props: OverlayTriggerProps, state: OverlayTriggerState, ref: RefObject<Element>): OverlayTriggerAria;
 interface PreventScrollOptions {
     /** Whether the scroll lock is disabled. */
     isDisabled?: boolean;
@@ -112,7 +112,7 @@ interface PreventScrollOptions {
  * shift due to the scrollbars disappearing.
  */
 export function usePreventScroll(options?: PreventScrollOptions): void;
-interface ModalProviderProps extends HTMLAttributes<HTMLElement> {
+export interface ModalProviderProps extends DOMAttributes {
     children: ReactNode;
 }
 /**
@@ -124,7 +124,7 @@ interface ModalProviderProps extends HTMLAttributes<HTMLElement> {
  * like portals, which can cause the React tree and the DOM tree to differ significantly in structure.
  */
 export function ModalProvider(props: ModalProviderProps): JSX.Element;
-interface ModalProviderAria {
+export interface ModalProviderAria {
     /**
      * Props to be spread on the container element.
      */
@@ -144,12 +144,12 @@ export function useModalProvider(): ModalProviderAria;
  * overlay should be accessible at once.
  */
 export function OverlayProvider(props: ModalProviderProps): JSX.Element;
-interface OverlayContainerProps extends ModalProviderProps {
+export interface OverlayContainerProps extends ModalProviderProps {
     /**
      * The container element in which the overlay portal will be placed.
      * @default document.body
      */
-    portalContainer?: HTMLElement;
+    portalContainer?: Element;
 }
 /**
  * A container for overlays like modals and popovers. Renders the overlay
@@ -159,14 +159,14 @@ interface OverlayContainerProps extends ModalProviderProps {
  * be accessible at once.
  */
 export function OverlayContainer(props: OverlayContainerProps): React.ReactPortal;
-interface ModalAriaProps extends HTMLAttributes<HTMLElement> {
+interface ModalAriaProps extends DOMAttributes {
     /** Data attribute marks the dom node as a modal for the aria-modal-polyfill. */
     'data-ismodal': boolean;
 }
-interface ModalOptions {
+export interface AriaModalOptions {
     isDisabled?: boolean;
 }
-interface ModalAria {
+export interface ModalAria {
     /** Props for the modal content element. */
     modalProps: ModalAriaProps;
 }
@@ -176,8 +176,8 @@ interface ModalAria {
  * other types of overlays to ensure that only the top-most modal is
  * accessible at once.
  */
-export function useModal(options?: ModalOptions): ModalAria;
-interface DismissButtonProps extends AriaLabelingProps, DOMProps {
+export function useModal(options?: AriaModalOptions): ModalAria;
+export interface DismissButtonProps extends AriaLabelingProps, DOMProps {
     /** Called when the dismiss button is activated. */
     onDismiss?: () => void;
 }
@@ -195,6 +195,6 @@ export function DismissButton(props: DismissButtonProps): JSX.Element;
  * @param root - Nothing will be hidden above this element.
  * @returns - A function to restore all hidden elements.
  */
-export function ariaHideOutside(targets: HTMLElement[], root?: HTMLElement): () => void;
+export function ariaHideOutside(targets: Element[], root?: HTMLElement): () => void;
 
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/calculatePosition.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useCloseOnScroll.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useOverlayPosition.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useOverlay.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useOverlayTrigger.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/usePreventScroll.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useModal.tsx","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/DismissButton.tsx","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/ariaHideOutside.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/index.ts","packages/@react-aria/overlays/src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,"/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nexport * from './useOverlayPosition';\nexport * from './useOverlay';\nexport * from './useOverlayTrigger';\nexport * from './usePreventScroll';\nexport * from './useModal';\nexport * from './DismissButton';\nexport * from './ariaHideOutside';\n"],"names":[],"version":3,"file":"types.d.ts.map"}
+{"mappings":"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","sources":["packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/calculatePosition.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useCloseOnScroll.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useOverlayPosition.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useOverlay.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useOverlayTrigger.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/usePreventScroll.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/useModal.tsx","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/DismissButton.tsx","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/ariaHideOutside.ts","packages/@react-aria/overlays/src/packages/@react-aria/overlays/src/index.ts","packages/@react-aria/overlays/src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,"/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\nexport {useOverlayPosition} from './useOverlayPosition';\nexport {useOverlay} from './useOverlay';\nexport {useOverlayTrigger} from './useOverlayTrigger';\nexport {usePreventScroll} from './usePreventScroll';\nexport {ModalProvider, useModalProvider, OverlayProvider, OverlayContainer, useModal} from './useModal';\nexport {DismissButton} from './DismissButton';\nexport {ariaHideOutside} from './ariaHideOutside';\n\nexport type {AriaPositionProps, PositionAria} from './useOverlayPosition';\nexport type {AriaOverlayProps, OverlayAria} from './useOverlay';\nexport type {OverlayTriggerAria, OverlayTriggerProps} from './useOverlayTrigger';\nexport type {AriaModalOptions, ModalAria, ModalProviderAria, ModalProviderProps, OverlayContainerProps} from './useModal';\nexport type {DismissButtonProps} from './DismissButton';\n"],"names":[],"version":3,"file":"types.d.ts.map"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/overlays",
-  "version": "3.8.2",
+  "version": "3.10.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -18,22 +18,22 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.6.2",
-    "@react-aria/i18n": "^3.3.9",
-    "@react-aria/interactions": "^3.8.4",
-    "@react-aria/utils": "^3.12.0",
-    "@react-aria/visually-hidden": "^3.2.8",
-    "@react-stately/overlays": "^3.2.0",
-    "@react-types/button": "^3.4.5",
-    "@react-types/overlays": "^3.5.5",
-    "@react-types/shared": "^3.12.0",
-    "dom-helpers": "^3.3.1"
+    "@react-aria/i18n": "^3.5.0",
+    "@react-aria/interactions": "^3.10.0",
+    "@react-aria/ssr": "^3.3.0",
+    "@react-aria/utils": "^3.13.2",
+    "@react-aria/visually-hidden": "^3.4.0",
+    "@react-stately/overlays": "^3.4.0",
+    "@react-types/button": "^3.6.0",
+    "@react-types/overlays": "^3.6.2",
+    "@react-types/shared": "^3.14.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1",
-    "react-dom": "^16.8.0 || ^17.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6a503b715e0dbbf92038cd7f08b1bcdde4c78e82"
+  "gitHead": "cd7c0ec917122c7612f653c22f8ed558f8b66ecd"
 }

package/src/DismissButton.tsx

@@ -15,10 +15,10 @@ import {AriaLabelingProps, DOMProps} from '@react-types/shared';
 import intlMessages from '../intl/*.json';
 import React from 'react';
 import {useLabels} from '@react-aria/utils';
-import {useMessageFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {VisuallyHidden} from '@react-aria/visually-hidden';
 
-interface DismissButtonProps extends AriaLabelingProps, DOMProps {
+export interface DismissButtonProps extends AriaLabelingProps, DOMProps {
   /** Called when the dismiss button is activated. */
   onDismiss?: () => void
 }
@@ -30,9 +30,9 @@ interface DismissButtonProps extends AriaLabelingProps, DOMProps {
  */
 export function DismissButton(props: DismissButtonProps) {
   let {onDismiss, ...otherProps} = props;
-  let formatMessage = useMessageFormatter(intlMessages);
+  let stringFormatter = useLocalizedStringFormatter(intlMessages);
 
-  let labels = useLabels(otherProps, formatMessage('dismiss'));
+  let labels = useLabels(otherProps, stringFormatter.format('dismiss'));
 
   let onClick = () => {
     if (onDismiss) {

package/src/ariaHideOutside.ts

@@ -22,7 +22,7 @@ let refCountMap = new WeakMap<Element, number>();
  * @param root - Nothing will be hidden above this element.
  * @returns - A function to restore all hidden elements.
  */
-export function ariaHideOutside(targets: HTMLElement[], root = document.body) {
+export function ariaHideOutside(targets: Element[], root = document.body) {
   let visibleNodes = new Set<Element>(targets);
   let hiddenNodes = new Set<Element>();
   let walker = document.createTreeWalker(
@@ -31,7 +31,7 @@ export function ariaHideOutside(targets: HTMLElement[], root = document.body) {
     {
       acceptNode(node) {
         // If this node is a live announcer, add it to the set of nodes to keep visible.
-        if ((node instanceof HTMLElement && node.dataset.liveAnnouncer === 'true')) {
+        if (((node instanceof HTMLElement || node instanceof SVGElement) && node.dataset.liveAnnouncer === 'true')) {
           visibleNodes.add(node);
         }
 
@@ -46,7 +46,7 @@ export function ariaHideOutside(targets: HTMLElement[], root = document.body) {
 
         // VoiceOver on iOS has issues hiding elements with role="row". Hide the cells inside instead.
         // https://bugs.webkit.org/show_bug.cgi?id=222623
-        if (node instanceof HTMLElement && node.getAttribute('role') === 'row') {
+        if (node instanceof Element && node.getAttribute('role') === 'row') {
           return NodeFilter.FILTER_SKIP;
         }
 
@@ -93,7 +93,7 @@ export function ariaHideOutside(targets: HTMLElement[], root = document.body) {
       // and not already inside a hidden node, hide all of the new children.
       if (![...visibleNodes, ...hiddenNodes].some(node => node.contains(change.target))) {
         for (let node of change.addedNodes) {
-          if ((node instanceof HTMLElement && node.dataset.liveAnnouncer === 'true')) {
+          if (((node instanceof HTMLElement || node instanceof SVGElement) && node.dataset.liveAnnouncer === 'true')) {
             visibleNodes.add(node);
           } else if (node instanceof Element) {
             hide(node);

package/src/calculatePosition.ts

@@ -11,12 +11,6 @@
  */
 
 import {Axis, Placement, PlacementAxis, SizeAxis} from '@react-types/overlays';
-import getCss from 'dom-helpers/style';
-import getOffset from 'dom-helpers/query/offset';
-import getPosition from 'dom-helpers/query/position';
-import getScrollLeft from 'dom-helpers/query/scrollLeft';
-import getScrollTop from 'dom-helpers/query/scrollTop';
-import ownerDocument from 'dom-helpers/ownerDocument';
 
 interface Position {
   top?: number,
@@ -51,12 +45,12 @@ interface Offset {
 
 interface PositionOpts {
   placement: Placement,
-  targetNode: HTMLElement,
-  overlayNode: HTMLElement,
-  scrollNode: HTMLElement,
+  targetNode: Element,
+  overlayNode: Element,
+  scrollNode: Element,
   padding: number,
   shouldFlip: boolean,
-  boundaryElement: HTMLElement,
+  boundaryElement: Element,
   offset: number,
   crossOffset: number,
   maxHeight?: number
@@ -104,25 +98,22 @@ function getContainerDimensions(containerNode: Element): Dimensions {
   let scroll: Position = {};
 
   if (containerNode.tagName === 'BODY') {
-    width = visualViewport?.width ?? document.documentElement.clientWidth;
-    height = visualViewport?.height ?? document.documentElement.clientHeight;
-
-    scroll.top =
-      getScrollTop(ownerDocument(containerNode).documentElement) ||
-      getScrollTop(containerNode);
-    scroll.left =
-      getScrollLeft(ownerDocument(containerNode).documentElement) ||
-      getScrollLeft(containerNode);
+    let documentElement = document.documentElement;
+    width = visualViewport?.width ?? documentElement.clientWidth;
+    height = visualViewport?.height ?? documentElement.clientHeight;
+
+    scroll.top = documentElement.scrollTop || containerNode.scrollTop;
+    scroll.left = documentElement.scrollLeft || containerNode.scrollLeft;
   } else {
     ({width, height, top, left} = getOffset(containerNode));
-    scroll.top = getScrollTop(containerNode);
-    scroll.left = getScrollLeft(containerNode);
+    scroll.top = containerNode.scrollTop;
+    scroll.left = containerNode.scrollLeft;
   }
 
   return {width, height, scroll, top, left};
 }
 
-function getScroll(node: HTMLElement): Offset {
+function getScroll(node: Element): Offset {
   return {
     top: node.scrollTop,
     left: node.scrollLeft,
@@ -153,7 +144,7 @@ function getDelta(
   }
 }
 
-function getMargins(node: HTMLElement): Position {
+function getMargins(node: Element): Position {
   let style = window.getComputedStyle(node);
   return {
     top: parseInt(style.marginTop, 10) || 0,
@@ -373,15 +364,16 @@ export function calculatePosition(opts: PositionOpts): PositionResult {
     maxHeight
   } = opts;
 
-  let container = overlayNode.offsetParent || document.body;
+  let container = ((overlayNode instanceof HTMLElement && overlayNode.offsetParent) || document.body) as Element;
   let isBodyContainer = container.tagName === 'BODY';
   const containerPositionStyle = window.getComputedStyle(container).position;
   let isContainerPositioned = !!containerPositionStyle && containerPositionStyle !== 'static';
   let childOffset: Offset = isBodyContainer ? getOffset(targetNode) : getPosition(targetNode, container);
 
   if (!isBodyContainer) {
-    childOffset.top += parseInt(getCss(targetNode, 'marginTop'), 10) || 0;
-    childOffset.left += parseInt(getCss(targetNode, 'marginLeft'), 10) || 0;
+    let {marginTop, marginLeft} = window.getComputedStyle(targetNode);
+    childOffset.top += parseInt(marginTop, 10) || 0;
+    childOffset.left += parseInt(marginLeft, 10) || 0;
   }
 
   let overlaySize: Offset = getOffset(overlayNode);
@@ -409,3 +401,35 @@ export function calculatePosition(opts: PositionOpts): PositionResult {
     maxHeight
   );
 }
+
+function getOffset(node: Element): Offset {
+  let {top, left, width, height} = node.getBoundingClientRect();
+  let {scrollTop, scrollLeft, clientTop, clientLeft} = document.documentElement;
+  return {
+    top: top + scrollTop - clientTop,
+    left: left + scrollLeft - clientLeft,
+    width,
+    height
+  };
+}
+
+function getPosition(node: Element, parent: Element): Offset {
+  let style = window.getComputedStyle(node);
+  let offset: Offset;
+  if (style.position === 'fixed') {
+    let {top, left, width, height} = node.getBoundingClientRect();
+    offset = {top, left, width, height};
+  } else {
+    offset = getOffset(node);
+    let parentOffset = getOffset(parent);
+    let parentStyle = window.getComputedStyle(parent);
+    parentOffset.top += (parseInt(parentStyle.borderTopWidth, 10) || 0) - parent.scrollTop;
+    parentOffset.left += (parseInt(parentStyle.borderLeftWidth, 10) || 0) - parent.scrollLeft;
+    offset.top -= parentOffset.top;
+    offset.left -= parentOffset.left;
+  }
+
+  offset.top -= parseInt(style.marginTop, 10) || 0;
+  offset.left -= parseInt(style.marginLeft, 10) || 0;
+  return offset;
+}

package/src/index.ts

@@ -9,11 +9,16 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+export {useOverlayPosition} from './useOverlayPosition';
+export {useOverlay} from './useOverlay';
+export {useOverlayTrigger} from './useOverlayTrigger';
+export {usePreventScroll} from './usePreventScroll';
+export {ModalProvider, useModalProvider, OverlayProvider, OverlayContainer, useModal} from './useModal';
+export {DismissButton} from './DismissButton';
+export {ariaHideOutside} from './ariaHideOutside';
 
-export * from './useOverlayPosition';
-export * from './useOverlay';
-export * from './useOverlayTrigger';
-export * from './usePreventScroll';
-export * from './useModal';
-export * from './DismissButton';
-export * from './ariaHideOutside';
+export type {AriaPositionProps, PositionAria} from './useOverlayPosition';
+export type {AriaOverlayProps, OverlayAria} from './useOverlay';
+export type {OverlayTriggerAria, OverlayTriggerProps} from './useOverlayTrigger';
+export type {AriaModalOptions, ModalAria, ModalProviderAria, ModalProviderProps, OverlayContainerProps} from './useModal';
+export type {DismissButtonProps} from './DismissButton';

package/src/useCloseOnScroll.ts

@@ -17,10 +17,10 @@ import {RefObject, useEffect} from 'react';
 // it sets a close function here mapped from the trigger element. This way we can avoid
 // forcing users to pass an onClose function to useOverlayPosition which could be considered
 // a breaking change.
-export const onCloseMap: WeakMap<HTMLElement, () => void> = new WeakMap();
+export const onCloseMap: WeakMap<Element, () => void> = new WeakMap();
 
 interface CloseOnScrollOptions {
-  triggerRef: RefObject<HTMLElement>,
+  triggerRef: RefObject<Element>,
   isOpen?: boolean,
   onClose?: () => void
 }

package/src/useModal.tsx

@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import React, {AriaAttributes, HTMLAttributes, ReactNode, useContext, useEffect, useMemo, useState} from 'react';
+import {DOMAttributes} from '@react-types/shared';
+import React, {AriaAttributes, ReactNode, useContext, useEffect, useMemo, useState} from 'react';
 import ReactDOM from 'react-dom';
+import {useIsSSR} from '@react-aria/ssr';
 
-interface ModalProviderProps extends HTMLAttributes<HTMLElement> {
+export interface ModalProviderProps extends DOMAttributes {
   children: ReactNode
 }
 
@@ -62,7 +64,7 @@ export function ModalProvider(props: ModalProviderProps) {
   );
 }
 
-interface ModalProviderAria {
+export interface ModalProviderAria {
   /**
    * Props to be spread on the container element.
    */
@@ -106,12 +108,12 @@ export function OverlayProvider(props: ModalProviderProps) {
   );
 }
 
-interface OverlayContainerProps extends ModalProviderProps {
+export interface OverlayContainerProps extends ModalProviderProps {
   /**
    * The container element in which the overlay portal will be placed.
    * @default document.body
    */
-  portalContainer?: HTMLElement
+  portalContainer?: Element
 }
 
 /**
@@ -122,28 +124,33 @@ interface OverlayContainerProps extends ModalProviderProps {
  * be accessible at once.
  */
 export function OverlayContainer(props: OverlayContainerProps): React.ReactPortal {
-  let {portalContainer = document.body, ...rest} = props;
+  let isSSR = useIsSSR();
+  let {portalContainer = isSSR ? null : document.body, ...rest} = props;
 
   React.useEffect(() => {
-    if (portalContainer.closest('[data-overlay-container]')) {
+    if (portalContainer?.closest('[data-overlay-container]')) {
       throw new Error('An OverlayContainer must not be inside another container. Please change the portalContainer prop.');
     }
   }, [portalContainer]);
 
+  if (!portalContainer) {
+    return null;
+  }
+
   let contents = <OverlayProvider {...rest} />;
   return ReactDOM.createPortal(contents, portalContainer);
 }
 
-interface ModalAriaProps extends HTMLAttributes<HTMLElement> {
+interface ModalAriaProps extends DOMAttributes {
   /** Data attribute marks the dom node as a modal for the aria-modal-polyfill. */
   'data-ismodal': boolean
 }
 
-interface ModalOptions {
+export interface AriaModalOptions {
   isDisabled?: boolean
 }
 
-interface ModalAria {
+export interface ModalAria {
   /** Props for the modal content element. */
   modalProps: ModalAriaProps
 }
@@ -154,7 +161,7 @@ interface ModalAria {
  * other types of overlays to ensure that only the top-most modal is
  * accessible at once.
  */
-export function useModal(options?: ModalOptions): ModalAria {
+export function useModal(options?: AriaModalOptions): ModalAria {
   // Add aria-hidden to all parent providers on mount, and restore on unmount.
   let context = useContext(Context);
   if (!context) {

package/src/useOverlay.ts

@@ -10,10 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {HTMLAttributes, RefObject, SyntheticEvent, useEffect} from 'react';
+import {DOMAttributes} from '@react-types/shared';
+import {RefObject, SyntheticEvent, useEffect} from 'react';
 import {useFocusWithin, useInteractOutside} from '@react-aria/interactions';
 
-interface OverlayProps {
+export interface AriaOverlayProps {
   /** Whether the overlay is currently open. */
   isOpen?: boolean,
 
@@ -41,24 +42,24 @@ interface OverlayProps {
    * out interaction with elements that should not dismiss the overlay.
    * By default, onClose will always be called on interaction outside the overlay ref.
    */
-  shouldCloseOnInteractOutside?: (element: HTMLElement) => boolean
+  shouldCloseOnInteractOutside?: (element: Element) => boolean
 }
 
-interface OverlayAria {
+export interface OverlayAria {
   /** Props to apply to the overlay container element. */
-  overlayProps: HTMLAttributes<HTMLElement>,
+  overlayProps: DOMAttributes,
   /** Props to apply to the underlay element, if any. */
-  underlayProps: HTMLAttributes<HTMLElement>
+  underlayProps: DOMAttributes
 }
 
-const visibleOverlays: RefObject<HTMLElement>[] = [];
+const visibleOverlays: RefObject<Element>[] = [];
 
 /**
  * Provides the behavior for overlays such as dialogs, popovers, and menus.
  * Hides the overlay when the user interacts outside it, when the Escape key is pressed,
  * or optionally, on blur. Only the top-most overlay will close at once.
  */
-export function useOverlay(props: OverlayProps, ref: RefObject<HTMLElement>): OverlayAria {
+export function useOverlay(props: AriaOverlayProps, ref: RefObject<Element>): OverlayAria {
   let {
     onClose,
     shouldCloseOnBlur,
@@ -89,8 +90,8 @@ export function useOverlay(props: OverlayProps, ref: RefObject<HTMLElement>): Ov
     }
   };
 
-  let onInteractOutsideStart = (e: SyntheticEvent<HTMLElement>) => {
-    if (!shouldCloseOnInteractOutside || shouldCloseOnInteractOutside(e.target as HTMLElement)) {
+  let onInteractOutsideStart = (e: SyntheticEvent<Element>) => {
+    if (!shouldCloseOnInteractOutside || shouldCloseOnInteractOutside(e.target as Element)) {
       if (visibleOverlays[visibleOverlays.length - 1] === ref) {
         e.stopPropagation();
         e.preventDefault();
@@ -98,8 +99,8 @@ export function useOverlay(props: OverlayProps, ref: RefObject<HTMLElement>): Ov
     }
   };
 
-  let onInteractOutside = (e: SyntheticEvent<HTMLElement>) => {
-    if (!shouldCloseOnInteractOutside || shouldCloseOnInteractOutside(e.target as HTMLElement)) {
+  let onInteractOutside = (e: SyntheticEvent<Element>) => {
+    if (!shouldCloseOnInteractOutside || shouldCloseOnInteractOutside(e.target as Element)) {
       if (visibleOverlays[visibleOverlays.length - 1] === ref) {
         e.stopPropagation();
         e.preventDefault();
@@ -123,7 +124,7 @@ export function useOverlay(props: OverlayProps, ref: RefObject<HTMLElement>): Ov
   let {focusWithinProps} = useFocusWithin({
     isDisabled: !shouldCloseOnBlur,
     onBlurWithin: (e) => {
-      if (!shouldCloseOnInteractOutside || shouldCloseOnInteractOutside(e.relatedTarget as HTMLElement)) {
+      if (!shouldCloseOnInteractOutside || shouldCloseOnInteractOutside(e.relatedTarget as Element)) {
         onClose();
       }
     }