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!

πŸ› Bring back left-click context menu (#2255)

Alicia Sykescbec406e8e22
diff --git a/src/components/LinkItems/Collapsable.vue b/src/components/LinkItems/Collapsable.vue
index b8c5a5e4..648d47c6 100644
--- a/src/components/LinkItems/Collapsable.vue
+++ b/src/components/LinkItems/Collapsable.vue
@@ -14,8 +14,8 @@
tabIndex="-1"
>
<div class="section-header"
- @mouseup.right="openContextMenu" @contextmenu.prevent
- @long-press="openContextMenu" v-longPress="500">
+ @mouseup.right="openRightClickMenu" @contextmenu="preventNativeContextMenu"
+ @long-press="openRightClickMenu" v-longPress="500">
<label :for="sectionKey" class="collapse-toggle"
v-tooltip="toggleTooltip()" :aria-label="$t('context-menus.section.expand-collapse')">
<span class="arrow" aria-hidden="true"></span>
@@ -27,7 +27,7 @@
v-tooltip="openTooltip()" class="header-action" />
<EditModeIcon v-if="isEditMode" @click="openEditModal"
v-tooltip="editTooltip()" class="header-action" />
- <EllipseIcon @click.prevent.stop="openContextMenu" @contextmenu.prevent
+ <EllipseIcon @click.prevent.stop="openContextMenu" @contextmenu="preventNativeContextMenu"
v-tooltip="optionsTooltip()" class="header-action" />
</div>
<div class="collapsible-content">
@@ -75,6 +75,9 @@ export default {
isEditMode() {
return this.$store.state.editMode;
},
+ disableContextMenu() {
+ return this.$store.getters.appConfig.disableContextMenu;
+ },
sectionKey() {
return `collapsible-${this.uniqueKey}`;
},
@@ -169,6 +172,15 @@ export default {
openContextMenu(e) {
this.$emit('openContextMenu', e);
},
+ /* Right-click / long-press is skipped when disabled by user */
+ openRightClickMenu(e) {
+ if (this.disableContextMenu) return;
+ this.openContextMenu(e);
+ },
+ /* Prevent the native right-click menu, unless user disabled custom context menus */
+ preventNativeContextMenu(e) {
+ if (!this.disableContextMenu) e.preventDefault();
+ },
navigateToSection() {
this.$emit('navigateToSection');
},
diff --git a/src/components/LinkItems/Item.vue b/src/components/LinkItems/Item.vue
index 5ac9ace1..88ef0f8b 100644
--- a/src/components/LinkItems/Item.vue
+++ b/src/components/LinkItems/Item.vue
@@ -2,7 +2,7 @@
<div :class="`item-wrapper wrap-size-${size} span-${makeColumnCount}`" >
<a @click="itemClicked"
@long-press="openContextMenu"
- @contextmenu.prevent
+ @contextmenu="preventNativeContextMenu"
@mouseup.right="openContextMenu"
v-longPress="true"
:href="effectiveUrl"
diff --git a/src/components/LinkItems/ItemContextMenu.vue b/src/components/LinkItems/ItemContextMenu.vue
index 3b421d72..75b26514 100644
--- a/src/components/LinkItems/ItemContextMenu.vue
+++ b/src/components/LinkItems/ItemContextMenu.vue
@@ -1,6 +1,6 @@
<template>
<transition name="slide">
- <div class="context-menu" v-if="show && !isMenuDisabled"
+ <div class="context-menu" v-if="show"
:style="posX && posY ? `top:${posY}px;left:${posX}px;` : ''">
<!-- Open Options -->
<ul class="menu-section">
@@ -87,9 +87,6 @@ export default {
},
emits: ['launchItem', 'openItemSettings', 'openMoveItemMenu', 'openDeleteItem'],
computed: {
- isMenuDisabled() {
- return !!this.$store.getters.appConfig.disableContextMenu;
- },
isEditMode() {
return this.$store.state.editMode;
},
diff --git a/src/components/LinkItems/SectionContextMenu.vue b/src/components/LinkItems/SectionContextMenu.vue
index 5c991493..fa11f18a 100644
--- a/src/components/LinkItems/SectionContextMenu.vue
+++ b/src/components/LinkItems/SectionContextMenu.vue
@@ -1,6 +1,6 @@
<template>
<transition name="slide">
- <div class="context-menu" v-if="show && !isMenuDisabled"
+ <div class="context-menu" v-if="show"
:style="posX && posY ? calcPosition() : ''">
<!-- Open Options -->
<ul class="menu-section">
@@ -50,9 +50,6 @@ export default {
},
emits: ['navigateToSection', 'openEditSection', 'expandCollapseSection', 'removeSection'],
computed: {
- isMenuDisabled() {
- return !!this.$store.getters.appConfig.disableContextMenu;
- },
isEditMode() {
return this.$store.state.editMode;
},
diff --git a/src/components/LinkItems/SubItem.vue b/src/components/LinkItems/SubItem.vue
index 3235ec23..948b1f80 100644
--- a/src/components/LinkItems/SubItem.vue
+++ b/src/components/LinkItems/SubItem.vue
@@ -1,7 +1,7 @@
<template ref="container">
<div class="sub-item-wrapper">
<a @click="itemClicked"
- @contextmenu.prevent
+ @contextmenu="preventNativeContextMenu"
@long-press="openContextMenu"
@mouseup.right="openContextMenu"
v-longPress="true"
diff --git a/src/mixins/ItemMixin.js b/src/mixins/ItemMixin.js
index e227feef..26b601e4 100644
--- a/src/mixins/ItemMixin.js
+++ b/src/mixins/ItemMixin.js
@@ -350,6 +350,7 @@ export default {
},
/* Open custom context menu, and set position */
openContextMenu(e) {
+ if (this.appConfig.disableContextMenu) return; // Right-click menu disabled in config
this.contextMenuOpen = !this.contextMenuOpen;
if (e && window) {
// Calculate placement based on cursor and scroll position
@@ -363,6 +364,10 @@ export default {
closeContextMenu() {
this.contextMenuOpen = false;
},
+ /* Suppress the native right-click menu, unless the custom menu is disabled */
+ preventNativeContextMenu(e) {
+ if (!this.appConfig.disableContextMenu) e.preventDefault();
+ },
/* Copies a string to the users clipboard / shows error if not possible */
copyToClipboard(content) {
if (navigator.clipboard) {