Skip to content

Commit

Permalink
fix(form): TextArea applies custom height style when resize="none"
Browse files Browse the repository at this point in the history
  • Loading branch information
mlaursen committed Jan 18, 2022
1 parent b5e8b69 commit e77d939
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/form/src/text-field/TextArea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>(
onFocus={onFocus}
onBlur={onBlur}
onChange={onChange}
style={{ ...areaStyle, height }}
style={{ ...areaStyle, height: height ?? areaStyle?.height }}
className={cn(
block({
scrollable: scrollable || resize === "none",
Expand Down Expand Up @@ -334,7 +334,7 @@ export const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>(
...style,
height: height
? `calc(${PADDING_VARIABLES} + ${height}px)`
: undefined,
: style?.height,
}}
className={cn(
container({
Expand Down

0 comments on commit e77d939

Please sign in to comment.