From f5be6074782b31c3db00b9c46fce0424dd021164 Mon Sep 17 00:00:00 2001
From: "David W. Gray" <dwgray67@hotmail.com>
Date: Mon, 22 Jul 2024 16:37:40 -0700
Subject: [PATCH] fix(BFormInput,BFormTextArea): Deprecate trim, lazy, number
 props in favor of modifiers (#2066)

---
 .../src/components/BFormInput/BFormInput.vue  | 19 ++-----------------
 .../BFormTextarea/BFormTextarea.vue           | 15 ++-------------
 .../bootstrap-vue-next/src/utils/index.ts     |  1 +
 .../src/utils/normalizeInput.ts               | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 30 deletions(-)
 create mode 100644 packages/bootstrap-vue-next/src/utils/normalizeInput.ts

diff --git a/packages/bootstrap-vue-next/src/components/BFormInput/BFormInput.vue b/packages/bootstrap-vue-next/src/components/BFormInput/BFormInput.vue
index 3bd72715a..4bf2a31e7 100644
--- a/packages/bootstrap-vue-next/src/components/BFormInput/BFormInput.vue
+++ b/packages/bootstrap-vue-next/src/components/BFormInput/BFormInput.vue
@@ -27,6 +27,7 @@
 <script setup lang="ts">
 import {computed, ref} from 'vue'
 import {useDefaults, useFormInput, useStateClass} from '../../composables'
+import {normalizeInput} from '../../utils'
 import type {BFormInputProps, Numberish} from '../../types'
 
 const _props = withDefaults(defineProps<BFormInputProps>(), {
@@ -44,39 +45,23 @@ const _props = withDefaults(defineProps<BFormInputProps>(), {
   form: undefined,
   formatter: undefined,
   id: undefined,
-  lazy: false,
   lazyFormatter: false,
   list: undefined,
   modelValue: '',
   name: undefined,
-  number: false,
   placeholder: undefined,
   plaintext: false,
   readonly: false,
   required: false,
   size: undefined,
   state: null,
-  trim: false,
   // End CommonInputProps
 })
 const props = useDefaults(_props, 'BFormInput')
 
 const [modelValue, modelModifiers] = defineModel<Numberish | null, 'trim' | 'lazy' | 'number'>({
   default: '',
-  set: (v) => {
-    if (v === null) return
-    let update = v
-    if (modelModifiers.trim) update = update.toString().trim()
-    if (
-      (modelModifiers.number || props.type === 'number') &&
-      typeof update === 'string' &&
-      update !== ''
-    ) {
-      const parsed = Number.parseFloat(update)
-      update = Number.isNaN(parsed) ? update : parsed
-    }
-    return update
-  },
+  set: (v) => normalizeInput(v, modelModifiers),
 })
 
 const {input, computedId, computedAriaInvalid, onInput, onChange, onBlur, focus, blur} =
diff --git a/packages/bootstrap-vue-next/src/components/BFormTextarea/BFormTextarea.vue b/packages/bootstrap-vue-next/src/components/BFormTextarea/BFormTextarea.vue
index ecf1f0ce5..07ae20f28 100644
--- a/packages/bootstrap-vue-next/src/components/BFormTextarea/BFormTextarea.vue
+++ b/packages/bootstrap-vue-next/src/components/BFormTextarea/BFormTextarea.vue
@@ -26,6 +26,7 @@
 import type {BFormTextareaProps, Numberish} from '../../types'
 import {computed, type CSSProperties} from 'vue'
 import {useDefaults, useFormInput, useStateClass} from '../../composables'
+import {normalizeInput} from '../../utils'
 
 const _props = withDefaults(defineProps<BFormTextareaProps>(), {
   // CommonInputProps
@@ -38,19 +39,16 @@ const _props = withDefaults(defineProps<BFormTextareaProps>(), {
   form: undefined,
   formatter: undefined,
   id: undefined,
-  lazy: false,
   lazyFormatter: false,
   list: undefined,
   modelValue: '',
   name: undefined,
-  number: false,
   placeholder: undefined,
   plaintext: false,
   readonly: false,
   required: false,
   size: undefined,
   state: null,
-  trim: false,
   // End CommonInputProps
   noResize: false,
   rows: 2,
@@ -60,16 +58,7 @@ const props = useDefaults(_props, 'BFormTextarea')
 
 const [modelValue, modelModifiers] = defineModel<Numberish | null, 'trim' | 'lazy' | 'number'>({
   default: '',
-  set: (v) => {
-    if (v === null) return
-    let update = v
-    if (modelModifiers.trim) update = update.toString().trim()
-    if (modelModifiers.number && typeof update === 'string' && update !== '') {
-      const parsed = Number.parseFloat(update)
-      update = Number.isNaN(parsed) ? update : parsed
-    }
-    return update
-  },
+  set: (v) => normalizeInput(v, modelModifiers),
 })
 
 const {input, computedId, computedAriaInvalid, onInput, onChange, onBlur, focus, blur} =
diff --git a/packages/bootstrap-vue-next/src/utils/index.ts b/packages/bootstrap-vue-next/src/utils/index.ts
index 3c779a97a..904bb68f3 100644
--- a/packages/bootstrap-vue-next/src/utils/index.ts
+++ b/packages/bootstrap-vue-next/src/utils/index.ts
@@ -11,6 +11,7 @@ export {default as getSlotElements} from './getSlotElements'
 export {default as getTableFieldHeadLabel} from './getTableFieldHeadLabel'
 export {default as isLink} from './isLink'
 export * from './keys'
+export {default as normalizeInput} from './normalizeInput'
 export {default as normalizeSlot} from './normalizeSlot'
 export * from './object'
 export {default as parseActiveImports} from './parseActiveImports'
diff --git a/packages/bootstrap-vue-next/src/utils/normalizeInput.ts b/packages/bootstrap-vue-next/src/utils/normalizeInput.ts
new file mode 100644
index 000000000..3faebf9d1
--- /dev/null
+++ b/packages/bootstrap-vue-next/src/utils/normalizeInput.ts
@@ -0,0 +1,15 @@
+import type {Numberish} from '../types'
+
+export default (
+  v: Numberish | null,
+  modelModifiers: Record<'number' | 'lazy' | 'trim', true | undefined>
+) => {
+  if (v === null) return
+  let update = v
+  if (modelModifiers.trim) update = update.toString().trim()
+  if (modelModifiers.number && typeof update === 'string' && update !== '') {
+    const parsed = Number.parseFloat(update)
+    update = Number.isNaN(parsed) ? update : parsed
+  }
+  return update
+}