feat(BTooltip): add prop interactive

bootstrap-vue-next · Feb 19, 2024 · f683df2 · f683df2
1 parent c1171d9
commit f683df2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/packages/bootstrap-vue-next/src/components/BTooltip.vue b/packages/bootstrap-vue-next/src/components/BTooltip.vue
@@ -1,17 +1,17 @@
 <template>
-  <BPopover ref="popover" tooltip v-bind="$props">
+  <BPopover ref="popover" tooltip v-bind="computedProps">
     <template v-for="(_, name) in $slots" #[name]="slotData">
       <slot :name="name" v-bind="slotData" />
     </template>
   </BPopover>
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue'
+import {computed, ref} from 'vue'
 import BPopover from './BPopover.vue'
-import type {BPopoverProps} from '../types'
+import type {BPopoverProps, BTooltipProps} from '../types'
 
-withDefaults(defineProps<Omit<BPopoverProps, 'tooltip'>>(), {
+const props = withDefaults(defineProps<BTooltipProps>(), {
   click: undefined,
   container: undefined,
   content: undefined,
@@ -22,14 +22,15 @@ withDefaults(defineProps<Omit<BPopoverProps, 'tooltip'>>(), {
   html: undefined,
   id: undefined,
   inline: undefined,
+  interactive: undefined,
   manual: undefined,
   modelValue: undefined,
   noAutoClose: undefined,
   noFade: undefined,
   noFlip: undefined,
   noHide: undefined,
   noShift: undefined,
-  noninteractive: true,
+  noninteractive: undefined,
   offset: undefined,
   placement: undefined,
   realtime: undefined,
@@ -40,6 +41,11 @@ withDefaults(defineProps<Omit<BPopoverProps, 'tooltip'>>(), {
   variant: undefined,
 })
 
+const computedProps = computed<BPopoverProps>(() => {
+  const {interactive, noninteractive, ...rest} = props
+  return {noninteractive: noninteractive !== undefined ? noninteractive : !interactive, ...rest}
+})
+
 const popover = ref<null | InstanceType<typeof BPopover>>(null)
 
 defineExpose({

diff --git a/packages/bootstrap-vue-next/src/types/ComponentProps.ts b/packages/bootstrap-vue-next/src/types/ComponentProps.ts
@@ -272,6 +272,10 @@ export interface BPopoverProps {
   variant?: ColorVariant | null
 }
 
+export interface BTooltipProps extends Omit<BPopoverProps, 'tooltip'> {
+  interactive?: Booleanish
+}
+
 export interface BCardHeadFootProps extends ColorExtendables {
   borderVariant?: ColorVariant | null
   html?: string

diff --git a/packages/bootstrap-vue-next/src/utils/floatingUi.ts b/packages/bootstrap-vue-next/src/utils/floatingUi.ts
@@ -100,6 +100,7 @@ export const resolveDirectiveProps = (
           : undefined,
   html: true,
   ...(typeof binding.value === 'object' ? binding.value : {}),
+  ...(binding.modifiers.interactive ? {noninteractive: false} : {}),
   title: null,
   content: null,
 })