[drawer] Fix nested dialog stack semantics

Author: atomiks

packages/react/src/alert-dialog/root/AlertDialogRoot.tsx

@@ -26,7 +26,7 @@ export function AlertDialogRoot<Payload>(props: AlertDialogRoot.Props<Payload>)
     defaultTriggerId: defaultTriggerIdProp = null,
   } = props;
 
-  const parentDialogRootContext = useDialogRootContext();
+  const parentDialogRootContext = useDialogRootContext(true);
   const nested = Boolean(parentDialogRootContext);
 
   const store = DialogStore.useStore(handle?.store, {

packages/react/src/dialog/popup/DialogPopup.tsx

@@ -1,8 +1,10 @@
 'use client';
 import * as React from 'react';
 import { InteractionType } from '@base-ui/utils/useEnhancedClickHandler';
+import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
 import { FloatingFocusManager } from '../../floating-ui-react';
 import { useDialogRootContext } from '../root/DialogRootContext';
+import { useDrawerRootContext } from '../../drawer/root/DrawerRootContext';
 import { useRenderElement } from '../../utils/useRenderElement';
 import { type BaseUIComponentProps } from '../../utils/types';
 import { type TransitionStatus } from '../../utils/useTransitionStatus';
@@ -50,9 +52,29 @@ export const DialogPopup = React.forwardRef(function DialogPopup(
   const titleElementId = store.useState('titleElementId');
   const transitionStatus = store.useState('transitionStatus');
   const role = store.useState('role');
+  const drawerRootContext = useDrawerRootContext(true);
+  const lastReportedOpenRef = React.useRef(false);
 
   useDialogPortalContext();
 
+  useIsoLayoutEffect(() => {
+    if (!drawerRootContext) {
+      return undefined;
+    }
+
+    if (lastReportedOpenRef.current !== open) {
+      drawerRootContext.onNonDrawerDialogOpenChange(open ? 1 : -1);
+      lastReportedOpenRef.current = open;
+    }
+
+    return () => {
+      if (lastReportedOpenRef.current) {
+        drawerRootContext.onNonDrawerDialogOpenChange(-1);
+        lastReportedOpenRef.current = false;
+      }
+    };
+  }, [drawerRootContext, open]);
+
   useOpenChangeComplete({
     open,
     ref: store.context.popupRef,