refactor: update c-popover and c-tooltips import and exports

mrholek · mrholek · commit 2084775b5ec4 · 2021-10-06T00:03:45.000+02:00
diff --git a/src/directives/index.ts b/src/directives/index.ts
@@ -1,4 +1,4 @@
-import { CTooltip } from './CTooltip'
-import { CPopover } from './CPopover'
+import vctooltip from './v-c-tooltip'
+import vcpopover from './v-c-popover'
 
-export { CTooltip, CPopover }
+export { vctooltip, vcpopover }
diff --git a/src/directives/v-c-popover.ts b/src/directives/v-c-popover.ts
@@ -1,3 +1,4 @@
+import { DirectiveBinding } from 'vue'
 import { createPopper } from '@popperjs/core'
 
 const getUID = (prefix: string) => {
@@ -43,10 +44,10 @@ const togglePopoverElement = (popover: HTMLDivElement, el: HTMLElement, popperOp
   addPopoverElement(popover, el, popperOptions)
 }
 
-const CPopover = {
+export default {
   name: 'c-popover',
   uid: '',
-  mounted(el: HTMLElement, binding: any) {
+  mounted(el: HTMLElement, binding: DirectiveBinding): void {
     const value = binding.value
     const content = typeof value === 'string' ? value : value.content ? value.content : ''
     const header = value.header ? value.header : ''
@@ -69,7 +70,7 @@ const CPopover = {
     }
 
     const popoverUID = getUID('popover')
-    binding.dir.uid = popoverUID
+    binding.arg = popoverUID
     const popover = createPopoverElement(popoverUID, header, content)
 
     trigger.includes('click') &&
@@ -95,10 +96,8 @@ const CPopover = {
       })
     }
   },
-  unmounted(binding: any) {
-    const popover = document.getElementById(binding.dir.uid)
+  unmounted(binding: DirectiveBinding): void {
+    const popover = binding.arg && document.getElementById(binding.arg)
     popover && popover.remove()
   },
 }
-
-export { CPopover }
diff --git a/src/directives/v-c-tooltip.ts b/src/directives/v-c-tooltip.ts
@@ -1,3 +1,4 @@
+import { DirectiveBinding } from 'vue'
 import { createPopper } from '@popperjs/core'
 
 const getUID = (prefix: string) => {
@@ -42,10 +43,10 @@ const toggleTooltipElement = (tooltip: HTMLDivElement, el: HTMLElement, popperOp
   addTooltipElement(tooltip, el, popperOptions)
 }
 
-const CTooltip = {
-  name: 'c-tooltip',
-  uid: '',
-  mounted(el: HTMLElement, binding: any) {
+export default {
+  mounted(el: HTMLElement, binding: DirectiveBinding): void {
+    console.log(binding)
+
     const value = binding.value
     const content = typeof value === 'string' ? value : value.content ? value.content : ''
     const trigger = value.trigger ? value.trigger : 'hover'
@@ -67,7 +68,7 @@ const CTooltip = {
     }
 
     const tooltipUID = getUID('tooltip')
-    binding.dir.uid = tooltipUID
+    binding.arg = tooltipUID
     const tooltip = createTooltipElement(tooltipUID, content)
 
     trigger.includes('click') &&
@@ -93,10 +94,8 @@ const CTooltip = {
       })
     }
   },
-  unmounted(binding: any) {
-    const tooltip = document.getElementById(binding.dir.uid)
+  beforeUnmount(binding: DirectiveBinding): void {
+    const tooltip = binding.arg && document.getElementById(binding.arg)
     tooltip && tooltip.remove()
   },
 }
-
-export { CTooltip }
