feat(UI): Close submenu or context menu on option click (#8193)

Close #8192
shaka-project · Mar 3, 2025 · 5fc0fec · 5fc0fec
1 parent be12a7f
commit 5fc0fec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/ui/ad_statistics_button.js b/ui/ad_statistics_button.js
@@ -143,8 +143,6 @@ shaka.ui.AdStatisticsButton = class extends shaka.ui.Element {
 
   /** @private */
   onClick_() {
-    shaka.ui.Utils.setDisplay(this.parent, false);
-
     if (this.container_.classList.contains('shaka-hidden')) {
       this.icon_.textContent =
           shaka.ui.Enums.MaterialDesignIcons.STATISTICS_OFF;

diff --git a/ui/context_menu.js b/ui/context_menu.js
@@ -64,6 +64,10 @@ shaka.ui.ContextMenu = class extends shaka.ui.Element {
       shaka.ui.Utils.setDisplay(this.contextMenu_, false);
     });
 
+    this.eventManager.listen(this.contextMenu_, 'click', () => {
+      shaka.ui.Utils.setDisplay(this.contextMenu_, false);
+    });
+
     this.createChildren_();
   }
 

diff --git a/ui/settings_menu.js b/ui/settings_menu.js
@@ -114,7 +114,8 @@ shaka.ui.SettingsMenu = class extends shaka.ui.Element {
       this.backButton.firstChild.textContent =
             shaka.ui.Enums.MaterialDesignIcons.BACK;
 
-      this.eventManager.listen(this.backButton, 'click', () => {
+      this.eventManager.listen(this.menu, 'click', () => {
+        shaka.ui.Utils.setDisplay(this.menu, false);
         shaka.ui.Utils.setDisplay(this.parent, true);
 
         const isDisplayed =

diff --git a/ui/statistics_button.js b/ui/statistics_button.js
@@ -192,8 +192,6 @@ shaka.ui.StatisticsButton = class extends shaka.ui.Element {
 
   /** @private */
   onClick_() {
-    shaka.ui.Utils.setDisplay(this.parent, false);
-
     if (this.container_.classList.contains('shaka-hidden')) {
       this.icon_.textContent =
           shaka.ui.Enums.MaterialDesignIcons.STATISTICS_OFF;