From cff6d40f0de893641292d97ee3afac6942267d15 Mon Sep 17 00:00:00 2001
From: Mert Sincan <sincan.mert@gmail.com>
Date: Fri, 18 Oct 2024 17:24:24 +0100
Subject: [PATCH] Add form support to `Textarea`

---
 .../primevue/src/textarea/BaseTextarea.vue    | 19 ++---------
 packages/primevue/src/textarea/Textarea.vue   | 32 ++++++++-----------
 .../src/textarea/style/TextareaStyle.js       |  8 ++---
 3 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/packages/primevue/src/textarea/BaseTextarea.vue b/packages/primevue/src/textarea/BaseTextarea.vue
index 8a479fe8d..f8432690a 100644
--- a/packages/primevue/src/textarea/BaseTextarea.vue
+++ b/packages/primevue/src/textarea/BaseTextarea.vue
@@ -1,25 +1,12 @@
 <script>
-import BaseComponent from '@primevue/core/basecomponent';
+import BaseInput from '@primevue/core/baseinput';
 import TextareaStyle from 'primevue/textarea/style';
 
 export default {
     name: 'BaseTextarea',
-    extends: BaseComponent,
+    extends: BaseInput,
     props: {
-        modelValue: null,
-        autoResize: Boolean,
-        invalid: {
-            type: Boolean,
-            default: false
-        },
-        variant: {
-            type: String,
-            default: null
-        },
-        fluid: {
-            type: Boolean,
-            default: null
-        }
+        autoResize: Boolean
     },
     style: TextareaStyle,
     provide() {
diff --git a/packages/primevue/src/textarea/Textarea.vue b/packages/primevue/src/textarea/Textarea.vue
index 2419176a9..7fb30c2b5 100755
--- a/packages/primevue/src/textarea/Textarea.vue
+++ b/packages/primevue/src/textarea/Textarea.vue
@@ -1,19 +1,15 @@
 <template>
-    <textarea :class="cx('root')" :value="modelValue" :aria-invalid="invalid || undefined" @input="onInput" v-bind="ptmi('root', ptmParams)"></textarea>
+    <textarea :class="cx('root')" :value="d_value" :disabled="disabled" :aria-invalid="invalid || undefined" @input="onInput" v-bind="attrs"></textarea>
 </template>
 
 <script>
-import { isEmpty } from '@primeuix/utils/object';
+import { mergeProps } from 'vue';
 import BaseTextarea from './BaseTextarea.vue';
 
 export default {
     name: 'Textarea',
     extends: BaseTextarea,
     inheritAttrs: false,
-    emits: ['update:modelValue'],
-    inject: {
-        $pcFluid: { default: null }
-    },
     mounted() {
         if (this.$el.offsetParent && this.autoResize) {
             this.resize();
@@ -41,22 +37,20 @@ export default {
                 this.resize();
             }
 
-            this.$emit('update:modelValue', event.target.value);
+            this.updateValue(event.target.value, event);
         }
     },
     computed: {
-        filled() {
-            return this.modelValue != null && this.modelValue.toString().length > 0;
-        },
-        ptmParams() {
-            return {
-                context: {
-                    disabled: this.$attrs.disabled || this.$attrs.disabled === ''
-                }
-            };
-        },
-        hasFluid() {
-            return isEmpty(this.fluid) ? !!this.$pcFluid : this.fluid;
+        attrs() {
+            return mergeProps(
+                this.ptmi('root', {
+                    context: {
+                        filled: this.$filled,
+                        disabled: this.disabled
+                    }
+                }),
+                this.formField
+            );
         }
     }
 };
diff --git a/packages/primevue/src/textarea/style/TextareaStyle.js b/packages/primevue/src/textarea/style/TextareaStyle.js
index e452af4ca..5ebc12079 100644
--- a/packages/primevue/src/textarea/style/TextareaStyle.js
+++ b/packages/primevue/src/textarea/style/TextareaStyle.js
@@ -65,11 +65,11 @@ const classes = {
     root: ({ instance, props }) => [
         'p-textarea p-component',
         {
-            'p-filled': instance.filled,
+            'p-filled': instance.$filled,
             'p-textarea-resizable ': props.autoResize,
-            'p-invalid': props.invalid,
-            'p-variant-filled': props.variant ? props.variant === 'filled' : instance.$primevue.config.inputStyle === 'filled' || instance.$primevue.config.inputVariant === 'filled',
-            'p-textarea-fluid': instance.hasFluid
+            'p-invalid': instance.$invalid,
+            'p-variant-filled': instance.$variant === 'filled',
+            'p-textarea-fluid': instance.$fluid
         }
     ]
 };