Skip to content

Fix duplicate FormControl inputs in horizontal layout #8529

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

Open
orpheusdark wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −1
Open

Fix duplicate FormControl inputs in horizontal layout #8529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/horizontal-form-control-inputs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

Fix duplicate input rendering in horizontal FormControl layouts.
4 changes: 3 additions & 1 deletion packages/react/src/FormControl/FormControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ const FormControl = React.forwardRef<HTMLDivElement, FormControlProps>(
{childrenWithoutSlots.filter(
child =>
React.isValidElement(child) &&
![Checkbox, Radio].some(inputComponent => child.type === inputComponent || isSlot(child, inputComponent)),
!expectedInputComponents.some(
inputComponent => child.type === inputComponent || isSlot(child, inputComponent),
),
)}
</div>
{slots.leadingVisual ? (
Expand Down
11 changes: 11 additions & 0 deletions packages/react/src/FormControl/__tests__/FormControl.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,17 @@ describe('FormControl', () => {
expect(leadingVisual).not.toBeNull()
})

it('renders a non-choice input only once in horizontal layout', () => {
const {getAllByRole} = render(
<FormControl layout="horizontal">
<FormControl.Label>{LABEL_TEXT}</FormControl.Label>
<TextInput />
</FormControl>,
)

expect(getAllByRole('textbox')).toHaveLength(1)
})

describe('vertically stacked layout (default)', () => {
describe('rendering', () => {
it('renders with a hidden label', () => {
Expand Down
Loading