@react-aria/overlays 3.21.0 → 3.22.0

package/src/PortalProvider.tsx

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import React, {createContext, ReactNode, useContext} from 'react';
+
+export interface PortalProviderProps {
+  /* Should return the element where we should portal to. Can clear the context by passing null. */
+  getContainer?: () => HTMLElement | null
+}
+
+export const PortalContext = createContext<PortalProviderProps>({});
+
+export function UNSTABLE_PortalProvider(props: PortalProviderProps & {children: ReactNode}) {
+  let {getContainer} = props;
+  let {getContainer: ctxGetContainer} = useUNSTABLE_PortalContext();
+  return (
+    <PortalContext.Provider value={{getContainer: getContainer === null ? null : getContainer ?? ctxGetContainer}}>
+      {props.children}
+    </PortalContext.Provider>
+  );
+}
+
+export function useUNSTABLE_PortalContext() {
+  return useContext(PortalContext) ?? {};
+}

package/src/index.ts

@@ -19,6 +19,7 @@ export {ariaHideOutside} from './ariaHideOutside';
 export {usePopover} from './usePopover';
 export {useModalOverlay} from './useModalOverlay';
 export {Overlay, useOverlayFocusContain} from './Overlay';
+export {UNSTABLE_PortalProvider, useUNSTABLE_PortalContext} from './PortalProvider';
 
 export type {AriaPositionProps, PositionAria} from './useOverlayPosition';
 export type {AriaOverlayProps, OverlayAria} from './useOverlay';

package/src/useModalOverlay.ts

@@ -11,15 +11,15 @@
  */
 
 import {ariaHideOutside} from './ariaHideOutside';
+import {AriaOverlayProps, useOverlay} from './useOverlay';
 import {DOMAttributes} from '@react-types/shared';
 import {mergeProps} from '@react-aria/utils';
 import {OverlayTriggerState} from '@react-stately/overlays';
 import {RefObject, useEffect} from 'react';
-import {useOverlay} from './useOverlay';
 import {useOverlayFocusContain} from './Overlay';
 import {usePreventScroll} from './usePreventScroll';
 
-export interface AriaModalOverlayProps {
+export interface AriaModalOverlayProps extends Pick<AriaOverlayProps, 'shouldCloseOnInteractOutside'> {
   /**
    * Whether to close the modal when the user interacts outside it.
    * @default false

package/src/useOverlay.ts

@@ -112,7 +112,7 @@ export function useOverlay(props: AriaOverlayProps, ref: RefObject<Element>): Ov
 
   // Handle the escape key
   let onKeyDown = (e) => {
-    if (e.key === 'Escape' && !isKeyboardDismissDisabled) {
+    if (e.key === 'Escape' && !isKeyboardDismissDisabled && !e.nativeEvent.isComposing) {
       e.stopPropagation();
       e.preventDefault();
       onHide();