close main menu (server) and toolbar menus (server and desktop) when …

…keyboard shortcut used

- Fixes #6080

src/gwt/src/org/rstudio/core/client/command/BaseMenuBar.java

@@ -1,7 +1,7 @@
 /*
  * BaseMenuBar.java
  *
- * Copyright (C) 2009-19 by RStudio, PBC
+ * Copyright (C) 2009-20 by RStudio, PBC
  *
  * Unless you have received this program directly from RStudio pursuant
  * to the terms of a commercial license agreement with RStudio, then
@@ -22,6 +22,7 @@
 import com.google.gwt.user.client.ui.MenuItem;
 import com.google.gwt.user.client.ui.MenuItemSeparator;
 import com.google.gwt.user.client.ui.UIObject;
+import org.rstudio.core.client.HandlerRegistrations;
 import org.rstudio.core.client.SeparatorManager;
 import org.rstudio.core.client.dom.DomUtils;
 import org.rstudio.core.client.widget.events.GlassVisibilityEvent;
@@ -34,6 +35,7 @@
 import java.util.List;
 
 public class BaseMenuBar extends MenuBar
+                         implements CommandHandler
 {
    private class PositionComparator implements Comparator<UIObject>
    {
@@ -63,6 +65,7 @@ public BaseMenuBar(boolean vertical)
       // subclasses are instantiated using generated code--don't feel
       // like messing with all that now
       eventBus_ = RStudioGinjector.INSTANCE.getEventBus();
+      commandHandler_ = new HandlerRegistrations();
    }
 
    private MenuItem getTargetedMenuItem(Event event)
@@ -149,6 +152,7 @@ protected void onLoad()
       if (vertical_ && glass++ == 0)
          eventBus_.fireEvent(new GlassVisibilityEvent(true));
       super.onLoad();
+      commandHandler_.add(eventBus_.addHandler(CommandEvent.TYPE, this));
       for (MenuItem child : getItems())
       {
          if (child instanceof AppMenuItem)
@@ -179,6 +183,7 @@ protected void onLoad()
    protected void onUnload()
    {
       super.onUnload();
+      commandHandler_.removeHandler();
       if (vertical_ && --glass == 0)
          eventBus_.fireEvent(new GlassVisibilityEvent(false));
    }
@@ -300,6 +305,15 @@ public void keyboardActivateItem(int index)
       doItemAction(item, true, true);
    }
 
+   @Override
+   public void onCommand(AppCommand command)
+   {
+      if (command.getExecutedFromShortcut())
+      {
+         closeAllChildren(false);
+      }
+   }
+
    /**
     * Reference count for glass visibility. NOTE: Perhaps this should be
     * hoisted into a more general class so that everyone who raises
@@ -308,8 +322,8 @@ public void keyboardActivateItem(int index)
    private static int glass = 0;
 
    private boolean autoHideRedundantSeparators_ = true;
-   private final ArrayList<MenuItemSeparator> separators_ =
-         new ArrayList<MenuItemSeparator>();
+   private final ArrayList<MenuItemSeparator> separators_ = new ArrayList<>();
    private final EventBus eventBus_;
    private final boolean vertical_;
+   private final HandlerRegistrations commandHandler_;
 }

src/gwt/src/org/rstudio/core/client/widget/ToolbarPopupMenu.java

@@ -1,7 +1,7 @@
 /*
  * ToolbarPopupMenu.java
  *
- * Copyright (C) 2009-19 by RStudio, PBC
+ * Copyright (C) 2009-20 by RStudio, PBC
  *
  * Unless you have received this program directly from RStudio pursuant
  * to the terms of a commercial license agreement with RStudio, then
@@ -34,13 +34,19 @@
 import com.google.gwt.user.client.ui.MenuItemSeparator;
 import com.google.gwt.user.client.ui.Widget;
 
+import org.rstudio.core.client.HandlerRegistrations;
 import org.rstudio.core.client.command.AppCommand;
 import org.rstudio.core.client.command.AppMenuItem;
 import org.rstudio.core.client.command.BaseMenuBar;
+import org.rstudio.core.client.command.CommandEvent;
+import org.rstudio.core.client.command.CommandHandler;
 import org.rstudio.core.client.dom.DomUtils;
 import org.rstudio.core.client.dom.DomUtils.NodePredicate;
+import org.rstudio.studio.client.RStudioGinjector;
+import org.rstudio.studio.client.application.events.EventBus;
 
 public class ToolbarPopupMenu extends ThemedPopupPanel
+                              implements CommandHandler
 {
    // Extensibility point for dynamically constructed popup menus. The default
    // implementation returns itself, but extensions can do some work to build
@@ -58,6 +64,8 @@ public ToolbarPopupMenu()
       menuBar_ = createMenuBar();
       Widget mainWidget = createMainWidget();
       setWidget(mainWidget);
+      events_ = RStudioGinjector.INSTANCE.getEventBus();
+      commandHandler_ = new HandlerRegistrations();
    }
 
    public ToolbarPopupMenu(ToolbarPopupMenu parent)
@@ -76,11 +84,19 @@ protected Widget createMainWidget()
       return menuBar_;
    }
 
+   @Override
+   protected void onLoad()
+   {
+      super.onLoad();
+      commandHandler_.add(events_.addHandler(CommandEvent.TYPE, this));
+   }
+
    @Override
    protected void onUnload()
    {
       super.onUnload();
       menuBar_.selectItem(null);
+      commandHandler_.removeHandler();
    }
 
    public void selectFirst()
@@ -131,25 +147,25 @@ public void setAutoOpen(boolean autoOpen)
 
    public void insertItem(MenuItem menuItem, int beforeIndex)
    {
-     ScheduledCommand command = menuItem.getScheduledCommand() ;
+     ScheduledCommand command = menuItem.getScheduledCommand();
       if (command != null)
          menuItem.setScheduledCommand(new ToolbarPopupMenuCommand(command));
-      menuBar_.insertItem(menuItem, beforeIndex) ;
+      menuBar_.insertItem(menuItem, beforeIndex);
    }
 
    public void removeItem(MenuItem menuItem)
    {
-      menuBar_.removeItem(menuItem) ;
+      menuBar_.removeItem(menuItem);
    }
 
    public boolean containsItem(MenuItem menuItem)
    {
-      return menuBar_.getItemIndex(menuItem) >= 0 ;
+      return menuBar_.getItemIndex(menuItem) >= 0;
    }
 
    public void clearItems()
    {
-      menuBar_.clearItems() ;
+      menuBar_.clearItems();
    }
 
    public void addSeparator()
@@ -174,7 +190,7 @@ public void addSeparator(int minPx)
 
    public int getItemCount()
    {
-      return menuBar_.getItemCount() ;
+      return menuBar_.getItemCount();
    }
 
    public List<MenuItem> getMenuItems() { return menuBar_.getMenuItems(); }
@@ -214,7 +230,7 @@ protected class ToolbarMenuBar extends BaseMenuBar
    {
       public ToolbarMenuBar(boolean vertical)
       {
-         super(vertical) ;
+         super(vertical);
       }
 
       @Override
@@ -292,7 +308,7 @@ public void onPreviewNativeEvent(NativePreviewEvent e)
 
       public int getItemCount()
       {
-         return getItems().size() ;
+         return getItems().size();
       }
 
       public List<MenuItem> getMenuItems() { return getItems(); }
@@ -351,10 +367,22 @@ public boolean test(Node node)
       if (tableNode == null)
          return null;
 
-      return tableNode.<Element>cast();
+      return tableNode.cast();
 
    }
+
+   @Override
+   public void onCommand(AppCommand command)
+   {
+      if (command.getExecutedFromShortcut())
+      {
+         if (menuBar_.isVisible())
+            menuBar_.setVisible(false);
+      }
+   }
 
    protected ToolbarMenuBar menuBar_;
    private ToolbarPopupMenu parent_;
+   private EventBus events_;
+   private HandlerRegistrations commandHandler_;
 }