fix: tooltip popover trigger issue

unovue · Sep 19, 2023 · e9634a9 · e9634a9
1 parent 0bc0dcb
commit e9634a9
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 12 deletions.
diff --git a/apps/www/src/lib/registry/default/example/SliderDemo.vue b/apps/www/src/lib/registry/default/example/SliderDemo.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
+import { ref } from 'vue'
 import { cn } from '@/lib/utils'
 import { Slider } from '@/lib/registry/default/ui/slider'
 
-const modelValue = [50]
+const modelValue = ref([50])
 </script>
 
 <template>

diff --git a/apps/www/src/lib/registry/default/ui/popover/PopoverTrigger.vue b/apps/www/src/lib/registry/default/ui/popover/PopoverTrigger.vue
@@ -5,7 +5,7 @@ const props = defineProps<PopoverTriggerProps>()
 </script>
 
 <template>
-  <PopoverTrigger v-bind="props">
+  <PopoverTrigger v-bind="props" class="">
     <slot />
   </PopoverTrigger>
 </template>
diff --git a/apps/www/src/lib/registry/default/ui/slider/Slider.vue b/apps/www/src/lib/registry/default/ui/slider/Slider.vue
@@ -5,6 +5,8 @@ import { cn, useEmitAsProps } from '@/lib/utils'
 
 const props = defineProps<SliderRootProps>()
 const emits = defineEmits<SliderRootEmits>()
+
+const emitsAsProps = useEmitAsProps(emits)
 </script>
 
 <template>
@@ -13,7 +15,7 @@ const emits = defineEmits<SliderRootEmits>()
       'relative flex w-full touch-none select-none items-center',
       $attrs.class ?? '',
     )"
-    v-bind="{ ...props, ...useEmitAsProps(emits) }"
+    v-bind="{ ...props, ...emitsAsProps }"
   >
     <SliderTrack class="relative h-2 w-full grow overflow-hidden rounded-full bg-secondary">
       <SliderRange class="absolute h-full bg-primary" />

diff --git a/apps/www/src/lib/registry/default/ui/tooltip/Tooltip.vue b/apps/www/src/lib/registry/default/ui/tooltip/Tooltip.vue
@@ -4,10 +4,12 @@ import { useEmitAsProps } from '@/lib/utils'
 
 const props = defineProps<TooltipRootProps>()
 const emits = defineEmits<TooltipRootEmits>()
+
+const emitsAsProps = useEmitAsProps(emits)
 </script>
 
 <template>
-  <TooltipRoot v-bind="{ ...props, ...useEmitAsProps(emits) }">
+  <TooltipRoot v-bind="{ ...props, ...emitsAsProps }">
     <slot />
   </TooltipRoot>
 </template>
diff --git a/apps/www/src/lib/registry/default/ui/tooltip/TooltipContent.vue b/apps/www/src/lib/registry/default/ui/tooltip/TooltipContent.vue
@@ -1,15 +1,19 @@
 <script setup lang="ts">
-import { TooltipContent, type TooltipContentEmits, type TooltipContentProps } from 'radix-vue'
+import { TooltipContent, type TooltipContentEmits, type TooltipContentProps, TooltipPortal } from 'radix-vue'
 import { cn, useEmitAsProps } from '@/lib/utils'
 
 const props = withDefaults(defineProps<TooltipContentProps>(), {
   sideOffset: 4,
 })
 const emits = defineEmits<TooltipContentEmits>()
+
+const emitsAsProps = useEmitAsProps(emits)
 </script>
 
 <template>
-  <TooltipContent v-bind="{ ...props, ...useEmitAsProps(emits) }" :class="cn('z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2', $attrs.class ?? '')">
-    <slot />
-  </TooltipContent>
+  <TooltipPortal>
+    <TooltipContent v-bind="{ ...props, ...emitsAsProps, ...$attrs }" :class="cn('z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2', $attrs.class ?? '')">
+      <slot />
+    </TooltipContent>
+  </TooltipPortal>
 </template>
diff --git a/apps/www/src/lib/registry/default/ui/tooltip/TooltipTrigger.vue b/apps/www/src/lib/registry/default/ui/tooltip/TooltipTrigger.vue
@@ -5,7 +5,7 @@ const props = defineProps<TooltipTriggerProps>()
 </script>
 
 <template>
-  <TooltipTrigger v-bind="props">
+  <TooltipTrigger v-bind="props" class="">
     <slot />
   </TooltipTrigger>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/example/SliderDemo.vue b/apps/www/src/lib/registry/new-york/example/SliderDemo.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
+import { ref } from 'vue'
 import { cn } from '@/lib/utils'
 import { Slider } from '@/lib/registry/new-york/ui/slider'
 
-const modelValue = [50]
+const modelValue = ref([50])
 </script>
 
 <template>

diff --git a/apps/www/src/lib/registry/new-york/ui/popover/PopoverTrigger.vue b/apps/www/src/lib/registry/new-york/ui/popover/PopoverTrigger.vue
@@ -5,7 +5,7 @@ const props = defineProps<PopoverTriggerProps>()
 </script>
 
 <template>
-  <PopoverTrigger v-bind="props">
+  <PopoverTrigger v-bind="props" class="">
     <slot />
   </PopoverTrigger>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/ui/tooltip/TooltipTrigger.vue b/apps/www/src/lib/registry/new-york/ui/tooltip/TooltipTrigger.vue
@@ -5,7 +5,7 @@ const props = defineProps<TooltipTriggerProps>()
 </script>
 
 <template>
-  <TooltipTrigger v-bind="props">
+  <TooltipTrigger v-bind="props" class="">
     <slot />
   </TooltipTrigger>
 </template>