fix: Listen on printing shortcut to open print view for printing

Signed-off-by: Ferdinand Thiessen <[email protected]>
nextcloud · Apr 16, 2023 · 297d574 · 297d574
1 parent 1a6ad95
commit 297d574
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/src/components/Collective/CollectiveActions.vue b/src/components/Collective/CollectiveActions.vue
@@ -49,7 +49,7 @@
 		<NcActionSeparator v-if="collectiveCanShare(collective) && !isPublic" />
 		<NcActionLink :close-after-click="true"
 			:href="printLink"
-			target="_blank">
+			target="ncCollectivesPrint">
 			{{ t('collectives', 'Export or print') }}
 			<template #icon>
 				<DownloadIcon :size="20" />
@@ -142,6 +142,7 @@ export default {
 			'isCollectiveAdmin',
 			'isPublic',
 			'loading',
+			'printLink',
 		]),
 
 		isContactsInstalled() {
@@ -174,6 +175,10 @@ export default {
 				? generateUrl(`/apps/collectives/p/${this.shareTokenParam}/print/${this.collective.name}`)
 				: generateUrl(`/apps/collectives/_/print/${this.collective.name}`)
 		},
+
+		unshareIcon() {
+			return this.loading('unshare') ? 'icon-loading-small' : 'icon-public'
+		},
 	},
 
 	watch: {

diff --git a/src/store/store.js b/src/store/store.js
@@ -1,3 +1,4 @@
+import { generateUrl } from '@nextcloud/router'
 import Vue, { set } from 'vue'
 import Vuex, { Store } from 'vuex'
 
@@ -53,6 +54,10 @@ export default new Store({
 
 		isTextEdit: (state) => state.textMode === pageModes.MODE_EDIT,
 		isTextView: (state) => state.textMode === pageModes.MODE_VIEW,
+
+		printLink: (_state, get) => get.isPublic
+			? generateUrl(`/apps/collectives/p/${get.shareTokenParam}/print/${get.currentCollective.name}`)
+			: generateUrl(`/apps/collectives/_/print/${get.currentCollective.name}`),
 	},
 
 	mutations: {

diff --git a/src/views/CollectiveView.vue b/src/views/CollectiveView.vue
@@ -18,7 +18,9 @@
 <script>
 
 import { mapGetters, mapMutations } from 'vuex'
+import { showWarning } from '@nextcloud/dialogs'
 import { NcAppContent, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
+
 import Collective from '../components/Collective.vue'
 import CollectiveNotFound from '../components/CollectiveNotFound.vue'
 import PageList from '../components/PageList.vue'
@@ -39,12 +41,39 @@ export default {
 		...mapGetters([
 			'currentCollective',
 			'loading',
+			'printLink',
 			'showing',
 		]),
 	},
 
+	mounted() {
+		window.addEventListener('keydown', this.printKeyHandler)
+	},
+
+	beforeDestroy() {
+		window.removeEventListener('keydown', this.printKeyHandler)
+	},
+
 	methods: {
 		...mapMutations(['hide']),
+
+		/**
+		 * @param {KeyboardEvent} event the keydown event
+		 */
+		printKeyHandler(event) {
+			// Handle `CTRL+P` or `CMD+P` but ensure ALT or SHIFT are NOT pressed (e.g. CTRL+SHIFT+P is new private tab on firefox)
+			if ((event.metaKey || event.ctrlKey) && event.key.toLowerCase() === 'p' && !(event.altKey || event.shiftKey)) {
+				const handle = window.open(this.printLink, 'ncCollectivesPrint')
+				if (handle === null) {
+					// This might happen because of popup blockers etc
+					showWarning(t('collectives', 'Could not open print view, document might be formatted incorrectly.'))
+				} else {
+					handle.focus()
+					event.preventDefault()
+					event.stopImmediatePropagation()
+				}
+			}
+		},
 	},
 }
 </script>