Merge pull request #43388 from nextcloud/backport/43358/stable28

[stable28] fix(settings): focus on federation scope after dialog
nextcloud · Feb 6, 2024 · 2f6b641 · 2f6b641
2 parents a523a87 + 87dde68
commit 2f6b641
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue
@@ -31,6 +31,7 @@
 			:clearable="false"
 			:options="visibilityOptions"
 			:value="visibilityObject"
+			label-outside
 			@option:selected="onVisibilityChange" />
 	</div>
 </template>

diff --git a/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue b/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue
@@ -21,7 +21,8 @@
 -->
 
 <template>
-	<NcActions class="federation-actions"
+	<NcActions ref="federationActions"
+		class="federation-actions"
 		:class="{ 'federation-actions--additional': additional }"
 		:aria-label="ariaLabel"
 		:default-icon="scopeIcon"
@@ -151,6 +152,9 @@ export default {
 			} else {
 				await this.updateAdditionalScope(scope)
 			}
+
+			// TODO: provide focus method from NcActions
+			this.$refs.federationActions.$refs.menuButton.$el.focus()
 		},
 
 		async updatePrimaryScope(scope) {

diff --git a/dist/settings-vue-settings-personal-info.js b/dist/settings-vue-settings-personal-info.js
diff --git a/dist/settings-vue-settings-personal-info.js.map b/dist/settings-vue-settings-personal-info.js.map