Skip to content

Commit

Permalink
Merge branch 'release/v0.25.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
holtwick committed Dec 27, 2024
2 parents 95cc373 + 5b00150 commit ce910d4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
13 changes: 13 additions & 0 deletions lib/float/oui-tooltip-activator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const active = ref<boolean>(false)
const placement = ref<Placement>('top')
const reference = ref()
const text = ref('')
const style = ref({})
const titleAsTooltip = props.titleAsTooltip === true
Expand Down Expand Up @@ -79,6 +80,17 @@ if (ok) {
text.value = tooltip?.toString()?.trim() || ''
placement.value = el.getAttribute('tooltip-placement') || 'top' as any
active.value = true
// Z-Index: Make sure to have a higher z-index than the current element
let zel: any = el
while (zel instanceof Element && zel.tagName !== 'BODY') {
const zIndex = window.getComputedStyle(zel).zIndex
if (zIndex && zIndex !== 'auto') {
style.value = { zIndex: zIndex + 1 }
break
}
zel = zel.parentElement
}
return
}
el = el.parentElement
Expand Down Expand Up @@ -122,6 +134,7 @@ if (ok) {
class="oui-float oui-tooltip _tooltip"
transition="oui-float-transition"
:placement="placement"
:style="active ? style : {}"
>
{{ text }}
</OuiFloat>
Expand Down
1 change: 1 addition & 0 deletions lib/modal/oui-dialog-edit.example.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const disabled = computed(() => isEmpty(item.title) || snapshot() === reference)
title="Person"
:update="update"
:disabled="disabled"
close
@save="doSave"
@cancel="done"
@delete="done"
Expand Down
2 changes: 1 addition & 1 deletion lib/modal/oui-dialog.example.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async function doCancel() {
</script>

<template>
<OuiModal v-model="active" title="Example Dialog Mode" @close="doCancel">
<OuiModal v-model="active" title="Example Dialog Mode" close @close="doCancel">
<OuiText>
<b>Lorem ipsum</b>, dolor sit amet consectetur adipisicing elit. Deserunt delectus illum tenetur sint atque unde, voluptates facere assumenda in repellendus! Cupiditate laborum recusandae facere dicta reiciendis odio enim dolorum illum!
<OuiInput v-model="item.name" title="Your Name" required class="_focus" />
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "oui-kit",
"type": "module",
"version": "0.25.4",
"version": "0.25.5",
"author": {
"email": "[email protected]",
"name": "Dirk Holtwick",
Expand Down

0 comments on commit ce910d4

Please sign in to comment.