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

Prefer incoming open prop over OpenClosed state #1360

Merged
merged 2 commits into from
Apr 23, 2022
Merged

Prefer incoming open prop over OpenClosed state #1360

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
7ac99a8
prefer incoming `open` prop over OpenClosed state
RobinMalfait Apr 23, 2022
8fe6533
update changelog
RobinMalfait Apr 23, 2022
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Allow `Enter` for form submit in `RadioGroup`, `Switch` and `Combobox` improvements ([#1285](https://github.com/tailwindlabs/headlessui/pull/1285))
- add React 18 compatibility ([#1326](https://github.com/tailwindlabs/headlessui/pull/1326))
- Add explicit `multiple` prop ([#1355](https://github.com/tailwindlabs/headlessui/pull/1355))
- Prefer incoming `open` prop over OpenClosed state ([#1360](https://github.com/tailwindlabs/headlessui/pull/1360))

### Added

Expand Down Expand Up @@ -78,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Allow `Enter` for form submit in `RadioGroup`, `Switch` and `Combobox` improvements ([#1285](https://github.com/tailwindlabs/headlessui/pull/1285))
- Add explicit `multiple` prop ([#1355](https://github.com/tailwindlabs/headlessui/pull/1355))
- fix `nullable` prop for Vue ([2b109548b1a94a30858cf58c8f525554a1c12cbb](https://github.com/tailwindlabs/headlessui/commit/2b109548b1a94a30858cf58c8f525554a1c12cbb))
- Prefer incoming `open` prop over OpenClosed state ([#1360](https://github.com/tailwindlabs/headlessui/pull/1360))

### Added

Expand Down
9 changes: 1 addition & 8 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 @@ -173,13 +173,6 @@ let DialogRoot = forwardRefWithAs(function Dialog<
}

let dialogState = open ? DialogStates.Open : DialogStates.Closed
let visible = (() => {
if (usesOpenClosedState !== null) {
return usesOpenClosedState === State.Open
}

return dialogState === DialogStates.Open
})()

let [state, dispatch] = useReducer(stateReducer, {
titleId: null,
Expand Down Expand Up @@ -357,7 +350,7 @@ let DialogRoot = forwardRefWithAs(function Dialog<
slot,
defaultTag: DEFAULT_DIALOG_TAG,
features: DialogRenderFeatures,
visible,
visible: dialogState === DialogStates.Open,
name: 'Dialog',
})}
</DescriptionProvider>
Expand Down
10 changes: 1 addition & 9 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 @@ -113,14 +113,6 @@ export let Dialog = defineComponent({
}

let dialogState = computed(() => (open.value ? DialogStates.Open : DialogStates.Closed))
let visible = computed(() => {
if (usesOpenClosedState !== null) {
return usesOpenClosedState.value === State.Open
}

return dialogState.value === DialogStates.Open
})

let enabled = computed(() => dialogState.value === DialogStates.Open)

let hasNestedDialogs = computed(() => nestedDialogCount.value > 1) // 1 is the current dialog
Expand Down Expand Up @@ -307,7 +299,7 @@ export let Dialog = defineComponent({
slot,
attrs,
slots,
visible: visible.value,
visible: dialogState.value === DialogStates.Open,
features: Features.RenderStrategy | Features.Static,
name: 'Dialog',
})
Expand Down