@theia/core 1.61.0 → 1.62.0

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.js

@@ -15,23 +15,176 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolbarMenuNodeWrapper = exports.TOOLBAR_WRAPPER_ID_SUFFIX = void 0;
+exports.ToolbarSubmenuWrapper = exports.ToolbarMenuNodeWrapper = exports.TOOLBAR_WRAPPER_ID_SUFFIX = void 0;
+const React = require("react");
 const tab_bar_toolbar_types_1 = require("./tab-bar-toolbar-types");
+const tab_bar_toolbar_1 = require("./tab-bar-toolbar");
+const widgets_1 = require("../../widgets");
+const menu_1 = require("../../../common/menu");
 exports.TOOLBAR_WRAPPER_ID_SUFFIX = '-as-tabbar-toolbar-item';
-class ToolbarMenuNodeWrapper {
-    constructor(menuNode, group, delegateMenuPath, menuPath) {
+class AbstractToolbarMenuWrapper {
+    constructor(effectiveMenuPath, commandRegistry, menuRegistry, contextKeyService, contextMenuRenderer) {
+        this.effectiveMenuPath = effectiveMenuPath;
+        this.commandRegistry = commandRegistry;
+        this.menuRegistry = menuRegistry;
+        this.contextKeyService = contextKeyService;
+        this.contextMenuRenderer = contextMenuRenderer;
+    }
+    isEnabled() {
+        if (menu_1.CommandMenu.is(this.menuNode)) {
+            return this.menuNode.isEnabled(this.effectiveMenuPath);
+        }
+        return true;
+    }
+    isToggled() {
+        if (menu_1.CommandMenu.is(this.menuNode) && this.menuNode.isToggled) {
+            return !!this.menuNode.isToggled(this.effectiveMenuPath);
+        }
+        return false;
+    }
+    render(widget) {
+        return this.renderMenuItem(widget);
+    }
+    toMenuNode() {
+        return this.menuNode;
+    }
+    /**
+     * Presents the menu to popup on the `event` that is the clicking of
+     * a menu toolbar item.
+     *
+     * @param menuPath the path of the registered menu to show
+     * @param event the mouse event triggering the menu
+     */
+    showPopupMenu(widget, menuPath, event, contextMatcher) {
+        event.stopPropagation();
+        event.preventDefault();
+        const anchor = (0, tab_bar_toolbar_1.toAnchor)(event);
+        this.contextMenuRenderer.render({
+            menuPath: menuPath,
+            menu: this.menuNode,
+            args: [widget],
+            anchor,
+            context: (widget === null || widget === void 0 ? void 0 : widget.node) || event.target,
+            contextKeyService: contextMatcher,
+        });
+    }
+    /**
+     * Renders a toolbar item that is a menu, presenting it as a button with a little
+     * chevron decoration that pops up a floating menu when clicked.
+     *
+     * @param item a toolbar item that is a menu item
+     * @returns the rendered toolbar item
+     */
+    renderMenuItem(widget) {
+        const icon = this.icon || 'ellipsis';
+        const contextMatcher = this.contextKeyService;
+        if (menu_1.CompoundMenuNode.is(this.menuNode) && !this.menuNode.isEmpty(this.effectiveMenuPath, this.contextKeyService, widget.node)) {
+            return React.createElement("div", { key: this.id, className: tab_bar_toolbar_1.TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled menu' },
+                React.createElement("div", { className: (0, widgets_1.codicon)(icon, true), title: this.text, onClick: e => this.executeCommand(e) }),
+                React.createElement("div", { className: widgets_1.ACTION_ITEM, onClick: event => this.showPopupMenu(widget, this.menuPath, event, contextMatcher) },
+                    React.createElement("div", { className: (0, widgets_1.codicon)('chevron-down') + ' chevron' })));
+        }
+        else {
+            return React.createElement("div", { key: this.id, className: tab_bar_toolbar_1.TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled menu' },
+                React.createElement("div", { className: (0, widgets_1.codicon)(icon, true), title: this.text, onClick: e => this.executeCommand(e) }));
+        }
+    }
+}
+class ToolbarMenuNodeWrapper extends AbstractToolbarMenuWrapper {
+    constructor(effectiveMenuPath, commandRegistry, menuRegistry, contextKeyService, contextMenuRenderer, menuNode, group, menuPath) {
+        super(effectiveMenuPath, commandRegistry, menuRegistry, contextKeyService, contextMenuRenderer);
         this.menuNode = menuNode;
         this.group = group;
-        this.delegateMenuPath = delegateMenuPath;
         this.menuPath = menuPath;
     }
+    executeCommand(e) {
+        if (menu_1.CommandMenu.is(this.menuNode)) {
+            this.menuNode.run(this.effectiveMenuPath);
+        }
+    }
+    isVisible(widget) {
+        const menuNodeVisible = this.menuNode.isVisible(this.effectiveMenuPath, this.contextKeyService, widget.node);
+        if (menu_1.CommandMenu.is(this.menuNode)) {
+            return menuNodeVisible;
+        }
+        else if (menu_1.CompoundMenuNode.is(this.menuNode)) {
+            return menuNodeVisible && !menu_1.MenuModelRegistry.isEmpty(this.menuNode);
+        }
+        else {
+            return menuNodeVisible;
+        }
+    }
     get id() { return this.menuNode.id + exports.TOOLBAR_WRAPPER_ID_SUFFIX; }
-    get command() { var _a; return (_a = this.menuNode.command) !== null && _a !== void 0 ? _a : ''; }
-    ;
     get icon() { return this.menuNode.icon; }
     get tooltip() { return this.menuNode.label; }
-    get when() { return this.menuNode.when; }
-    get text() { return (this.group === tab_bar_toolbar_types_1.NAVIGATION || this.group === undefined) ? undefined : this.menuNode.label; }
+    get text() {
+        return (this.group === tab_bar_toolbar_types_1.NAVIGATION || this.group === undefined) ? undefined : this.menuNode.label;
+    }
+    get onDidChange() {
+        return this.menuNode.onDidChange;
+    }
 }
 exports.ToolbarMenuNodeWrapper = ToolbarMenuNodeWrapper;
+class ToolbarSubmenuWrapper extends AbstractToolbarMenuWrapper {
+    constructor(effectiveMenuPath, commandRegistry, menuRegistry, contextKeyService, contextMenuRenderer, toolbarItem) {
+        super(effectiveMenuPath, commandRegistry, menuRegistry, contextKeyService, contextMenuRenderer);
+        this.toolbarItem = toolbarItem;
+    }
+    isEnabled(widget) {
+        return this.toolbarItem.command ? this.commandRegistry.isEnabled(this.toolbarItem.command, widget) : !!this.toolbarItem.menuPath;
+    }
+    executeCommand(e, widget) {
+        e.preventDefault();
+        e.stopPropagation();
+        if (!this.isEnabled(widget)) {
+            return;
+        }
+        if (this.toolbarItem.command) {
+            this.commandRegistry.executeCommand(this.toolbarItem.command, widget);
+        }
+    }
+    ;
+    isVisible(widget) {
+        const menuNode = this.menuNode;
+        if (this.toolbarItem.isVisible && !this.toolbarItem.isVisible(widget)) {
+            return false;
+        }
+        if (!menuNode.isVisible(this.effectiveMenuPath, this.contextKeyService, widget.node, widget)) {
+            return false;
+        }
+        if (this.toolbarItem.command) {
+            return true;
+        }
+        if (menu_1.CompoundMenuNode.is(menuNode)) {
+            return !menuNode.isEmpty(this.effectiveMenuPath, this.contextKeyService, widget.node, widget);
+        }
+        return true;
+    }
+    get id() { return this.toolbarItem.id; }
+    get icon() {
+        if (typeof this.toolbarItem.icon === 'function') {
+            return this.toolbarItem.icon();
+        }
+        if (this.toolbarItem.icon) {
+            return this.toolbarItem.icon;
+        }
+        if (this.toolbarItem.command) {
+            const command = this.commandRegistry.getCommand(this.toolbarItem.command);
+            return command === null || command === void 0 ? void 0 : command.iconClass;
+        }
+        return undefined;
+    }
+    get tooltip() { return this.toolbarItem.tooltip; }
+    get text() { return (this.toolbarItem.group === tab_bar_toolbar_types_1.NAVIGATION || this.toolbarItem.group === undefined) ? undefined : this.toolbarItem.text; }
+    get onDidChange() {
+        return this.menuNode.onDidChange;
+    }
+    get menuPath() {
+        return this.toolbarItem.menuPath;
+    }
+    get menuNode() {
+        return this.menuRegistry.getMenu(this.menuPath);
+    }
+}
+exports.ToolbarSubmenuWrapper = ToolbarSubmenuWrapper;
 //# sourceMappingURL=tab-bar-toolbar-menu-adapters.js.map

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.js.map

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-menu-adapters.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAGhF,mEAA0E;AAE7D,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AAEnE,MAAa,sBAAsB;IAC/B,YAA+B,QAAkB,EAAW,KAAyB,EAAW,gBAA0B,EAAW,QAAmB;QAAzH,aAAQ,GAAR,QAAQ,CAAU;QAAW,UAAK,GAAL,KAAK,CAAoB;QAAW,qBAAgB,GAAhB,gBAAgB,CAAU;QAAW,aAAQ,GAAR,QAAQ,CAAW;IAAI,CAAC;IAC7J,IAAI,EAAE,KAAa,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,iCAAyB,CAAC,CAAC,CAAC;IACzE,IAAI,OAAO,aAAa,OAAO,MAAA,IAAI,CAAC,QAAQ,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,CAAC;IAAA,CAAC;IAC9D,IAAI,IAAI,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,IAAI,OAAO,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,IAAI,IAAI,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,IAAI,IAAI,KAAyB,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,kCAAU,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;CACvI;AARD,wDAQC"}
+{"version":3,"file":"tab-bar-toolbar-menu-adapters.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.tsx"],"names":[],"mappings":"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"}

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.d.ts

@@ -1,9 +1,13 @@
 /// <reference types="lodash" />
-import { CommandRegistry, ContributionProvider, Disposable, Emitter, Event, MenuModelRegistry, MenuPath } from '../../../common';
+import { CommandRegistry, ContributionProvider, Disposable, DisposableCollection, Emitter, Event, MenuModelRegistry, MenuPath } from '../../../common';
 import { ContextKeyService } from '../../context-key-service';
 import { FrontendApplicationContribution } from '../../frontend-application-contribution';
 import { Widget } from '../../widgets';
-import { MenuDelegate, ReactTabBarToolbarItem, RenderedToolbarItem, TabBarToolbarItem } from './tab-bar-toolbar-types';
+import { ReactTabBarToolbarAction, RenderedToolbarAction } from './tab-bar-toolbar-types';
+import { KeybindingRegistry } from '../../keybinding';
+import { LabelParser } from '../../label-parser';
+import { ContextMenuRenderer } from '../../context-menu-renderer';
+import { TabBarToolbarItem } from './tab-toolbar-item';
 /**
  * Clients should implement this interface if they want to contribute to the tab-bar toolbar.
  */
@@ -18,6 +22,10 @@ export interface TabBarToolbarContribution {
      */
     registerToolbarItems(registry: TabBarToolbarRegistry): void;
 }
+interface MenuDelegate {
+    menuPath: MenuPath;
+    isVisible(widget?: Widget): boolean;
+}
 /**
  * Main, shared registry for tab-bar toolbar items.
  */
@@ -27,6 +35,9 @@ export declare class TabBarToolbarRegistry implements FrontendApplicationContrib
     protected readonly commandRegistry: CommandRegistry;
     protected readonly contextKeyService: ContextKeyService;
     protected readonly menuRegistry: MenuModelRegistry;
+    protected readonly keybindingRegistry: KeybindingRegistry;
+    protected readonly labelParser: LabelParser;
+    protected readonly contextMenuRenderer: ContextMenuRenderer;
     protected readonly contributionProvider: ContributionProvider<TabBarToolbarContribution>;
     protected readonly onDidChangeEmitter: Emitter<void>;
     readonly onDidChange: Event<void>;
@@ -37,41 +48,15 @@ export declare class TabBarToolbarRegistry implements FrontendApplicationContrib
      *
      * @param item the item to register.
      */
-    registerItem(item: RenderedToolbarItem | ReactTabBarToolbarItem): Disposable;
+    registerItem(item: RenderedToolbarAction | ReactTabBarToolbarAction): Disposable;
+    doRegisterItem(item: TabBarToolbarItem): DisposableCollection;
     /**
      * Returns an array of tab-bar toolbar items which are visible when the `widget` argument is the current one.
      *
      * By default returns with all items where the command is enabled and `item.isVisible` is `true`.
      */
-    visibleItems(widget: Widget): Array<TabBarToolbarItem | ReactTabBarToolbarItem>;
-    /**
-     * Query whether a toolbar `item` should be shown in the toolbar.
-     * This implementation delegates to item-specific checks according to their type.
-     *
-     * @param item a menu toolbar item
-     * @param widget the widget that is updating the toolbar
-     * @returns `false` if the `item` should be suppressed, otherwise `true`
-     */
-    protected isItemVisible(item: TabBarToolbarItem | ReactTabBarToolbarItem, widget: Widget): boolean;
-    /**
-     * Query whether a conditional toolbar `item` should be shown in the toolbar.
-     * This implementation delegates to the `item`'s own intrinsic conditionality.
-     *
-     * @param item a menu toolbar item
-     * @param widget the widget that is updating the toolbar
-     * @returns `false` if the `item` should be suppressed, otherwise `true`
-     */
-    protected isConditionalItemVisible(item: TabBarToolbarItem, widget: Widget): boolean;
-    /**
-     * Query whether a menu toolbar `item` should be shown in the toolbar.
-     * This implementation returns `false` if the `item` does not have any actual menu to show.
-     *
-     * @param item a menu toolbar item
-     * @param widget the widget that is updating the toolbar
-     * @returns `false` if the `item` should be suppressed, otherwise `true`
-     */
-    isNonEmptyMenu(item: TabBarToolbarItem, widget: Widget | undefined): boolean;
-    unregisterItem(itemOrId: TabBarToolbarItem | ReactTabBarToolbarItem | string): void;
+    visibleItems(widget: Widget): Array<TabBarToolbarItem>;
+    unregisterItem(id: string): void;
     registerMenuDelegate(menuPath: MenuPath, when?: ((widget: Widget) => boolean)): Disposable;
     unregisterMenuDelegate(menuPath: MenuPath): void;
     /**
@@ -83,4 +68,5 @@ export declare class TabBarToolbarRegistry implements FrontendApplicationContrib
      */
     toElementId(menuPath: MenuPath): string;
 }
+export {};
 //# sourceMappingURL=tab-bar-toolbar-registry.d.ts.map

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-registry.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,UAAU,EAAwB,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACjK,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGvH;;GAEG;AACH,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC;;;OAGG;IACH,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAC/D;AAKD;;GAEG;AACH,qBACa,qBAAsB,YAAW,+BAA+B;IAEzE,SAAS,CAAC,KAAK,iCAAiE;IAChF,SAAS,CAAC,aAAa,4BAAmC;IAEjC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IAG9E,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IAEzF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,gBAAuB;IAC5D,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAiC;IAElE,SAAS,CAAC,eAAe,4CAA8D;IAEvF,OAAO,IAAI,IAAI;IAOf;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,sBAAsB,GAAG,UAAU;IAiB5E;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,iBAAiB,GAAG,sBAAsB,CAAC;IAiC/E;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,sBAAsB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAgBlG;;;;;;;OAOG;IACH,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAUpF;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAmB5E,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,sBAAsB,GAAG,MAAM,GAAG,IAAI;IAOnF,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,UAAU;IAgB1F,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAMhD;;;;;;OAMG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM;CAI1C"}
+{"version":3,"file":"tab-bar-toolbar-registry.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACvJ,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAE1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAiD,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEtG;;GAEG;AACH,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC;;;OAGG;IACH,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAC/D;AAGD,UAAU,YAAY;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACvC;AACD;;GAEG;AACH,qBACa,qBAAsB,YAAW,+BAA+B;IAEzE,SAAS,CAAC,KAAK,iCAAwC;IACvD,SAAS,CAAC,aAAa,4BAAmC;IAEjC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IACpC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAGzF,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IAEzF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,gBAAuB;IAC5D,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAiC;IAElE,SAAS,CAAC,eAAe,4CAA8D;IAEvF,OAAO,IAAI,IAAI;IAOf;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,qBAAqB,GAAG,wBAAwB,GAAG,UAAU;IAgBhF,cAAc,CAAC,IAAI,EAAE,iBAAiB,GAAG,oBAAoB;IAmB7D;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC;IAkCtD,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAMhC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,UAAU;IAc1F,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAMhD;;;;;;OAMG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM;CAI1C"}

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.js

@@ -22,12 +22,17 @@ const inversify_1 = require("inversify");
 // eslint-disable-next-line max-len
 const common_1 = require("../../../common");
 const context_key_service_1 = require("../../context-key-service");
+const tab_bar_toolbar_types_1 = require("./tab-bar-toolbar-types");
 const tab_bar_toolbar_menu_adapters_1 = require("./tab-bar-toolbar-menu-adapters");
+const keybinding_1 = require("../../keybinding");
+const label_parser_1 = require("../../label-parser");
+const context_menu_renderer_1 = require("../../context-menu-renderer");
+const menu_1 = require("../../../common/menu");
+const tab_toolbar_item_1 = require("./tab-toolbar-item");
 /**
  * Clients should implement this interface if they want to contribute to the tab-bar toolbar.
  */
 exports.TabBarToolbarContribution = Symbol('TabBarToolbarContribution');
-function yes() { return true; }
 const menuDelegateSeparator = '=@=';
 /**
  * Main, shared registry for tab-bar toolbar items.
@@ -53,13 +58,31 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
      * @param item the item to register.
      */
     registerItem(item) {
-        const { id } = item;
-        if (this.items.has(id)) {
-            throw new Error(`A toolbar item is already registered with the '${id}' ID.`);
+        if (tab_bar_toolbar_types_1.ReactTabBarToolbarAction.is(item)) {
+            return this.doRegisterItem(new tab_toolbar_item_1.ReactToolbarItemImpl(this.commandRegistry, this.contextKeyService, item));
         }
-        this.items.set(id, item);
+        else {
+            if (item.menuPath) {
+                return this.doRegisterItem(new tab_bar_toolbar_menu_adapters_1.ToolbarSubmenuWrapper(item.menuPath, this.commandRegistry, this.menuRegistry, this.contextKeyService, this.contextMenuRenderer, item));
+            }
+            else {
+                const wrapper = new tab_toolbar_item_1.RenderedToolbarItemImpl(this.commandRegistry, this.contextKeyService, this.keybindingRegistry, this.labelParser, item);
+                const disposables = this.doRegisterItem(wrapper);
+                disposables.push(wrapper);
+                return disposables;
+            }
+        }
+    }
+    doRegisterItem(item) {
+        if (this.items.has(item.id)) {
+            throw new Error(`A toolbar item is already registered with the '${item.id}' ID.`);
+        }
+        this.items.set(item.id, item);
         this.fireOnDidChange();
-        const toDispose = new common_1.DisposableCollection(common_1.Disposable.create(() => this.fireOnDidChange()), common_1.Disposable.create(() => this.items.delete(id)));
+        const toDispose = new common_1.DisposableCollection(common_1.Disposable.create(() => {
+            this.items.delete(item.id);
+            this.fireOnDidChange();
+        }));
         if (item.onDidChange) {
             toDispose.push(item.onDidChange(() => this.fireOnDidChange()));
         }
@@ -76,7 +99,7 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
         }
         const result = [];
         for (const item of this.items.values()) {
-            if (this.isItemVisible(item, widget)) {
+            if (item.isVisible(widget)) {
                 result.push(item);
             }
         }
@@ -84,18 +107,16 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
             if (delegate.isVisible(widget)) {
                 const menu = this.menuRegistry.getMenu(delegate.menuPath);
                 for (const child of menu.children) {
-                    if (!child.when || this.contextKeyService.match(child.when, widget.node)) {
-                        if (child.children) {
+                    if (child.isVisible([...delegate.menuPath, child.id], this.contextKeyService, widget.node)) {
+                        if (menu_1.CompoundMenuNode.is(child)) {
                             for (const grandchild of child.children) {
-                                if (!grandchild.when || this.contextKeyService.match(grandchild.when, widget.node)) {
-                                    const menuPath = this.menuRegistry.getPath(grandchild);
-                                    result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper(grandchild, child.id, delegate.menuPath, menuPath));
+                                if (grandchild.isVisible([...delegate.menuPath, child.id, grandchild.id], this.contextKeyService, widget.node) && menu_1.RenderedMenuNode.is(grandchild)) {
+                                    result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper([...delegate.menuPath, child.id, grandchild.id], this.commandRegistry, this.menuRegistry, this.contextKeyService, this.contextMenuRenderer, grandchild, child.id, delegate.menuPath));
                                 }
                             }
                         }
-                        else if (child.command) {
-                            const menuPath = this.menuRegistry.getPath(child);
-                            result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper(child, undefined, delegate.menuPath, menuPath));
+                        else if (menu_1.CommandMenu.is(child)) {
+                            result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper([...delegate.menuPath, child.id], this.commandRegistry, this.menuRegistry, this.contextKeyService, this.contextMenuRenderer, child, undefined, delegate.menuPath));
                         }
                     }
                 }
@@ -103,73 +124,7 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
         }
         return result;
     }
-    /**
-     * Query whether a toolbar `item` should be shown in the toolbar.
-     * This implementation delegates to item-specific checks according to their type.
-     *
-     * @param item a menu toolbar item
-     * @param widget the widget that is updating the toolbar
-     * @returns `false` if the `item` should be suppressed, otherwise `true`
-     */
-    isItemVisible(item, widget) {
-        if (!this.isConditionalItemVisible(item, widget)) {
-            return false;
-        }
-        if (item.command && !this.commandRegistry.isVisible(item.command, widget)) {
-            return false;
-        }
-        if (item.menuPath && !this.isNonEmptyMenu(item, widget)) {
-            return false;
-        }
-        // The item is not vetoed. Accept it
-        return true;
-    }
-    /**
-     * Query whether a conditional toolbar `item` should be shown in the toolbar.
-     * This implementation delegates to the `item`'s own intrinsic conditionality.
-     *
-     * @param item a menu toolbar item
-     * @param widget the widget that is updating the toolbar
-     * @returns `false` if the `item` should be suppressed, otherwise `true`
-     */
-    isConditionalItemVisible(item, widget) {
-        if (item.isVisible && !item.isVisible(widget)) {
-            return false;
-        }
-        if (item.when && !this.contextKeyService.match(item.when, widget.node)) {
-            return false;
-        }
-        return true;
-    }
-    /**
-     * Query whether a menu toolbar `item` should be shown in the toolbar.
-     * This implementation returns `false` if the `item` does not have any actual menu to show.
-     *
-     * @param item a menu toolbar item
-     * @param widget the widget that is updating the toolbar
-     * @returns `false` if the `item` should be suppressed, otherwise `true`
-     */
-    isNonEmptyMenu(item, widget) {
-        if (!item.menuPath) {
-            return false;
-        }
-        const menu = this.menuRegistry.getMenu(item.menuPath);
-        const isVisible = node => {
-            var _a, _b;
-            return ((_a = node.children) === null || _a === void 0 ? void 0 : _a.length)
-                // Either the node is a sub-menu that has some visible child ...
-                ? (_b = node.children) === null || _b === void 0 ? void 0 : _b.some(isVisible)
-                // ... or there is a command ...
-                : !!node.command
-                    // ... that is visible ...
-                    && this.commandRegistry.isVisible(node.command, widget)
-                    // ... and a "when" clause does not suppress the menu node.
-                    && (!node.when || this.contextKeyService.match(node.when, widget === null || widget === void 0 ? void 0 : widget.node));
-        };
-        return isVisible(menu);
-    }
-    unregisterItem(itemOrId) {
-        const id = typeof itemOrId === 'string' ? itemOrId : itemOrId.id;
+    unregisterItem(id) {
         if (this.items.delete(id)) {
             this.fireOnDidChange();
         }
@@ -177,12 +132,9 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
     registerMenuDelegate(menuPath, when) {
         const id = this.toElementId(menuPath);
         if (!this.menuDelegates.has(id)) {
-            const isVisible = !when
-                ? yes
-                : typeof when === 'function'
-                    ? when
-                    : widget => this.contextKeyService.match(when, widget === null || widget === void 0 ? void 0 : widget.node);
-            this.menuDelegates.set(id, { menuPath, isVisible });
+            this.menuDelegates.set(id, {
+                menuPath, isVisible: (widget) => !when || when(widget)
+            });
             this.fireOnDidChange();
             return { dispose: () => this.unregisterMenuDelegate(menuPath) };
         }
@@ -218,6 +170,18 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(common_1.MenuModelRegistry),
     tslib_1.__metadata("design:type", common_1.MenuModelRegistry)
 ], TabBarToolbarRegistry.prototype, "menuRegistry", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(keybinding_1.KeybindingRegistry),
+    tslib_1.__metadata("design:type", keybinding_1.KeybindingRegistry)
+], TabBarToolbarRegistry.prototype, "keybindingRegistry", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(label_parser_1.LabelParser),
+    tslib_1.__metadata("design:type", label_parser_1.LabelParser)
+], TabBarToolbarRegistry.prototype, "labelParser", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(context_menu_renderer_1.ContextMenuRenderer),
+    tslib_1.__metadata("design:type", context_menu_renderer_1.ContextMenuRenderer)
+], TabBarToolbarRegistry.prototype, "contextMenuRenderer", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(common_1.ContributionProvider),
     (0, inversify_1.named)(exports.TabBarToolbarContribution),

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-registry.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tab-bar-toolbar-registry.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts"],"names":[],"mappings":"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"}

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import { Event, MenuPath } from '../../../common';
+import { Event } from '../../../common';
 import { Widget } from '../../widgets';
+import { MenuPath } from '../../../common/menu';
 /** Items whose group is exactly 'navigation' will be rendered inline. */
 export declare const NAVIGATION = "navigation";
 export declare const TAB_BAR_TOOLBAR_CONTEXT_MENU: string[];
@@ -10,11 +11,11 @@ export interface TabBarDelegator extends Widget {
 export declare namespace TabBarDelegator {
     function is(candidate?: Widget): candidate is TabBarDelegator;
 }
-export type TabBarToolbarItem = RenderedToolbarItem | ReactTabBarToolbarItem;
+export type TabBarToolbarAction = RenderedToolbarAction | ReactTabBarToolbarAction;
 /**
  * Representation of an item in the tab
  */
-export interface TabBarToolbarItemBase {
+export interface TabBarToolbarActionBase {
     /**
      * The unique ID of the toolbar item.
      */
@@ -44,21 +45,14 @@ export interface TabBarToolbarItemBase {
     group?: string;
     /**
      * A menu path with which this item is associated.
-     * If accompanied by a command, this data will be passed to the {@link MenuCommandExecutor}.
-     * If no command is present, this menu will be opened.
      */
     menuPath?: MenuPath;
-    /**
-     * The path of the menu delegate that contributed this toolbar item
-     */
-    delegateMenuPath?: MenuPath;
-    contextKeyOverlays?: Record<string, string>;
     /**
      * Optional ordering string for placing the item within its group
      */
     order?: string;
 }
-export interface RenderedToolbarItem extends TabBarToolbarItemBase {
+export interface RenderedToolbarAction extends TabBarToolbarActionBase {
     /**
      * Optional icon for the item.
      */
@@ -81,22 +75,24 @@ export interface RenderedToolbarItem extends TabBarToolbarItemBase {
 }
 /**
  * Tab-bar toolbar item backed by a `React.ReactNode`.
- * Unlike the `TabBarToolbarItem`, this item is not connected to the command service.
+ * Unlike the `TabBarToolbarAction`, this item is not connected to the command service.
  */
-export interface ReactTabBarToolbarItem extends TabBarToolbarItemBase {
+export interface ReactTabBarToolbarAction extends TabBarToolbarActionBase {
     render(widget?: Widget): React.ReactNode;
 }
-export declare namespace ReactTabBarToolbarItem {
-    function is(item: TabBarToolbarItem): item is ReactTabBarToolbarItem;
-}
-export interface MenuDelegate {
-    menuPath: MenuPath;
-    isVisible(widget?: Widget): boolean;
+export declare namespace ReactTabBarToolbarAction {
+    function is(item: TabBarToolbarAction): item is ReactTabBarToolbarAction;
 }
-export declare namespace TabBarToolbarItem {
+export declare namespace TabBarToolbarAction {
     /**
      * Compares the items by `priority` in ascending. Undefined priorities will be treated as `0`.
      */
-    const PRIORITY_COMPARATOR: (left: TabBarToolbarItem, right: TabBarToolbarItem) => number;
+    const PRIORITY_COMPARATOR: (left: {
+        group?: string;
+        priority?: number;
+    }, right: {
+        group?: string;
+        priority?: number;
+    }) => number;
 }
 //# sourceMappingURL=tab-bar-toolbar-types.d.ts.map

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-types.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAc,KAAK,EAAwB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,yEAAyE;AACzE,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,4BAA4B,UAAmC,CAAC;AAE7E,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC3C,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAAC;CAC3C;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,IAAI,eAAe,CAEnE;CACJ;AAED,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,sBAAsB,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACrC;;;;OAIG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;OAEG;IACH,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAoB,SAAQ,qBAAqB;IAC9D;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IAE/B;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACjE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;CAC5C;AAED,yBAAiB,sBAAsB,CAAC;IACpC,SAAgB,EAAE,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,IAAI,sBAAsB,CAE1E;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACvC;AAED,yBAAiB,iBAAiB,CAAC;IAE/B;;OAEG;IACI,MAAM,mBAAmB,SAAU,iBAAiB,SAAS,iBAAiB,WAapF,CAAC;CACL"}
+{"version":3,"file":"tab-bar-toolbar-types.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAc,KAAK,EAAwB,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,yEAAyE;AACzE,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,4BAA4B,UAAmC,CAAC;AAE7E,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC3C,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAAC;CAC3C;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,IAAI,eAAe,CAEnE;CACJ;AAED,MAAM,MAAM,mBAAmB,GAAG,qBAAqB,GAAG,wBAAwB,CAAC;AAEnF;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAErC;;;;OAIG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAsB,SAAQ,uBAAuB;IAClE;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IAE/B;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,wBAAyB,SAAQ,uBAAuB;IACrE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;CAC5C;AAED,yBAAiB,wBAAwB,CAAC;IACtC,SAAgB,EAAE,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI,IAAI,wBAAwB,CAE9E;CACJ;AAED,yBAAiB,mBAAmB,CAAC;IAEjC;;OAEG;IACI,MAAM,mBAAmB,SAAU;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,SAAS;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,WAa5H,CAAC;CACL"}