Skip to content

fix: prevent menu item focus ring from exceeding popover boundaries #7672

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
Feb 7, 2025
Merged

fix: prevent menu item focus ring from exceeding popover boundaries #7672

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
4d74d66
fix: prevent menu item focus ring from exceeding the boundaries of th…
yihuiliao Jan 27, 2025
1854a9b
try diff css changes...
yihuiliao Jan 28, 2025
2e7114d
Merge branch 'main' into menu-item-focus-ring
yihuiliao Jan 28, 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
2 changes: 2 additions & 0 deletions packages/@react-spectrum/s2/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ export let menu = style({
gridTemplateColumns: menuItemGrid,
boxSizing: 'border-box',
maxHeight: '[inherit]',
width: 'full',
overflow: {
isPopover: 'auto'
},
Expand Down Expand Up @@ -186,6 +187,7 @@ export let menuitem = style({
},
alignItems: 'baseline',
minHeight: 'control',
height: 'min',
textDecoration: 'none',
cursor: {
default: 'default',
Expand Down
1 change: 1 addition & 0 deletions packages/@react-spectrum/s2/src/Picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ const quietFocusLine = style({
export let menu = style({
outlineStyle: 'none',
display: 'grid',
width: 'full',
gridTemplateColumns: {
size: {
S: [edgeToText(24), 'auto', 'auto', 'minmax(0, 1fr)', 'auto', 'auto', 'auto', edgeToText(24)],
Expand Down
3 changes: 2 additions & 1 deletion packages/@react-spectrum/s2/src/Popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ let popover = style({
// Don't be larger than full screen minus 2 * containerPadding
maxWidth: '[calc(100vw - 24px)]',
boxSizing: 'border-box',
display: 'flex',
opacity: {
isEntering: 0,
isExiting: 0
Expand Down Expand Up @@ -226,7 +227,7 @@ const dialogStyle = style({
borderRadius: '[inherit]',
overflow: 'auto',
position: 'relative',
size: 'full',
width: 'full',
maxSize: '[inherit]'
}, getAllowedOverrides({height: true}));

Expand Down