arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-27 10:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix popper props merge

Browse Source
This commit is contained in:
Benjamin Canac
2022-10-07 13:40:23 +02:00
parent 005c18e4c0
commit f1b59fc59e
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/runtime/components/overlays/Popover.vue
View File

@@ -18,7 +18,8 @@
<script setup lang="ts">
import type { Ref, PropType } from 'vue'
import { ref, onMounted } from 'vue'
import { ref, computed, onMounted } from 'vue'
import { defu } from 'defu'
import { Popover, PopoverButton, PopoverPanel } from '@headlessui/vue'
import { usePopper } from '../../composables/usePopper'
import type { PopperOptions } from './../types'
@@ -54,13 +55,13 @@ const props = defineProps({
},
popperOptions: {
type: Object as PropType<PopperOptions>,
default: () => ({
strategy: 'fixed'
})
default: () => {}
}
})
const [trigger, container] = usePopper(props.popperOptions)
const popperOptions = computed(() => defu({}, props.popperOptions, { strategy: 'fixed' }))
const [trigger, container] = usePopper(popperOptions.value)
const popoverApi: Ref<any> = ref(null)

11
src/runtime/components/overlays/Tooltip.vue
View File

@@ -18,7 +18,8 @@
<script setup lang="ts">
import type { PropType } from 'vue'
import { ref } from 'vue'
import { ref, computed } from 'vue'
import { defu } from 'defu'
import { usePopper } from '../../composables/usePopper'
import type { PopperOptions } from './../types'
import $ui from '#build/ui'
@@ -50,14 +51,14 @@ const props = defineProps({
},
popperOptions: {
type: Object as PropType<PopperOptions>,
default: () => ({
strategy: 'fixed'
})
default: () => {}
}
})
const popperOptions = computed(() => defu({}, props.popperOptions, { strategy: 'fixed' }))
const [trigger, container] = usePopper(popperOptions.value)
const open = ref(false)
const [trigger, container] = usePopper(props.popperOptions)
</script>
<script lang="ts">