Skip to content

Fix Dialog cleanup when the Dialog becomes hidden #2303

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 4 commits into from
Feb 24, 2023
Merged

Fix Dialog cleanup when the Dialog becomes hidden #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ea4e43
use the Dialog's parent as the root for the Intersection observer
RobinMalfait Feb 24, 2023
04358c6
use a `ResizeObserver` instead of `IntersectionObserver`
RobinMalfait Feb 24, 2023
290deb2
implement a `ResizeObserver` for the tests
RobinMalfait Feb 24, 2023
8ef4436
update changelog
RobinMalfait Feb 24, 2023
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 @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Ensure the main tree and parent `Dialog` components are marked as `inert` ([#2290](https://github.com/tailwindlabs/headlessui/pull/2290))
- Fix nested `Popover` components not opening ([#2293](https://github.com/tailwindlabs/headlessui/pull/2293))
- Make React types more compatible with other libraries ([#2282](https://github.com/tailwindlabs/headlessui/pull/2282))
- Fix `Dialog` cleanup when the `Dialog` becomes hidden ([#2303](https://github.com/tailwindlabs/headlessui/pull/2303))

## [1.7.11] - 2023-02-15

Expand Down
2 changes: 1 addition & 1 deletion packages/@headlessui-react/src/components/dialog/dialog.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { OpenClosedProvider, State } from '../../internal/open-closed'
jest.mock('../../hooks/use-id')

// @ts-expect-error
global.IntersectionObserver = class FakeIntersectionObserver {
global.ResizeObserver = class FakeResizeObserver {
observe() {}
disconnect() {}
}
Expand Down
10 changes: 3 additions & 7 deletions packages/@headlessui-react/src/components/dialog/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,10 @@ function DialogFn<TTag extends ElementType = typeof DEFAULT_DIALOG_TAG>(
if (dialogState !== DialogStates.Open) return
if (!internalDialogRef.current) return

let observer = new IntersectionObserver((entries) => {
let observer = new ResizeObserver((entries) => {
for (let entry of entries) {
if (
entry.boundingClientRect.x === 0 &&
entry.boundingClientRect.y === 0 &&
entry.boundingClientRect.width === 0 &&
entry.boundingClientRect.height === 0
) {
let rect = entry.target.getBoundingClientRect()
if (rect.x === 0 && rect.y === 0 && rect.width === 0 && rect.height === 0) {
close()
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/@headlessui-vue/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Ensure the main tree and parent `Dialog` components are marked as `inert` ([#2290](https://github.com/tailwindlabs/headlessui/pull/2290))
- Fix nested `Popover` components not opening ([#2293](https://github.com/tailwindlabs/headlessui/pull/2293))
- Fix `change` event incorrectly getting called on `blur` ([#2296](https://github.com/tailwindlabs/headlessui/pull/2296))
- Fix `Dialog` cleanup when the `Dialog` becomes hidden ([#2303](https://github.com/tailwindlabs/headlessui/pull/2303))

## [1.7.10] - 2023-02-15

Expand Down
2 changes: 1 addition & 1 deletion packages/@headlessui-vue/src/components/dialog/dialog.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { html } from '../../test-utils/html'
import { useOpenClosedProvider, State } from '../../internal/open-closed'

// @ts-expect-error
global.IntersectionObserver = class FakeIntersectionObserver {
global.ResizeObserver = class FakeResizeObserver {
observe() {}
disconnect() {}
}
Expand Down
10 changes: 3 additions & 7 deletions packages/@headlessui-vue/src/components/dialog/dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,10 @@ export let Dialog = defineComponent({
let container = dom(internalDialogRef)
if (!container) return

let observer = new IntersectionObserver((entries) => {
let observer = new ResizeObserver((entries) => {
for (let entry of entries) {
if (
entry.boundingClientRect.x === 0 &&
entry.boundingClientRect.y === 0 &&
entry.boundingClientRect.width === 0 &&
entry.boundingClientRect.height === 0
) {
let rect = entry.target.getBoundingClientRect()
if (rect.x === 0 && rect.y === 0 && rect.width === 0 && rect.height === 0) {
api.close()
}
}
Expand Down