Skip to content

fix(S2): fix Modal position and S2 docs modal style #9007

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 3 commits into from
Oct 9, 2025
+4 −4
Merged

fix(S2): fix Modal position and S2 docs modal style #9007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dacddc4
revert S2 modal position change
reidbarber Oct 9, 2025
9d195d8
fix S2 docs menu modal position
reidbarber Oct 9, 2025
9cb2618
s2: fix ModalProps types
reidbarber Oct 9, 2025
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
6 changes: 3 additions & 3 deletions packages/@react-spectrum/s2/src/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

import {colorScheme} from './style-utils' with {type: 'macro'};
import {ColorSchemeContext} from './Provider';
import {DOMRef} from '@react-types/shared';
import {DOMRef, GlobalDOMAttributes} from '@react-types/shared';
import {forwardRef, MutableRefObject, useCallback, useContext} from 'react';
import {ModalOverlay, ModalOverlayProps, Modal as RACModal, useLocale} from 'react-aria-components';
import {style} from '../style' with {type: 'macro'};
import {useDOMRef} from '@react-spectrum/utils';

interface ModalProps extends ModalOverlayProps {
interface ModalProps extends Omit<ModalOverlayProps, 'className' | 'style' | keyof GlobalDOMAttributes> {
/**
* The size of the Modal.
*
Expand All @@ -29,7 +29,7 @@ interface ModalProps extends ModalOverlayProps {

const modalOverlayStyles = style({
...colorScheme(),
position: 'fixed',
position: 'absolute',
top: 0,
left: 0,
width: 'full',
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/s2-docs/src/MobileHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export function MobileHeader({toc, pages, currentPage}) {
<ActionButton aria-label="Navigation" isQuiet>
<MenuHamburger />
</ActionButton>
<Modal size="fullscreenTakeover" style={{zIndex: 100, height: '100dvh'}}>
<Modal size="fullscreenTakeover">
<MobileSearchMenu pages={pages} currentPage={currentPage} />
</Modal>
</DialogTrigger>
Expand Down