Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
dist/
.husky/
.idea/
build/
coverage/
node_modules/
11 changes: 11 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@
"parser": "babylon"
}
},
{
"files": "./**/*.svelte",
"options": {
"svelteBracketNewLine": false,
"svelteAllowShorthand": false,
"svelteSortOrder" : "options-scripts-styles-markup",
"plugins": [
"prettier-plugin-svelte"
]
}
},
{
"files": "./**/*.json",
"options": {
Expand Down
24 changes: 15 additions & 9 deletions src/Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,14 @@ class Tooltip {
await this.#transitionTooltip(1)
}

this.#target.appendChild(this.#tooltip)
this.#observer.wait(this.#tooltip, null, { events: [DOMObserver.EXIST, DOMObserver.ADD] }).then(() => {
this.#observer.wait(this.#tooltip, null, { events: [DOMObserver.ADD] }).then(({ node }) => {
this.#positionTooltip()
})
this.#target.appendChild(this.#tooltip)

if (this.#contentActions) {
Object.entries(this.#contentActions).forEach(
([key, { eventType, callback, callbackParams, closeOnCallback }]) => {
([key, { eventType, callback, callbackParams, closeOnCallback }], i) => {
const trigger = key === '*' ? this.#tooltip : this.#tooltip.querySelector(key)
if (trigger) {
const listener = (event) => {
Expand All @@ -289,6 +289,8 @@ class Tooltip {
}
trigger.addEventListener(eventType, listener)
this.#events.push({ trigger, eventType, listener })

if (i === 0) trigger.focus()
}
}
)
Expand Down Expand Up @@ -352,14 +354,18 @@ class Tooltip {
})
}

async #onTargetEnter() {
await this.#waitForDelay(this.#enterDelay)
await this.#appendTooltipToTarget()
async #onTargetEnter(e) {
if (this.#target === e.target) {
await this.#waitForDelay(this.#enterDelay)
await this.#appendTooltipToTarget()
}
}

async #onTargetLeave() {
await this.#waitForDelay(this.#leaveDelay)
await this.#removeTooltipFromTarget()
async #onTargetLeave(e) {
if (this.#target === e.target || !this.#target.contains(e.target)) {
await this.#waitForDelay(this.#leaveDelay)
await this.#removeTooltipFromTarget()
}
}

async #onWindowChange(e) {
Expand Down