@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.0

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -4,8 +4,8 @@ import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { asCssVariable, foreground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { SIDE_BAR_BACKGROUND, PANEL_BACKGROUND } from '../../../common/theme.js';
-import { trackFocus, append, $, addDisposableListener, EventType, asCssValueWithDefault, createCSSRule, asCSSUrl, after, Dimension, reset } from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { trackFocus, append, $, addDisposableListener, EventType, asCssValueWithDefault, createCSSRule, asCSSUrl, after, focusWindow, Dimension, reset } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
 import { prepareActions } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
@@ -58,26 +58,68 @@ const viewPaneContainerCollapsedIcon = registerIcon('view-pane-container-collaps
 )));
 const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
 let ViewWelcomeController = class ViewWelcomeController {
-    get contents() {
-        const visibleItems = this.items.filter(v => v.visible);
-        if (visibleItems.length === 0 && this.defaultItem) {
-            return [this.defaultItem.descriptor];
-        }
-        return ( visibleItems.map(v => v.descriptor));
-    }
-    constructor(id, contextKeyService) {
-        this.id = id;
+    get enabled() { return this._enabled; }
+    constructor(container, delegate, instantiationService, openerService, telemetryService, contextKeyService) {
+        this.container = container;
+        this.delegate = delegate;
+        this.instantiationService = instantiationService;
+        this.openerService = openerService;
+        this.telemetryService = telemetryService;
         this.contextKeyService = contextKeyService;
-        this._onDidChange = ( new Emitter());
-        this.onDidChange = this._onDidChange.event;
         this.items = [];
+        this._enabled = false;
         this.disposables = ( new DisposableStore());
-        contextKeyService.onDidChangeContext(this.onDidChangeContext, this, this.disposables);
-        this.disposables.add(Event.filter(viewsRegistry.onDidChangeViewWelcomeContent, id => id === this.id)(this.onDidChangeViewWelcomeContent, this, this.disposables));
+        this.enabledDisposables = this.disposables.add(( new DisposableStore()));
+        this.renderDisposables = this.disposables.add(( new DisposableStore()));
+        this.delegate.onDidChangeViewWelcomeState(this.onDidChangeViewWelcomeState, this, this.disposables);
+        this.onDidChangeViewWelcomeState();
+    }
+    layout(height, width) {
+        if (!this._enabled) {
+            return;
+        }
+        this.element.style.height = `${height}px`;
+        this.element.style.width = `${width}px`;
+        this.element.classList.toggle('wide', width > 640);
+        this.scrollableElement.scanDomNode();
+    }
+    focus() {
+        if (!this._enabled) {
+            return;
+        }
+        this.element.focus();
+    }
+    onDidChangeViewWelcomeState() {
+        const enabled = this.delegate.shouldShowWelcome();
+        if (this._enabled === enabled) {
+            return;
+        }
+        this._enabled = enabled;
+        if (!enabled) {
+            this.enabledDisposables.clear();
+            return;
+        }
+        this.container.classList.add('welcome');
+        const viewWelcomeContainer = append(this.container, $('.welcome-view'));
+        this.element = $('.welcome-view-content', { tabIndex: 0 });
+        this.scrollableElement = ( new DomScrollableElement(
+            this.element,
+            { alwaysConsumeMouseWheel: true, horizontal: 2 , vertical: 3 , }
+        ));
+        append(viewWelcomeContainer, this.scrollableElement.getDomNode());
+        this.enabledDisposables.add(toDisposable(() => {
+            this.container.classList.remove('welcome');
+            this.scrollableElement.dispose();
+            viewWelcomeContainer.remove();
+            this.scrollableElement = undefined;
+            this.element = undefined;
+        }));
+        this.contextKeyService.onDidChangeContext(this.onDidChangeContext, this, this.enabledDisposables);
+        Event.chain(viewsRegistry.onDidChangeViewWelcomeContent, $ => $.filter(id => id === this.delegate.id))(this.onDidChangeViewWelcomeContent, this, this.enabledDisposables);
         this.onDidChangeViewWelcomeContent();
     }
     onDidChangeViewWelcomeContent() {
-        const descriptors = viewsRegistry.getViewWelcomeContent(this.id);
+        const descriptors = viewsRegistry.getViewWelcomeContent(this.delegate.id);
         this.items = [];
         for (const descriptor of descriptors) {
             if (descriptor.when === 'default') {
@@ -88,7 +130,7 @@ let ViewWelcomeController = class ViewWelcomeController {
                 this.items.push({ descriptor, visible });
             }
         }
-        this._onDidChange.fire();
+        this.render();
     }
     onDidChangeContext() {
         let didChange = false;
@@ -104,15 +146,86 @@ let ViewWelcomeController = class ViewWelcomeController {
             didChange = true;
         }
         if (didChange) {
-            this._onDidChange.fire();
+            this.render();
         }
     }
+    render() {
+        this.renderDisposables.clear();
+        this.element.innerText = '';
+        const contents = this.getContentDescriptors();
+        if (contents.length === 0) {
+            this.container.classList.remove('welcome');
+            this.scrollableElement.scanDomNode();
+            return;
+        }
+        for (const { content, precondition } of contents) {
+            const lines = content.split('\n');
+            for (let line of lines) {
+                line = line.trim();
+                if (!line) {
+                    continue;
+                }
+                const linkedText = parseLinkedText(line);
+                if (linkedText.nodes.length === 1 && typeof linkedText.nodes[0] !== 'string') {
+                    const node = linkedText.nodes[0];
+                    const buttonContainer = append(this.element, $('.button-container'));
+                    const button = ( new Button(
+                        buttonContainer,
+                        { title: node.title, supportIcons: true, ...defaultButtonStyles }
+                    ));
+                    button.label = node.label;
+                    button.onDidClick(_ => {
+                        this.telemetryService.publicLog2('views.welcomeAction', { viewId: this.delegate.id, uri: node.href });
+                        this.openerService.open(node.href, { allowCommands: true });
+                    }, null, this.renderDisposables);
+                    this.renderDisposables.add(button);
+                    if (precondition) {
+                        const updateEnablement = () => button.enabled = this.contextKeyService.contextMatchesRules(precondition);
+                        updateEnablement();
+                        const keys = ( new Set(( precondition.keys())));
+                        const onDidChangeContext = Event.filter(this.contextKeyService.onDidChangeContext, e => e.affectsSome(keys));
+                        onDidChangeContext(updateEnablement, null, this.renderDisposables);
+                    }
+                }
+                else {
+                    const p = append(this.element, $('p'));
+                    for (const node of linkedText.nodes) {
+                        if (typeof node === 'string') {
+                            append(p, document.createTextNode(node));
+                        }
+                        else {
+                            const link = this.renderDisposables.add(this.instantiationService.createInstance(Link, p, node, {}));
+                            if (precondition && node.href.startsWith('command:')) {
+                                const updateEnablement = () => link.enabled = this.contextKeyService.contextMatchesRules(precondition);
+                                updateEnablement();
+                                const keys = ( new Set(( precondition.keys())));
+                                const onDidChangeContext = Event.filter(this.contextKeyService.onDidChangeContext, e => e.affectsSome(keys));
+                                onDidChangeContext(updateEnablement, null, this.renderDisposables);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        this.container.classList.add('welcome');
+        this.scrollableElement.scanDomNode();
+    }
+    getContentDescriptors() {
+        const visibleItems = this.items.filter(v => v.visible);
+        if (visibleItems.length === 0 && this.defaultItem) {
+            return [this.defaultItem.descriptor];
+        }
+        return ( visibleItems.map(v => v.descriptor));
+    }
     dispose() {
         this.disposables.dispose();
     }
 };
 ViewWelcomeController = ( __decorate([
-    ( __param(1, IContextKeyService))
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IOpenerService)),
+    ( __param(4, ITelemetryService)),
+    ( __param(5, IContextKeyService))
 ], ViewWelcomeController));
 let ViewPane = class ViewPane extends Pane {
     static { ViewPane_1 = this; }
@@ -145,7 +258,6 @@ let ViewPane = class ViewPane extends Pane {
         this._onDidChangeViewWelcomeState = this._register(( new Emitter()));
         this.onDidChangeViewWelcomeState = this._onDidChangeViewWelcomeState.event;
         this._isVisible = false;
-        this.viewWelcomeDisposable = Disposable.None;
         this.id = options.id;
         this._title = options.title;
         this._titleDescription = options.titleDescription;
@@ -154,9 +266,8 @@ let ViewPane = class ViewPane extends Pane {
         this.scopedContextKeyService.createKey('view', this.id);
         const viewLocationKey = this.scopedContextKeyService.createKey('viewLocation', ViewContainerLocationToString(viewDescriptorService.getViewLocationById(this.id)));
         this._register(Event.filter(viewDescriptorService.onDidChangeLocation, e => ( e.views.some(view => view.id === this.id)))(() => viewLocationKey.set(ViewContainerLocationToString(viewDescriptorService.getViewLocationById(this.id)))));
-        this.menuActions = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))).createInstance(CompositeMenuActions, options.titleMenuId ?? MenuId.ViewTitle, MenuId.ViewTitleContext, { shouldForwardArgs: !options.donotForwardArgs }));
+        this.menuActions = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))).createInstance(CompositeMenuActions, options.titleMenuId ?? MenuId.ViewTitle, MenuId.ViewTitleContext, { shouldForwardArgs: !options.donotForwardArgs, renderShortTitle: true }));
         this._register(this.menuActions.onDidChange(() => this.updateActions()));
-        this.viewWelcomeController = this._register(( new ViewWelcomeController(this.id, contextKeyService)));
     }
     get headerVisible() {
         return super.headerVisible;
@@ -184,10 +295,7 @@ let ViewPane = class ViewPane extends Pane {
         if (changed) {
             this._onDidChangeBodyVisibility.fire(expanded);
         }
-        if (this.twistiesContainer) {
-            this.twistiesContainer.classList.remove(...ThemeIcon.asClassNameArray(this.getTwistyIcon(!expanded)));
-            this.twistiesContainer.classList.add(...ThemeIcon.asClassNameArray(this.getTwistyIcon(expanded)));
-        }
+        this.updateTwistyIcon();
         return changed;
     }
     render() {
@@ -199,7 +307,7 @@ let ViewPane = class ViewPane extends Pane {
     }
     renderHeader(container) {
         this.headerContainer = container;
-        this.twistiesContainer = append(container, $(ThemeIcon.asCSSSelector(this.getTwistyIcon(this.isExpanded()))));
+        this.twistiesContainer = append(container, $(`.twisty-container${ThemeIcon.asCSSSelector(this.getTwistyIcon(this.isExpanded()))}`));
         this.renderHeaderTitle(container, this.title);
         const actions = append(container, $('.actions'));
         actions.classList.toggle('show-always', this.showActions === ViewPaneShowActions.Always);
@@ -232,6 +340,16 @@ let ViewPane = class ViewPane extends Pane {
         this._register(onDidRelevantConfigurationChange(this.updateActionsVisibility, this));
         this.updateActionsVisibility();
     }
+    updateHeader() {
+        super.updateHeader();
+        this.updateTwistyIcon();
+    }
+    updateTwistyIcon() {
+        if (this.twistiesContainer) {
+            this.twistiesContainer.classList.remove(...ThemeIcon.asClassNameArray(this.getTwistyIcon(!this._expanded)));
+            this.twistiesContainer.classList.add(...ThemeIcon.asClassNameArray(this.getTwistyIcon(this._expanded)));
+        }
+    }
     getTwistyIcon(expanded) {
         return expanded ? viewPaneContainerExpandedIcon : viewPaneContainerCollapsedIcon;
     }
@@ -319,24 +437,17 @@ let ViewPane = class ViewPane extends Pane {
         return title;
     }
     renderBody(container) {
-        this.bodyContainer = container;
-        const viewWelcomeContainer = append(container, $('.welcome-view'));
-        this.viewWelcomeContainer = $('.welcome-view-content', { tabIndex: 0 });
-        this.scrollableElement = this._register(( new DomScrollableElement(this.viewWelcomeContainer, {
-            alwaysConsumeMouseWheel: true,
-            horizontal: 2 ,
-            vertical: 3 ,
-        })));
-        append(viewWelcomeContainer, this.scrollableElement.getDomNode());
-        const onViewWelcomeChange = Event.any(this.viewWelcomeController.onDidChange, this.onDidChangeViewWelcomeState);
-        this._register(onViewWelcomeChange(this.updateViewWelcome, this));
-        this.updateViewWelcome();
+        this.viewWelcomeController = this._register(( new ViewWelcomeController(
+            container,
+            this,
+            this.instantiationService,
+            this.openerService,
+            this.telemetryService,
+            this.contextKeyService
+        )));
     }
     layoutBody(height, width) {
-        this.viewWelcomeContainer.style.height = `${height}px`;
-        this.viewWelcomeContainer.style.width = `${width}px`;
-        this.viewWelcomeContainer.classList.toggle('wide', width > 640);
-        this.scrollableElement.scanDomNode();
+        this.viewWelcomeController.layout(height, width);
     }
     onDidScrollRoot() {
     }
@@ -373,8 +484,9 @@ let ViewPane = class ViewPane extends Pane {
         return SIDE_BAR_BACKGROUND;
     }
     focus() {
-        if (this.shouldShowWelcome()) {
-            this.viewWelcomeContainer.focus();
+        focusWindow(this.element);
+        if (this.viewWelcomeController.enabled) {
+            this.viewWelcomeController.focus();
         }
         else if (this.element) {
             this.element.focus();
@@ -428,78 +540,6 @@ let ViewPane = class ViewPane extends Pane {
     }
     saveState() {
     }
-    updateViewWelcome() {
-        this.viewWelcomeDisposable.dispose();
-        if (!this.shouldShowWelcome()) {
-            this.bodyContainer.classList.remove('welcome');
-            this.viewWelcomeContainer.innerText = '';
-            this.scrollableElement.scanDomNode();
-            return;
-        }
-        const contents = this.viewWelcomeController.contents;
-        if (contents.length === 0) {
-            this.bodyContainer.classList.remove('welcome');
-            this.viewWelcomeContainer.innerText = '';
-            this.scrollableElement.scanDomNode();
-            return;
-        }
-        const disposables = ( new DisposableStore());
-        this.bodyContainer.classList.add('welcome');
-        this.viewWelcomeContainer.innerText = '';
-        for (const { content, precondition } of contents) {
-            const lines = content.split('\n');
-            for (let line of lines) {
-                line = line.trim();
-                if (!line) {
-                    continue;
-                }
-                const linkedText = parseLinkedText(line);
-                if (linkedText.nodes.length === 1 && typeof linkedText.nodes[0] !== 'string') {
-                    const node = linkedText.nodes[0];
-                    const buttonContainer = append(this.viewWelcomeContainer, $('.button-container'));
-                    const button = ( new Button(
-                        buttonContainer,
-                        { title: node.title, supportIcons: true, ...defaultButtonStyles }
-                    ));
-                    button.label = node.label;
-                    button.onDidClick(_ => {
-                        this.telemetryService.publicLog2('views.welcomeAction', { viewId: this.id, uri: node.href });
-                        this.openerService.open(node.href, { allowCommands: true });
-                    }, null, disposables);
-                    disposables.add(button);
-                    if (precondition) {
-                        const updateEnablement = () => button.enabled = this.contextKeyService.contextMatchesRules(precondition);
-                        updateEnablement();
-                        const keys = ( new Set());
-                        ( precondition.keys()).forEach(key => keys.add(key));
-                        const onDidChangeContext = Event.filter(this.contextKeyService.onDidChangeContext, e => e.affectsSome(keys));
-                        onDidChangeContext(updateEnablement, null, disposables);
-                    }
-                }
-                else {
-                    const p = append(this.viewWelcomeContainer, $('p'));
-                    for (const node of linkedText.nodes) {
-                        if (typeof node === 'string') {
-                            append(p, document.createTextNode(node));
-                        }
-                        else {
-                            const link = disposables.add(this.instantiationService.createInstance(Link, p, node, {}));
-                            if (precondition && node.href.startsWith('command:')) {
-                                const updateEnablement = () => link.enabled = this.contextKeyService.contextMatchesRules(precondition);
-                                updateEnablement();
-                                const keys = ( new Set());
-                                ( precondition.keys()).forEach(key => keys.add(key));
-                                const onDidChangeContext = Event.filter(this.contextKeyService.onDidChangeContext, e => e.affectsSome(keys));
-                                onDidChangeContext(updateEnablement, null, disposables);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        this.scrollableElement.scanDomNode();
-        this.viewWelcomeDisposable = disposables;
-    }
     shouldShowWelcome() {
         return false;
     }

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DragAndDropObserver, addDisposableListener, EventType, isAncestor } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { DragAndDropObserver, addDisposableListener, EventType, getWindow, isAncestor, focusWindow } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
 import { Gesture, EventType as EventType$1 } from 'monaco-editor/esm/vs/base/browser/touch.js';
 import { PaneView } from '../../../../base/browser/ui/splitview/paneview.js';
@@ -34,10 +34,13 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     submenu: ViewsSubMenu,
     title: ( nls.localizeWithPath('vs/workbench/browser/parts/views/viewPaneContainer', 'views', "Views")),
     order: 1,
-    when: ( ContextKeyExpr.equals(
+    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(
         'viewContainerLocation',
         ViewContainerLocationToString(0 )
-    )),
+    )), ( ContextKeyExpr.notEquals(
+        `config.${"workbench.activityBar.location" }`,
+        "top"
+    )))),
 });
 class ViewPaneDropOverlay extends Themable {
     static { this.OVERLAY_ID = 'monaco-pane-drop-overlay'; }
@@ -80,12 +83,11 @@ class ViewPaneDropOverlay extends Themable {
         this.overlay.style.outlineStyle = activeContrastBorderColor ? 'dashed' : '';
         this.overlay.style.outlineWidth = activeContrastBorderColor ? '2px' : '';
         this.overlay.style.borderColor = activeContrastBorderColor || '';
-        this.overlay.style.borderStyle = 'solid' ;
+        this.overlay.style.borderStyle = 'solid';
         this.overlay.style.borderWidth = '0px';
     }
     registerListeners() {
         this._register(( new DragAndDropObserver(this.container, {
-            onDragEnter: e => undefined,
             onDragOver: e => {
                 this.positionOverlay(e.offsetX, e.offsetY);
                 if (this.cleanupOverlayScheduler.isScheduled()) {
@@ -193,7 +195,7 @@ let ViewContainerMenuActions = class ViewContainerMenuActions extends CompositeM
         const scopedContextKeyService = contextKeyService.createScoped(element);
         scopedContextKeyService.createKey('viewContainer', viewContainer.id);
         const viewContainerLocationKey = scopedContextKeyService.createKey('viewContainerLocation', ViewContainerLocationToString(viewDescriptorService.getViewContainerLocation(viewContainer)));
-        super(MenuId.ViewContainerTitle, MenuId.ViewContainerTitleContext, { shouldForwardArgs: true }, scopedContextKeyService, menuService);
+        super(MenuId.ViewContainerTitle, MenuId.ViewContainerTitleContext, { shouldForwardArgs: true, renderShortTitle: true }, scopedContextKeyService, menuService);
         this._register(scopedContextKeyService);
         this._register(Event.filter(viewDescriptorService.onDidChangeContainerLocation, e => e.viewContainer === viewContainer)(() => viewContainerLocationKey.set(ViewContainerLocationToString(viewDescriptorService.getViewContainerLocation(viewContainer)))));
     }
@@ -270,9 +272,9 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
         this._register(this.paneview.onDidDrop(({ from, to }) => this.movePane(from, to)));
         this._register(this.paneview.onDidScroll(_ => this.onDidScrollPane()));
         this._register(this.paneview.onDidSashReset((index) => this.onDidSashReset(index)));
-        this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, (e) => this.showContextMenu(( new StandardMouseEvent(e)))));
+        this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, (e) => this.showContextMenu(( new StandardMouseEvent(getWindow(parent), e)))));
         this._register(Gesture.addTarget(parent));
-        this._register(addDisposableListener(parent, EventType$1.Contextmenu, (e) => this.showContextMenu(( new StandardMouseEvent(e)))));
+        this._register(addDisposableListener(parent, EventType$1.Contextmenu, (e) => this.showContextMenu(( new StandardMouseEvent(getWindow(parent), e)))));
         this._menuActions = this._register(this.instantiationService.createInstance(ViewContainerMenuActions, this.paneview.element, this.viewContainer));
         this._register(this._menuActions.onDidChange(() => this.updateTitleArea()));
         let overlay;
@@ -360,12 +362,12 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
                         const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
                         const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
                         if (oldViewContainer !== this.viewContainer && viewDescriptor && viewDescriptor.canMoveView) {
-                            this.viewDescriptorService.moveViewsToContainer([viewDescriptor], this.viewContainer);
+                            this.viewDescriptorService.moveViewsToContainer([viewDescriptor], this.viewContainer, undefined, 'dnd');
                         }
                     }
                     const paneCount = this.panes.length;
                     if (viewsToMove.length > 0) {
-                        this.viewDescriptorService.moveViewsToContainer(viewsToMove, this.viewContainer);
+                        this.viewDescriptorService.moveViewsToContainer(viewsToMove, this.viewContainer, undefined, 'dnd');
                     }
                     if (paneCount > 0) {
                         for (const view of viewsToMove) {
@@ -397,6 +399,11 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
                 this.updateTitleArea();
                 this.updateViewHeaders();
             }
+            this._register(this.configurationService.onDidChangeConfiguration(e => {
+                if (e.affectsConfiguration("workbench.activityBar.location" )) {
+                    this.updateViewHeaders();
+                }
+            }));
         });
         this._register(this.viewContainerModel.onDidChangeActiveViewDescriptors(() => this._onTitleAreaUpdate.fire()));
     }
@@ -434,17 +441,22 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
         return createActionViewItem(this.instantiationService, action);
     }
     focus() {
+        let paneToFocus = undefined;
         if (this.lastFocusedPane) {
-            this.lastFocusedPane.focus();
+            paneToFocus = this.lastFocusedPane;
         }
         else if (this.paneItems.length > 0) {
-            for (const { pane: pane } of this.paneItems) {
+            for (const { pane } of this.paneItems) {
                 if (pane.isExpanded()) {
-                    pane.focus();
-                    return;
+                    paneToFocus = pane;
+                    break;
                 }
             }
         }
+        if (paneToFocus) {
+            focusWindow(paneToFocus.element);
+            paneToFocus.focus();
+        }
     }
     get orientation() {
         switch (this.viewDescriptorService.getViewContainerLocation(this.viewContainer)) {
@@ -581,7 +593,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
         for (const { viewDescriptor, collapsed, index, size } of added) {
             const pane = this.createView(viewDescriptor, {
                 id: viewDescriptor.id,
-                title: viewDescriptor.name,
+                title: viewDescriptor.name.value,
                 fromExtensionId: viewDescriptor.extensionId,
                 expanded: !collapsed
             });
@@ -589,7 +601,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
             const contextMenuDisposable = addDisposableListener(pane.draggableElement, 'contextmenu', e => {
                 e.stopPropagation();
                 e.preventDefault();
-                this.onContextMenu(( new StandardMouseEvent(e)), pane);
+                this.onContextMenu(( new StandardMouseEvent(getWindow(pane.draggableElement), e)), pane);
             });
             const collapseDisposable = Event.latch(( Event.map(pane.onDidChange, () => !pane.isExpanded())))(collapsed => {
                 this.viewContainerModel.setCollapsed(viewDescriptor.id, collapsed);
@@ -721,7 +733,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
                         }
                     }
                     if (viewsToMove) {
-                        this.viewDescriptorService.moveViewsToContainer(viewsToMove, this.viewContainer);
+                        this.viewDescriptorService.moveViewsToContainer(viewsToMove, this.viewContainer, undefined, 'dnd');
                     }
                     if (anchorView) {
                         if (overlay.currentDropOperation === 1  ||
@@ -826,18 +838,33 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
                 this.paneItems[0].pane.setExpanded(true);
             }
             this.paneItems[0].pane.headerVisible = false;
+            this.paneItems[0].pane.collapsible = true;
         }
         else {
-            this.paneItems.forEach(i => {
-                i.pane.headerVisible = true;
-                if (i.pane === this.lastMergedCollapsedPane) {
-                    i.pane.setExpanded(false);
+            if (this.paneItems.length === 1) {
+                this.paneItems[0].pane.headerVisible = true;
+                if (this.paneItems[0].pane === this.lastMergedCollapsedPane) {
+                    this.paneItems[0].pane.setExpanded(false);
                 }
-            });
+                this.paneItems[0].pane.collapsible = false;
+            }
+            else {
+                this.paneItems.forEach(i => {
+                    i.pane.headerVisible = true;
+                    i.pane.collapsible = true;
+                    if (i.pane === this.lastMergedCollapsedPane) {
+                        i.pane.setExpanded(false);
+                    }
+                });
+            }
             this.lastMergedCollapsedPane = undefined;
         }
     }
     isViewMergedWithContainer() {
+        const location = this.viewDescriptorService.getViewContainerLocation(this.viewContainer);
+        if (location === 0  && !this.layoutService.isVisible("workbench.parts.activitybar" ) && this.configurationService.getValue("workbench.activityBar.location" ) === "top" ) {
+            return false;
+        }
         if (!(this.options.mergeViewWithContainerWhenSingleView && this.paneItems.length === 1)) {
             return false;
         }
@@ -1030,7 +1057,7 @@ registerAction2(class MoveViews extends Action2 {
         for (const viewId of options.viewIds) {
             const viewDescriptor = viewDescriptorService.getViewDescriptorById(viewId);
             if (viewDescriptor?.canMoveView) {
-                viewDescriptorService.moveViewsToContainer([viewDescriptor], destination, ViewVisibilityState.Default);
+                viewDescriptorService.moveViewsToContainer([viewDescriptor], destination, ViewVisibilityState.Default, this.desc.id);
             }
         }
         await accessor.get(IViewsService).openViewContainer(destination.id, true);