Merge branch 'main' of https://github.com/coreui/coreui-vue

mrholek · mrholek · commit 94d128601b24 · 2022-07-28T21:20:39.000+02:00
# Conflicts:
#	packages/coreui-vue/src/components/form/CFormInput.ts
diff --git a/packages/coreui-vue/src/components/form/CFormInput.ts b/packages/coreui-vue/src/components/form/CFormInput.ts
@@ -67,7 +67,7 @@ const CFormInput = defineComponent({
      * The default name for a value passed using v-model.
      */
     modelValue: {
-      type: [File, String],
+      type: [File, Number, String],
       default: undefined,
     },
     /**
diff --git a/packages/coreui-vue/src/directives/v-c-popover.ts b/packages/coreui-vue/src/directives/v-c-popover.ts
@@ -96,7 +96,7 @@ export default {
       })
     }
   },
-  unmounted(binding: DirectiveBinding): void {
+  unmounted(_el: HTMLElement, binding: DirectiveBinding): void {
     const popover = binding.arg && document.getElementById(binding.arg)
     popover && popover.remove()
   },
diff --git a/packages/coreui-vue/src/directives/v-c-tooltip.ts b/packages/coreui-vue/src/directives/v-c-tooltip.ts
@@ -92,7 +92,7 @@ export default {
       })
     }
   },
-  beforeUnmount(binding: DirectiveBinding): void {
+  beforeUnmount(_el: HTMLElement, binding: DirectiveBinding): void {
     const tooltip = binding.arg && document.getElementById(binding.arg)
     tooltip && tooltip.remove()
   },

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ export default {`
`96`	`96`	`})`
`97`	`97`	`}`
`98`	`98`	`},`
`99`		`- unmounted(binding: DirectiveBinding): void {`
	`99`	`+ unmounted(_el: HTMLElement, binding: DirectiveBinding): void {`
`100`	`100`	`const popover = binding.arg && document.getElementById(binding.arg)`
`101`	`101`	`popover && popover.remove()`
`102`	`102`	`},`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ export default {`
`92`	`92`	`})`
`93`	`93`	`}`
`94`	`94`	`},`
`95`		`- beforeUnmount(binding: DirectiveBinding): void {`
	`95`	`+ beforeUnmount(_el: HTMLElement, binding: DirectiveBinding): void {`
`96`	`96`	`const tooltip = binding.arg && document.getElementById(binding.arg)`
`97`	`97`	`tooltip && tooltip.remove()`
`98`	`98`	`},`