From 2299e6bfef1d58b87e73373430db6d75deb911cc Mon Sep 17 00:00:00 2001
From: Peter Holmberg <peterholmberg@users.noreply.github.com>
Date: Mon, 6 Apr 2020 16:52:48 +0200
Subject: [PATCH] TextArea: Combine style and classname (#23367)

---
 .../components/Forms/TextArea/TextArea.tsx    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/grafana-ui/src/components/Forms/TextArea/TextArea.tsx b/packages/grafana-ui/src/components/Forms/TextArea/TextArea.tsx
index 04e034f5655..d65f3ba0ecd 100644
--- a/packages/grafana-ui/src/components/Forms/TextArea/TextArea.tsx
+++ b/packages/grafana-ui/src/components/Forms/TextArea/TextArea.tsx
@@ -12,16 +12,18 @@ export interface Props extends Omit<HTMLProps<HTMLTextAreaElement>, 'size'> {
   size?: FormInputSize;
 }
 
-export const TextArea = React.forwardRef<HTMLTextAreaElement, Props>(({ invalid, size = 'auto', ...props }, ref) => {
-  const theme = useTheme();
-  const styles = getTextAreaStyle(theme, invalid);
+export const TextArea = React.forwardRef<HTMLTextAreaElement, Props>(
+  ({ invalid, size = 'auto', className, ...props }, ref) => {
+    const theme = useTheme();
+    const styles = getTextAreaStyle(theme, invalid);
 
-  return (
-    <div className={inputSizes()[size]}>
-      <textarea className={styles.textarea} {...props} ref={ref} />
-    </div>
-  );
-});
+    return (
+      <div className={inputSizes()[size]}>
+        <textarea {...props} className={cx(styles.textarea, className)} ref={ref} />
+      </div>
+    );
+  }
+);
 
 const getTextAreaStyle = stylesFactory((theme: GrafanaTheme, invalid = false) => {
   return {