Skip to content
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

Jump to bottom

Fix anchored elements not flipping when there is padding #3157

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Fix anchored elements not flipping when there is padding #3157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eef666d
Fix anchored elements not flipping when there is padding
thecrypticace Apr 30, 2024
57cf6ea
Update changelog
thecrypticace Apr 30, 2024
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
1 change: 1 addition & 0 deletions packages/@headlessui-react/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Ensure `TransitionRoot` component without props transitions correctly ([#3147](https://github.com/tailwindlabs/headlessui/pull/3147))
- Ensure the `static` and `portal` props work nicely together ([#3152](https://github.com/tailwindlabs/headlessui/pull/3152))
- Only check for elements in `useInertOthers` ([#3154](https://github.com/tailwindlabs/headlessui/pull/3154))
- Fix anchored elements not flipping when there is padding ([#3157](https://github.com/tailwindlabs/headlessui/pull/3157))

### Changed

Expand Down
7 changes: 4 additions & 3 deletions packages/@headlessui-react/src/internal/floating.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ export function FloatingProvider({
// The `flip` middleware will swap the `placement` of the panel if there is not enough room.
// This is not compatible with the `inner` middleware (which is only enabled when `to` is set
// to "selection").
to !== 'selection' && flipMiddleware(),
to !== 'selection' && flipMiddleware({ padding }),

// The `inner` middleware will ensure the panel is always fully visible on screen and
// positioned on top of the reference and moved to the currently selected item.
Expand Down Expand Up @@ -312,11 +312,12 @@ export function FloatingProvider({
// The `size` middleware will ensure the panel is never bigger than the viewport minus the
// provided `padding` that we want.
sizeMiddleware({
padding,
apply({ availableWidth, availableHeight, elements }) {
Object.assign(elements.floating.style, {
overflow: 'auto',
maxWidth: `${availableWidth - padding}px`,
maxHeight: `min(var(--anchor-max-height, 100vh), ${availableHeight - padding}px)`,
maxWidth: `${availableWidth}px`,
maxHeight: `min(var(--anchor-max-height, 100vh), ${availableHeight}px)`,
})
},
}),
Expand Down
Loading