From 2e0cd481413476c2bd294bc4a37a31fd3b920385 Mon Sep 17 00:00:00 2001
From: Sayam Samal <sayam@zulip.com>
Date: Wed, 9 Oct 2024 13:43:37 +0530
Subject: [PATCH] popovers: Fix initial focus on popover simplebar container.

This commit is a follow-up of 43eebbf9c6b6ef8f3da517bed2b2841143e27b1e,
and it sets `data-simplebar-tab-index="-1"` on the remaining popovers.

This prevents the simplebar container from taking focus while trying to
navigate the popovers via the keyboard, thus fixing the bug where the
user had to click the down key twice before reaching the first
focus-able popover menu option.
---
 .../popovers/left_sidebar/left_sidebar_all_messages_popover.hbs | 2 +-
 .../left_sidebar/left_sidebar_condensed_views_popover.hbs       | 2 +-
 .../popovers/left_sidebar/left_sidebar_drafts_popover.hbs       | 2 +-
 .../popovers/left_sidebar/left_sidebar_inbox_popover.hbs        | 2 +-
 .../popovers/left_sidebar/left_sidebar_recent_view_popover.hbs  | 2 +-
 .../left_sidebar/left_sidebar_starred_messages_popover.hbs      | 2 +-
 .../left_sidebar/left_sidebar_stream_setting_popover.hbs        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/templates/popovers/left_sidebar/left_sidebar_all_messages_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_all_messages_popover.hbs
index e4e162a9a2..810b94b24c 100644
--- a/web/templates/popovers/left_sidebar/left_sidebar_all_messages_popover.hbs
+++ b/web/templates/popovers/left_sidebar/left_sidebar_all_messages_popover.hbs
@@ -1,4 +1,4 @@
-<div class="popover-menu" data-simplebar>
+<div class="popover-menu" data-simplebar data-simplebar-tab-index="-1">
     <ul role="menu" class="popover-menu-list">
         {{#if is_home_view}}
         <li role="none" class="link-item popover-menu-list-item">
diff --git a/web/templates/popovers/left_sidebar/left_sidebar_condensed_views_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_condensed_views_popover.hbs
index fc4e5a5066..215bf4863e 100644
--- a/web/templates/popovers/left_sidebar/left_sidebar_condensed_views_popover.hbs
+++ b/web/templates/popovers/left_sidebar/left_sidebar_condensed_views_popover.hbs
@@ -1,4 +1,4 @@
-<div class="popover-menu" data-simplebar>
+<div class="popover-menu" data-simplebar data-simplebar-tab-index="-1">
     <ul role="menu" class="popover-menu-list condensed-views-popover-menu">
         <li role="none" class="link-item popover-menu-list-item condensed-views-popover-menu-reactions">
             <a href="#narrow/has/reaction/sender/me" role="menuitem" class="popover-menu-link tippy-left-sidebar-tooltip" data-tooltip-template-id="my-reactions-tooltip-template" tabindex="0">
diff --git a/web/templates/popovers/left_sidebar/left_sidebar_drafts_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_drafts_popover.hbs
index c1ef3b8691..4d13a55e9b 100644
--- a/web/templates/popovers/left_sidebar/left_sidebar_drafts_popover.hbs
+++ b/web/templates/popovers/left_sidebar/left_sidebar_drafts_popover.hbs
@@ -1,4 +1,4 @@
-<div class="popover-menu" data-simplebar>
+<div class="popover-menu" data-simplebar data-simplebar-tab-index="-1">
     <ul role="menu" class="popover-menu-list">
         <li role="none" class="link-item popover-menu-list-item">
             <a role="menuitem" id="delete_all_drafts_sidebar" class="popover-menu-link" tabindex="0">
diff --git a/web/templates/popovers/left_sidebar/left_sidebar_inbox_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_inbox_popover.hbs
index f8cd456617..74274dc1db 100644
--- a/web/templates/popovers/left_sidebar/left_sidebar_inbox_popover.hbs
+++ b/web/templates/popovers/left_sidebar/left_sidebar_inbox_popover.hbs
@@ -1,4 +1,4 @@
-<div class="popover-menu" data-simplebar>
+<div class="popover-menu" data-simplebar data-simplebar-tab-index="-1">
     <ul role="menu" class="popover-menu-list">
         {{#if is_home_view}}
         <li role="none" class="link-item popover-menu-list-item">
diff --git a/web/templates/popovers/left_sidebar/left_sidebar_recent_view_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_recent_view_popover.hbs
index 20a5812035..9409f530bb 100644
--- a/web/templates/popovers/left_sidebar/left_sidebar_recent_view_popover.hbs
+++ b/web/templates/popovers/left_sidebar/left_sidebar_recent_view_popover.hbs
@@ -1,4 +1,4 @@
-<div class="popover-menu" data-simplebar>
+<div class="popover-menu" data-simplebar data-simplebar-tab-index="-1">
     <ul role="menu" class="popover-menu-list">
         {{#if is_home_view}}
         <li role="none" class="link-item popover-menu-list-item">
diff --git a/web/templates/popovers/left_sidebar/left_sidebar_starred_messages_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_starred_messages_popover.hbs
index 66a7044a38..da298ab6a2 100644
--- a/web/templates/popovers/left_sidebar/left_sidebar_starred_messages_popover.hbs
+++ b/web/templates/popovers/left_sidebar/left_sidebar_starred_messages_popover.hbs
@@ -1,4 +1,4 @@
-<div class="popover-menu" data-simplebar>
+<div class="popover-menu" data-simplebar data-simplebar-tab-index="-1">
     <ul role="menu" class="popover-menu-list">
         {{#if show_unstar_all_button}}
         <li role="none" class="link-item popover-menu-list-item">
diff --git a/web/templates/popovers/left_sidebar/left_sidebar_stream_setting_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_stream_setting_popover.hbs
index 0fb2499bef..69822964a2 100644
--- a/web/templates/popovers/left_sidebar/left_sidebar_stream_setting_popover.hbs
+++ b/web/templates/popovers/left_sidebar/left_sidebar_stream_setting_popover.hbs
@@ -1,4 +1,4 @@
-<div class="popover-menu" data-simplebar>
+<div class="popover-menu" data-simplebar data-simplebar-tab-index="-1">
     <ul role="menu" class="popover-menu-list">
         <li role="none" class="link-item popover-menu-list-item">
             <a href="#channels/notsubscribed" role="menuitem" class="popover-menu-link navigate_and_close_popover" tabindex="0">