@theia/core 1.62.0-next.3 → 1.62.1

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

@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TabBarToolbarItem = exports.ReactTabBarToolbarItem = exports.TabBarDelegator = exports.TAB_BAR_TOOLBAR_CONTEXT_MENU = exports.NAVIGATION = void 0;
+exports.TabBarToolbarAction = exports.ReactTabBarToolbarAction = exports.TabBarDelegator = exports.TAB_BAR_TOOLBAR_CONTEXT_MENU = exports.NAVIGATION = void 0;
 const common_1 = require("../../../common");
 /** Items whose group is exactly 'navigation' will be rendered inline. */
 exports.NAVIGATION = 'navigation';
@@ -27,19 +27,19 @@ var TabBarDelegator;
     }
     TabBarDelegator.is = is;
 })(TabBarDelegator || (exports.TabBarDelegator = TabBarDelegator = {}));
-var ReactTabBarToolbarItem;
-(function (ReactTabBarToolbarItem) {
+var ReactTabBarToolbarAction;
+(function (ReactTabBarToolbarAction) {
     function is(item) {
         return (0, common_1.isObject)(item) && typeof item.render === 'function';
     }
-    ReactTabBarToolbarItem.is = is;
-})(ReactTabBarToolbarItem || (exports.ReactTabBarToolbarItem = ReactTabBarToolbarItem = {}));
-var TabBarToolbarItem;
-(function (TabBarToolbarItem) {
+    ReactTabBarToolbarAction.is = is;
+})(ReactTabBarToolbarAction || (exports.ReactTabBarToolbarAction = ReactTabBarToolbarAction = {}));
+var TabBarToolbarAction;
+(function (TabBarToolbarAction) {
     /**
      * Compares the items by `priority` in ascending. Undefined priorities will be treated as `0`.
      */
-    TabBarToolbarItem.PRIORITY_COMPARATOR = (left, right) => {
+    TabBarToolbarAction.PRIORITY_COMPARATOR = (left, right) => {
         var _a, _b;
         const leftGroup = (_a = left.group) !== null && _a !== void 0 ? _a : exports.NAVIGATION;
         const rightGroup = (_b = right.group) !== null && _b !== void 0 ? _b : exports.NAVIGATION;
@@ -54,5 +54,5 @@ var TabBarToolbarItem;
         }
         return (left.priority || 0) - (right.priority || 0);
     };
-})(TabBarToolbarItem || (exports.TabBarToolbarItem = TabBarToolbarItem = {}));
+})(TabBarToolbarAction || (exports.TabBarToolbarAction = TabBarToolbarAction = {}));
 //# sourceMappingURL=tab-bar-toolbar-types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-types.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.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,4CAAoF;AAGpF,yEAAyE;AAC5D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,4BAA4B,GAAG,CAAC,8BAA8B,CAAC,CAAC;AAM7E,IAAiB,eAAe,CAI/B;AAJD,WAAiB,eAAe;IAC5B,SAAgB,EAAE,CAAC,SAAkB;QACjC,OAAO,IAAA,iBAAQ,EAAkB,SAAS,CAAC,IAAI,IAAA,mBAAU,EAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3F,CAAC;IAFe,kBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,eAAe,+BAAf,eAAe,QAI/B;AAsFD,IAAiB,sBAAsB,CAItC;AAJD,WAAiB,sBAAsB;IACnC,SAAgB,EAAE,CAAC,IAAuB;QACtC,OAAO,IAAA,iBAAQ,EAAyB,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC;IACvF,CAAC;IAFe,yBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,sBAAsB,sCAAtB,sBAAsB,QAItC;AAOD,IAAiB,iBAAiB,CAmBjC;AAnBD,WAAiB,iBAAiB;IAE9B;;OAEG;IACU,qCAAmB,GAAG,CAAC,IAAuB,EAAE,KAAwB,EAAE,EAAE;;QACrF,MAAM,SAAS,GAAW,MAAA,IAAI,CAAC,KAAK,mCAAI,kBAAU,CAAC;QACnD,MAAM,UAAU,GAAW,MAAA,KAAK,CAAC,KAAK,mCAAI,kBAAU,CAAC;QACrD,IAAI,SAAS,KAAK,kBAAU,IAAI,UAAU,KAAK,kBAAU,EAAE,CAAC;YACxD,OAAO,mBAAU,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3C,CAAC;QACD,IAAI,UAAU,KAAK,kBAAU,IAAI,SAAS,KAAK,kBAAU,EAAE,CAAC;YACxD,OAAO,mBAAU,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3C,CAAC;QACD,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC;AACN,CAAC,EAnBgB,iBAAiB,iCAAjB,iBAAiB,QAmBjC"}
+{"version":3,"file":"tab-bar-toolbar-types.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.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,4CAA0E;AAI1E,yEAAyE;AAC5D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,4BAA4B,GAAG,CAAC,8BAA8B,CAAC,CAAC;AAM7E,IAAiB,eAAe,CAI/B;AAJD,WAAiB,eAAe;IAC5B,SAAgB,EAAE,CAAC,SAAkB;QACjC,OAAO,IAAA,iBAAQ,EAAkB,SAAS,CAAC,IAAI,IAAA,mBAAU,EAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3F,CAAC;IAFe,kBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,eAAe,+BAAf,eAAe,QAI/B;AAiFD,IAAiB,wBAAwB,CAIxC;AAJD,WAAiB,wBAAwB;IACrC,SAAgB,EAAE,CAAC,IAAyB;QACxC,OAAO,IAAA,iBAAQ,EAA2B,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC;IACzF,CAAC;IAFe,2BAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,wBAAwB,wCAAxB,wBAAwB,QAIxC;AAED,IAAiB,mBAAmB,CAmBnC;AAnBD,WAAiB,mBAAmB;IAEhC;;OAEG;IACU,uCAAmB,GAAG,CAAC,IAA2C,EAAE,KAA4C,EAAE,EAAE;;QAC7H,MAAM,SAAS,GAAW,MAAA,IAAI,CAAC,KAAK,mCAAI,kBAAU,CAAC;QACnD,MAAM,UAAU,GAAW,MAAA,KAAK,CAAC,KAAK,mCAAI,kBAAU,CAAC;QACrD,IAAI,SAAS,KAAK,kBAAU,IAAI,UAAU,KAAK,kBAAU,EAAE,CAAC;YACxD,OAAO,mBAAU,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3C,CAAC;QACD,IAAI,UAAU,KAAK,kBAAU,IAAI,SAAS,KAAK,kBAAU,EAAE,CAAC;YACxD,OAAO,mBAAU,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3C,CAAC;QACD,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC;AACN,CAAC,EAnBgB,mBAAmB,mCAAnB,mBAAmB,QAmBnC"}

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

@@ -1,12 +1,13 @@
 import * as React from 'react';
-import { ContextKeyService, ContextMatcher } from '../../context-key-service';
-import { CommandRegistry, Disposable, DisposableCollection, MenuCommandExecutor, MenuModelRegistry, MenuPath } from '../../../common';
+import { ContextKeyService } from '../../context-key-service';
+import { CommandRegistry, Disposable, DisposableCollection } from '../../../common';
 import { Anchor, ContextMenuAccess, ContextMenuRenderer } from '../../context-menu-renderer';
 import { LabelParser } from '../../label-parser';
 import { ReactWidget, Widget } from '../../widgets';
 import { TabBarToolbarRegistry } from './tab-bar-toolbar-registry';
-import { ReactTabBarToolbarItem, TabBarToolbarItem, RenderedToolbarItem } from './tab-bar-toolbar-types';
 import { KeybindingRegistry } from '../..//keybinding';
+import { TabBarToolbarItem } from './tab-toolbar-item';
+import { MenuModelRegistry } from '../../../common/menu';
 /**
  * Factory for instantiating tab-bar toolbars.
  */
@@ -14,6 +15,7 @@ export declare const TabBarToolbarFactory: unique symbol;
 export interface TabBarToolbarFactory {
     (): TabBarToolbar;
 }
+export declare function toAnchor(event: React.MouseEvent): Anchor;
 /**
  * Tab-bar toolbar widget representing the active [tab-bar toolbar items](TabBarToolbarItem).
  */
@@ -27,59 +29,25 @@ export declare class TabBarToolbar extends ReactWidget {
     protected readonly commands: CommandRegistry;
     protected readonly labelParser: LabelParser;
     protected readonly menus: MenuModelRegistry;
-    protected readonly menuCommandExecutor: MenuCommandExecutor;
     protected readonly contextMenuRenderer: ContextMenuRenderer;
     protected readonly toolbarRegistry: TabBarToolbarRegistry;
     protected readonly contextKeyService: ContextKeyService;
     protected readonly keybindings: KeybindingRegistry;
     constructor();
     protected init(): void;
-    updateItems(items: Array<TabBarToolbarItem | ReactTabBarToolbarItem>, current: Widget | undefined): void;
+    updateItems(items: Array<TabBarToolbarItem>, current: Widget | undefined): void;
     updateTarget(current?: Widget): void;
     protected readonly toDisposeOnSetCurrent: DisposableCollection;
     protected setCurrent(current: Widget | undefined): void;
-    protected updateContextKeyListener(contextKeys: Set<string>): void;
     protected render(): React.ReactNode;
-    protected resolveKeybindingForCommand(command: string | undefined): string;
-    protected renderItem(item: RenderedToolbarItem): React.ReactNode;
-    protected isEnabled(item: TabBarToolbarItem): boolean;
-    protected getToolbarItemClassNames(item: TabBarToolbarItem): string[];
     protected renderMore(): React.ReactNode;
     protected showMoreContextMenu: (event: React.MouseEvent) => void;
-    protected toAnchor(event: React.MouseEvent): Anchor;
-    renderMoreContextMenu(anchor: Anchor, subpath?: MenuPath): ContextMenuAccess;
-    /**
-     * 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
-     */
-    protected renderMenuItem(item: RenderedToolbarItem): React.ReactNode;
-    /**
-     * 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
-     */
-    protected showPopupMenu: (menuPath: MenuPath, event: React.MouseEvent, contextMatcher: ContextMatcher) => void;
-    /**
-     * Renders the menu popped up on a menu toolbar item.
-     *
-     * @param menuPath the path of the registered menu to render
-     * @param anchor a description of where to render the menu
-     * @returns platform-specific access to the rendered context menu
-     */
-    protected renderPopupMenu(menuPath: MenuPath, anchor: Anchor, contextMatcher: ContextMatcher): ContextMenuAccess;
+    renderMoreContextMenu(anchor: Anchor): ContextMenuAccess;
     shouldHandleMouseEvent(event: MouseEvent): boolean;
     protected commandIsEnabled(command: string): boolean;
     protected commandIsToggled(command: string): boolean;
     protected evaluateWhenClause(whenClause: string | undefined): boolean;
-    protected executeCommand(e: React.MouseEvent<HTMLElement>, item: TabBarToolbarItem): void;
     protected maybeUpdate(): void;
-    protected onMouseDownEvent: (e: React.MouseEvent<HTMLElement>) => void;
-    protected onMouseUpEvent: (e: React.MouseEvent<HTMLElement>) => void;
 }
 export declare namespace TabBarToolbar {
     namespace Styles {

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

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

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

@@ -16,7 +16,7 @@
 // *****************************************************************************
 var TabBarToolbar_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TabBarToolbar = exports.TabBarToolbarFactory = void 0;
+exports.TabBarToolbar = exports.toAnchor = exports.TabBarToolbarFactory = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("inversify");
 const React = require("react");
@@ -28,14 +28,17 @@ const widgets_1 = require("../../widgets");
 const tab_bar_toolbar_registry_1 = require("./tab-bar-toolbar-registry");
 const tab_bar_toolbar_types_1 = require("./tab-bar-toolbar-types");
 const keybinding_1 = require("../..//keybinding");
+const menu_1 = require("../../../common/menu");
 /**
  * Factory for instantiating tab-bar toolbars.
  */
 exports.TabBarToolbarFactory = Symbol('TabBarToolbarFactory');
-/**
- * Class name indicating rendering of a toolbar item without an icon but instead with a text label.
- */
-const NO_ICON_CLASS = 'no-icon';
+function toAnchor(event) {
+    var _a;
+    const itemBox = (_a = event.currentTarget.closest('.' + TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM)) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
+    return itemBox ? { y: itemBox.bottom, x: itemBox.left } : event.nativeEvent;
+}
+exports.toAnchor = toAnchor;
 /**
  * Tab-bar toolbar widget representing the active [tab-bar toolbar items](TabBarToolbarItem).
  */
@@ -50,30 +53,9 @@ let TabBarToolbar = TabBarToolbar_1 = class TabBarToolbar extends widgets_1.Reac
         this.showMoreContextMenu = (event) => {
             event.stopPropagation();
             event.preventDefault();
-            const anchor = this.toAnchor(event);
+            const anchor = toAnchor(event);
             this.renderMoreContextMenu(anchor);
         };
-        /**
-         * 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
-         */
-        this.showPopupMenu = (menuPath, event, contextMatcher) => {
-            event.stopPropagation();
-            event.preventDefault();
-            const anchor = this.toAnchor(event);
-            this.renderPopupMenu(menuPath, anchor, contextMatcher);
-        };
-        this.onMouseDownEvent = (e) => {
-            if (e.button === 0) {
-                e.currentTarget.classList.add('active');
-            }
-        };
-        this.onMouseUpEvent = (e) => {
-            e.currentTarget.classList.remove('active');
-        };
         this.addClass(TabBarToolbar_1.Styles.TAB_BAR_TOOLBAR);
         this.hide();
     }
@@ -86,31 +68,21 @@ let TabBarToolbar = TabBarToolbar_1 = class TabBarToolbar extends widgets_1.Reac
         }));
     }
     updateItems(items, current) {
-        var _a;
         this.toDisposeOnUpdateItems.dispose();
         this.toDisposeOnUpdateItems = new common_1.DisposableCollection();
         this.inline.clear();
         this.more.clear();
-        const contextKeys = new Set();
-        for (const item of items.sort(tab_bar_toolbar_types_1.TabBarToolbarItem.PRIORITY_COMPARATOR).reverse()) {
-            if (item.command) {
-                this.commands.getAllHandlers(item.command).forEach(handler => {
-                    if (handler.onDidChangeEnabled) {
-                        this.toDisposeOnUpdateItems.push(handler.onDidChangeEnabled(() => this.maybeUpdate()));
-                    }
-                });
-            }
-            if ('render' in item || item.group === undefined || item.group === 'navigation') {
+        for (const item of items.sort(tab_bar_toolbar_types_1.TabBarToolbarAction.PRIORITY_COMPARATOR).reverse()) {
+            if (!('toMenuNode' in item) || item.group === undefined || item.group === 'navigation') {
                 this.inline.set(item.id, item);
             }
             else {
                 this.more.set(item.id, item);
             }
-            if (item.when) {
-                (_a = this.contextKeyService.parseKeys(item.when)) === null || _a === void 0 ? void 0 : _a.forEach(key => contextKeys.add(key));
+            if (item.onDidChange) {
+                this.toDisposeOnUpdateItems.push(item.onDidChange(() => this.maybeUpdate()));
             }
         }
-        this.updateContextKeyListener(contextKeys);
         this.setCurrent(current);
         if (items.length) {
             this.show();
@@ -138,200 +110,42 @@ let TabBarToolbar = TabBarToolbar_1 = class TabBarToolbar extends widgets_1.Reac
             this.toDisposeOnSetCurrent.push(common_1.Disposable.create(() => current.disposed.disconnect(resetCurrent)));
         }
     }
-    updateContextKeyListener(contextKeys) {
-        var _a;
-        (_a = this.contextKeyListener) === null || _a === void 0 ? void 0 : _a.dispose();
-        if (contextKeys.size > 0) {
-            this.contextKeyListener = this.contextKeyService.onDidChange(event => {
-                if (event.affects(contextKeys)) {
-                    this.maybeUpdate();
-                }
-            });
-        }
-    }
     render() {
         this.keybindingContextKeys.clear();
         return React.createElement(React.Fragment, null,
             this.renderMore(),
-            [...this.inline.values()].map(item => {
-                if (tab_bar_toolbar_types_1.ReactTabBarToolbarItem.is(item)) {
-                    return item.render(this.current);
-                }
-                else {
-                    return (item.menuPath && this.toolbarRegistry.isNonEmptyMenu(item, this.current) ? this.renderMenuItem(item) : this.renderItem(item));
-                }
-            }));
-    }
-    resolveKeybindingForCommand(command) {
-        let result = '';
-        if (command) {
-            const bindings = this.keybindings.getKeybindingsForCommand(command);
-            let found = false;
-            if (bindings && bindings.length > 0) {
-                bindings.forEach(binding => {
-                    var _a, _b;
-                    if (binding.when) {
-                        (_a = this.contextKeyService.parseKeys(binding.when)) === null || _a === void 0 ? void 0 : _a.forEach(key => this.keybindingContextKeys.add(key));
-                    }
-                    if (!found && this.keybindings.isEnabledInScope(binding, (_b = this.current) === null || _b === void 0 ? void 0 : _b.node)) {
-                        found = true;
-                        result = ` (${this.keybindings.acceleratorFor(binding, '+')})`;
-                    }
-                });
-            }
-        }
-        return result;
-    }
-    renderItem(item) {
-        let innerText = '';
-        const classNames = [];
-        const command = item.command ? this.commands.getCommand(item.command) : undefined;
-        // Fall back to the item ID in extremis so there is _something_ to render in the
-        // case that there is neither an icon nor a title
-        const itemText = item.text || (command === null || command === void 0 ? void 0 : command.label) || (command === null || command === void 0 ? void 0 : command.id) || item.id;
-        if (itemText) {
-            for (const labelPart of this.labelParser.parse(itemText)) {
-                if (label_parser_1.LabelIcon.is(labelPart)) {
-                    const className = `fa fa-${labelPart.name}${labelPart.animation ? ' fa-' + labelPart.animation : ''}`;
-                    classNames.push(...className.split(' '));
-                }
-                else {
-                    innerText = labelPart;
-                }
-            }
-        }
-        const iconClass = (typeof item.icon === 'function' && item.icon()) || item.icon || (command && command.iconClass);
-        if (iconClass) {
-            classNames.push(iconClass);
-        }
-        const tooltipText = item.tooltip || (command && command.label) || '';
-        const tooltip = `${this.labelParser.stripIcons(tooltipText)}${this.resolveKeybindingForCommand(command === null || command === void 0 ? void 0 : command.id)}`;
-        // Only present text if there is no icon
-        if (classNames.length) {
-            innerText = '';
-        }
-        else if (innerText) {
-            // Make room for the label text
-            classNames.push(NO_ICON_CLASS);
-        }
-        // In any case, this is an action item, with or without icon.
-        classNames.push(widgets_1.ACTION_ITEM);
-        const toolbarItemClassNames = this.getToolbarItemClassNames(item);
-        return React.createElement("div", { key: item.id, className: toolbarItemClassNames.join(' '), onMouseDown: this.onMouseDownEvent, onMouseUp: this.onMouseUpEvent, onMouseOut: this.onMouseUpEvent },
-            React.createElement("div", { id: item.id, className: classNames.join(' '), onClick: e => this.executeCommand(e, item), title: tooltip }, innerText));
-    }
-    isEnabled(item) {
-        if (!!item.command) {
-            return this.commandIsEnabled(item.command) && this.evaluateWhenClause(item.when);
-        }
-        else {
-            return !!item.menuPath;
-        }
-    }
-    getToolbarItemClassNames(item) {
-        const classNames = [TabBarToolbar_1.Styles.TAB_BAR_TOOLBAR_ITEM];
-        if (item.command) {
-            if (this.isEnabled(item)) {
-                classNames.push('enabled');
-            }
-            if (this.commandIsToggled(item.command)) {
-                classNames.push('toggled');
-            }
-        }
-        else {
-            if (this.isEnabled(item)) {
-                classNames.push('enabled');
-            }
-        }
-        return classNames;
+            [...this.inline.values()].map(item => item.render(this.current)));
     }
     renderMore() {
         return !!this.more.size && React.createElement("div", { key: '__more__', className: TabBarToolbar_1.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled' },
             React.createElement("div", { id: '__more__', className: (0, widgets_1.codicon)('ellipsis', true), onClick: this.showMoreContextMenu, title: common_1.nls.localizeByDefault('More Actions...') }));
     }
-    toAnchor(event) {
+    renderMoreContextMenu(anchor) {
         var _a;
-        const itemBox = (_a = event.currentTarget.closest('.' + TabBarToolbar_1.Styles.TAB_BAR_TOOLBAR_ITEM)) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
-        return itemBox ? { y: itemBox.bottom, x: itemBox.left } : event.nativeEvent;
-    }
-    renderMoreContextMenu(anchor, subpath) {
-        var _a, _b;
         const toDisposeOnHide = new common_1.DisposableCollection();
         this.addClass('menu-open');
         toDisposeOnHide.push(common_1.Disposable.create(() => this.removeClass('menu-open')));
-        if (subpath) {
-            toDisposeOnHide.push(this.menus.linkSubmenu(tab_bar_toolbar_types_1.TAB_BAR_TOOLBAR_CONTEXT_MENU, subpath));
-        }
-        else {
-            for (const item of this.more.values()) {
-                if (item.menuPath && !item.command) {
-                    toDisposeOnHide.push(this.menus.linkSubmenu(tab_bar_toolbar_types_1.TAB_BAR_TOOLBAR_CONTEXT_MENU, item.menuPath, undefined, item.group));
-                }
-                else if (item.command) {
-                    // Register a submenu for the item, if the group is in format `<submenu group>/<submenu name>/.../<item group>`
-                    if ((_a = item.group) === null || _a === void 0 ? void 0 : _a.includes('/')) {
-                        const split = item.group.split('/');
-                        const paths = [];
-                        for (let i = 0; i < split.length - 1; i += 2) {
-                            paths.push(split[i], split[i + 1]);
-                            toDisposeOnHide.push(this.menus.registerSubmenu([...tab_bar_toolbar_types_1.TAB_BAR_TOOLBAR_CONTEXT_MENU, ...paths], split[i + 1], { order: item.order }));
-                        }
+        const menu = new menu_1.GroupImpl('contextMenu');
+        for (const item of this.more.values()) {
+            if (item.toMenuNode) {
+                const node = item.toMenuNode();
+                if (node) {
+                    if (item.group) {
+                        menu.getOrCreate([item.group], 0, 1).addNode(node);
+                    }
+                    else {
+                        menu.addNode(node);
                     }
-                    toDisposeOnHide.push(this.menus.registerMenuAction([...tab_bar_toolbar_types_1.TAB_BAR_TOOLBAR_CONTEXT_MENU, ...item.group.split('/')], {
-                        label: item.tooltip,
-                        commandId: item.command,
-                        when: item.when,
-                        order: item.order
-                    }));
                 }
             }
         }
         return this.contextMenuRenderer.render({
-            menuPath: tab_bar_toolbar_types_1.TAB_BAR_TOOLBAR_CONTEXT_MENU,
-            args: [this.current],
-            anchor,
-            context: ((_b = this.current) === null || _b === void 0 ? void 0 : _b.node) || this.node,
-            onHide: () => toDisposeOnHide.dispose(),
-            skipSingleRootNode: true,
-        });
-    }
-    /**
-     * 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(item) {
-        const command = item.command ? this.commands.getCommand(item.command) : undefined;
-        const icon = (typeof item.icon === 'function' && item.icon()) || item.icon || (command && command.iconClass) || 'ellipsis';
-        let contextMatcher = this.contextKeyService;
-        if (item.contextKeyOverlays) {
-            contextMatcher = this.contextKeyService.createOverlay(Object.keys(item.contextKeyOverlays).map(key => [key, item.contextKeyOverlays[key]]));
-        }
-        return React.createElement("div", { key: item.id, className: TabBarToolbar_1.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled menu' },
-            React.createElement("div", { className: (0, widgets_1.codicon)(icon, true), title: item.text, onClick: e => this.executeCommand(e, item) }),
-            React.createElement("div", { className: widgets_1.ACTION_ITEM, onClick: event => this.showPopupMenu(item.menuPath, event, contextMatcher) },
-                React.createElement("div", { className: (0, widgets_1.codicon)('chevron-down') + ' chevron' })));
-    }
-    /**
-     * Renders the menu popped up on a menu toolbar item.
-     *
-     * @param menuPath the path of the registered menu to render
-     * @param anchor a description of where to render the menu
-     * @returns platform-specific access to the rendered context menu
-     */
-    renderPopupMenu(menuPath, anchor, contextMatcher) {
-        var _a;
-        const toDisposeOnHide = new common_1.DisposableCollection();
-        this.addClass('menu-open');
-        toDisposeOnHide.push(common_1.Disposable.create(() => this.removeClass('menu-open')));
-        return this.contextMenuRenderer.render({
-            menuPath,
+            menu: menu_1.MenuModelRegistry.removeSingleRootNodes(menu),
+            menuPath: ['contextMenu'],
             args: [this.current],
             anchor,
             context: ((_a = this.current) === null || _a === void 0 ? void 0 : _a.node) || this.node,
-            contextKeyService: contextMatcher,
+            contextKeyService: this.contextKeyService,
             onHide: () => toDisposeOnHide.dispose()
         });
     }
@@ -348,24 +162,6 @@ let TabBarToolbar = TabBarToolbar_1 = class TabBarToolbar extends widgets_1.Reac
         var _a;
         return whenClause ? this.contextKeyService.match(whenClause, (_a = this.current) === null || _a === void 0 ? void 0 : _a.node) : true;
     }
-    executeCommand(e, item) {
-        e.preventDefault();
-        e.stopPropagation();
-        if (!item || !this.isEnabled(item)) {
-            return;
-        }
-        if (item.command && item.delegateMenuPath) {
-            this.menuCommandExecutor.executeCommand(item.delegateMenuPath, item.command, this.current);
-        }
-        else if (item.command) {
-            this.commands.executeCommand(item.command, this.current);
-        }
-        else if (item.menuPath) {
-            this.renderMoreContextMenu(this.toAnchor(e), item.menuPath);
-        }
-        this.maybeUpdate();
-    }
-    ;
     maybeUpdate() {
         if (!this.isDisposed) {
             this.update();
@@ -382,13 +178,9 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", label_parser_1.LabelParser)
 ], TabBarToolbar.prototype, "labelParser", void 0);
 tslib_1.__decorate([
-    (0, inversify_1.inject)(common_1.MenuModelRegistry),
-    tslib_1.__metadata("design:type", common_1.MenuModelRegistry)
+    (0, inversify_1.inject)(menu_1.MenuModelRegistry),
+    tslib_1.__metadata("design:type", menu_1.MenuModelRegistry)
 ], TabBarToolbar.prototype, "menus", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(common_1.MenuCommandExecutor),
-    tslib_1.__metadata("design:type", Object)
-], TabBarToolbar.prototype, "menuCommandExecutor", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(context_menu_renderer_1.ContextMenuRenderer),
     tslib_1.__metadata("design:type", context_menu_renderer_1.ContextMenuRenderer)

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

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;;AAEhF,yCAA8D;AAC9D,+BAA+B;AAC/B,mEAA8E;AAC9E,4CAA2I;AAC3I,uEAA6F;AAC7F,qDAA4D;AAC5D,2CAA0E;AAC1E,yEAAmE;AACnE,mEAAwJ;AACxJ,kDAAuD;AAEvD;;GAEG;AACU,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAKnE;;GAEG;AACH,MAAM,aAAa,GAAG,SAAS,CAAC;AAEhC;;GAEG;AAEI,IAAM,aAAa,qBAAnB,MAAM,aAAc,SAAQ,qBAAW;IAoB1C;QACI,KAAK,EAAE,CAAC;QAlBF,WAAM,GAAG,IAAI,GAAG,EAAsD,CAAC;QACvE,SAAI,GAAG,IAAI,GAAG,EAA6B,CAAC;QAG5C,2BAAsB,GAAyB,IAAI,6BAAoB,EAAE,CAAC;QAE1E,0BAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;QAuEjC,0BAAqB,GAAG,IAAI,6BAAoB,EAAE,CAAC;QA8I5D,wBAAmB,GAAG,CAAC,KAAuB,EAAE,EAAE;YACxD,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,KAAK,CAAC,cAAc,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACpC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC,CAAC;QA4EF;;;;;;WAMG;QACO,kBAAa,GAAG,CAAC,QAAkB,EAAE,KAAuB,EAAE,cAA8B,EAAE,EAAE;YACtG,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,KAAK,CAAC,cAAc,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACpC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC3D,CAAC,CAAC;QAgEQ,qBAAgB,GAAG,CAAC,CAAgC,EAAE,EAAE;YAC9D,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjB,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5C,CAAC;QACL,CAAC,CAAC;QAEQ,mBAAc,GAAG,CAAC,CAAgC,EAAE,EAAE;YAC5D,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/C,CAAC,CAAC;QA7WE,IAAI,CAAC,QAAQ,CAAC,eAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAGS,IAAI;QACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAErF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;YACvD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,WAAW,CAAC,KAAwD,EAAE,OAA2B;;QAC7F,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC;QACtC,IAAI,CAAC,sBAAsB,GAAG,IAAI,6BAAoB,EAAE,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAElB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;QACtC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,yCAAiB,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC7E,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACf,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACzD,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;wBAC7B,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;oBAC3F,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;YACD,IAAI,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;gBAC9E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YACjC,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,MAAA,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,0CAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACtF,CAAC;QACL,CAAC;QAED,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;QAE3C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IAED,YAAY,CAAC,OAAgB;QACzB,MAAM,eAAe,GAAG,uCAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC5F,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxF,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAC7C,CAAC;IAGS,UAAU,CAAC,OAA2B;QAC5C,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,YAAY,GAAG,GAAG,EAAE;gBACtB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,CAAC,CAAC;YACF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACvC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CACnD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAC5C,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAES,wBAAwB,CAAC,WAAwB;;QACvD,MAAA,IAAI,CAAC,kBAAkB,0CAAE,OAAO,EAAE,CAAC;QACnC,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBACjE,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC7B,IAAI,CAAC,WAAW,EAAE,CAAC;gBACvB,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAES,MAAM;QACZ,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACnC,OAAO,oBAAC,KAAK,CAAC,QAAQ;YACjB,IAAI,CAAC,UAAU,EAAE;YACjB,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAClC,IAAI,8CAAsB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;oBAClC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrC,CAAC;qBAAM,CAAC;oBACJ,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC1I,CAAC;YACL,CAAC,CAAC,CACW,CAAC;IACtB,CAAC;IAES,2BAA2B,CAAC,OAA2B;QAC7D,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;YACpE,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;;oBACvB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;wBACf,MAAA,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,0CAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;oBACxG,CAAC;oBACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,EAAE,CAAC;wBAC3E,KAAK,GAAG,IAAI,CAAC;wBACb,MAAM,GAAG,KAAK,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC;oBACnE,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,UAAU,CAAC,IAAyB;QAC1C,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,gFAAgF;QAChF,iDAAiD;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAA,IAAI,IAAI,CAAC,EAAE,CAAC;QACvE,IAAI,QAAQ,EAAE,CAAC;YACX,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvD,IAAI,wBAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC1B,MAAM,SAAS,GAAG,SAAS,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;oBACtG,UAAU,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC7C,CAAC;qBAAM,CAAC;oBACJ,SAAS,GAAG,SAAS,CAAC;gBAC1B,CAAC;YACL,CAAC;QACL,CAAC;QACD,MAAM,SAAS,GAAG,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,IAAI,CAAC,IAAc,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5H,IAAI,SAAS,EAAE,CAAC;YACZ,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACrE,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,EAAE,CAAC;QAE9G,wCAAwC;QACxC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACpB,SAAS,GAAG,EAAE,CAAC;QACnB,CAAC;aAAM,IAAI,SAAS,EAAE,CAAC;YACnB,+BAA+B;YAC/B,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACnC,CAAC;QAED,6DAA6D;QAC7D,UAAU,CAAC,IAAI,CAAC,qBAAW,CAAC,CAAC;QAE7B,MAAM,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAClE,OAAO,6BAAK,GAAG,EAAE,IAAI,CAAC,EAAE,EACpB,SAAS,EAAE,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,EAC1C,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAClC,SAAS,EAAE,IAAI,CAAC,cAAc,EAC9B,UAAU,EAAE,IAAI,CAAC,cAAc;YAC/B,6BAAK,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAC7C,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,EAC1C,KAAK,EAAE,OAAO,IAAG,SAAS,CACxB,CACJ,CAAC;IACX,CAAC;IAES,SAAS,CAAC,IAAuB;QACvC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrF,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC3B,CAAC;IACL,CAAC;IAES,wBAAwB,CAAC,IAAuB;QACtD,MAAM,UAAU,GAAG,CAAC,eAAa,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAC/D,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;YACD,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,6BAAK,GAAG,EAAC,UAAU,EAAC,SAAS,EAAE,eAAa,CAAC,MAAM,CAAC,oBAAoB,GAAG,UAAU;YAC5G,6BAAK,EAAE,EAAC,UAAU,EAAC,SAAS,EAAE,IAAA,iBAAO,EAAC,UAAU,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,mBAAmB,EACtF,KAAK,EAAE,YAAG,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAI,CACrD,CAAC;IACX,CAAC;IASS,QAAQ,CAAC,KAAuB;;QACtC,MAAM,OAAO,GAAG,MAAA,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,eAAa,CAAC,MAAM,CAAC,oBAAoB,CAAC,0CAAE,qBAAqB,EAAE,CAAC;QACtH,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;IAChF,CAAC;IAED,qBAAqB,CAAC,MAAc,EAAE,OAAkB;;QACpD,MAAM,eAAe,GAAG,IAAI,6BAAoB,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC3B,eAAe,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7E,IAAI,OAAO,EAAE,CAAC;YACV,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,oDAA4B,EAAE,OAAO,CAAC,CAAC,CAAC;QACxF,CAAC;aAAM,CAAC;YACJ,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBACpC,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACjC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,oDAA4B,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBACrH,CAAC;qBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACtB,+GAA+G;oBAC/G,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACpC,MAAM,KAAK,GAAa,EAAE,CAAC;wBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;4BAC3C,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;4BACnC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,GAAG,oDAA4B,EAAE,GAAG,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;wBACvI,CAAC;oBACL,CAAC;oBACD,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,GAAG,oDAA4B,EAAE,GAAG,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE;wBAC7G,KAAK,EAAG,IAA4B,CAAC,OAAO;wBAC5C,SAAS,EAAE,IAAI,CAAC,OAAO;wBACvB,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,KAAK,EAAE,IAAI,CAAC,KAAK;qBACpB,CAAC,CAAC,CAAC;gBACR,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;YACnC,QAAQ,EAAE,oDAA4B;YACtC,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;YACpB,MAAM;YACN,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,KAAI,IAAI,CAAC,IAAI;YACxC,MAAM,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE;YACvC,kBAAkB,EAAE,IAAI;SAC3B,CAAC,CAAC;IACP,CAAC;IAED;;;;;;OAMG;IACO,cAAc,CAAC,IAAyB;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,MAAM,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,IAAI,CAAC,IAAc,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC;QAErI,IAAI,cAAc,GAAmB,IAAI,CAAC,iBAAiB,CAAC;QAC5D,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,kBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACjJ,CAAC;QAED,OAAO,6BAAK,GAAG,EAAE,IAAI,CAAC,EAAE,EACpB,SAAS,EAAE,eAAa,CAAC,MAAM,CAAC,oBAAoB,GAAG,eAAe;YAEtE,6BAAK,SAAS,EAAE,IAAA,iBAAO,EAAC,IAAI,EAAE,IAAI,CAAC,EAC/B,KAAK,EAAE,IAAI,CAAC,IAAI,EAChB,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,GAC5C;YACF,6BAAK,SAAS,EAAE,qBAAW,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAS,EAAE,KAAK,EAAE,cAAc,CAAC;gBACpG,6BAAK,SAAS,EAAE,IAAA,iBAAO,EAAC,cAAc,CAAC,GAAG,UAAU,GAAI,CACtD,CAEH,CAAC;IACZ,CAAC;IAgBD;;;;;;OAMG;IACO,eAAe,CAAC,QAAkB,EAAE,MAAc,EAAE,cAA8B;;QACxF,MAAM,eAAe,GAAG,IAAI,6BAAoB,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC3B,eAAe,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAE7E,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;YACnC,QAAQ;YACR,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;YACpB,MAAM;YACN,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,KAAI,IAAI,CAAC,IAAI;YACxC,iBAAiB,EAAE,cAAc;YACjC,MAAM,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE;SAC1C,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,KAAiB;QACpC,OAAO,KAAK,CAAC,MAAM,YAAY,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/E,CAAC;IAES,gBAAgB,CAAC,OAAe;QACtC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAES,gBAAgB,CAAC,OAAe;QACtC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAES,kBAAkB,CAAC,UAA8B;;QACvD,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,CAAC;IAES,cAAc,CAAC,CAAgC,EAAE,IAAuB;QAC9E,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC,eAAe,EAAE,CAAC;QAEpB,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO;QACX,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/F,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACtB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7D,CAAC;aAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvB,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IAAA,CAAC;IAEQ,WAAW;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;IACL,CAAC;CAWJ,CAAA;AApYY,sCAAa;AAWsB;IAA3C,IAAA,kBAAM,EAAC,wBAAe,CAAC;sCAA8B,wBAAe;+CAAC;AAC9B;IAAvC,IAAA,kBAAM,EAAC,0BAAW,CAAC;sCAAiC,0BAAW;kDAAC;AACnB;IAA7C,IAAA,kBAAM,EAAC,0BAAiB,CAAC;sCAA2B,0BAAiB;4CAAC;AACvB;IAA/C,IAAA,kBAAM,EAAC,4BAAmB,CAAC;;0DAA6D;AACzC;IAA/C,IAAA,kBAAM,EAAC,2CAAmB,CAAC;sCAAyC,2CAAmB;0DAAC;AACvC;IAAjD,IAAA,kBAAM,EAAC,gDAAqB,CAAC;sCAAqC,gDAAqB;sDAAC;AAC3C;IAA7C,IAAA,kBAAM,EAAC,uCAAiB,CAAC;;wDAAyD;AACpC;IAA9C,IAAA,kBAAM,EAAC,+BAAkB,CAAC;sCAAiC,+BAAkB;kDAAC;AASrE;IADT,IAAA,yBAAa,GAAE;;;;yCASf;wBAnCQ,aAAa;IADzB,IAAA,sBAAU,GAAE;;GACA,aAAa,CAoYzB;AAED,WAAiB,aAAa;IAE1B,IAAiB,MAAM,CAKtB;IALD,WAAiB,MAAM;QAEN,sBAAe,GAAG,mBAAmB,CAAC;QACtC,2BAAoB,GAAG,MAAM,CAAC;IAE/C,CAAC,EALgB,MAAM,GAAN,oBAAM,KAAN,oBAAM,QAKtB;AACL,CAAC,EARgB,aAAa,6BAAb,aAAa,QAQ7B"}
+{"version":3,"file":"tab-bar-toolbar.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx"],"names":[],"mappings":"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"}

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

@@ -28,24 +28,24 @@ describe('tab-bar-toolbar', () => {
         after(() => {
             disableJSDOM();
         });
-        const testMe = tab_bar_toolbar_types_1.TabBarToolbarItem.PRIORITY_COMPARATOR;
+        const testMe = tab_bar_toolbar_types_1.TabBarToolbarAction.PRIORITY_COMPARATOR;
         it("should favour the 'navigation' group before everything else", () => {
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', group: 'navigation' }, { id: 'b', command: 'b', group: 'other' })).to.be.equal(-1);
+            (0, chai_1.expect)(testMe({ group: 'navigation' }, { group: 'other' })).to.be.equal(-1);
         });
         it("should treat 'undefined' groups as 'navigation'", () => {
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a' }, { id: 'b', command: 'b' })).to.be.equal(0);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', group: 'navigation' }, { id: 'b', command: 'b' })).to.be.equal(0);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a' }, { id: 'b', command: 'b', group: 'navigation' })).to.be.equal(0);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a' }, { id: 'b', command: 'b', group: 'other' })).to.be.equal(-1);
+            (0, chai_1.expect)(testMe({}, {})).to.be.equal(0);
+            (0, chai_1.expect)(testMe({ group: 'navigation' }, {})).to.be.equal(0);
+            (0, chai_1.expect)(testMe({}, { group: 'navigation' })).to.be.equal(0);
+            (0, chai_1.expect)(testMe({}, { group: 'other' })).to.be.equal(-1);
         });
         it("should fall back to 'priority' if the groups are the same", () => {
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', priority: 1 }, { id: 'b', command: 'b', priority: 2 })).to.be.equal(-1);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', group: 'navigation', priority: 1 }, { id: 'b', command: 'b', priority: 2 })).to.be.equal(-1);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', priority: 1 }, { id: 'b', command: 'b', group: 'navigation', priority: 2 })).to.be.equal(-1);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', priority: 1, group: 'other' }, { id: 'b', command: 'b', priority: 2 })).to.be.equal(1);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', group: 'other', priority: 1 }, { id: 'b', command: 'b', priority: 2, group: 'other' })).to.be.equal(-1);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', priority: 10 }, { id: 'b', command: 'b', group: 'other', priority: 2 })).to.be.equal(-1);
-            (0, chai_1.expect)(testMe({ id: 'a', command: 'a', group: 'other', priority: 10 }, { id: 'b', command: 'b', group: 'other', priority: 10 })).to.be.equal(0);
+            (0, chai_1.expect)(testMe({ priority: 1 }, { priority: 2 })).to.be.equal(-1);
+            (0, chai_1.expect)(testMe({ group: 'navigation', priority: 1 }, { priority: 2 })).to.be.equal(-1);
+            (0, chai_1.expect)(testMe({ priority: 1 }, { group: 'navigation', priority: 2 })).to.be.equal(-1);
+            (0, chai_1.expect)(testMe({ priority: 1, group: 'other' }, { priority: 2 })).to.be.equal(1);
+            (0, chai_1.expect)(testMe({ group: 'other', priority: 1 }, { priority: 2, group: 'other' })).to.be.equal(-1);
+            (0, chai_1.expect)(testMe({ priority: 10 }, { group: 'other', priority: 2 })).to.be.equal(-1);
+            (0, chai_1.expect)(testMe({ group: 'other', priority: 10 }, { group: 'other', priority: 10 })).to.be.equal(0);
         });
     });
 });

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

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