fix(form): TextArea applies custom height style when resize="none"

mlaursen · Jan 18, 2022 · e77d939 · e77d939
1 parent b5e8b69
commit e77d939
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/form/src/text-field/TextArea.tsx b/packages/form/src/text-field/TextArea.tsx
@@ -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",
@@ -334,7 +334,7 @@ export const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>(
           ...style,
           height: height
             ? `calc(${PADDING_VARIABLES} + ${height}px)`
-            : undefined,
+            : style?.height,
         }}
         className={cn(
           container({