From 4d8179ba08bc69f28a541fa6d6cf3519db322662 Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Tue, 1 Apr 2025 12:05:57 +0200
Subject: [PATCH] chore(Input/InputNumber/PinInput/Textarea): clean functions
 order

---
 src/runtime/components/Input.vue       | 18 +++++++-------
 src/runtime/components/InputNumber.vue | 24 +++++++++---------
 src/runtime/components/PinInput.vue    | 18 +++++++-------
 src/runtime/components/Textarea.vue    | 34 +++++++++++---------------
 4 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/src/runtime/components/Input.vue b/src/runtime/components/Input.vue
index 20d3db13..8ca5ff98 100644
--- a/src/runtime/components/Input.vue
+++ b/src/runtime/components/Input.vue
@@ -104,12 +104,6 @@ const ui = computed(() => input({
 
 const inputRef = ref<HTMLInputElement | null>(null)
 
-function autoFocus() {
-  if (props.autofocus) {
-    inputRef.value?.focus()
-  }
-}
-
 // Custom function to handle the v-model properties
 function updateInput(value: string | null) {
   if (modelModifiers.trim) {
@@ -155,15 +149,21 @@ function onBlur(event: FocusEvent) {
   emits('blur', event)
 }
 
-defineExpose({
-  inputRef
-})
+function autoFocus() {
+  if (props.autofocus) {
+    inputRef.value?.focus()
+  }
+}
 
 onMounted(() => {
   setTimeout(() => {
     autoFocus()
   }, props.autofocusDelay)
 })
+
+defineExpose({
+  inputRef
+})
 </script>
 
 <template>
diff --git a/src/runtime/components/InputNumber.vue b/src/runtime/components/InputNumber.vue
index 461966a8..b9f4fbb7 100644
--- a/src/runtime/components/InputNumber.vue
+++ b/src/runtime/components/InputNumber.vue
@@ -115,18 +115,6 @@ const decrementIcon = computed(() => props.decrementIcon || (props.orientation =
 
 const inputRef = ref<InstanceType<typeof NumberFieldInput> | null>(null)
 
-function autoFocus() {
-  if (props.autofocus) {
-    inputRef.value?.$el?.focus()
-  }
-}
-
-onMounted(() => {
-  setTimeout(() => {
-    autoFocus()
-  }, props.autofocusDelay)
-})
-
 function onUpdate(value: number) {
   // @ts-expect-error - 'target' does not exist in type 'EventInit'
   const event = new Event('change', { target: { value } })
@@ -141,6 +129,18 @@ function onBlur(event: FocusEvent) {
   emits('blur', event)
 }
 
+function autoFocus() {
+  if (props.autofocus) {
+    inputRef.value?.$el?.focus()
+  }
+}
+
+onMounted(() => {
+  setTimeout(() => {
+    autoFocus()
+  }, props.autofocusDelay)
+})
+
 defineExpose({
   inputRef
 })
diff --git a/src/runtime/components/PinInput.vue b/src/runtime/components/PinInput.vue
index 415a400a..dc8fbaf3 100644
--- a/src/runtime/components/PinInput.vue
+++ b/src/runtime/components/PinInput.vue
@@ -78,12 +78,6 @@ const ui = computed(() => pinInput({
 
 const inputsRef = ref<ComponentPublicInstance[]>([])
 
-function autoFocus() {
-  if (props.autofocus) {
-    inputsRef.value[0]?.$el?.focus()
-  }
-}
-
 const completed = ref(false)
 function onComplete(value: string[]) {
   // @ts-expect-error - 'target' does not exist in type 'EventInit'
@@ -99,15 +93,21 @@ function onBlur(event: FocusEvent) {
   }
 }
 
-defineExpose({
-  inputsRef
-})
+function autoFocus() {
+  if (props.autofocus) {
+    inputsRef.value[0]?.$el?.focus()
+  }
+}
 
 onMounted(() => {
   setTimeout(() => {
     autoFocus()
   }, props.autofocusDelay)
 })
+
+defineExpose({
+  inputsRef
+})
 </script>
 
 <template>
diff --git a/src/runtime/components/Textarea.vue b/src/runtime/components/Textarea.vue
index e1ee8d66..40d37589 100644
--- a/src/runtime/components/Textarea.vue
+++ b/src/runtime/components/Textarea.vue
@@ -87,12 +87,6 @@ const ui = computed(() => textarea({
 
 const textareaRef = ref<HTMLTextAreaElement | null>(null)
 
-function autoFocus() {
-  if (props.autofocus) {
-    textareaRef.value?.focus()
-  }
-}
-
 // Custom function to handle the v-model properties
 function updateInput(value: string | null) {
   if (modelModifiers.trim) {
@@ -140,18 +134,14 @@ function onBlur(event: FocusEvent) {
   emits('blur', event)
 }
 
-onMounted(() => {
-  setTimeout(() => {
-    autoFocus()
-  }, props.autofocusDelay)
-})
+function autoFocus() {
+  if (props.autofocus) {
+    textareaRef.value?.focus()
+  }
+}
 
 function autoResize() {
-  if (props.autoresize) {
-    if (!textareaRef.value) {
-      return
-    }
-
+  if (props.autoresize && textareaRef.value) {
     textareaRef.value.rows = props.rows
     const overflow = textareaRef.value.style.overflow
     textareaRef.value.style.overflow = 'hidden'
@@ -176,15 +166,19 @@ watch(modelValue, () => {
   nextTick(autoResize)
 })
 
-defineExpose({
-  textareaRef
-})
-
 onMounted(() => {
+  setTimeout(() => {
+    autoFocus()
+  }, props.autofocusDelay)
+
   setTimeout(() => {
     autoResize()
   }, 100)
 })
+
+defineExpose({
+  textareaRef
+})
 </script>
 
 <template>