Skip to content

Commit e8508b7

Browse files
authored
Merge branch 'main' into test/update-overlay-test
2 parents 5e8f66e + d2fecd9 commit e8508b7

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': patch
3+
---
4+
5+
Remove selected from <option> and add defaultValue for <select> when placeholder is provided

src/Select.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,11 @@ const Select = React.forwardRef<HTMLSelectElement, SelectProps>(
8787
disabled={disabled}
8888
aria-invalid={validationStatus === 'error' ? 'true' : 'false'}
8989
data-hasplaceholder={Boolean(placeholder)}
90+
defaultValue={placeholder ?? undefined}
9091
{...rest}
9192
>
9293
{placeholder && (
93-
<option value="" disabled={required} selected hidden={required}>
94+
<option value="" disabled={required} hidden={required}>
9495
{placeholder}
9596
</option>
9697
)}

src/__tests__/Textarea.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ describe('Textarea', () => {
9494

9595
it('renders a value in the textarea', () => {
9696
const mockValue = 'mock value'
97-
const {getByRole} = render(<Textarea value={mockValue} />)
97+
const onChange = jest.fn()
98+
const {getByRole} = render(<Textarea onChange={onChange} value={mockValue} />)
9899

99100
const textareaElement = getByRole('textbox') as HTMLTextAreaElement
100101

0 commit comments

Comments
 (0)