Skip to content

Commit e77d939

Browse files
committed
fix(form): TextArea applies custom height style when resize="none"
1 parent b5e8b69 commit e77d939

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

packages/form/src/text-field/TextArea.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>(
279279
onFocus={onFocus}
280280
onBlur={onBlur}
281281
onChange={onChange}
282-
style={{ ...areaStyle, height }}
282+
style={{ ...areaStyle, height: height ?? areaStyle?.height }}
283283
className={cn(
284284
block({
285285
scrollable: scrollable || resize === "none",
@@ -334,7 +334,7 @@ export const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>(
334334
...style,
335335
height: height
336336
? `calc(${PADDING_VARIABLES} + ${height}px)`
337-
: undefined,
337+
: style?.height,
338338
}}
339339
className={cn(
340340
container({

0 commit comments

Comments
 (0)