Skip to content

fix(react-textarea): Don't remove outline when filled and disabled and apply correct disabled color to text #27837

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
sopranopillow merged 6 commits into from
May 15, 2023
Merged

fix(react-textarea): Don't remove outline when filled and disabled and apply correct disabled color to text #27837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5ff32e
isolating disabled styles
sopranopillow May 12, 2023
795f71d
change files
sopranopillow May 12, 2023
94808ca
Update change/@fluentui-react-textarea-5bff6329-66e1-4f78-b54e-615647…
sopranopillow May 12, 2023
65b14bc
Merge branch 'master' into textarea-bug
sopranopillow May 12, 2023
b64d010
adding vr-tests for disabled appearance and value states
sopranopillow May 12, 2023
c7437d4
cleaning up tests
sopranopillow May 15, 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
6 changes: 5 additions & 1 deletion apps/vr-tests-react-components/src/stories/Textarea.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ storiesOf('Textarea Converged', module)
<Textarea aria-invalid appearance="filled-lighter" placeholder="Placeholder" />
</div>
))
.addStory('Disabled', () => <Textarea disabled />)
.addStory('With value', () => <Textarea defaultValue="Value" />);

// Non interactive
Expand All @@ -49,6 +48,11 @@ storiesOf('Textarea Converged', module)
.addStory('Size: small', () => <Textarea size="small" placeholder="Placeholder" />)
.addStory('Size: medium', () => <Textarea size="medium" placeholder="Placeholder" />)
.addStory('Size: large', () => <Textarea size="large" placeholder="Placeholder" />)
.addStory('Disabled', () => <Textarea defaultValue="Example Textarea value" disabled />)
.addStory('Disabled + placeholder', () => <Textarea placeholder="Example Textarea placeholder" disabled />)
.addStory('Disabled + filled', () => (
<Textarea appearance="filled-darker" defaultValue="Example Textarea value" disabled />
))
.addStory('With appearance override', () => (
<FluentProvider overrides_unstable={{ inputDefaultAppearance: 'filled-darker' }}>
<div style={{ display: 'flex', flexDirection: 'column', gap: '10px' }}>
Expand Down
7 changes: 7 additions & 0 deletions change/@fluentui-react-textarea-5bff6329-66e1-4f78-b54e-615647eb847c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: When Textarea is disabled, make the text gray and add an outline for the filled appearance.",
"packageName": "@fluentui/react-textarea",
"email": "[email protected]",
"dependentChangeType": "patch"
}
5 changes: 3 additions & 2 deletions packages/react-components/react-textarea/src/components/Textarea/useTextareaStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const useRootStyles = makeStyles({
backgroundColor: tokens.colorTransparentBackground,
...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStrokeDisabled),
[`& > textarea`]: {
color: tokens.colorNeutralForegroundDisabled,
cursor: 'not-allowed',
'::placeholder': {
color: tokens.colorNeutralForegroundDisabled,
Expand Down Expand Up @@ -244,9 +245,9 @@ export const useTextareaStyles_unstable = (state: TextareaState): TextareaState
state.root.className = mergeClasses(
textareaClassNames.root,
rootStyles.base,
rootStyles[appearance],
filled && rootStyles.filled,
disabled && rootStyles.disabled,
!disabled && filled && rootStyles.filled,
!disabled && rootStyles[appearance],
!disabled && rootStyles.interactive,
!disabled && appearance === 'outline' && rootStyles.outlineInteractive,
!disabled && invalid && rootStyles.invalid,
Expand Down