mirror of
https://github.com/ArthurDanjou/ui.git
synced 2026-01-30 11:47:55 +01:00
fix(Tooltip): hide when text prop & slot are empty (#2232)
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
Hover
|
Hover
|
||||||
</slot>
|
</slot>
|
||||||
|
|
||||||
<div v-if="open && !prevent" ref="container" :class="[ui.container, ui.width]">
|
<div v-if="open && !prevent && isVisible" ref="container" :class="[ui.container, ui.width]">
|
||||||
<Transition appear v-bind="ui.transition">
|
<Transition appear v-bind="ui.transition">
|
||||||
<div>
|
<div>
|
||||||
<div v-if="popper.arrow" data-popper-arrow :class="Object.values(ui.arrow)" />
|
<div v-if="popper.arrow" data-popper-arrow :class="Object.values(ui.arrow)" />
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { computed, ref, toRef, defineComponent } from 'vue'
|
import { computed, ref, toRef, defineComponent, useSlots } from 'vue'
|
||||||
import type { PropType } from 'vue'
|
import type { PropType } from 'vue'
|
||||||
import { defu } from 'defu'
|
import { defu } from 'defu'
|
||||||
import UKbd from '../elements/Kbd.vue'
|
import UKbd from '../elements/Kbd.vue'
|
||||||
@@ -40,6 +40,8 @@ import type { DeepPartial, PopperOptions, Strategy } from '../../types/index'
|
|||||||
// @ts-expect-error
|
// @ts-expect-error
|
||||||
import appConfig from '#build/app.config'
|
import appConfig from '#build/app.config'
|
||||||
import { tooltip } from '#ui/ui.config'
|
import { tooltip } from '#ui/ui.config'
|
||||||
|
// import useslots
|
||||||
|
|
||||||
|
|
||||||
const config = mergeConfig<typeof tooltip>(appConfig.ui.strategy, appConfig.ui.tooltip, tooltip)
|
const config = mergeConfig<typeof tooltip>(appConfig.ui.strategy, appConfig.ui.tooltip, tooltip)
|
||||||
|
|
||||||
@@ -94,6 +96,8 @@ export default defineComponent({
|
|||||||
let openTimeout: NodeJS.Timeout | null = null
|
let openTimeout: NodeJS.Timeout | null = null
|
||||||
let closeTimeout: NodeJS.Timeout | null = null
|
let closeTimeout: NodeJS.Timeout | null = null
|
||||||
|
|
||||||
|
const isVisible = computed<boolean>(() => !!(useSlots().text || props.text))
|
||||||
|
|
||||||
// Methods
|
// Methods
|
||||||
|
|
||||||
function onMouseEnter () {
|
function onMouseEnter () {
|
||||||
@@ -138,7 +142,8 @@ export default defineComponent({
|
|||||||
container,
|
container,
|
||||||
open,
|
open,
|
||||||
onMouseEnter,
|
onMouseEnter,
|
||||||
onMouseLeave
|
onMouseLeave,
|
||||||
|
isVisible
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user