Merge pull request #1 from krassowski/collapse-menu-review

Collapse logic to reduce code complexity
steff456 · Jan 31, 2023 · 8cca0f6 · 8cca0f6
2 parents c14d733 + fcc357b
commit 8cca0f6
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/packages/widgets/src/menubar.ts b/packages/widgets/src/menubar.ts
@@ -413,14 +413,9 @@ export class MenuBar extends Widget {
 
     // Render visible menus
     for (let i = 0; i < length; ++i) {
-      let title = menus[i].title;
-      let active = i === activeIndex;
-      if (active && menus[i].items.length == 0) {
-        active = false;
-      }
       content[i] = renderer.renderItem({
-        title,
-        active,
+        title: menus[i].title,
+        active: i === activeIndex && menus[i].items.length !== 0,
         onfocus: () => {
           this.activeIndex = i;
         }
@@ -447,14 +442,9 @@ export class MenuBar extends Widget {
         });
         this.removeMenu(submenu, false);
       }
-      let title = this._overflowMenu.title;
-      let active = length === activeIndex;
-      if (active && menus[length].items.length == 0) {
-        active = false;
-      }
       content[length] = renderer.renderOverflowItem({
-        title,
-        active,
+        title: this._overflowMenu.title,
+        active: length === activeIndex && menus[length].items.length !== 0,
         onfocus: () => {
           this.activeIndex = length;
         }
@@ -470,11 +460,9 @@ export class MenuBar extends Widget {
           let menu = overflowMenuItems[0].submenu as Menu;
           this._overflowMenu.removeItemAt(0);
           this.insertMenu(length, menu, false);
-          let title = menu.title;
-          let active = false;
           content[length] = renderer.renderItem({
-            title,
-            active,
+            title: menu.title,
+            active: false,
             onfocus: () => {
               this.activeIndex = length;
             }