From 59b8f51fd053f12e47c64a165b24fd844d5876e1 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Wed, 15 May 2024 14:22:53 +0200
Subject: [PATCH 1/2] fix(directive): unify tooltip registration

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/AdminSettings/TurnServer.vue               | 2 +-
 src/components/AdminSettings/WebServerSetupChecks.vue     | 2 +-
 .../CallView/shared/LocalAudioControlButton.vue           | 7 ++++++-
 .../CallView/shared/LocalVideoControlButton.vue           | 7 ++++++-
 src/components/CallView/shared/VideoBottomBar.vue         | 2 +-
 .../Matterbridge/MatterbridgeSettings.vue                 | 8 ++------
 .../MessagesGroup/Message/MessagePart/FilePreview.vue     | 2 +-
 src/components/NewMessage/NewMessageAudioRecorder.vue     | 2 +-
 src/components/RightSidebar/Participants/Participant.vue  | 2 +-
 src/components/TopBar/ReactionMenu.vue                    | 5 +++++
 src/components/TopBar/TopBarMediaControls.vue             | 2 +-
 src/components/TopBar/TopBarMenu.vue                      | 5 +++++
 12 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/components/AdminSettings/TurnServer.vue b/src/components/AdminSettings/TurnServer.vue
index c6454cca9c4..94c0a771e42 100644
--- a/src/components/AdminSettings/TurnServer.vue
+++ b/src/components/AdminSettings/TurnServer.vue
@@ -95,7 +95,7 @@ export default {
 	name: 'TurnServer',
 
 	directives: {
-		tooltip: Tooltip,
+		Tooltip,
 	},
 
 	components: {
diff --git a/src/components/AdminSettings/WebServerSetupChecks.vue b/src/components/AdminSettings/WebServerSetupChecks.vue
index 28fe097b94b..619a9708bfc 100644
--- a/src/components/AdminSettings/WebServerSetupChecks.vue
+++ b/src/components/AdminSettings/WebServerSetupChecks.vue
@@ -53,7 +53,7 @@ export default {
 	name: 'WebServerSetupChecks',
 
 	directives: {
-		tooltip: Tooltip,
+		Tooltip,
 	},
 
 	components: {
diff --git a/src/components/CallView/shared/LocalAudioControlButton.vue b/src/components/CallView/shared/LocalAudioControlButton.vue
index 3eec3229cc1..55f93b6b28a 100644
--- a/src/components/CallView/shared/LocalAudioControlButton.vue
+++ b/src/components/CallView/shared/LocalAudioControlButton.vue
@@ -24,7 +24,8 @@
 <script>
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 
-import { NcButton } from '@nextcloud/vue'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 import VolumeIndicator from '../../UIShared/VolumeIndicator.vue'
 
@@ -39,6 +40,10 @@ export default {
 		VolumeIndicator,
 	},
 
+	directives: {
+		Tooltip,
+	},
+
 	props: {
 		conversation: {
 			type: Object,
diff --git a/src/components/CallView/shared/LocalVideoControlButton.vue b/src/components/CallView/shared/LocalVideoControlButton.vue
index bc4c14f2f18..3c447bcb108 100644
--- a/src/components/CallView/shared/LocalVideoControlButton.vue
+++ b/src/components/CallView/shared/LocalVideoControlButton.vue
@@ -24,7 +24,8 @@ import VideoOff from 'vue-material-design-icons/VideoOff.vue'
 
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 
-import { NcButton } from '@nextcloud/vue'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 import { PARTICIPANT } from '../../../constants.js'
 import BrowserStorage from '../../../services/BrowserStorage.js'
@@ -38,6 +39,10 @@ export default {
 		VideoOff,
 	},
 
+	directives: {
+		Tooltip,
+	},
+
 	props: {
 		conversation: {
 			type: Object,
diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue
index 95ba403e4e4..6ce0bcc0a2f 100644
--- a/src/components/CallView/shared/VideoBottomBar.vue
+++ b/src/components/CallView/shared/VideoBottomBar.vue
@@ -120,7 +120,7 @@ export default {
 	},
 
 	directives: {
-		tooltip: Tooltip,
+		Tooltip,
 	},
 
 	inheritAttrs: false,
diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
index 108444a0be9..35323b14e3a 100644
--- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
+++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
@@ -105,8 +105,6 @@ import {
 	getBridgeProcessState,
 } from '../../../services/matterbridgeService.js'
 
-Vue.directive('tooltip', Tooltip)
-
 export default {
 	name: 'MatterbridgeSettings',
 	components: {
@@ -120,10 +118,8 @@ export default {
 		Plus,
 	},
 
-	mixins: [
-	],
-
-	props: {
+	directives: {
+		Tooltip,
 	},
 
 	data() {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
index 453381c293c..712f564932e 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
@@ -94,7 +94,7 @@ export default {
 	},
 
 	directives: {
-		tooltip: Tooltip,
+		Tooltip,
 	},
 
 	props: {
diff --git a/src/components/NewMessage/NewMessageAudioRecorder.vue b/src/components/NewMessage/NewMessageAudioRecorder.vue
index 8cc6a726894..9ab7d3a7fc0 100644
--- a/src/components/NewMessage/NewMessageAudioRecorder.vue
+++ b/src/components/NewMessage/NewMessageAudioRecorder.vue
@@ -76,7 +76,7 @@ export default {
 	},
 
 	directives: {
-		tooltip: Tooltip,
+		Tooltip,
 	},
 
 	props: {
diff --git a/src/components/RightSidebar/Participants/Participant.vue b/src/components/RightSidebar/Participants/Participant.vue
index 9e97369f357..864e220ad3e 100644
--- a/src/components/RightSidebar/Participants/Participant.vue
+++ b/src/components/RightSidebar/Participants/Participant.vue
@@ -406,7 +406,7 @@ export default {
 	},
 
 	directives: {
-		tooltip: Tooltip,
+		Tooltip,
 	},
 
 	props: {
diff --git a/src/components/TopBar/ReactionMenu.vue b/src/components/TopBar/ReactionMenu.vue
index 25da7f5ef0d..6c2f5a54b99 100644
--- a/src/components/TopBar/ReactionMenu.vue
+++ b/src/components/TopBar/ReactionMenu.vue
@@ -36,6 +36,7 @@ import { emit } from '@nextcloud/event-bus'
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcActionButtonGroup from '@nextcloud/vue/dist/Components/NcActionButtonGroup.js'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 export default {
 	name: 'ReactionMenu',
@@ -47,6 +48,10 @@ export default {
 		EmoticonOutline,
 	},
 
+	directives: {
+		Tooltip,
+	},
+
 	props: {
 		/**
 		 * The conversation token
diff --git a/src/components/TopBar/TopBarMediaControls.vue b/src/components/TopBar/TopBarMediaControls.vue
index 7be179dca03..12ac6341aa7 100644
--- a/src/components/TopBar/TopBarMediaControls.vue
+++ b/src/components/TopBar/TopBarMediaControls.vue
@@ -139,7 +139,7 @@ export default {
 	name: 'TopBarMediaControls',
 
 	directives: {
-		tooltip: Tooltip,
+		Tooltip,
 	},
 	components: {
 		LocalAudioControlButton,
diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue
index baf377adb22..e847c5f248e 100644
--- a/src/components/TopBar/TopBarMenu.vue
+++ b/src/components/TopBar/TopBarMenu.vue
@@ -170,6 +170,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 Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 import { useIsInCall } from '../../composables/useIsInCall.js'
 import { CALL, CONVERSATION, PARTICIPANT } from '../../constants.js'
@@ -203,6 +204,10 @@ export default {
 		VideoIcon,
 	},
 
+	directives: {
+		Tooltip,
+	},
+
 	props: {
 		/**
 			* The conversation token

From be09463e2b47ee7ef10b62f691067d49ab7ba565 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Wed, 15 May 2024 14:23:39 +0200
Subject: [PATCH 2/2] fix(directive): remove unused imports

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/CallView/Grid/Grid.vue                       | 5 -----
 src/components/CallView/shared/ViewerOverlayCallView.vue    | 6 +-----
 .../MessagesGroup/Message/MessagePart/Contact.vue           | 6 ------
 .../MessagesGroup/Message/MessagePart/DeckCard.vue          | 6 ------
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/components/CallView/Grid/Grid.vue b/src/components/CallView/Grid/Grid.vue
index 184991590d1..bcd18832420 100644
--- a/src/components/CallView/Grid/Grid.vue
+++ b/src/components/CallView/Grid/Grid.vue
@@ -144,7 +144,6 @@ import { loadState } from '@nextcloud/initial-state'
 import { generateFilePath } from '@nextcloud/router'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
 import TransitionWrapper from '../../UIShared/TransitionWrapper.vue'
 import EmptyCallView from '../shared/EmptyCallView.vue'
@@ -172,10 +171,6 @@ export default {
 		ChevronDown,
 	},
 
-	directives: {
-		Tooltip,
-	},
-
 	props: {
 		/**
 		 * Developer mode: If enabled it allows to debug the grid using dummy
diff --git a/src/components/CallView/shared/ViewerOverlayCallView.vue b/src/components/CallView/shared/ViewerOverlayCallView.vue
index 0f183de8ea7..97154419b6f 100644
--- a/src/components/CallView/shared/ViewerOverlayCallView.vue
+++ b/src/components/CallView/shared/ViewerOverlayCallView.vue
@@ -115,7 +115,7 @@ import ArrowExpand from 'vue-material-design-icons/ArrowExpand.vue'
 import ChevronDown from 'vue-material-design-icons/ChevronDown.vue'
 import ChevronUp from 'vue-material-design-icons/ChevronUp.vue'
 
-import { NcButton, Tooltip } from '@nextcloud/vue'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import EmptyCallView from './EmptyCallView.vue'
 import LocalAudioControlButton from './LocalAudioControlButton.vue'
@@ -145,10 +145,6 @@ export default {
 		ArrowExpand,
 	},
 
-	directives: {
-		tooltip: Tooltip,
-	},
-
 	props: {
 		token: {
 			type: String,
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Contact.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Contact.vue
index 9166f575569..4f231f0bd63 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Contact.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Contact.vue
@@ -24,15 +24,9 @@
 </template>
 
 <script>
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
-
 export default {
 	name: 'Contact',
 
-	directives: {
-		tooltip: Tooltip,
-	},
-
 	props: {
 		name: {
 			type: String,
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/DeckCard.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/DeckCard.vue
index 83563aa1be6..c5f6b145b59 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/DeckCard.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/DeckCard.vue
@@ -24,15 +24,9 @@
 </template>
 
 <script>
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
-
 export default {
 	name: 'DeckCard',
 
-	directives: {
-		tooltip: Tooltip,
-	},
-
 	props: {
 		type: {
 			type: String,