Skip to content

fix(modals): always pass environment to useModal hook #2059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2025
Merged

fix(modals): always pass environment to useModal hook #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/modals/src/elements/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ export const ModalComponent = forwardRef<HTMLDivElement, IModalProps>(
onClose,
modalRef,
focusOnMount,
restoreFocus
restoreFocus,
environment
});

useEffect(() => {
Expand Down
11 changes: 9 additions & 2 deletions packages/modals/src/elements/TooltipDialog/TooltipDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ import { Body } from './Body';
import { Close } from './Close';
import { Footer } from './Footer';
import { FooterItem } from './FooterItem';
import { DEFAULT_THEME, getFloatingPlacements, useText } from '@zendeskgarden/react-theming';
import {
DEFAULT_THEME,
getFloatingPlacements,
useText,
useDocument
} from '@zendeskgarden/react-theming';
import { createPortal } from 'react-dom';

const PLACEMENT_DEFAULT = 'top';
Expand Down Expand Up @@ -64,6 +69,7 @@ const TooltipDialogComponent = React.forwardRef<HTMLDivElement, ITooltipDialogPr
ref
) => {
const theme = useContext(ThemeContext) || DEFAULT_THEME;
const environment = useDocument(theme);
const previousReferenceElementRef = useRef<HTMLElement | null>();
const modalRef = useRef<HTMLDivElement>(null);
const transitionRef = useRef<HTMLDivElement>(null);
Expand All @@ -76,7 +82,8 @@ const TooltipDialogComponent = React.forwardRef<HTMLDivElement, ITooltipDialogPr
modalRef,
focusOnMount,
/** Handle `restoreFocus` locally to return focus to `referenceElement` */
restoreFocus: false
restoreFocus: false,
environment
});

const [floatingPlacement, fallbackPlacements] = getFloatingPlacements(
Expand Down