From fc658842bbb65c807adc12cd6090733d5304d4b0 Mon Sep 17 00:00:00 2001 From: Sylvain Marroufin Date: Tue, 25 Oct 2022 14:09:54 +0200 Subject: [PATCH] chore: fix typescript errors (#102) --- src/runtime/components/elements/Dropdown.vue | 4 ++-- src/runtime/components/forms/SelectCustom.vue | 4 ++-- src/runtime/components/overlays/ContextMenu.vue | 4 ++-- src/runtime/components/overlays/Popover.vue | 4 ++-- src/runtime/components/overlays/Tooltip.vue | 4 ++-- src/runtime/composables/usePopper.ts | 3 ++- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/runtime/components/elements/Dropdown.vue b/src/runtime/components/elements/Dropdown.vue index 37802026..f33eb6e1 100644 --- a/src/runtime/components/elements/Dropdown.vue +++ b/src/runtime/components/elements/Dropdown.vue @@ -132,9 +132,9 @@ const props = defineProps({ } }) -const popperOptions = computed(() => defu({}, props.popperOptions, $ui.dropdown.popperOptions)) +const popperOptions = computed(() => defu({}, props.popperOptions, $ui.dropdown.popperOptions)) -const [trigger, container] = usePopper(popperOptions.value as PopperOptions) +const [trigger, container] = usePopper(popperOptions.value) function resolveItemClass ({ active, disabled }: { active: boolean, disabled: boolean }) { return classNames( diff --git a/src/runtime/components/forms/SelectCustom.vue b/src/runtime/components/forms/SelectCustom.vue index a22588aa..b8c0fe8d 100644 --- a/src/runtime/components/forms/SelectCustom.vue +++ b/src/runtime/components/forms/SelectCustom.vue @@ -263,9 +263,9 @@ const props = defineProps({ const emit = defineEmits(['update:modelValue']) -const popperOptions = computed(() => defu({}, props.popperOptions, $ui.selectCustom.popperOptions)) +const popperOptions = computed(() => defu({}, props.popperOptions, $ui.selectCustom.popperOptions)) -const [trigger, container] = usePopper(popperOptions.value as PopperOptions) +const [trigger, container] = usePopper(popperOptions.value) const query = ref('') const searchInput = ref>() diff --git a/src/runtime/components/overlays/ContextMenu.vue b/src/runtime/components/overlays/ContextMenu.vue index 82afdf9a..1d354b0f 100644 --- a/src/runtime/components/overlays/ContextMenu.vue +++ b/src/runtime/components/overlays/ContextMenu.vue @@ -63,9 +63,9 @@ const isOpen = computed({ const virtualElement = toRef(props, 'virtualElement') -const popperOptions = computed(() => defu({}, props.popperOptions, $ui.contextMenu.popperOptions)) +const popperOptions = computed(() => defu({}, props.popperOptions, $ui.contextMenu.popperOptions)) -const [, container] = usePopper(popperOptions.value as PopperOptions, virtualElement) +const [, container] = usePopper(popperOptions.value, virtualElement) diff --git a/src/runtime/composables/usePopper.ts b/src/runtime/composables/usePopper.ts index 147d1a8f..4b0a21ad 100644 --- a/src/runtime/composables/usePopper.ts +++ b/src/runtime/composables/usePopper.ts @@ -8,6 +8,7 @@ import offset from '@popperjs/core/lib/modifiers/offset' import preventOverflow from '@popperjs/core/lib/modifiers/preventOverflow' import computeStyles from '@popperjs/core/lib/modifiers/computeStyles' import eventListeners from '@popperjs/core/lib/modifiers/eventListeners' +import type { PopperOptions } from '../types' export const createPopper = popperGenerator({ defaultModifiers: [...defaultModifiers, offset, flip, preventOverflow, computeStyles, eventListeners] @@ -24,7 +25,7 @@ export function usePopper ({ resize = true, placement, strategy -}, virtualReference: Ref = null) { +}: PopperOptions, virtualReference: Ref = null) { const reference: Ref = ref(null) const popper: Ref = ref(null) const instance: Ref = ref(null)