PSPDFKit-labs
diff --git a/‎packages/@react-aria/overlays/docs/PortalProvider.mdx
+4-4 b/‎packages/@react-aria/overlays/docs/PortalProvider.mdx
+4-4
diff --git a/‎packages/@react-aria/overlays/package.json
+1 b/‎packages/@react-aria/overlays/package.json
+1
diff --git a/‎packages/@react-aria/overlays/src/Overlay.tsx
+3-3 b/‎packages/@react-aria/overlays/src/Overlay.tsx
+3-3
diff --git a/‎packages/@react-aria/overlays/src/useModal.tsx
+6 b/‎packages/@react-aria/overlays/src/useModal.tsx
+6
diff --git a/‎packages/@react-aria/selection/src/useSelectableItem.ts
+2-2 b/‎packages/@react-aria/selection/src/useSelectableItem.ts
+2-2
diff --git a/‎packages/@react-spectrum/dialog/test/DialogContainer.test.js
+3-3 b/‎packages/@react-spectrum/dialog/test/DialogContainer.test.js
+3-3
diff --git a/‎packages/@react-spectrum/dialog/test/DialogTrigger.test.js
+3-3 b/‎packages/@react-spectrum/dialog/test/DialogTrigger.test.js
+3-3
diff --git a/‎packages/@react-spectrum/menu/test/MenuTrigger.test.js
+27-3 b/‎packages/@react-spectrum/menu/test/MenuTrigger.test.js
+27-3
diff --git a/‎packages/@react-spectrum/table/src/Resizer.tsx
+3-3 b/‎packages/@react-spectrum/table/src/Resizer.tsx
+3-3
diff --git a/‎packages/@react-spectrum/table/stories/TreeGridTable.stories.tsx
+16-10 b/‎packages/@react-spectrum/table/stories/TreeGridTable.stories.tsx
+16-10
@@ -10,9 +10,9 @@ governing permissions and limitations under the License. */}
 import {Layout} from '@react-spectrum/docs';
 export default Layout;
 
-import docs from 'docs:@react-aria/overlays';
+import docs from 'docs:@react-aria-nutrient/overlays';
 import {HeaderInfo, PropTable, FunctionAPI, PageDescription} from '@react-spectrum/docs';
-import packageData from '@react-aria/overlays/package.json';
+import packageData from '@react-aria-nutrient/overlays/package.json';
 
 ---
 category: Utilities
@@ -83,7 +83,7 @@ function MyToastRegion() {
 ```
 
 ```tsx example
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {UNSAFE_PortalProvider} from '@react-aria-nutrient/overlays';
 
 // See the above Toast docs link for the ToastRegion implementation
 function App() {
@@ -128,7 +128,7 @@ used by custom overlay components to ensure that they are also being consistentl
 <FunctionAPI links={docs.links} function={docs.exports.useUNSAFE_PortalContext} />
 
 ```tsx
-import {useUNSAFE_PortalContext} from '@react-aria/overlays';
+import {useUNSAFE_PortalContext} from '@react-aria-nutrient/overlays';
 
 function MyOverlay(props) {
   let {children} = props;
 
@@ -28,6 +28,7 @@
     "@react-aria-nutrient/ssr": "^3.9.7",
     "@react-aria-nutrient/utils": "^3.28.1",
     "@react-aria-nutrient/visually-hidden": "^3.8.21",
+    "@react-aria/ssr": "^3.9.7",
     "@react-stately/overlays": "^3.6.14",
     "@react-types/button": "^3.11.0",
     "@react-types/overlays": "^3.8.13",
 
@@ -16,7 +16,7 @@ import React, {ReactNode, useContext, useMemo, useState} from 'react';
 import ReactDOM from 'react-dom';
 import {useIsSSR} from '@react-aria-nutrient/ssr';
 import {useLayoutEffect} from '@react-aria-nutrient/utils';
-import {useUNSTABLE_PortalContext} from './PortalProvider';
+import {useUNSAFE_PortalContext} from './PortalProvider';
 
 export interface OverlayProps {
   /**
@@ -55,8 +55,8 @@ export function Overlay(props: OverlayProps): ReactNode | null {
   let [contain, setContain] = useState(false);
   let contextValue = useMemo(() => ({contain, setContain}), [contain, setContain]);
 
-  let {getContainer} = useUNSTABLE_PortalContext();
-  if  (!props.portalContainer && getContainer) {
+  let {getContainer} = useUNSAFE_PortalContext();
+  if (!props.portalContainer && getContainer) {
     portalContainer = getContainer();
   }
 
 
@@ -14,6 +14,7 @@ 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-nutrient/ssr';
+import {useUNSAFE_PortalContext} from './PortalProvider';
 
 export interface ModalProviderProps extends DOMAttributes {
   children: ReactNode
@@ -112,6 +113,7 @@ export interface OverlayContainerProps extends ModalProviderProps {
   /**
    * The container element in which the overlay portal will be placed.
    * @default document.body
+   * @deprecated - Use a parent UNSAFE_PortalProvider to set your portal container instead.
    */
   portalContainer?: Element
 }
@@ -126,6 +128,10 @@ export interface OverlayContainerProps extends ModalProviderProps {
 export function OverlayContainer(props: OverlayContainerProps): React.ReactPortal | null {
   let isSSR = useIsSSR();
   let {portalContainer = isSSR ? null : document.body, ...rest} = props;
+  let {getContainer} = useUNSAFE_PortalContext();
+  if (!props.portalContainer && getContainer) {
+    portalContainer = getContainer();
+  }
 
   React.useEffect(() => {
     if (portalContainer?.closest('[data-overlay-container]')) {
 
@@ -11,7 +11,7 @@
  */
 
 import {DOMAttributes, DOMProps, FocusableElement, Key, LongPressEvent, PointerType, PressEvent, RefObject} from '@react-types/shared';
-import {focusSafely, PressProps, useLongPress, usePress} from '@react-aria-nutrient/interactions';
+import {focusSafely, PressHookProps, useLongPress, usePress} from '@react-aria-nutrient/interactions';
 import {getCollectionId, isNonContiguousSelectionModifier} from './utils';
 import {isCtrlKeyPressed, mergeProps, openLink, useId, useRouter} from '@react-aria-nutrient/utils';
 import {moveVirtualFocus} from '@react-aria-nutrient/focus';
@@ -239,7 +239,7 @@ export function useSelectableItem(options: SelectableItemOptions): SelectableIte
   // we want to be able to have the pointer down on the trigger that opens the menu and
   // the pointer up on the menu item rather than requiring a separate press.
   // For keyboard events, selection still occurs on key down.
-  let itemPressProps: PressProps = {};
+  let itemPressProps: PressHookProps = {ref};
   if (shouldSelectOnPressUp) {
     itemPressProps.onPressStart = (e) => {
       modality.current = e.pointerType;
 
@@ -21,7 +21,7 @@ import {Heading, Text} from '@react-spectrum/text';
 import {Provider} from '@react-spectrum/provider';
 import React, {useRef, useState} from 'react';
 import {theme} from '@react-spectrum/theme-default';
-import {UNSTABLE_PortalProvider} from '@react-aria-nutrient/overlays';
+import {UNSAFE_PortalProvider} from '@react-aria-nutrient/overlays';
 import userEvent from '@testing-library/user-event';
 
 describe('DialogContainer', function () {
@@ -254,13 +254,13 @@ describe('DialogContainer', function () {
       return (
         <Provider theme={theme}>
           <ActionButton onPress={() => setOpen(true)}>Open dialog</ActionButton>
-          <UNSTABLE_PortalProvider getContainer={() => container.current}>
+          <UNSAFE_PortalProvider getContainer={() => container.current}>
             <DialogContainer onDismiss={() => setOpen(false)} {...props}>
               {isOpen &&
                 <ExampleDialog {...props} />
               }
             </DialogContainer>
-          </UNSTABLE_PortalProvider>
+          </UNSAFE_PortalProvider>
           <div ref={container} data-testid="custom-container" />
         </Provider>
       );
 
@@ -21,7 +21,7 @@ import {Provider} from '@react-spectrum/provider';
 import React from 'react';
 import {TextField} from '@react-spectrum/textfield';
 import {theme} from '@react-spectrum/theme-default';
-import {UNSTABLE_PortalProvider} from '@react-aria-nutrient/overlays';
+import {UNSAFE_PortalProvider} from '@react-aria-nutrient/overlays';
 import userEvent from '@testing-library/user-event';
 
 
@@ -1031,12 +1031,12 @@ describe('DialogTrigger', function () {
       let {container} = props;
       return (
         <Provider theme={theme}>
-          <UNSTABLE_PortalProvider getContainer={() => container.current}>
+          <UNSAFE_PortalProvider getContainer={() => container.current}>
             <DialogTrigger type={props.type}>
               <ActionButton>Trigger</ActionButton>
               <Dialog>contents</Dialog>
             </DialogTrigger>
-          </UNSTABLE_PortalProvider>
+          </UNSAFE_PortalProvider>
         </Provider>
       );
     }
 
@@ -29,7 +29,7 @@ import {Link} from '@react-spectrum/link';
 import {Provider} from '@react-spectrum/provider';
 import React from 'react';
 import {theme} from '@react-spectrum/theme-default';
-import {UNSTABLE_PortalProvider} from '@react-aria-nutrient/overlays';
+import {UNSAFE_PortalProvider} from '@react-aria-nutrient/overlays';
 import {User} from '@react-aria-nutrient/test-utils';
 import userEvent from '@testing-library/user-event';
 
@@ -267,6 +267,30 @@ describe('MenuTrigger', function () {
       expect(onOpenChange).toBeCalledTimes(1);
     });
 
+    it.each`
+      Name               | Component        | props
+      ${'MenuTrigger'}   | ${MenuTrigger}   | ${{onOpenChange}}
+    `('$Name should prevent Esc from clearing selection and close the menu if escapeKeyBehavior is "none"', async function ({Component, props}) {
+      tree = renderComponent(Component, props, {selectionMode: 'multiple', escapeKeyBehavior: 'none', onSelectionChange});
+      let menuTester = testUtilUser.createTester('Menu', {root: tree.container, interactionType: 'keyboard'});
+      expect(onOpenChange).toBeCalledTimes(0);
+      await menuTester.open();
+
+      expect(onOpenChange).toBeCalledTimes(1);
+      expect(onSelectionChange).toBeCalledTimes(0);
+
+      await menuTester.selectOption({option: 'Foo', menuSelectionMode: 'multiple', keyboardActivation: 'Space'});
+      expect(onSelectionChange).toBeCalledTimes(1);
+      expect(onSelectionChange.mock.calls[0][0].has('Foo')).toBeTruthy();
+      await menuTester.selectOption({option: 'Bar', menuSelectionMode: 'multiple', keyboardActivation: 'Space'});
+      expect(onSelectionChange).toBeCalledTimes(2);
+      expect(onSelectionChange.mock.calls[1][0].has('Bar')).toBeTruthy();
+
+      await menuTester.close();
+      expect(menuTester.menu).not.toBeInTheDocument();
+      expect(onOpenChange).toBeCalledTimes(2);
+    });
+
     it.each`
       Name                      | Component      | props | menuProps
       ${'MenuTrigger multiple'} | ${MenuTrigger} | ${{closeOnSelect: true}} | ${{selectionMode: 'multiple', onClose}}
@@ -735,7 +759,7 @@ describe('MenuTrigger', function () {
     function InfoMenu(props) {
       return (
         <Provider theme={theme}>
-          <UNSTABLE_PortalProvider getContainer={() => props.container.current}>
+          <UNSAFE_PortalProvider getContainer={() => props.container.current}>
             <MenuTrigger>
               <ActionButton aria-label="trigger" />
               <Menu>
@@ -744,7 +768,7 @@ describe('MenuTrigger', function () {
                 <Item key="3">Three</Item>
               </Menu>
             </MenuTrigger>
-          </UNSTABLE_PortalProvider>
+          </UNSAFE_PortalProvider>
         </Provider>
       );
     }
 
@@ -1,4 +1,4 @@
- 
+
 import {classNames} from '@react-spectrum/utils';
 import {ColumnSize} from '@react-types/table';
 import eCursor from 'bundle-text:./cursors/Cur_MoveToRight_9_9.svg';
@@ -16,7 +16,7 @@ import {TableColumnResizeState} from '@react-stately/table';
 import {useLocale, useLocalizedStringFormatter} from '@react-aria-nutrient/i18n';
 import {useTableColumnResize} from '@react-aria-nutrient/table';
 import {useTableContext, useVirtualizerContext} from './TableViewBase';
-import {useUNSTABLE_PortalContext} from '@react-aria-nutrient/overlays';
+import {useUNSAFE_PortalContext} from '@react-aria-nutrient/overlays';
 // @ts-ignore
 import wCursor from 'bundle-text:./cursors/Cur_MoveToLeft_9_9.svg';
 
@@ -132,6 +132,6 @@ export const Resizer = React.forwardRef(function Resizer<T>(props: ResizerProps<
 
 function CursorOverlay(props) {
   let {show, children} = props;
-  let {getContainer} = useUNSTABLE_PortalContext();
+  let {getContainer} = useUNSAFE_PortalContext();
   return show ? ReactDOM.createPortal(children, getContainer?.() ?? document.body) : null;
 }
@@ -14,7 +14,7 @@ import {action} from '@storybook/addon-actions';
 import {ActionButton} from '@react-spectrum/button';
 import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
 import {chain} from '@react-aria-nutrient/utils';
-import {ComponentMeta} from '@storybook/react';
+import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
 import defaultConfig, {columns, EmptyStateTable, TableStory} from './Table.stories';
 import {enableTableNestedRows} from '@react-stately/flags';
 import {Flex} from '@react-spectrum/layout';
@@ -162,7 +162,6 @@ export const UserSetRowHeader: TableStory = {
   }
 };
 
-let manyRows: Record<typeof columns[number]['key'], string>[] = [];
 function generateRow(lvlIndex, lvlLimit, rowIndex) {
   let row = {key: `Row ${rowIndex} Lvl ${lvlIndex}`};
   for (let col of columns) {
@@ -175,19 +174,25 @@ function generateRow(lvlIndex, lvlLimit, rowIndex) {
   return row;
 }
 
-for (let i = 1; i < 20; i++) {
-  let row = generateRow(1, 3, i);
-  manyRows.push(row);
+function generateRows(count = 5) {
+  let manyRows: Record<typeof columns[number]['key'], string>[] = [];
+  for (let i = 1; i <= count; i++) {
+    let row = generateRow(1, 3, i);
+    manyRows.push(row);
+  }  
+  return manyRows;
 }
 
 interface ManyExpandableRowsProps extends SpectrumTableProps<unknown> {
   allowsResizing?: boolean,
-  showDivider?: boolean
+  showDivider?: boolean,
+  rowCount?: number
 }
 
 function ManyExpandableRows(props: ManyExpandableRowsProps) {
   let {allowsResizing, showDivider, ...otherProps} = props;
   let [expandedKeys, setExpandedKeys] = useState<'all' | Set<Key>>('all');
+  let manyRows = generateRows(props.rowCount ?? 5);
 
   return (
     <Flex direction="column">
@@ -211,11 +216,12 @@ function ManyExpandableRows(props: ManyExpandableRowsProps) {
   );
 }
 
-export const ManyExpandableRowsStory: TableStory = {
+export const ManyExpandableRowsStory: ComponentStoryObj<typeof ManyExpandableRows> = {
   args: {
     'aria-label': 'TableView with many dynamic expandable rows',
     width: 500,
-    height: 400
+    height: 400,
+    rowCount: 5
   },
   render: (args) => (
     <ManyExpandableRows {...args} />
@@ -230,7 +236,7 @@ export const EmptyTreeGridStory: TableStory = {
     height: 400
   },
   render: (args) => (
-    <EmptyStateTable UNSTABLE_allowsExpandableRows selectionMode="none" columns={columns} items={manyRows} allowsSorting={false} onSortChange={null} sortDescriptor={null} {...args} />
+    <EmptyStateTable UNSTABLE_allowsExpandableRows selectionMode="none" columns={columns} items={generateRows()} allowsSorting={false} onSortChange={null} sortDescriptor={null} {...args} />
   ),
   name: 'empty state'
 };
@@ -245,7 +251,7 @@ function LoadingStateTable(props) {
         <TableHeader columns={columns}>
           {column => <Column>{column.name}</Column>}
         </TableHeader>
-        <TableBody items={show ? manyRows : []} loadingState="loadingMore">
+        <TableBody items={show ? generateRows() : []} loadingState="loadingMore">
           {item =>
             (<Row key={item.key} UNSTABLE_childItems={item.childRows}>
               {key => <Cell>{item[key]}</Cell>}