Submenus can be empty to start

electron · Apr 30, 2020 · bf4c875 · bf4c875
1 parent d1ef420
commit bf4c875
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/browser/api/menu-item.js b/lib/browser/api/menu-item.js
@@ -16,7 +16,7 @@ const MenuItem = function (options) {
   }
   this.submenu = this.submenu || roles.getDefaultSubmenu(this.role);
   if (this.submenu != null && this.submenu.constructor !== Menu) {
-    this.submenu = Menu.buildFromTemplate(this.submenu);
+    this.submenu = Menu.buildFromTemplate(this.submenu, true);
   }
   if (this.type == null && this.submenu != null) {
     this.type = 'submenu';

diff --git a/lib/browser/api/menu.js b/lib/browser/api/menu.js
@@ -173,13 +173,17 @@ Menu.setApplicationMenu = function (menu) {
   }
 };
 
-Menu.buildFromTemplate = function (template) {
-  if (!Array.isArray(template) || template.length === 0) {
+Menu.buildFromTemplate = function (template, isSubmenu = false) {
+  if (!Array.isArray(template)) {
+    throw new TypeError('Invalid template for Menu: Menu template must be an array');
+  } else if (!isSubmenu && template.length === 0) {
     throw new TypeError('Invalid template for Menu: Menu template must be an non-empty array');
   }
+
   if (!areValidTemplateItems(template)) {
     throw new TypeError('Invalid template for MenuItem: must have at least one of label, role or type');
   }
+
   const filtered = removeExtraSeparators(template);
   const sorted = sortTemplate(filtered);
 

diff --git a/spec-main/api-menu-spec.ts b/spec-main/api-menu-spec.ts
@@ -102,7 +102,7 @@ describe('Menu module', function () {
     it('throws when an non-array is passed as a template', () => {
       expect(() => {
         Menu.buildFromTemplate('hello' as any);
-      }).to.throw(/Invalid template for Menu: Menu template must be an non-empty array/);
+      }).to.throw(/Invalid template for Menu: Menu template must be an array/);
     });
 
     describe('Menu sorting and building', () => {