From 38e6d5861cf72101b43eb500dfa1c8f17d638519 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 11 Jul 2024 17:59:39 +0300
Subject: [PATCH 1/6] fix: replace fullscreen and raised hand toggles

- codestyle refactoring
- replace if blocks with ternary operators
- remove redundant method

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/TopBar/TopBarMenu.vue | 84 ++++++++++++----------------
 1 file changed, 36 insertions(+), 48 deletions(-)

diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue
index ae1d77090e0..50e76a7b845 100644
--- a/src/components/TopBar/TopBarMenu.vue
+++ b/src/components/TopBar/TopBarMenu.vue
@@ -6,11 +6,9 @@
 <template>
 	<div class="top-bar__wrapper">
 		<TransitionExpand v-if="isInCall" :show="isHandRaised" direction="horizontal">
-			<NcButton v-shortkey.once="disableKeyboardShortcuts ? null : ['r']"
-				v-tooltip="raiseHandButtonLabel"
+			<NcButton v-tooltip="raiseHandButtonLabel"
 				:aria-label="raiseHandButtonLabel"
 				type="tertiary"
-				@shortkey="toggleHandRaised"
 				@click.stop="toggleHandRaised">
 				<template #icon>
 					<!-- The following icon is much bigger than all the others
@@ -21,12 +19,10 @@
 		</TransitionExpand>
 
 		<NcActions v-if="!isSidebar"
-			v-shortkey.once="disableKeyboardShortcuts ? null : ['f']"
 			v-tooltip="t('spreed', 'Conversation actions')"
 			:aria-label="t('spreed', 'Conversation actions')"
 			type="tertiary"
-			:container="container"
-			@shortkey.native="toggleFullscreen">
+			:container="container">
 			<!-- Menu icon: white if in call -->
 			<template v-if="isInCall" #icon>
 				<DotsHorizontal :size="20" />
@@ -173,6 +169,7 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
+import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 import TransitionExpand from '../MediaSettings/TransitionExpand.vue'
@@ -185,6 +182,7 @@ import { generateAbsoluteUrl } from '../../utils/handleUrl.ts'
 import { callParticipantCollection } from '../../utils/webrtc/index.js'
 
 const AUTO_LOWER_HAND_THRESHOLD = 3000
+const disableKeyboardShortcuts = OCP.Accessibility.disableKeyboardShortcuts()
 
 export default {
 	name: 'TopBarMenu',
@@ -219,16 +217,16 @@ export default {
 
 	props: {
 		/**
-			* The conversation token
-			*/
+		 * The conversation token
+		 */
 		token: {
 			type: String,
 			required: true,
 		},
 
 		/**
-			* The local media model
-			*/
+		 * The local media model
+		 */
 		model: {
 			type: Object,
 			required: true,
@@ -240,8 +238,8 @@ export default {
 		},
 
 		/**
-			* In the sidebar the conversation settings are hidden
-			*/
+		 * In the sidebar the conversation settings are hidden
+		 */
 		isSidebar: {
 			type: Boolean,
 			default: false,
@@ -276,10 +274,9 @@ export default {
 		},
 
 		labelFullscreen() {
-			if (this.isFullscreen) {
-				return t('spreed', 'Exit full screen (F)')
-			}
-			return t('spreed', 'Full screen (F)')
+			return this.isFullscreen
+				? t('spreed', 'Exit full screen (F)')
+				: t('spreed', 'Full screen (F)')
 		},
 
 		isFileConversation() {
@@ -287,11 +284,9 @@ export default {
 		},
 
 		linkToFile() {
-			if (this.isFileConversation) {
-				return generateAbsoluteUrl('/f/{objectId}', { objectId: this.conversation.objectId })
-			} else {
-				return ''
-			}
+			return this.isFileConversation
+				? generateAbsoluteUrl('/f/{objectId}', { objectId: this.conversation.objectId })
+				: ''
 		},
 
 		isOneToOneConversation() {
@@ -304,11 +299,9 @@ export default {
 		},
 
 		changeViewText() {
-			if (this.isGrid) {
-				return t('spreed', 'Speaker view')
-			} else {
-				return t('spreed', 'Grid view')
-			}
+			return this.isGrid
+				? t('spreed', 'Speaker view')
+				: t('spreed', 'Grid view')
 		},
 
 		isGrid() {
@@ -329,19 +322,13 @@ export default {
 
 		raiseHandButtonLabel() {
 			if (!this.isHandRaised) {
-				if (this.disableKeyboardShortcuts) {
-					return t('spreed', 'Raise hand')
-				}
-				return t('spreed', 'Raise hand (R)')
-			}
-			if (this.disableKeyboardShortcuts) {
-				return t('spreed', 'Lower hand')
+				return disableKeyboardShortcuts
+					? t('spreed', 'Raise hand')
+					: t('spreed', 'Raise hand (R)')
 			}
-			return t('spreed', 'Lower hand (R)')
-		},
-
-		disableKeyboardShortcuts() {
-			return OCP.Accessibility.disableKeyboardShortcuts()
+			return disableKeyboardShortcuts
+				? t('spreed', 'Lower hand')
+				: t('spreed', 'Lower hand (R)')
 		},
 
 		participantType() {
@@ -388,11 +375,9 @@ export default {
 		showCallLayoutSwitch() {
 			return !this.$store.getters.isEmptyCallView
 		},
-
 	},
 
 	watch: {
-
 		'model.attributes.speaking'(speaking) {
 			// user stops speaking in lowerHandTimeout
 			if (this.lowerHandTimeout !== null && !speaking) {
@@ -419,7 +404,11 @@ export default {
 				}
 			}, this.lowerHandDelay)
 		},
+	},
 
+	created() {
+		useHotKey('r', this.toggleHandRaised)
+		useHotKey('f', this.toggleFullscreen)
 	},
 
 	methods: {
@@ -431,6 +420,10 @@ export default {
 		},
 
 		toggleFullscreen() {
+			if (this.isSidebar) {
+				return
+			}
+
 			// Don't toggle fullscreen if there is an open modal
 			// FIXME won't be needed without Fulscreen API
 			if (Array.from(document.body.childNodes).filter(child => {
@@ -476,14 +469,6 @@ export default {
 			}
 		},
 
-		toggleVirtualBackground() {
-			if (this.model.attributes.virtualBackgroundEnabled) {
-				this.model.disableVirtualBackground()
-			} else {
-				this.model.enableVirtualBackground()
-			}
-		},
-
 		changeView() {
 			this.$store.dispatch('setCallViewMode', { isGrid: !this.isGrid, clearLast: false })
 			this.$store.dispatch('selectedVideoPeerId', null)
@@ -494,6 +479,9 @@ export default {
 		},
 
 		toggleHandRaised() {
+			if (!this.isInCall) {
+				return
+			}
 			const newState = !this.isHandRaised
 			this.model.toggleHandRaised(newState)
 			this.$store.dispatch(

From 0a80015042295ad1bf9bf742f4810eb4f76d1a61 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 11 Jul 2024 18:04:22 +0300
Subject: [PATCH 2/6] fix: replace audio and video toggles

- move push-to-talk feature to related component

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../shared/LocalAudioControlButton.vue        | 10 ++++--
 .../shared/LocalVideoControlButton.vue        | 17 ++++-----
 src/components/TopBar/TopBarMediaControls.vue | 36 ++-----------------
 3 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/src/components/CallView/shared/LocalAudioControlButton.vue b/src/components/CallView/shared/LocalAudioControlButton.vue
index b1ef037797b..86f56479047 100644
--- a/src/components/CallView/shared/LocalAudioControlButton.vue
+++ b/src/components/CallView/shared/LocalAudioControlButton.vue
@@ -4,12 +4,10 @@
 -->
 
 <template>
-	<NcButton v-shortkey.once="disableKeyboardShortcuts ? null : ['m']"
-		v-tooltip="audioButtonTooltip"
+	<NcButton v-tooltip="audioButtonTooltip"
 		:type="type"
 		:aria-label="audioButtonAriaLabel"
 		:class="{ 'no-audio-available': !isAudioAllowed || !model.attributes.audioAvailable }"
-		@shortkey="toggleAudio"
 		@click.stop="toggleAudio">
 		<template #icon>
 			<VolumeIndicator :audio-preview-available="model.attributes.audioAvailable"
@@ -26,6 +24,7 @@ import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 import VolumeIndicator from '../../UIShared/VolumeIndicator.vue'
@@ -128,6 +127,11 @@ export default {
 		},
 	},
 
+	created() {
+		useHotKey('m', this.toggleAudio)
+		useHotKey(' ', this.toggleAudio, { push: true })
+	},
+
 	mounted() {
 		subscribe('local-audio-control-button:toggle-audio', this.updateDeviceState)
 	},
diff --git a/src/components/CallView/shared/LocalVideoControlButton.vue b/src/components/CallView/shared/LocalVideoControlButton.vue
index b98cfba0754..4c9556b1605 100644
--- a/src/components/CallView/shared/LocalVideoControlButton.vue
+++ b/src/components/CallView/shared/LocalVideoControlButton.vue
@@ -4,12 +4,10 @@
 -->
 
 <template>
-	<NcButton v-shortkey.once="disableKeyboardShortcuts ? null : ['v']"
-		v-tooltip="videoButtonTooltip"
+	<NcButton v-tooltip="videoButtonTooltip"
 		:type="type"
 		:aria-label="videoButtonAriaLabel"
 		:class="{ 'no-video-available': !isVideoAllowed || !model.attributes.videoAvailable }"
-		@shortkey="toggleVideo"
 		@click.stop="toggleVideo">
 		<template #icon>
 			<VideoIcon v-if="showVideoOn" :size="20" />
@@ -26,6 +24,7 @@ import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 import { PARTICIPANT } from '../../../constants.js'
@@ -123,6 +122,10 @@ export default {
 		},
 	},
 
+	created() {
+		useHotKey('v', this.toggleVideo)
+	},
+
 	mounted() {
 		subscribe('local-video-control-button:toggle-video', this.updateDeviceState)
 	},
@@ -134,14 +137,6 @@ export default {
 	methods: {
 		t,
 		toggleVideo() {
-			/**
-			 * Abort toggling the video if the 'v' key is lifted when pasting an
-			 * image in the new message form.
-			 */
-			if (document.getElementsByClassName('upload-editor').length !== 0) {
-				return
-			}
-
 			if (!this.model.attributes.videoAvailable) {
 				emit('talk:media-settings:show')
 				return
diff --git a/src/components/TopBar/TopBarMediaControls.vue b/src/components/TopBar/TopBarMediaControls.vue
index 5b3cf7ed042..c5cbfbcdced 100644
--- a/src/components/TopBar/TopBarMediaControls.vue
+++ b/src/components/TopBar/TopBarMediaControls.vue
@@ -3,9 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<div v-shortkey.push="disableKeyboardShortcuts ? null : ['space']"
-		class="buttons-bar"
-		@shortkey="handleShortkey">
+	<div class="buttons-bar">
 		<div class="network-connection-state">
 			<NcPopover v-if="qualityWarningTooltip"
 				:boundary="boundaryElement"
@@ -44,8 +42,7 @@
 			</NcPopover>
 		</div>
 
-		<LocalAudioControlButton ref="audioControl"
-			:token="token"
+		<LocalAudioControlButton :token="token"
 			:conversation="conversation"
 			:model="model"
 			type="tertiary" />
@@ -191,8 +188,6 @@ export default {
 			boundaryElement: document.querySelector('.main-view'),
 			mouseover: false,
 			qualityWarningInGracePeriodTimeout: null,
-			audioEnabledBeforeSpacebarKeydown: undefined,
-			spacebarKeyDown: false,
 		}
 	},
 
@@ -377,10 +372,6 @@ export default {
 
 			return tooltip
 		},
-
-		disableKeyboardShortcuts() {
-			return OCP.Accessibility.disableKeyboardShortcuts()
-		},
 	},
 
 	watch: {
@@ -409,29 +400,6 @@ export default {
 
 	methods: {
 		t,
-		/**
-		 * This method executes on spacebar keydown and keyup
-		 */
-		handleShortkey() {
-			if (!this.model.attributes.audioAvailable) {
-				return
-			}
-
-			if (!this.spacebarKeyDown) {
-				this.audioEnabledBeforeSpacebarKeydown = this.model.attributes.audioEnabled
-				this.spacebarKeyDown = true
-				this.$refs.audioControl.toggleAudio()
-			} else {
-				this.spacebarKeyDown = false
-				if (this.audioEnabledBeforeSpacebarKeydown) {
-					this.model.enableAudio()
-				} else {
-					this.model.disableAudio()
-				}
-				this.audioEnabledBeforeSpacebarKeydown = undefined
-			}
-
-		},
 
 		setSpeakingWhileMutedNotification(message) {
 			this.speakingWhileMutedNotification = message

From 2d164edcbb51db1dac1de92fbb19e700885e1584 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 11 Jul 2024 18:33:03 +0300
Subject: [PATCH 3/6] fix: replace focus shortcuts

- LeftSidebar searchbox
- NewMessage input

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/App.vue                              | 12 ++++--------
 src/components/NewMessage/NewMessage.vue | 11 +++++------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0c3c7f10b29..484f0625b9b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,10 +4,8 @@
 -->
 
 <template>
-	<NcContent v-shortkey.once="disableKeyboardShortcuts ? null : ['ctrl', 'f']"
-		:class="{ 'icon-loading': loading, 'in-call': isInCall }"
-		app-name="talk"
-		@shortkey.native="handleAppSearch">
+	<NcContent :class="{ 'icon-loading': loading, 'in-call': isInCall }"
+		app-name="talk">
 		<LeftSidebar v-if="getUserId && !isFullscreen" ref="leftSidebar" />
 		<NcAppContent>
 			<router-view />
@@ -30,6 +28,7 @@ import { generateUrl } from '@nextcloud/router'
 
 import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
+import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
 import { useIsMobile } from '@nextcloud/vue/dist/Composables/useIsMobile.js'
 
 import ConversationSettingsDialog from './components/ConversationSettings/ConversationSettingsDialog.vue'
@@ -186,10 +185,6 @@ export default {
 			return this.currentConversation?.type === CONVERSATION.TYPE.ONE_TO_ONE
 				|| this.currentConversation?.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
 		},
-
-		disableKeyboardShortcuts() {
-			return OCP.Accessibility.disableKeyboardShortcuts()
-		},
 	},
 
 	watch: {
@@ -246,6 +241,7 @@ export default {
 
 	created() {
 		window.addEventListener('beforeunload', this.preventUnload)
+		useHotKey('f', this.handleAppSearch, { ctrl: true, stop: true, prevent: true })
 	},
 
 	beforeDestroy() {
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index e3f09d8ae90..26735f54cfb 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -74,7 +74,6 @@
 					<p>{{ t('spreed','Adding a mention will only notify users who did not read the message.') }}</p>
 				</NcNoteCard>
 				<NcRichContenteditable ref="richContenteditable"
-					v-shortkey.once="$options.disableKeyboardShortcuts ? null : ['c']"
 					:value.sync="text"
 					:auto-complete="autoComplete"
 					:disabled="disabled"
@@ -83,7 +82,6 @@
 					:placeholder="placeholderText"
 					:aria-label="placeholderText"
 					dir="auto"
-					@shortkey="focusInput"
 					@keydown.esc="handleInputEsc"
 					@keydown.ctrl.up="handleEditLastMessage"
 					@input="handleTyping"
@@ -192,6 +190,7 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 import NcRichContenteditable from '@nextcloud/vue/dist/Components/NcRichContenteditable.js'
+import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
 
 import NewMessageAbsenceInfo from './NewMessageAbsenceInfo.vue'
 import NewMessageAttachments from './NewMessageAttachments.vue'
@@ -215,13 +214,9 @@ import { fetchClipboardContent } from '../../utils/clipboard.js'
 import { isDarkTheme } from '../../utils/isDarkTheme.js'
 import { parseSpecialSymbols } from '../../utils/textParse.ts'
 
-const disableKeyboardShortcuts = OCP.Accessibility.disableKeyboardShortcuts()
-
 export default {
 	name: 'NewMessage',
 
-	disableKeyboardShortcuts,
-
 	components: {
 		FilePickerVue,
 		NcActionButton,
@@ -537,6 +532,10 @@ export default {
 		},
 	},
 
+	created() {
+		useHotKey('c', this.focusInput, { stop: true, prevent: true })
+	},
+
 	mounted() {
 		EventBus.on('focus-chat-input', this.focusInput)
 		EventBus.on('upload-start', this.handleUploadSideEffects)

From 19467c320c2795169c7d95b3e25da2a02aca8b17 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Fri, 12 Jul 2024 20:32:37 +0200
Subject: [PATCH 4/6] chore: remove duplicated keyboard events from NcButton
 components

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/PublicShareAuthRequestPasswordButton.vue              | 3 +--
 src/components/ConversationSettings/LinkShareSettings.vue | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/PublicShareAuthRequestPasswordButton.vue b/src/PublicShareAuthRequestPasswordButton.vue
index 42d36bad075..10fd993e50f 100644
--- a/src/PublicShareAuthRequestPasswordButton.vue
+++ b/src/PublicShareAuthRequestPasswordButton.vue
@@ -12,8 +12,7 @@
 				type="primary"
 				:wide="true"
 				:disabled="isRequestInProgress"
-				@click="requestPassword"
-				@keydown.enter="requestPassword">
+				@click="requestPassword">
 				{{ t('spreed', 'Request password') }}
 			</NcButton>
 		</div>
diff --git a/src/components/ConversationSettings/LinkShareSettings.vue b/src/components/ConversationSettings/LinkShareSettings.vue
index 4bbd7598040..f2e5c229618 100644
--- a/src/components/ConversationSettings/LinkShareSettings.vue
+++ b/src/components/ConversationSettings/LinkShareSettings.vue
@@ -57,8 +57,7 @@
 
 		<div class="app-settings-subsection__buttons">
 			<NcButton ref="copyLinkButton"
-				@click="handleCopyLink"
-				@keydown.enter="handleCopyLink">
+				@click="handleCopyLink">
 				<template #icon>
 					<ClipboardTextOutline />
 				</template>
@@ -66,8 +65,7 @@
 			</NcButton>
 			<NcButton v-if="isSharedPublicly && canModerate"
 				:disabled="isSendingInvitations"
-				@click="handleResendInvitations"
-				@keydown.enter="handleResendInvitations">
+				@click="handleResendInvitations">
 				<template #icon>
 					<Email />
 				</template>

From 9f4776d0c44add316fe73728ef3ce80a466e647e Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Fri, 12 Jul 2024 20:57:46 +0200
Subject: [PATCH 5/6] chore: remove vue-shortkey directive initialization

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/main.js                       | 2 --
 src/mainFilesSidebar.js           | 2 --
 src/mainPublicShareAuthSidebar.js | 2 --
 src/mainPublicShareSidebar.js     | 2 --
 src/mainRecording.js              | 2 --
 5 files changed, 10 deletions(-)

diff --git a/src/main.js b/src/main.js
index 62c86156858..9c74e5000c5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,6 @@
 import { createPinia, PiniaVuePlugin } from 'pinia'
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import VueShortKey from 'vue-shortkey'
 import Vuex from 'vuex'
 
 import { getRequestToken } from '@nextcloud/auth'
@@ -47,7 +46,6 @@ Vue.prototype.OCA = OCA
 Vue.use(PiniaVuePlugin)
 Vue.use(Vuex)
 Vue.use(VueRouter)
-Vue.use(VueShortKey, { prevent: ['input', 'textarea', 'div'] })
 
 const pinia = createPinia()
 
diff --git a/src/mainFilesSidebar.js b/src/mainFilesSidebar.js
index 7a9f1640b9a..7191e0a8bc3 100644
--- a/src/mainFilesSidebar.js
+++ b/src/mainFilesSidebar.js
@@ -5,7 +5,6 @@
 
 import { createPinia, PiniaVuePlugin } from 'pinia'
 import Vue from 'vue'
-import VueShortKey from 'vue-shortkey'
 import Vuex from 'vuex'
 
 import { getRequestToken } from '@nextcloud/auth'
@@ -40,7 +39,6 @@ Vue.prototype.OCA = OCA
 
 Vue.use(PiniaVuePlugin)
 Vue.use(Vuex)
-Vue.use(VueShortKey, { prevent: ['input', 'textarea', 'div'] })
 
 const pinia = createPinia()
 
diff --git a/src/mainPublicShareAuthSidebar.js b/src/mainPublicShareAuthSidebar.js
index a51738ba29e..730ce8bbfc3 100644
--- a/src/mainPublicShareAuthSidebar.js
+++ b/src/mainPublicShareAuthSidebar.js
@@ -5,7 +5,6 @@
 
 import { createPinia, PiniaVuePlugin } from 'pinia'
 import Vue from 'vue'
-import VueShortKey from 'vue-shortkey'
 import Vuex from 'vuex'
 
 import { getRequestToken } from '@nextcloud/auth'
@@ -40,7 +39,6 @@ Vue.prototype.OCA = OCA
 
 Vue.use(PiniaVuePlugin)
 Vue.use(Vuex)
-Vue.use(VueShortKey, { prevent: ['input', 'textarea', 'div'] })
 
 const pinia = createPinia()
 store.dispatch('setMainContainerSelector', '#talk-sidebar')
diff --git a/src/mainPublicShareSidebar.js b/src/mainPublicShareSidebar.js
index 0fe180f2a50..bee64912723 100644
--- a/src/mainPublicShareSidebar.js
+++ b/src/mainPublicShareSidebar.js
@@ -5,7 +5,6 @@
 
 import { createPinia, PiniaVuePlugin } from 'pinia'
 import Vue, { reactive } from 'vue'
-import VueShortKey from 'vue-shortkey'
 import Vuex from 'vuex'
 
 import { getRequestToken } from '@nextcloud/auth'
@@ -40,7 +39,6 @@ Vue.prototype.OCA = OCA
 
 Vue.use(PiniaVuePlugin)
 Vue.use(Vuex)
-Vue.use(VueShortKey, { prevent: ['input', 'textarea', 'div'] })
 
 const pinia = createPinia()
 
diff --git a/src/mainRecording.js b/src/mainRecording.js
index 121d9e5f2c3..56008069664 100644
--- a/src/mainRecording.js
+++ b/src/mainRecording.js
@@ -7,7 +7,6 @@
 import { createPinia, PiniaVuePlugin } from 'pinia'
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import VueShortKey from 'vue-shortkey'
 import Vuex from 'vuex'
 
 import { getRequestToken } from '@nextcloud/auth'
@@ -50,7 +49,6 @@ Vue.prototype.OCA = OCA
 Vue.use(PiniaVuePlugin)
 Vue.use(Vuex)
 Vue.use(VueRouter)
-Vue.use(VueShortKey, { prevent: ['input', 'textarea', 'div'] })
 
 const pinia = createPinia()
 

From 884c51a2351017763f4c20e65b41e752d7dc3c6b Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Fri, 12 Jul 2024 20:58:09 +0200
Subject: [PATCH 6/6] chore(deps): drop vue-shortkey library

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 package-lock.json | 39 ---------------------------------------
 package.json      |  1 -
 2 files changed, 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 26d6a88a315..314c8ae485d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,7 +48,6 @@
         "vue-frag": "^1.4.3",
         "vue-material-design-icons": "^5.3.0",
         "vue-router": "^3.6.5",
-        "vue-shortkey": "^3.1.7",
         "vue-virtual-scroller": "^1.1.2",
         "vue2-leaflet": "^2.7.1",
         "vuex": "^3.6.2",
@@ -7767,11 +7766,6 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
       "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
     },
-    "node_modules/custom-event-polyfill": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz",
-      "integrity": "sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w=="
-    },
     "node_modules/data-uri-to-buffer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
@@ -8234,11 +8228,6 @@
       "integrity": "sha512-VY+J0e4SFcNfQy19MEoMdaIcZLmDCprqvBtkii1WTCTQHpRvf5N8+3kTYCgL/PcntvwQvmMJWTuDPsq+IlhWKQ==",
       "dev": true
     },
-    "node_modules/element-matches": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/element-matches/-/element-matches-0.1.2.tgz",
-      "integrity": "sha512-yWh1otcs3OKUWDvu/IxyI36ZI3WNaRZlI0uG/DK6fu0pap0VYZ0J5pEGTk1zakme+hT0OKHwhlHc0N5TJhY6yQ=="
-    },
     "node_modules/elliptic": {
       "version": "6.5.7",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
@@ -20136,15 +20125,6 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
       "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
     },
-    "node_modules/vue-shortkey": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/vue-shortkey/-/vue-shortkey-3.1.7.tgz",
-      "integrity": "sha512-Wm/vPXXS+4Wl/LoYpD+cZc0J0HIoVlY8Ep0JLIqqswmAya3XUBtsqKbhzEf9sXo+3rZ5p1YsUyZfXas8XD7YjQ==",
-      "dependencies": {
-        "custom-event-polyfill": "^1.0.7",
-        "element-matches": "^0.1.2"
-      }
-    },
     "node_modules/vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
@@ -26776,11 +26756,6 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
       "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
     },
-    "custom-event-polyfill": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz",
-      "integrity": "sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w=="
-    },
     "data-uri-to-buffer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
@@ -27132,11 +27107,6 @@
       "integrity": "sha512-VY+J0e4SFcNfQy19MEoMdaIcZLmDCprqvBtkii1WTCTQHpRvf5N8+3kTYCgL/PcntvwQvmMJWTuDPsq+IlhWKQ==",
       "dev": true
     },
-    "element-matches": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/element-matches/-/element-matches-0.1.2.tgz",
-      "integrity": "sha512-yWh1otcs3OKUWDvu/IxyI36ZI3WNaRZlI0uG/DK6fu0pap0VYZ0J5pEGTk1zakme+hT0OKHwhlHc0N5TJhY6yQ=="
-    },
     "elliptic": {
       "version": "6.5.7",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
@@ -35931,15 +35901,6 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
       "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
     },
-    "vue-shortkey": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/vue-shortkey/-/vue-shortkey-3.1.7.tgz",
-      "integrity": "sha512-Wm/vPXXS+4Wl/LoYpD+cZc0J0HIoVlY8Ep0JLIqqswmAya3XUBtsqKbhzEf9sXo+3rZ5p1YsUyZfXas8XD7YjQ==",
-      "requires": {
-        "custom-event-polyfill": "^1.0.7",
-        "element-matches": "^0.1.2"
-      }
-    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
diff --git a/package.json b/package.json
index 2434072de33..7bc0a441f93 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,6 @@
     "vue-frag": "^1.4.3",
     "vue-material-design-icons": "^5.3.0",
     "vue-router": "^3.6.5",
-    "vue-shortkey": "^3.1.7",
     "vue-virtual-scroller": "^1.1.2",
     "vue2-leaflet": "^2.7.1",
     "vuex": "^3.6.2",