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

Add <fieldset disabled> check to radio group options in React #1835

Merged
merged 2 commits into from
Sep 8, 2022
Merged

Add <fieldset disabled> check to radio group options in React #1835

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
f93e340
wip
thecrypticace Sep 8, 2022
53b76dc
Update changelog
thecrypticace Sep 8, 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
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 @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Improve iOS scroll locking ([#1830](https://github.com/tailwindlabs/headlessui/pull/1830))
- Add `<fieldset disabled>` check to radio group options in React ([#1835](https://github.com/tailwindlabs/headlessui/pull/1835))

## [1.7.0] - 2022-09-06

Expand Down
12 changes: 10 additions & 2 deletions packages/@headlessui-react/src/components/radio-group/radio-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import React, {
// Types
ContextType,
ElementType,
FocusEvent as ReactFocusEvent,
KeyboardEvent as ReactKeyboardEvent,
MouseEvent as ReactMouseEvent,
MutableRefObject,
Ref,
} from 'react'
Expand All @@ -30,6 +32,7 @@ import { attemptSubmit, objectToFormEntries } from '../../utils/form'
import { getOwnerDocument } from '../../utils/owner'
import { useEvent } from '../../hooks/use-event'
import { useControllable } from '../../hooks/use-controllable'
import { isDisabledReactIssue7711 } from '../../utils/bugs'

interface Option<T = unknown> {
id: string
Expand Down Expand Up @@ -385,14 +388,19 @@ let Option = forwardRefWithAs(function Option<
[id, registerOption, internalOptionRef, props]
)

let handleClick = useEvent(() => {
let handleClick = useEvent((event: ReactMouseEvent) => {
if (isDisabledReactIssue7711(event.currentTarget)) return event.preventDefault()
if (!change(value)) return

addFlag(OptionState.Active)
internalOptionRef.current?.focus()
})

let handleFocus = useEvent(() => addFlag(OptionState.Active))
let handleFocus = useEvent((event: ReactFocusEvent) => {
if (isDisabledReactIssue7711(event.currentTarget)) return event.preventDefault()
addFlag(OptionState.Active)
})

let handleBlur = useEvent(() => removeFlag(OptionState.Active))

let isFirstOption = firstOption?.id === id
Expand Down