Merge pull request #47404 from nextcloud/backport/47363/stable30

[stable30] fix: use empty template by default when pressing enter
nextcloud · Aug 29, 2024 · a56f7cb · a56f7cb
2 parents f81a349 + 93d946b
commit a56f7cb
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 7 deletions.
diff --git a/apps/files/src/components/TemplatePreview.vue b/apps/files/src/components/TemplatePreview.vue
@@ -6,6 +6,7 @@
 <template>
 	<li class="template-picker__item">
 		<input :id="id"
+			ref="input"
 			:checked="checked"
 			type="radio"
 			class="radio"
@@ -124,6 +125,9 @@ export default {
 		onFailure() {
 			this.failedPreview = true
 		},
+		focus() {
+			this.$refs.input?.focus()
+		},
 	},
 }
 </script>

diff --git a/apps/files/src/views/TemplatePicker.vue b/apps/files/src/views/TemplatePicker.vue
@@ -17,6 +17,7 @@
 			<!-- Templates list -->
 			<ul class="templates-picker__list">
 				<TemplatePreview v-bind="emptyTemplate"
+					ref="emptyTemplatePreview"
 					:checked="checked === emptyTemplate.fileid"
 					@check="onCheck" />
 
@@ -179,6 +180,11 @@ export default defineComponent({
 
 			// Else, open the picker
 			this.opened = true
+
+			// Set initial focus to the empty template preview
+			this.$nextTick(() => {
+				this.$refs.emptyTemplatePreview?.focus()
+			})
 		},
 
 		/**

diff --git a/dist/1218-1218.js b/dist/1218-1218.js
diff --git a/dist/1218-1218.js.map b/dist/1218-1218.js.map
diff --git a/dist/1218-1218.js.map.license b/dist/1218-1218.js.map.license
diff --git a/dist/3235-3235.js b/dist/3235-3235.js
diff --git a/dist/1218-1218.js.license → dist/3235-3235.js.license b/dist/1218-1218.js.license → dist/3235-3235.js.license
diff --git a/dist/3235-3235.js.map b/dist/3235-3235.js.map
diff --git a/dist/3235-3235.js.map.license b/dist/3235-3235.js.map.license
@@ -0,0 +1 @@
+3235-3235.js.license
diff --git a/dist/files-init.js b/dist/files-init.js
diff --git a/dist/files-init.js.map b/dist/files-init.js.map