From 1ca558e2f8a3c95a359b9a4faa2a461813a73668 Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Wed, 18 Mar 2020 10:22:48 -0300
Subject: [PATCH] [IMPROVE] Context menu autofocus (#16915)

---
 app/search/client/search/search.js              | 7 +++++++
 app/ui-flextab/client/tabs/membersList.js       | 1 +
 app/ui-flextab/client/tabs/uploadedFilesList.js | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/app/search/client/search/search.js b/app/search/client/search/search.js
index fbaed0bab15..a71cc3270ec 100644
--- a/app/search/client/search/search.js
+++ b/app/search/client/search/search.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
@@ -177,6 +178,12 @@ Template.RocketSearch.onRendered(function() {
 		this.suggestions.set();
 		// }
 	});
+	Tracker.autorun((c) => {
+		if (this.isActive.get() === true) {
+			Tracker.afterFlush(() => { document.querySelector('#message-search').focus(); });
+			c.stop();
+		}
+	});
 });
 
 Template.RocketSearch.onDestroyed(function() {
diff --git a/app/ui-flextab/client/tabs/membersList.js b/app/ui-flextab/client/tabs/membersList.js
index 811d171d255..261f311dd1f 100644
--- a/app/ui-flextab/client/tabs/membersList.js
+++ b/app/ui-flextab/client/tabs/membersList.js
@@ -322,6 +322,7 @@ Template.membersList.onCreated(function() {
 });
 
 Template.membersList.onRendered(function() {
+	this.firstNode.parentNode.querySelector('#user-search').focus();
 	this.autorun(() => {
 		const showAllUsers = this.showAllUsers.get();
 		const statusTypeSelect = this.find('.js-type');
diff --git a/app/ui-flextab/client/tabs/uploadedFilesList.js b/app/ui-flextab/client/tabs/uploadedFilesList.js
index fcd41ad8eb8..6cd62c94cb7 100644
--- a/app/ui-flextab/client/tabs/uploadedFilesList.js
+++ b/app/ui-flextab/client/tabs/uploadedFilesList.js
@@ -313,3 +313,7 @@ Template.uploadedFilesList.events({
 		popover.open(config);
 	},
 });
+
+Template.uploadedFilesList.onRendered(function() {
+	this.firstNode.querySelector('[name="file-search"]').focus();
+});