From 7e0857dcb6a042bc7f66fc337ee65c67296c4661 Mon Sep 17 00:00:00 2001
From: codewithvk <vivek.javiya@collabora.com>
Date: Tue, 10 Mar 2026 16:12:57 +0530
Subject: [PATCH] fix: Restore editor focus on Save As modal close

When the Save As dialog is dismissed (via Cancel or Esc), focus was not returning to the document iframe. This change restores focus to the document iframe by sending a Grab_Focus postMessage before the close event.

Signed-off-by: codewithvk <vivek.javiya@collabora.com>

[skip ci]
---
 src/components/Modal/SaveAs.vue |  3 ++-
 src/document.js                 |  4 ++++
 src/mixins/saveAs.js            | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/Modal/SaveAs.vue b/src/components/Modal/SaveAs.vue
index d033f5216b..386c9b61c3 100644
--- a/src/components/Modal/SaveAs.vue
+++ b/src/components/Modal/SaveAs.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<NcModal :name="t('richdocuments', 'Save as')">
+	<NcModal :name="t('richdocuments', 'Save as')" @close="cancel">
 		<div class="saveas-dialog">
 			<h1>{{ name }}</h1>
 			<p>{{ description }}</p>
@@ -102,6 +102,7 @@ export default {
 			this.$emit('close', this.newFileName)
 		},
 		cancel() {
+			emit('richdocuments:grab-focus')
 			this.$emit('close', null)
 		},
 	},
diff --git a/src/document.js b/src/document.js
index b121107305..52f777bdde 100644
--- a/src/document.js
+++ b/src/document.js
@@ -28,6 +28,10 @@ const PostMessages = new PostMessageService({
 	loolframe: () => document.getElementById('loleafletframe').contentWindow,
 })
 
+subscribe('richdocuments:grab-focus', () => {
+	PostMessages.sendWOPIPostMessage('loolframe', 'Grab_Focus')
+})
+
 if (isDirectEditing()) {
 	enableScrollLock()
 }
diff --git a/src/mixins/saveAs.js b/src/mixins/saveAs.js
index 03a0994f6c..edb530c6f8 100644
--- a/src/mixins/saveAs.js
+++ b/src/mixins/saveAs.js
@@ -4,11 +4,21 @@
  */
 
 import { spawnDialog } from '@nextcloud/dialogs'
+import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { basename } from 'path'
 import SaveAs from '../components/Modal/SaveAs.vue'
 
 export default {
+	mounted() {
+		subscribe('richdocuments:grab-focus', this.grabFocus)
+	},
+	beforeDestroy() {
+		unsubscribe('richdocuments:grab-focus', this.grabFocus)
+	},
 	methods: {
+		grabFocus() {
+			this.sendPostMessage('Grab_Focus')
+		},
 		async saveAs(format) {
 			spawnDialog(
 				SaveAs,