Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

πŸ‘” Removes dep for vue-tooltip, and wrote our own directive instead

Alicia Sykesdef411a75ff5
diff --git a/package.json b/package.json
index e8b419d1..eb88b76c 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,6 @@
"entities": "^7.0.1",
"express": "^4.21.0",
"express-basic-auth": "^1.2.1",
- "floating-vue": "^5.2.2",
"frappe-charts": "^1.6.2",
"js-yaml": "^4.1.0",
"keycloak-js": "^20.0.3",
diff --git a/src/components/Configuration/JsonEditor.vue b/src/components/Configuration/JsonEditor.vue
index 066d1c18..02ad36e7 100644
--- a/src/components/Configuration/JsonEditor.vue
+++ b/src/components/Configuration/JsonEditor.vue
@@ -26,7 +26,7 @@
</Button>
</div>
<!-- List validation warnings -->
- <p class="errors">
+ <div class="errors">
<ul>
<li v-for="(error, index) in errorMessages" :key="index" :class="`type-${error.type}`">
{{error.msg}}
@@ -35,7 +35,7 @@
{{ $t('config-editor.valid-label') }}
</li>
</ul>
- </p>
+ </div>
<!-- Information notes -->
<p v-if="saveSuccess !== undefined"
:class="`response-output status-${saveSuccess ? 'success' : 'fail'}`">
diff --git a/src/components/FormElements/Button.vue b/src/components/FormElements/Button.vue
index 11a4ba29..3924e579 100644
--- a/src/components/FormElements/Button.vue
+++ b/src/components/FormElements/Button.vue
@@ -29,9 +29,7 @@ export default {
/* If tooltip prop specified, then return config for v-tooltip */
hoverText() {
const content = this.tooltip;
- const trigger = 'hover focus';
- const delay = { show: 350, hide: 100 };
- return (content) ? { content, trigger, delay } : undefined;
+ return content ? { content, delay: { show: 350, hide: 100 } } : undefined;
},
},
};
diff --git a/src/components/InteractiveEditor/EditModeSaveMenu.vue b/src/components/InteractiveEditor/EditModeSaveMenu.vue
index 11cc9521..6fc9d281 100644
--- a/src/components/InteractiveEditor/EditModeSaveMenu.vue
+++ b/src/components/InteractiveEditor/EditModeSaveMenu.vue
@@ -159,7 +159,7 @@ export default {
this.$store.commit(StoreKeys.SET_MODAL_OPEN, true);
},
tooltip(content) {
- return { content, trigger: 'hover focus', delay: 250 };
+ return { content };
},
showToast(message, success) {
this.$toasted.show(message, { className: `toast-${success ? 'success' : 'error'}` });
diff --git a/src/components/InteractiveEditor/ExportConfigMenu.vue b/src/components/InteractiveEditor/ExportConfigMenu.vue
index 03f95e09..9365c5df 100644
--- a/src/components/InteractiveEditor/ExportConfigMenu.vue
+++ b/src/components/InteractiveEditor/ExportConfigMenu.vue
@@ -107,7 +107,7 @@ export default {
},
tooltip(content) {
return {
- content, trigger: 'hover focus', delay: 250, classes: 'in-modal-tt',
+ content, popperClass: 'in-modal-tt',
};
},
},
diff --git a/src/components/LinkItems/Collapsable.vue b/src/components/LinkItems/Collapsable.vue
index c97dfe1e..9dce78e8 100644
--- a/src/components/LinkItems/Collapsable.vue
+++ b/src/components/LinkItems/Collapsable.vue
@@ -155,7 +155,7 @@ export default {
},
editTooltip() {
const content = this.$t('interactive-editor.edit-section.edit-tooltip');
- return { content, trigger: 'hover focus', delay: { show: 100, hide: 0 } };
+ return { content, delay: { show: 100, hide: 0 } };
},
},
};
diff --git a/src/components/LinkItems/Item.vue b/src/components/LinkItems/Item.vue
index ee14fd41..0b553bd9 100644
--- a/src/components/LinkItems/Item.vue
+++ b/src/components/LinkItems/Item.vue
@@ -160,12 +160,10 @@ export default {
const editText = this.$t('interactive-editor.edit-section.edit-tooltip');
return {
content: (this.isEditMode ? editText : tooltipText),
- trigger: 'hover focus',
- hideOnTargetClick: true,
html: true,
placement: this.statusResponse ? 'left' : 'auto',
delay: { show: 600, hide: 200 },
- classes: `item-description-tooltip tooltip-is-${this.size}`,
+ popperClass: `item-description-tooltip tooltip-is-${this.size}`,
};
},
openItemSettings() {
diff --git a/src/components/LinkItems/ItemOpenMethodIcon.vue b/src/components/LinkItems/ItemOpenMethodIcon.vue
index 83250b50..a3cbb2a1 100644
--- a/src/components/LinkItems/ItemOpenMethodIcon.vue
+++ b/src/components/LinkItems/ItemOpenMethodIcon.vue
@@ -36,7 +36,7 @@ export default {
props: {
openingMethod: String, // newtab | sametab | parent | top | modal | workspace | newwindow
isSmall: Boolean, // If true, will apply small class
- position: String, // Position classes: top, bottom, left, right
+ position: String, // Position popperClass: top, bottom, left, right
isTransparent: Boolean, // If true, will apply opacity
hotkey: Number, // Optional hotkey to also display
},
diff --git a/src/components/LinkItems/StatusIndicator.vue b/src/components/LinkItems/StatusIndicator.vue
index c4d6b2d6..1beb60aa 100644
--- a/src/components/LinkItems/StatusIndicator.vue
+++ b/src/components/LinkItems/StatusIndicator.vue
@@ -2,7 +2,7 @@
<div class="indicator"
v-tooltip="{
content: statusText || otherStatusText,
- classes: ['status-tooltip', `tip-${color()}`],
+ popperClass: ['status-tooltip', `tip-${color()}`],
delay: { show: 0, hide: 150 }
}">
<div :class="`dot dot-${color()}`">
diff --git a/src/components/MinimalView/MinimalHeading.vue b/src/components/MinimalView/MinimalHeading.vue
index 0a965bb3..210c5ba7 100644
--- a/src/components/MinimalView/MinimalHeading.vue
+++ b/src/components/MinimalView/MinimalHeading.vue
@@ -26,7 +26,7 @@ export default {
},
tooltip() {
return this.hideTitleText
- ? { content: this.title, trigger: 'hover focus', delay: 250 } : null;
+ ? { content: this.title, } : null;
},
},
};
diff --git a/src/components/PageStrcture/PageTitle.vue b/src/components/PageStrcture/PageTitle.vue
index 4c8f3d66..eebaef6d 100644
--- a/src/components/PageStrcture/PageTitle.vue
+++ b/src/components/PageStrcture/PageTitle.vue
@@ -42,7 +42,7 @@ export default {
/* Edit button tooltip */
tooltip() {
const content = this.$t('interactive-editor.menu.edit-page-info-btn');
- return { content, trigger: 'hover focus', delay: 250 };
+ return { content };
},
},
};
diff --git a/src/components/Settings/AuthButtons.vue b/src/components/Settings/AuthButtons.vue
index 37a9f166..93dddf05 100644
--- a/src/components/Settings/AuthButtons.vue
+++ b/src/components/Settings/AuthButtons.vue
@@ -82,7 +82,7 @@ export default {
router.push({ path: '/login' });
},
tooltip(content) {
- return { content, trigger: 'hover focus', delay: 250 };
+ return { content };
},
makeUserGreeting() {
if (this.userType === userStateEnum.loggedIn
diff --git a/src/components/Settings/ConfigLauncher.vue b/src/components/Settings/ConfigLauncher.vue
index 7591d704..7db56657 100644
--- a/src/components/Settings/ConfigLauncher.vue
+++ b/src/components/Settings/ConfigLauncher.vue
@@ -100,7 +100,7 @@ export default {
return conf;
},
tooltip(content) {
- return { content, trigger: 'hover focus', delay: 250 };
+ return { content };
},
openChangeViewMenu() {
this.viewSwitcherOpen = !this.viewSwitcherOpen;
diff --git a/src/components/Settings/ItemSizeSelector.vue b/src/components/Settings/ItemSizeSelector.vue
index 9ba14906..efe7d5bf 100644
--- a/src/components/Settings/ItemSizeSelector.vue
+++ b/src/components/Settings/ItemSizeSelector.vue
@@ -52,7 +52,7 @@ export default {
this.$store.commit(StoreKeys.SET_ITEM_SIZE, iconSize);
},
tooltip(content) {
- return { content, trigger: 'hover focus', delay: 250 };
+ return { content };
},
},
};
diff --git a/src/components/Settings/LayoutSelector.vue b/src/components/Settings/LayoutSelector.vue
index fbb8c001..8f7366cf 100644
--- a/src/components/Settings/LayoutSelector.vue
+++ b/src/components/Settings/LayoutSelector.vue
@@ -50,7 +50,7 @@ export default {
this.$store.commit(StoreKeys.SET_ITEM_LAYOUT, layout);
},
tooltip(content) {
- return { content, trigger: 'hover focus', delay: 250 };
+ return { content };
},
},
};
diff --git a/src/components/Widgets/CryptoWatchList.vue b/src/components/Widgets/CryptoWatchList.vue
index ef2be634..fc975298 100644
--- a/src/components/Widgets/CryptoWatchList.vue
+++ b/src/components/Widgets/CryptoWatchList.vue
@@ -124,7 +124,7 @@ export default {
+ `<br>All-time-high of <b>${info.allTimeHigh}</b> `
+ `at <b>${timestampToDate(info.allTimeHighDate)}</b>`;
return {
- content, html: true, trigger: 'hover focus', delay: 250,
+ content, html: true,
};
},
},
diff --git a/src/components/Widgets/DroneCi.vue b/src/components/Widgets/DroneCi.vue
index dfe6e3ef..c115a3c2 100644
--- a/src/components/Widgets/DroneCi.vue
+++ b/src/components/Widgets/DroneCi.vue
@@ -149,7 +149,7 @@ export default {
+ `<b>Repo:</b> ${build.slug}<br>`
+ `<b>Branch:</b> ${build.build.target}<br>`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'build-info-tt',
+ content, html: true, popperClass: 'build-info-tt',
};
},
formatPrId(link) {
diff --git a/src/components/Widgets/Flights.vue b/src/components/Widgets/Flights.vue
index 7afeec70..b00e2abc 100644
--- a/src/components/Widgets/Flights.vue
+++ b/src/components/Widgets/Flights.vue
@@ -148,7 +148,7 @@ export default {
tip(flight) {
const content = `${flight.aircraft} | ${flight.airline}`;
return {
- content, trigger: 'hover focus', delay: 250, classes: 'in-modal-tt',
+ content, popperClass: 'in-modal-tt',
};
},
},
diff --git a/src/components/Widgets/HealthChecks.vue b/src/components/Widgets/HealthChecks.vue
index 36595ec3..cc1aa62a 100644
--- a/src/components/Widgets/HealthChecks.vue
+++ b/src/components/Widgets/HealthChecks.vue
@@ -99,7 +99,7 @@ export default {
+ `<b>Last Ping:</b> ${timestampToDateTime(lastPing)}<br>`
+ `<b>Next Ping:</b>${timestampToDateTime(nextPing)}`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'ping-times-tt',
+ content, html: true, popperClass: 'ping-times-tt',
};
},
},
diff --git a/src/components/Widgets/Mvg.vue b/src/components/Widgets/Mvg.vue
index 4e610ef7..5123a0e2 100644
--- a/src/components/Widgets/Mvg.vue
+++ b/src/components/Widgets/Mvg.vue
@@ -171,7 +171,7 @@ export default {
departureDetails += 'Live!<br />';
}
return {
- content: departureDetails, html: true, trigger: 'hover', delay: 250, classes: 'mvg-info-tt',
+ content: departureDetails, html: true, triggers: ['hover'], popperClass: 'mvg-info-tt',
};
},
mvgTooltipDestination(data) {
@@ -183,7 +183,7 @@ export default {
departureDetails += '<b>Cancelled!</b><br />';
}
return {
- content: departureDetails, html: true, trigger: 'hover', delay: 250, classes: 'mvg-info-tt',
+ content: departureDetails, html: true, triggers: ['hover'], popperClass: 'mvg-info-tt',
};
},
},
diff --git a/src/components/Widgets/MvgConnection.vue b/src/components/Widgets/MvgConnection.vue
index 2a37b8c9..663583f6 100644
--- a/src/components/Widgets/MvgConnection.vue
+++ b/src/components/Widgets/MvgConnection.vue
@@ -188,7 +188,7 @@ export default {
addStep(part.to);
});
return {
- content: connectionDetails, html: true, trigger: 'hover', delay: 250, classes: 'mvg-connection-detail',
+ content: connectionDetails, html: true, triggers: ['hover'], popperClass: 'mvg-connection-detail',
};
},
},
diff --git a/src/components/Widgets/NextcloudNotifications.vue b/src/components/Widgets/NextcloudNotifications.vue
index 62802f2e..2f143fc7 100644
--- a/src/components/Widgets/NextcloudNotifications.vue
+++ b/src/components/Widgets/NextcloudNotifications.vue
@@ -125,13 +125,13 @@ export default {
subjectTooltip(notification) {
const content = notification.message;
return {
- content, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, popperClass: 'nc-tooltip',
};
},
dateTooltip(notification) {
const content = new Date(Date.parse(notification.datetime)).toLocaleString();
return {
- content, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, popperClass: 'nc-tooltip',
};
},
},
diff --git a/src/components/Widgets/NextcloudPhpOpcache.vue b/src/components/Widgets/NextcloudPhpOpcache.vue
index f361d7b0..d1802801 100644
--- a/src/components/Widgets/NextcloudPhpOpcache.vue
+++ b/src/components/Widgets/NextcloudPhpOpcache.vue
@@ -156,7 +156,7 @@ export default {
);
}
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
opcacheStatsTooltip() {
@@ -166,7 +166,7 @@ export default {
+ `${parseFloat(this.opcache_stats.num_cached_keys).toLocaleString()} ${this.tt('keys')}<br>`
+ `${parseFloat(this.opcache_stats.max_cached_keys).toLocaleString()} ${this.tt('max-keys')}<br>`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
opcacheMemoryUsageTooltip() {
@@ -177,7 +177,7 @@ export default {
+ `${this.convertBytes(this.opcache.memory_usage.wasted_memory)} (`
+ `${parseFloat(this.opcache.memory_usage.current_wasted_percentage).toFixed(1)}%) ${this.tt('wasted')}`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
opcacheInternedStringsTooltip() {
@@ -188,7 +188,7 @@ export default {
+ `${parseFloat(this.opcache_interned.number_of_strings).toLocaleString()}`
+ ' strings';
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
},
diff --git a/src/components/Widgets/NextcloudStats.vue b/src/components/Widgets/NextcloudStats.vue
index 12e5d1fe..54d3eb0f 100644
--- a/src/components/Widgets/NextcloudStats.vue
+++ b/src/components/Widgets/NextcloudStats.vue
@@ -143,7 +143,7 @@ export default {
+ `${parseFloat(this.activeUsers.last1hour).toLocaleString()}`
+ ` ${this.tt('last-hour')}<br>`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
appUpdatesTooltip() {
@@ -153,7 +153,7 @@ export default {
});
content += '</ul>';
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
storagesTooltip() {
@@ -163,7 +163,7 @@ export default {
+ `${parseFloat(this.storage.num_storages_other).toLocaleString()} ${this.tt('other')}</li></ul>`
+ `${parseFloat(this.storage.num_files).toLocaleString()} ${this.tt('total-files')}`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
sharesTooltip() {
@@ -178,7 +178,7 @@ export default {
+ `${parseFloat(this.shares.num_fed_shares_sent).toLocaleString()} ${this.tt('sent')}</li><li>`
+ `${parseFloat(this.shares.num_fed_shares_received).toLocaleString()} ${this.tt('received')}</li></ul>`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
},
diff --git a/src/components/Widgets/NextcloudUser.vue b/src/components/Widgets/NextcloudUser.vue
index 1d84f825..b45975b3 100644
--- a/src/components/Widgets/NextcloudUser.vue
+++ b/src/components/Widgets/NextcloudUser.vue
@@ -126,13 +126,13 @@ export default {
+ `${this.convertBytes(this.user.quota.free)} ${this.tt('free')}<br>`
+ `${this.convertBytes(this.user.quota.total)} ${this.tt('total')}`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
lastLoginTooltip() {
const content = new Date(this.user.lastLogin).toLocaleString();
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
},
diff --git a/src/components/Widgets/NextcloudUserStatus.vue b/src/components/Widgets/NextcloudUserStatus.vue
index 37f8ae7c..68de11df 100644
--- a/src/components/Widgets/NextcloudUserStatus.vue
+++ b/src/components/Widgets/NextcloudUserStatus.vue
@@ -136,7 +136,7 @@ export default {
const content = clearAtTime ? `${this.tt('until')}`
+ ` ${new Date(clearAtTime * 1000).toLocaleString()}` : '';
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'nc-tooltip',
+ content, html: true, popperClass: 'nc-tooltip',
};
},
},
diff --git a/src/components/Widgets/PublicHolidays.vue b/src/components/Widgets/PublicHolidays.vue
index 8212fc72..009f728a 100644
--- a/src/components/Widgets/PublicHolidays.vue
+++ b/src/components/Widgets/PublicHolidays.vue
@@ -106,7 +106,7 @@ export default {
const observed = holiday.observed ? `<br><b>Observed On</b>: ${holiday.observed}` : '';
const content = `<b>Type</b>: ${holiday.type}${observed}`;
return {
- content, trigger: 'hover focus', html: true, delay: 250, classes: 'in-modal-tt',
+ content, html: true, popperClass: 'in-modal-tt',
};
},
},
diff --git a/src/components/Widgets/SportsScores.vue b/src/components/Widgets/SportsScores.vue
index d2068553..2b2a63f3 100644
--- a/src/components/Widgets/SportsScores.vue
+++ b/src/components/Widgets/SportsScores.vue
@@ -213,7 +213,7 @@ export default {
},
tooltip(content) {
return {
- content, html: true, trigger: 'hover focus', delay: 250,
+ content, html: true,
};
},
},
diff --git a/src/components/Widgets/StatPing.vue b/src/components/Widgets/StatPing.vue
index f507e8c1..ada2bb6f 100644
--- a/src/components/Widgets/StatPing.vue
+++ b/src/components/Widgets/StatPing.vue
@@ -101,7 +101,7 @@ export default {
+ `<b>Last Success:</b> ${lastSuccess}<br>`
+ `<b>Last Failure:</b> ${lastFailure}`;
return {
- content, html: true, trigger: 'hover focus', delay: 250, classes: 'ping-times-tt',
+ content, html: true, popperClass: 'ping-times-tt',
};
},
processData(data) {
diff --git a/src/components/Widgets/WeatherForecast.vue b/src/components/Widgets/WeatherForecast.vue
index 82a9e707..7e8bee36 100644
--- a/src/components/Widgets/WeatherForecast.vue
+++ b/src/components/Widgets/WeatherForecast.vue
@@ -142,7 +142,7 @@ export default {
/* Display weather description and Click for more note on hover */
tooltip(text) {
const content = `${text ? capitalize(text) : ''}\nClick for more Info`;
- return { content, trigger: 'hover focus', delay: 250 };
+ return { content };
},
/* Validate input props, and print warning if incorrect */
checkProps() {
diff --git a/src/components/Widgets/WidgetBase.vue b/src/components/Widgets/WidgetBase.vue
index 2e4f453a..68d761dd 100644
--- a/src/components/Widgets/WidgetBase.vue
+++ b/src/components/Widgets/WidgetBase.vue
@@ -190,7 +190,7 @@ export default {
return null;
}
// eslint-disable-next-line prefer-template
- return () => import('@/components/Widgets/' + type + '.vue').catch(() => import('@/components/Widgets/Blank.vue'));
+ return () => import(/* @vite-ignore */ '@/components/Widgets/' + type + '.vue').catch(() => import('@/components/Widgets/Blank.vue'));
},
},
methods: {
diff --git a/src/components/Widgets/XkcdComic.vue b/src/components/Widgets/XkcdComic.vue
index 22bcc10f..91a0d215 100644
--- a/src/components/Widgets/XkcdComic.vue
+++ b/src/components/Widgets/XkcdComic.vue
@@ -67,7 +67,7 @@ export default {
toolTip(alt) {
const content = alt;
return {
- content, html: false, trigger: 'hover focus', delay: 250, classes: 'xkcd-alt-tt',
+ content, html: false, popperClass: 'xkcd-alt-tt',
};
},
},
diff --git a/src/components/Workspace/SideBarItem.vue b/src/components/Workspace/SideBarItem.vue
index 90319afe..dfc85ea1 100644
--- a/src/components/Workspace/SideBarItem.vue
+++ b/src/components/Workspace/SideBarItem.vue
@@ -32,7 +32,7 @@ export default {
tooltip: {
disabled: !this.title,
content: this.title,
- trigger: 'hover focus',
+
placement: 'bottom-end',
},
};
diff --git a/src/directives/Tooltip.js b/src/directives/Tooltip.js
new file mode 100644
index 00000000..8332f910
--- /dev/null
+++ b/src/directives/Tooltip.js
@@ -0,0 +1,337 @@
+/**
+ * Custom v-tooltip directive for Vue 3.
+ * Lightweight replacement for floating-vue β€” zero external dependencies.
+ * Supports string or object bindings, HTML content (sanitized via DOMPurify),
+ * auto-positioning with viewport flip/shift, accessible keyboard + screen reader support,
+ * and theme-aware styling via CSS variables.
+ */
+import DOMPurify from 'dompurify';
+
+/* ── Defaults ── */
+const DEFAULTS = {
+ triggers: ['hover', 'focus'],
+ placement: 'auto',
+ delay: { show: 250, hide: 0 },
+};
+const GAP = 8;
+const ARROW_SIZE = 6;
+const TRANSITION_MS = 150;
+
+/* ── Style injection (once) ── */
+let stylesInjected = false;
+function injectStyles() {
+ if (stylesInjected) return;
+ stylesInjected = true;
+ const style = document.createElement('style');
+ style.id = 'dashy-tooltip-styles';
+ style.textContent = `
+.dashy-tooltip {
+ position: absolute;
+ top: 0; left: 0;
+ z-index: 5;
+ max-width: var(--tooltip-width, 250px);
+ pointer-events: none;
+ visibility: hidden;
+ opacity: 0;
+ transition: opacity ${TRANSITION_MS}ms, visibility ${TRANSITION_MS}ms;
+ font-size: 0.8rem;
+}
+.dashy-tooltip.is-visible {
+ visibility: visible;
+ opacity: 1;
+}
+.dashy-tooltip .tooltip-inner {
+ background: var(--description-tooltip-background, #1a1a2e);
+ border: 1px solid var(--description-tooltip-color, #7efff5);
+ border-radius: var(--curve-factor-small, 2px);
+ color: var(--description-tooltip-color, #7efff5);
+ padding: var(--tooltip-padding, 0.2rem);
+ overflow: hidden;
+ word-wrap: break-word;
+}
+.dashy-tooltip .tooltip-arrow {
+ position: absolute;
+ width: 0; height: 0;
+ border-style: solid;
+ border-color: transparent;
+ border-width: ${ARROW_SIZE}px;
+}
+.dashy-tooltip[data-placement^="top"] .tooltip-arrow {
+ bottom: -${ARROW_SIZE}px;
+ border-bottom-width: 0;
+ border-top-color: var(--description-tooltip-color, #7efff5);
+}
+.dashy-tooltip[data-placement^="bottom"] .tooltip-arrow {
+ top: -${ARROW_SIZE}px;
+ border-top-width: 0;
+ border-bottom-color: var(--description-tooltip-color, #7efff5);
+}
+.dashy-tooltip[data-placement^="left"] .tooltip-arrow {
+ right: -${ARROW_SIZE}px;
+ border-right-width: 0;
+ border-left-color: var(--description-tooltip-color, #7efff5);
+}
+.dashy-tooltip[data-placement^="right"] .tooltip-arrow {
+ left: -${ARROW_SIZE}px;
+ border-left-width: 0;
+ border-right-color: var(--description-tooltip-color, #7efff5);
+}
+.dashy-tooltip.in-modal-tt { z-index: 999; }
+@media (prefers-reduced-motion: reduce) {
+ .dashy-tooltip { transition: none; }
+}
+ `;
+ document.head.appendChild(style);
+}
+
+/* ── Positioning ── */
+const PLACEMENTS = ['top', 'bottom', 'right', 'left'];
+const FLIP = { top: 'bottom', bottom: 'top', left: 'right', right: 'left' };
+
+function clamp(val, min, max) { return Math.max(min, Math.min(max, val)); }
+
+function computeCoords(target, tip, placement, sx, sy) {
+ const cx = target.left + target.width / 2 + sx;
+ const cy = target.top + target.height / 2 + sy;
+ switch (placement) {
+ case 'top': return { left: cx - tip.width / 2, top: target.top + sy - tip.height - GAP };
+ case 'bottom': return { left: cx - tip.width / 2, top: target.bottom + sy + GAP };
+ case 'bottom-end': return { left: target.right + sx - tip.width, top: target.bottom + sy + GAP };
+ case 'left': return { left: target.left + sx - tip.width - GAP, top: cy - tip.height / 2 };
+ case 'right': return { left: target.right + sx + GAP, top: cy - tip.height / 2 };
+ default: return { left: cx - tip.width / 2, top: target.top + sy - tip.height - GAP };
+ }
+}
+
+function fitsViewport(target, tip, vw, vh, placement) {
+ switch (placement) {
+ case 'top': return target.top - tip.height - GAP >= 0;
+ case 'bottom': return target.bottom + tip.height + GAP <= vh;
+ case 'left': return target.left - tip.width - GAP >= 0;
+ case 'right': return target.right + tip.width + GAP <= vw;
+ default: return true;
+ }
+}
+
+function positionTooltip(targetEl, tipEl, requested) {
+ const target = targetEl.getBoundingClientRect();
+ const tipEl2 = tipEl; // keep ref stable
+ tipEl2.style.visibility = 'hidden';
+ tipEl2.style.display = 'block';
+ const tip = tipEl2.getBoundingClientRect();
+ const sx = window.scrollX;
+ const sy = window.scrollY;
+ const vw = document.documentElement.clientWidth;
+ const vh = document.documentElement.clientHeight;
+
+ let placement = requested;
+ if (placement === 'auto') {
+ placement = PLACEMENTS.find(p => fitsViewport(target, tip, vw, vh, p)) || 'top';
+ } else if (!placement.includes('-') && !fitsViewport(target, tip, vw, vh, placement)) {
+ placement = FLIP[placement] || placement;
+ }
+
+ const coords = computeCoords(target, tip, placement, sx, sy);
+ coords.left = clamp(coords.left, sx + GAP, sx + vw - tip.width - GAP);
+ coords.top = clamp(coords.top, sy + GAP, sy + vh - tip.height - GAP);
+
+ tipEl2.style.left = `${coords.left}px`;
+ tipEl2.style.top = `${coords.top}px`;
+ tipEl2.setAttribute('data-placement', placement);
+
+ // Arrow: point at target center, clamped within tooltip
+ const arrow = tipEl2.querySelector('.tooltip-arrow');
+ if (!arrow) return;
+ if (placement === 'top' || placement === 'bottom' || placement === 'bottom-end') {
+ const targetCx = target.left + target.width / 2 + sx;
+ const arrowLeft = clamp(targetCx - coords.left - ARROW_SIZE, ARROW_SIZE, tip.width - ARROW_SIZE * 3);
+ arrow.style.left = `${arrowLeft}px`;
+ arrow.style.top = '';
+ } else {
+ const targetCy = target.top + target.height / 2 + sy;
+ const arrowTop = clamp(targetCy - coords.top - ARROW_SIZE, ARROW_SIZE, tip.height - ARROW_SIZE * 3);
+ arrow.style.top = `${arrowTop}px`;
+ arrow.style.left = '';
+ }
+
+ tipEl2.style.visibility = '';
+ tipEl2.style.display = '';
+}
+
+/* ── Options normalizer ── */
+let idCounter = 0;
+
+function normalize(value) {
+ if (!value && value !== 0) return null;
+ if (typeof value === 'string' || typeof value === 'number') return { content: String(value) };
+ if (typeof value === 'object' && value !== null) {
+ if (value.disabled || !value.content) return null;
+ return value;
+ }
+ return null;
+}
+
+function resolveDelay(raw) {
+ if (raw == null) return DEFAULTS.delay;
+ if (typeof raw === 'number') return { show: raw, hide: 0 };
+ return { show: raw.show ?? DEFAULTS.delay.show, hide: raw.hide ?? DEFAULTS.delay.hide };
+}
+
+/* ── Show / Hide ── */
+function show(el) {
+ const state = el._tooltip;
+ if (!state || state.visible) return;
+ const opts = state.options;
+ if (!opts) return;
+ clearTimeout(state.hideTimer);
+
+ state.showTimer = setTimeout(() => {
+ injectStyles();
+
+ const tip = document.createElement('div');
+ tip.className = 'dashy-tooltip tooltip';
+ tip.id = state.id;
+ tip.setAttribute('role', 'tooltip');
+
+ // Apply popperClass
+ if (opts.popperClass) {
+ const classes = Array.isArray(opts.popperClass) ? opts.popperClass : opts.popperClass.split(' ');
+ classes.forEach(c => { if (c) tip.classList.add(c); });
+ }
+
+ const inner = document.createElement('div');
+ inner.className = 'tooltip-inner';
+ if (opts.html) {
+ inner.innerHTML = DOMPurify.sanitize(opts.content);
+ } else {
+ inner.textContent = opts.content;
+ }
+
+ const arrow = document.createElement('div');
+ arrow.className = 'tooltip-arrow';
+
+ tip.appendChild(inner);
+ tip.appendChild(arrow);
+ document.body.appendChild(tip);
+ state.tooltipEl = tip;
+
+ positionTooltip(el, tip, opts.placement || DEFAULTS.placement);
+
+ requestAnimationFrame(() => { tip.classList.add('is-visible'); });
+ state.visible = true;
+
+ // Reposition on scroll/resize
+ state.reposition = () => {
+ if (state.tooltipEl) positionTooltip(el, state.tooltipEl, opts.placement || DEFAULTS.placement);
+ };
+ window.addEventListener('scroll', state.reposition, { passive: true, capture: true });
+ window.addEventListener('resize', state.reposition, { passive: true });
+ }, resolveDelay(opts.delay).show);
+}
+
+function hide(el) {
+ const state = el._tooltip;
+ if (!state) return;
+ clearTimeout(state.showTimer);
+
+ const doHide = () => {
+ if (state.tooltipEl) {
+ state.tooltipEl.classList.remove('is-visible');
+ const tipEl = state.tooltipEl;
+ setTimeout(() => { tipEl.remove(); }, TRANSITION_MS);
+ state.tooltipEl = null;
+ }
+ state.visible = false;
+ if (state.reposition) {
+ window.removeEventListener('scroll', state.reposition, { capture: true });
+ window.removeEventListener('resize', state.reposition);
+ state.reposition = null;
+ }
+ };
+
+ const delay = resolveDelay(state.options?.delay).hide;
+ if (delay > 0) {
+ state.hideTimer = setTimeout(doHide, delay);
+ } else {
+ doHide();
+ }
+}
+
+/* ── Event binding ── */
+function bind(el) {
+ const state = el._tooltip;
+ const triggers = state.options?.triggers || DEFAULTS.triggers;
+
+ state.onShow = () => show(el);
+ state.onHide = () => hide(el);
+
+ if (triggers.includes('hover')) {
+ el.addEventListener('mouseenter', state.onShow);
+ el.addEventListener('mouseleave', state.onHide);
+ }
+ if (triggers.includes('focus')) {
+ el.addEventListener('focusin', state.onShow);
+ el.addEventListener('focusout', state.onHide);
+ }
+}
+
+function unbind(el) {
+ const state = el._tooltip;
+ if (!state || !state.onShow) return;
+ el.removeEventListener('mouseenter', state.onShow);
+ el.removeEventListener('mouseleave', state.onHide);
+ el.removeEventListener('focusin', state.onShow);
+ el.removeEventListener('focusout', state.onHide);
+}
+
+/* ── Directive hooks ── */
+export default {
+ mounted(el, binding) {
+ const opts = normalize(binding.value);
+ const id = `dashy-tt-${idCounter++}`;
+ el._tooltip = { options: opts, id, tooltipEl: null, visible: false };
+ if (!opts) return;
+ el.setAttribute('aria-describedby', id);
+ bind(el);
+ },
+
+ updated(el, binding) {
+ const opts = normalize(binding.value);
+ const state = el._tooltip;
+ if (!state) return;
+
+ const wasEnabled = !!state.options;
+ state.options = opts;
+
+ if (!opts) {
+ if (state.visible) hide(el);
+ el.removeAttribute('aria-describedby');
+ if (wasEnabled) unbind(el);
+ return;
+ }
+
+ if (!wasEnabled) {
+ el.setAttribute('aria-describedby', state.id);
+ bind(el);
+ }
+
+ // Update visible tooltip content/position
+ if (state.visible && state.tooltipEl) {
+ const inner = state.tooltipEl.querySelector('.tooltip-inner');
+ if (inner) {
+ if (opts.html) {
+ inner.innerHTML = DOMPurify.sanitize(opts.content);
+ } else {
+ inner.textContent = opts.content;
+ }
+ }
+ positionTooltip(el, state.tooltipEl, opts.placement || DEFAULTS.placement);
+ }
+ },
+
+ unmounted(el) {
+ unbind(el);
+ hide(el);
+ delete el._tooltip;
+ },
+};
diff --git a/src/main.js b/src/main.js
index 38b405bd..36017bed 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,11 +4,9 @@ import { createApp } from 'vue';
import { createI18n } from 'vue-i18n';
// Import component Vue plugins, used throughout the app
-import FloatingVue from 'floating-vue'; // Tooltip component (replaces v-tooltip)
import VModal from '@febe95/vue-js-modal'; // Modal component (Vue 3 fork)
import VSelect from 'vue-select'; // Select dropdown component
import JsonViewer from 'vue3-json-viewer'; // JSON tree viewer
-import 'floating-vue/dist/style.css';
// Import base Dashy components and utils
import Dashy from '@/App.vue'; // Main Dashy Vue app
@@ -18,7 +16,8 @@ import serviceWorker from '@/utils/InitServiceWorker'; // Service worker initial
import { messages } from '@/utils/languages'; // Language texts
import ErrorReporting from '@/utils/ErrorReporting'; // Error reporting initializer (off)
import clickOutside from '@/directives/ClickOutside'; // Directive for closing popups, modals, etc
-import { tooltipOptions, language as defaultLanguage } from '@/utils/defaults';
+import tooltip from '@/directives/Tooltip'; // Custom tooltip directive
+import { language as defaultLanguage } from '@/utils/defaults';
import { initKeycloakAuth, isKeycloakEnabled } from '@/utils/KeycloakAuth';
import { initHeaderAuth, isHeaderAuthEnabled } from '@/utils/HeaderAuth';
import { initOidcAuth, isOidcEnabled } from '@/utils/OidcAuth';
@@ -40,13 +39,13 @@ const app = createApp(Dashy);
app.use(store);
app.use(router);
app.use(i18n);
-app.use(FloatingVue, tooltipOptions);
app.use(VModal);
app.use(JsonViewer);
// Register global components and directives
app.component('v-select', VSelect);
app.directive('clickOutside', clickOutside);
+app.directive('tooltip', tooltip);
// Lightweight $toasted shim (replaces vue-toasted)
/* eslint-disable object-property-newline */
@@ -71,6 +70,7 @@ app.config.errorHandler = (err, instance, info) => {
ErrorHandler(`Vue error in ${info}`, err);
};
+
window.addEventListener('unhandledrejection', (event) => {
ErrorHandler('Unhandled promise rejection', event.reason);
});
diff --git a/src/mixins/WidgetMixin.js b/src/mixins/WidgetMixin.js
index ddcb8bc1..3c099dfe 100644
--- a/src/mixins/WidgetMixin.js
+++ b/src/mixins/WidgetMixin.js
@@ -97,7 +97,7 @@ const WidgetMixin = {
/* Used as v-tooltip, pass text content in, and will show on hover */
tooltip(content, html = false) {
return {
- content, html, trigger: 'hover focus', delay: 250,
+ content, html,
};
},
/* Makes data request, returns promise */
diff --git a/src/styles/global-styles.scss b/src/styles/global-styles.scss
index 2956786e..f5143ef3 100644
--- a/src/styles/global-styles.scss
+++ b/src/styles/global-styles.scss
@@ -102,80 +102,3 @@ button svg, a svg {
}
}
-/* Overriding styles for tooltip component */
-.tooltip {
- display: block;
- z-index: 5;
- max-width: var(--tooltip-width);
- border: none;
- padding: 0;
- .tooltip-inner {
- background: var(--description-tooltip-background);
- border: 1px solid var(--description-tooltip-color);
- border-radius: var(--curve-factor-small);
- color: var(--description-tooltip-color);
- padding: var(--tooltip-padding);
- overflow: hidden;
- }
- .tooltip-arrow {
- width: 0;
- height: 0;
- border-style: solid;
- position: absolute;
- margin: var(--tooltip-arrow-size);
- border-color: transparent;
- border-width: var(--tooltip-arrow-size);
- z-index: 1;
- }
- &[x-placement^="top"] {
- margin-bottom: var(--tooltip-arrow-size);
- .tooltip-arrow {
- border-bottom-width: 0;
- border-top-color: var(--description-tooltip-color);
- bottom: calc(-1 * var(--tooltip-arrow-size));
- left: calc(50% - var(--tooltip-arrow-size));
- margin: 0 var(--tooltip-arrow-size);
- }
- }
- &[x-placement^="bottom"] {
- margin-top: var(--tooltip-arrow-size);
- .tooltip-arrow {
- border-top-width: 0;
- border-bottom-color: var(--description-tooltip-color);
- top: calc(-1 * var(--tooltip-arrow-size));
- left: calc(50% - var(--tooltip-arrow-size));
- margin: 0 var(--tooltip-arrow-size);
- }
- }
- &[x-placement^="right"] {
- margin-left: var(--tooltip-arrow-size);
- .tooltip-arrow {
- border-left-width: 0;
- border-right-color: var(--description-tooltip-color);
- left: calc(-1 * var(--tooltip-arrow-size));
- top: calc(50% - var(--tooltip-arrow-size));
- margin: var(--tooltip-arrow-size) 0;
- }
- }
- &[x-placement^="left"] {
- margin-right: var(--tooltip-arrow-size);
- .tooltip-arrow {
- border-right-width: 0;
- border-left-color: var(--description-tooltip-color);
- right: calc(-1 * var(--tooltip-arrow-size));
- top: calc(50% - var(--tooltip-arrow-size));
- margin: var(--tooltip-arrow-size) 0;
- }
- }
- &[aria-hidden='true'] {
- visibility: hidden;
- opacity: 0;
- transition: opacity .15s, visibility .15s;
- }
- &[aria-hidden='false'] {
- visibility: visible;
- opacity: 1;
- transition: opacity .15s;
- }
- &.in-modal-tt { z-index: 999; }
-}
diff --git a/src/utils/defaults.js b/src/utils/defaults.js
index 3d8d0594..994197b3 100644
--- a/src/utils/defaults.js
+++ b/src/utils/defaults.js
@@ -181,20 +181,6 @@ const defaults = {
className: 'toast-message',
iconPack: 'fontawesome',
},
- /* Default tooltip options */
- tooltipOptions: {
- themes: {
- tooltip: {
- triggers: ['hover', 'focus'],
- hideOnTargetClick: true,
- autoHide: true,
- html: false,
- placement: 'auto',
- loadingContent: 'Loading...',
- delay: { show: 380, hide: 0 },
- },
- },
- },
/* Server location of the Backup & Sync cloud function */
backupEndpoint: 'https://sync-service.dashy.to',
/* Available services for fetching favicon icon for user apps */
@@ -386,7 +372,6 @@ export const {
splashScreenTime,
metaTagData,
toastedOptions,
- tooltipOptions,
backupEndpoint,
faviconApiEndpoints,
iconCdns,
diff --git a/yarn.lock b/yarn.lock
index 9edf7ad3..2c179fd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1098,25 +1098,6 @@
resize-observer-polyfill "^1.5.1"
tiny-emitter "^2.1.0"
-"@floating-ui/core@^1.1.0":
- version "1.7.5"
- resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.7.5.tgz#d4af157a03330af5a60e69da7a4692507ada0622"
- integrity sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==
- dependencies:
- "@floating-ui/utils" "^0.2.11"
-
-"@floating-ui/dom@~1.1.1":
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.1.1.tgz#66aa747e15894910869bf9144fc54fc7d6e9f975"
- integrity sha512-TpIO93+DIujg3g7SykEAGZMDtbJRrmnYRCNYSjJlvIbGhBjRSNTLVbNeDQBrzy9qDgUbiWdc7KA0uZHZ2tJmiw==
- dependencies:
- "@floating-ui/core" "^1.1.0"
-
-"@floating-ui/utils@^0.2.11":
- version "0.2.11"
- resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.11.tgz#a269e055e40e2f45873bae9d1a2fdccbd314ea3f"
- integrity sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==
-
"@humanwhocodes/config-array@^0.13.0":
version "0.13.0"
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
@@ -3038,14 +3019,6 @@ flatted@^3.2.9, flatted@^3.3.3:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.0.tgz#92ab2efec9b272eb85a3a25a106c3afbbc990d8b"
integrity sha512-kC6Bb+ooptOIvWj5B63EQWkF0FEnNjV2ZNkLMLZRDDduIiWeFF4iKnslwhiWxjAdbg4NzTNo6h0qLuvFrcx+Sw==
-floating-vue@^5.2.2:
- version "5.2.2"
- resolved "https://registry.yarnpkg.com/floating-vue/-/floating-vue-5.2.2.tgz#e263932042753f59f3e36e7c1188f3f3e272a539"
- integrity sha512-afW+h2CFafo+7Y9Lvw/xsqjaQlKLdJV7h1fCHfcYQ1C4SVMlu7OAekqWgu5d4SgvkBVU0pVpLlVsrSTBURFRkg==
- dependencies:
- "@floating-ui/dom" "~1.1.1"
- vue-resize "^2.0.0-alpha.1"
-
for-each@^0.3.3, for-each@^0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
@@ -5333,11 +5306,6 @@ vue-i18n@^9.14.0:
"@intlify/shared" "9.14.5"
"@vue/devtools-api" "^6.5.0"
-vue-resize@^2.0.0-alpha.1:
- version "2.0.0-alpha.1"
- resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz#43eeb79e74febe932b9b20c5c57e0ebc14e2df3a"
- integrity sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==
-
vue-router@^4.4.0:
version "4.6.4"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.6.4.tgz#a0a9cb9ef811a106d249e4bb9313d286718020d8"