fix(react-aria-components): set id on Popover, remove from DialogContext, update DialogTester

Author: albertdugba

packages/@react-aria/test-utils/src/dialog.ts

@@ -82,7 +82,9 @@ export class DialogTester {
           if (!dialogId || document.getElementById(dialogId) == null) {
             throw new Error(`Dialog with id of ${dialogId} not found in document.`);
           } else {
-            this._dialog = document.getElementById(dialogId)!;
+            let el = document.getElementById(dialogId)!;
+            let nestedDialog = el.querySelector('[role=dialog], [role=alertdialog]');
+            this._dialog = nestedDialog as HTMLElement || el;
             return true;
           }
         });

packages/react-aria-components/src/Dialog.tsx

@@ -78,7 +78,7 @@ export function DialogTrigger(props: DialogTriggerProps): JSX.Element {
       values={[
         [OverlayTriggerStateContext, state],
         [RootMenuTriggerStateContext, state],
-        [DialogContext, overlayProps],
+        [DialogContext, {...overlayProps, id: undefined}],
         [PopoverContext, {
           trigger: 'DialogTrigger',
           triggerRef: buttonRef,

packages/react-aria-components/src/Popover.tsx

@@ -225,7 +225,6 @@ function PopoverInner({state, isExiting, UNSTABLE_portalContainer, clearContexts
     <dom.div
       {...mergeProps(filterDOMProps(props, {global: true}), popoverProps)}
       {...renderProps}
-      id={isDialog ? props.id : undefined}
       role={isDialog ? 'dialog' : undefined}
       tabIndex={isDialog ? -1 : undefined}
       aria-label={props['aria-label']}