@codingame/monaco-vscode-view-title-bar-service-override 30.0.0 → 31.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-title-bar-service-override",
-  "version": "30.0.0",
+  "version": "31.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-title-bar service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "30.0.0"
+    "@codingame/monaco-vscode-api": "31.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/browser/parts/titlebar/commandCenterControl.js

@@ -8,6 +8,7 @@ import { SubmenuAction } from '@codingame/monaco-vscode-api/vscode/vs/base/commo
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { createActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuWorkbenchToolBar, HiddenItemStrategy, WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
@@ -18,10 +19,10 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var CommandCenterCenterViewItem_1;
 const AI_DISABLED_SETTING = "chat.disableAIFeatures";
-const AI_CUSTOMIZATION_MENU_ENABLED_SETTING = "chat.customizationsMenu.enabled";
 const AGENT_STATUS_ENABLED_SETTING = "chat.agentsControl.enabled";
 let CommandCenterControl = class CommandCenterControl {
     constructor(windowTitle, hoverDelegate, instantiationService, quickInputService) {
@@ -51,12 +52,25 @@ let CommandCenterControl = class CommandCenterControl {
                 }
             }
         });
+        let quickInputVisible = false;
         this._disposables.add(Event.filter(
             quickInputService.onShow,
             () => isActiveDocument(this.element),
             this._disposables
-        )(this._setVisibility.bind(this, false)));
-        this._disposables.add(quickInputService.onHide(this._setVisibility.bind(this, true)));
+        )(() => {
+            quickInputVisible = true;
+            this._setVisibility(quickInputService.alignment.get() !== "top");
+        }));
+        this._disposables.add(quickInputService.onHide(() => {
+            quickInputVisible = false;
+            this._setVisibility(true);
+        }));
+        this._disposables.add(autorun(reader => {
+            const alignment = quickInputService.alignment.read(reader);
+            if (quickInputVisible) {
+                this._setVisibility(alignment !== "top");
+            }
+        }));
         this._disposables.add(titleToolbar);
     }
     _setVisibility(show) {
@@ -141,7 +155,7 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
                             container.role = "button";
                             container.setAttribute("aria-description", this.getTooltip());
                             const aiFeaturesDisabled = that._configurationService.getValue(AI_DISABLED_SETTING) === true;
-                            const aiCustomizationsDisabled = that._configurationService.getValue("disableAICustomizations") === true || that._configurationService.getValue("workbench.disableAICustomizations") === true || that._configurationService.getValue(AI_CUSTOMIZATION_MENU_ENABLED_SETTING) === false;
+                            const aiCustomizationsDisabled = that._configurationService.getValue("disableAICustomizations") === true || that._configurationService.getValue("workbench.disableAICustomizations") === true;
                             const forcedHidden = aiFeaturesDisabled && aiCustomizationsDisabled;
                             const agentControlValue = that._configurationService.getValue(AGENT_STATUS_ENABLED_SETTING);
                             const isCompactMode = !forcedHidden && (agentControlValue === true || agentControlValue === undefined || agentControlValue === "compact");

package/vscode/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css

@@ -402,6 +402,8 @@
 	z-index: 2500;
 	-webkit-app-region: no-drag;
 	margin-right: auto;
+	min-width: 0;
+	overflow: hidden;
 }
 
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .center-adjacent-toolbar-container.has-no-actions {

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.d.ts

@@ -66,11 +66,9 @@ export declare class BrowserTitlebarPart extends Part implements ITitlebarPart {
     private readonly contextMenuService;
     protected readonly configurationService: IConfigurationService;
     protected readonly environmentService: IBrowserWorkbenchEnvironmentService;
-    protected readonly instantiationService: IInstantiationService;
     private readonly storageService;
     protected readonly contextKeyService: IContextKeyService;
     private readonly hostService;
-    private readonly editorService;
     private readonly menuService;
     private readonly keybindingService;
     readonly minimumWidth: number;
@@ -112,6 +110,7 @@ export declare class BrowserTitlebarPart extends Part implements ITitlebarPart {
     private isCompact;
     private readonly isCompactContextKey;
     private readonly windowTitle;
+    protected readonly instantiationService: IInstantiationService;
     constructor(id: string, targetWindow: CodeWindow, editorGroupsContainer: IEditorGroupsContainer, contextMenuService: IContextMenuService, configurationService: IConfigurationService, environmentService: IBrowserWorkbenchEnvironmentService, instantiationService: IInstantiationService, themeService: IThemeService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextKeyService: IContextKeyService, hostService: IHostService, editorService: IEditorService, menuService: IMenuService, keybindingService: IKeybindingService);
     private registerListeners;
     private onBlur;

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.js

@@ -50,6 +50,7 @@ import { createInstantHoverDelegate } from '@codingame/monaco-vscode-api/vscode/
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { safeIntl } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
 import { TitleBarVisibleContext, IsCompactTitleBarContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { AnchorAlignment } from '@codingame/monaco-vscode-api/vscode/vs/base/common/layout';
 
 var AuxiliaryBrowserTitlebarPart_1;
@@ -200,11 +201,9 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         this.contextMenuService = contextMenuService;
         this.configurationService = configurationService;
         this.environmentService = environmentService;
-        this.instantiationService = instantiationService;
         this.storageService = storageService;
         this.contextKeyService = contextKeyService;
         this.hostService = hostService;
-        this.editorService = editorService;
         this.menuService = menuService;
         this.keybindingService = keybindingService;
         this.minimumWidth = 0;
@@ -224,10 +223,12 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         this.titleDisposables = this._register(( new DisposableStore()));
         this.isInactive = false;
         this.isCompact = false;
+        const scopedEditorService = editorService.createScoped(editorGroupsContainer, this._store);
+        this.instantiationService = this._register(instantiationService.createChild(( new ServiceCollection([IEditorService, scopedEditorService]))));
         this.isAuxiliary = targetWindow.vscodeWindowId !== mainWindow.vscodeWindowId;
         this.isCompactContextKey = IsCompactTitleBarContext.bindTo(this.contextKeyService);
         this.titleBarStyle = getTitleBarStyle(this.configurationService);
-        this.windowTitle = this._register(instantiationService.createInstance(WindowTitle, targetWindow));
+        this.windowTitle = this._register(this.instantiationService.createInstance(WindowTitle, targetWindow));
         this.hoverDelegate = this._register(createInstantHoverDelegate());
         this.registerListeners(getWindowId(targetWindow));
     }
@@ -555,7 +556,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         };
         if (update.editorActions) {
             this.editorToolbarMenuDisposables.clear();
-            if (this.editorActionsEnabled && this.editorService.activeEditor !== undefined) {
+            if (this.editorActionsEnabled && this.editorGroupsContainer.activeGroup?.activeEditor) {
                 const context = {
                     groupId: this.editorGroupsContainer.activeGroup.id
                 };