@theia/core 1.18.0 → 1.19.0

package/lib/browser/view-container.js

@@ -38,10 +38,15 @@ const theia_dock_panel_1 = require("./shell/theia-dock-panel");
 const frontend_application_state_1 = require("./frontend-application-state");
 const context_menu_renderer_1 = require("./context-menu-renderer");
 const browser_1 = require("./browser");
-const widget_manager_1 = require("./widget-manager");
 const tab_bar_toolbar_1 = require("./shell/tab-bar-toolbar");
+const common_1 = require("../common");
+const widget_manager_1 = require("./widget-manager");
 const keys_1 = require("./keys");
 const progress_bar_factory_1 = require("./progress-bar-factory");
+const dragdrop_1 = require("@phosphor/dragdrop");
+const coreutils_1 = require("@phosphor/coreutils");
+const domutils_1 = require("@phosphor/domutils");
+const tab_bar_decorator_1 = require("./shell/tab-bar-decorator");
 let ViewContainerIdentifier = class ViewContainerIdentifier {
 };
 ViewContainerIdentifier = __decorate([
@@ -63,12 +68,17 @@ var DescriptionWidget;
 let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.BaseWidget {
     constructor() {
         super(...arguments);
+        /**
+         * Disable dragging parts from/to this view container.
+         */
+        this.disableDNDBetweenContainers = false;
         this.onDidChangeTrackableWidgetsEmitter = new event_1.Emitter();
         this.onDidChangeTrackableWidgets = this.onDidChangeTrackableWidgetsEmitter.event;
         this.toDisposeOnCurrentPart = new disposable_1.DisposableCollection();
         this.toDisposeOnUpdateTitle = new disposable_1.DisposableCollection();
         this._tabBarDelegate = this;
         this.toRemoveWidgets = new Map();
+        this.toDisposeOnDragEnd = new disposable_1.DisposableCollection();
     }
     init() {
         this.id = this.options.id;
@@ -116,7 +126,8 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
                 commandId: this.globalHideCommandId,
                 label: 'Hide'
             }),
-            this.onDidChangeTrackableWidgetsEmitter
+            this.onDidChangeTrackableWidgetsEmitter,
+            this.onDidChangeTrackableWidgets(() => this.decoratorService.fireDidChangeDecorations())
         ]);
         if (this.options.progressLocationId) {
             this.toDispose.push(this.progressBarFactory({ container: this.node, insertMode: 'prepend', locationId: this.options.progressLocationId }));
@@ -156,28 +167,48 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
         this.toDisposeOnUpdateTitle.dispose();
         this.toDispose.push(this.toDisposeOnUpdateTitle);
         this.updateTabBarDelegate();
-        const title = this.titleOptions;
-        if (!title) {
+        let title = Object.assign({}, this.titleOptions);
+        if (common_1.isEmpty(title)) {
             return;
         }
         const allParts = this.getParts();
         const visibleParts = allParts.filter(part => !part.isHidden);
         this.title.label = title.label;
-        if (visibleParts.length === 1) {
+        // If there's only one visible part - inline it's title into the container title except in case the part
+        // isn't originally belongs to this container but there are other **original** hidden parts.
+        if (visibleParts.length === 1 && (visibleParts[0].originalContainerId === this.id || !this.findOriginalPart())) {
             const part = visibleParts[0];
             this.toDisposeOnUpdateTitle.push(part.onTitleChanged(() => this.updateTitle()));
             const partLabel = part.wrapped.title.label;
+            // Change the container title if it contains only one part that originally belongs to another container.
+            if (allParts.length === 1 && part.originalContainerId !== this.id && !this.isCurrentTitle(part.originalContainerTitle)) {
+                title = Object.assign({}, part.originalContainerTitle);
+                this.setTitleOptions(title);
+                return;
+            }
             if (partLabel) {
-                this.title.label += ': ' + partLabel;
+                if (this.title.label && this.title.label !== partLabel) {
+                    this.title.label += ': ' + partLabel;
+                }
+                else {
+                    this.title.label = partLabel;
+                }
             }
             part.collapsed = false;
             part.hideTitle();
         }
         else {
             visibleParts.forEach(part => part.showTitle());
+            // If at least one part originally belongs to this container the title should return to its original value.
+            const originalPart = this.findOriginalPart();
+            if (originalPart && !this.isCurrentTitle(originalPart.originalContainerTitle)) {
+                title = Object.assign({}, originalPart.originalContainerTitle);
+                this.setTitleOptions(title);
+                return;
+            }
         }
         this.updateToolbarItems(allParts);
-        const caption = title.caption || title.label;
+        const caption = (title === null || title === void 0 ? void 0 : title.caption) || (title === null || title === void 0 ? void 0 : title.label);
         if (caption) {
             this.title.caption = caption;
             if (visibleParts.length === 1) {
@@ -221,6 +252,14 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
             this.toDisposeOnUpdateTitle.push(this.toolbarRegistry.registerItem(Object.assign(Object.assign({}, options), { id: newId, command: newId })));
         }
     }
+    findOriginalPart() {
+        return this.getParts().find(part => part.originalContainerId === this.id);
+    }
+    isCurrentTitle(titleOptions) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return (!!titleOptions && !!this.titleOptions && Object.keys(titleOptions).every(key => titleOptions[key] === this.titleOptions[key]))
+            || (!titleOptions && !this.titleOptions);
+    }
     findPartForAnchor(anchor) {
         const element = document.elementFromPoint(anchor.x, anchor.y);
         if (element instanceof Element) {
@@ -231,21 +270,27 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
         }
         return undefined;
     }
-    addWidget(widget, options) {
+    createPartId(widget) {
+        const description = this.widgetManager.getDescription(widget);
+        return widget.id || JSON.stringify(description);
+    }
+    addWidget(widget, options, originalContainerId, originalContainerTitle) {
         const existing = this.toRemoveWidgets.get(widget.id);
         if (existing) {
             return existing;
         }
+        const partId = this.createPartId(widget);
+        const newPart = this.createPart(widget, partId, originalContainerId || this.id, originalContainerTitle || this.titleOptions, options);
+        return this.attachNewPart(newPart);
+    }
+    attachNewPart(newPart, insertIndex) {
         const toRemoveWidget = new disposable_1.DisposableCollection();
         this.toDispose.push(toRemoveWidget);
-        this.toRemoveWidgets.set(widget.id, toRemoveWidget);
-        toRemoveWidget.push(disposable_1.Disposable.create(() => this.toRemoveWidgets.delete(widget.id)));
-        const description = this.widgetManager.getDescription(widget);
-        const partId = description ? JSON.stringify(description) : widget.id;
-        const newPart = this.createPart(widget, partId, options);
+        this.toRemoveWidgets.set(newPart.wrapped.id, toRemoveWidget);
+        toRemoveWidget.push(disposable_1.Disposable.create(() => this.toRemoveWidgets.delete(newPart.wrapped.id)));
         this.registerPart(newPart);
-        if (newPart.options && newPart.options.order !== undefined) {
-            const index = this.getParts().findIndex(part => part.options.order === undefined || part.options.order > newPart.options.order);
+        if (insertIndex !== undefined || (newPart.options && newPart.options.order !== undefined)) {
+            const index = insertIndex !== null && insertIndex !== void 0 ? insertIndex : this.getParts().findIndex(part => part.options.order === undefined || part.options.order > newPart.options.order);
             if (index >= 0) {
                 this.containerLayout.insertWidget(index, newPart);
             }
@@ -262,10 +307,12 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
         this.update();
         this.fireDidChangeTrackableWidgets();
         toRemoveWidget.pushAll([
-            newPart,
             disposable_1.Disposable.create(() => {
+                if (newPart.currentViewContainerId === this.id) {
+                    newPart.dispose();
+                }
                 this.unregisterPart(newPart);
-                if (!newPart.isDisposed) {
+                if (!newPart.isDisposed && this.getPartIndex(newPart.id) > -1) {
                     this.containerLayout.removeWidget(newPart);
                 }
                 if (!this.isDisposed) {
@@ -297,8 +344,8 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
         newPart.disposed.connect(() => toRemoveWidget.dispose());
         return toRemoveWidget;
     }
-    createPart(widget, partId, options) {
-        return new ViewContainerPart(widget, partId, this.id, this.toolbarRegistry, this.toolbarFactory, options);
+    createPart(widget, partId, originalContainerId, originalContainerTitle, options) {
+        return new ViewContainerPart(widget, partId, this.id, originalContainerId, originalContainerTitle, this.toolbarRegistry, this.toolbarFactory, options);
     }
     removeWidget(widget) {
         const disposable = this.toRemoveWidgets.get(widget.id);
@@ -311,6 +358,12 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
     getParts() {
         return this.containerLayout.widgets;
     }
+    getPartIndex(partId) {
+        if (partId) {
+            return this.getParts().findIndex(part => part.id === partId);
+        }
+        return -1;
+    }
     getPartFor(widget) {
         return this.getParts().find(p => p.wrapped.id === widget.id);
     }
@@ -347,7 +400,9 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
                 partId: part.partId,
                 collapsed: part.collapsed,
                 hidden: part.isHidden,
-                relativeSize: size && availableSize ? size / availableSize : undefined
+                relativeSize: size && availableSize ? size / availableSize : undefined,
+                originalContainerId: part.originalContainerId,
+                originalContainerTitle: part.originalContainerTitle
             };
         });
         return { parts: partStates, title: this.titleOptions };
@@ -361,14 +416,14 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
         // restore widgets
         for (const part of state.parts) {
             if (part.widget) {
-                this.addWidget(part.widget);
+                this.addWidget(part.widget, undefined, part.originalContainerId, part.originalContainerTitle || {});
             }
         }
         const partStates = state.parts.filter(partState => algorithm_1.some(this.containerLayout.iter(), p => p.partId === partState.partId));
         // Reorder the parts according to the stored state
         for (let index = 0; index < partStates.length; index++) {
             const partState = partStates[index];
-            const currentIndex = this.getParts().findIndex(p => p.partId === partState.partId);
+            const currentIndex = this.getParts().findIndex(part => part.partId === partState.partId);
             if (currentIndex > index) {
                 this.containerLayout.moveWidget(currentIndex, index, this.getParts()[currentIndex]);
             }
@@ -477,6 +532,7 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
             return undefined;
         }
         this.updateCurrentPart(part);
+        part.collapsed = false;
         return part.wrapped;
     }
     revealWidget(id) {
@@ -516,54 +572,165 @@ let ViewContainer = ViewContainer_1 = class ViewContainer extends widgets_1.Base
     }
     onAfterShow(msg) {
         super.onAfterShow(msg);
+        this.updateTitle();
         this.lastVisibleState = undefined;
     }
-    registerDND(part) {
-        part['header'].draggable = true;
-        const style = (event) => {
-            if (!this.draggingPart) {
-                return;
-            }
+    onBeforeAttach(msg) {
+        super.onBeforeAttach(msg);
+        this.node.addEventListener('p-dragenter', this, true);
+        this.node.addEventListener('p-dragover', this, true);
+        this.node.addEventListener('p-dragleave', this, true);
+        this.node.addEventListener('p-drop', this, true);
+    }
+    onAfterDetach(msg) {
+        super.onAfterDetach(msg);
+        this.node.removeEventListener('p-dragenter', this, true);
+        this.node.removeEventListener('p-dragover', this, true);
+        this.node.removeEventListener('p-dragleave', this, true);
+        this.node.removeEventListener('p-drop', this, true);
+    }
+    handleEvent(event) {
+        switch (event.type) {
+            case 'p-dragenter':
+                this.handleDragEnter(event);
+                break;
+            case 'p-dragover':
+                this.handleDragOver(event);
+                break;
+            case 'p-dragleave':
+                this.handleDragLeave(event);
+                break;
+            case 'p-drop':
+                this.handleDrop(event);
+                break;
+        }
+    }
+    handleDragEnter(event) {
+        if (event.mimeData.hasData('application/vnd.phosphor.view-container-factory')) {
             event.preventDefault();
-            const enclosingPartNode = ViewContainerPart.closestPart(event.target);
-            if (enclosingPartNode && enclosingPartNode !== this.draggingPart.node) {
-                enclosingPartNode.classList.add('drop-target');
+            event.stopPropagation();
+        }
+    }
+    handleDragOver(event) {
+        var _a;
+        const factory = event.mimeData.getData('application/vnd.phosphor.view-container-factory');
+        const widget = factory && factory();
+        if (!(widget instanceof ViewContainerPart)) {
+            return;
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        const sameContainers = this.id === widget.currentViewContainerId;
+        const targetPart = algorithm_1.ArrayExt.findFirstValue(this.getParts(), (p => domutils_1.ElementExt.hitTest(p.node, event.clientX, event.clientY)));
+        if (!targetPart && sameContainers) {
+            event.dropAction = 'none';
+            return;
+        }
+        if (targetPart) {
+            // add overlay class style to the `targetPart` node.
+            targetPart.node.classList.add('drop-target');
+            this.toDisposeOnDragEnd.push(disposable_1.Disposable.create(() => targetPart.node.classList.remove('drop-target')));
+        }
+        else {
+            // show panel overlay.
+            const dockPanel = this.getDockPanel();
+            if (dockPanel) {
+                dockPanel.overlay.show({ top: 0, bottom: 0, right: 0, left: 0 });
+                this.toDisposeOnDragEnd.push(disposable_1.Disposable.create(() => dockPanel.overlay.hide(100)));
             }
-        };
-        const unstyle = (event) => {
-            if (!this.draggingPart) {
-                return;
+        }
+        const isDraggingOutsideDisabled = this.disableDNDBetweenContainers || ((_a = widget.viewContainer) === null || _a === void 0 ? void 0 : _a.disableDNDBetweenContainers)
+            || widget.options.disableDraggingToOtherContainers;
+        if (isDraggingOutsideDisabled && !sameContainers) {
+            const { target } = event;
+            if (target instanceof HTMLElement) {
+                target.classList.add('theia-cursor-no-drop');
+                this.toDisposeOnDragEnd.push(disposable_1.Disposable.create(() => {
+                    target.classList.remove('theia-cursor-no-drop');
+                }));
             }
+            event.dropAction = 'none';
+            return;
+        }
+        ;
+        event.dropAction = event.proposedAction;
+    }
+    ;
+    handleDragLeave(event) {
+        this.toDisposeOnDragEnd.dispose();
+        if (event.mimeData.hasData('application/vnd.phosphor.view-container-factory')) {
             event.preventDefault();
-            const enclosingPartNode = ViewContainerPart.closestPart(event.target);
-            if (enclosingPartNode) {
-                enclosingPartNode.classList.remove('drop-target');
-            }
-        };
-        return new disposable_1.DisposableCollection(widgets_1.addEventListener(part['header'], 'dragstart', event => {
-            const { dataTransfer } = event;
-            if (dataTransfer) {
-                this.draggingPart = part;
-                dataTransfer.effectAllowed = 'move';
-                dataTransfer.setData('view-container-dnd', part.id);
-                const dragImage = document.createElement('div');
-                dragImage.classList.add('theia-view-container-drag-image');
-                dragImage.innerText = part.wrapped.title.label;
-                document.body.appendChild(dragImage);
-                dataTransfer.setDragImage(dragImage, -10, -10);
-                setTimeout(() => document.body.removeChild(dragImage), 0);
-            }
-        }, false), widgets_1.addEventListener(part.node, 'dragend', () => this.draggingPart = undefined, false), widgets_1.addEventListener(part.node, 'dragover', style, false), widgets_1.addEventListener(part.node, 'dragleave', unstyle, false), widgets_1.addEventListener(part.node, 'drop', event => {
-            const { dataTransfer } = event;
-            if (dataTransfer) {
-                const moveId = dataTransfer.getData('view-container-dnd');
-                if (moveId && moveId !== part.id) {
-                    this.moveBefore(moveId, part.id);
+            event.stopPropagation();
+        }
+    }
+    ;
+    handleDrop(event) {
+        this.toDisposeOnDragEnd.dispose();
+        const factory = event.mimeData.getData('application/vnd.phosphor.view-container-factory');
+        const draggedPart = factory && factory();
+        if (!(draggedPart instanceof ViewContainerPart)) {
+            event.dropAction = 'none';
+            return;
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        const parts = this.getParts();
+        const toIndex = algorithm_1.ArrayExt.findFirstIndex(parts, part => domutils_1.ElementExt.hitTest(part.node, event.clientX, event.clientY));
+        if (draggedPart.currentViewContainerId !== this.id) {
+            this.attachNewPart(draggedPart, toIndex > -1 ? toIndex + 1 : toIndex);
+            draggedPart.onPartMoved(this);
+        }
+        else {
+            this.moveBefore(draggedPart.id, parts[toIndex].id);
+        }
+        event.dropAction = event.proposedAction;
+    }
+    registerDND(part) {
+        part.headerElement.draggable = true;
+        return new disposable_1.DisposableCollection(widgets_1.addEventListener(part.headerElement, 'dragstart', event => {
+            event.preventDefault();
+            const mimeData = new coreutils_1.MimeData();
+            mimeData.setData('application/vnd.phosphor.view-container-factory', () => part);
+            const clonedHeader = part.headerElement.cloneNode(true);
+            clonedHeader.style.width = part.node.style.width;
+            clonedHeader.style.opacity = '0.6';
+            const drag = new dragdrop_1.Drag({
+                mimeData,
+                dragImage: clonedHeader,
+                proposedAction: 'move',
+                supportedActions: 'move'
+            });
+            part.node.classList.add('p-mod-hidden');
+            drag.start(event.clientX, event.clientY).then(dropAction => {
+                // The promise is resolved when the drag has ended
+                if (dropAction === 'move' && part.currentViewContainerId !== this.id) {
+                    this.removeWidget(part.wrapped);
+                    this.lastVisibleState = this.doStoreState();
                 }
-                unstyle(event);
-            }
+            });
+            setTimeout(() => { part.node.classList.remove('p-mod-hidden'); }, 0);
         }, false));
     }
+    getDockPanel() {
+        let panel;
+        let parent = this.parent;
+        while (!panel && parent) {
+            if (this.isSideDockPanel(parent)) {
+                panel = parent;
+            }
+            else {
+                parent = parent.parent;
+            }
+        }
+        return panel;
+    }
+    isSideDockPanel(widget) {
+        const { leftPanelHandler, rightPanelHandler } = this.shell;
+        if (widget instanceof widgets_1.DockPanel && (widget.id === rightPanelHandler.dockPanel.id || widget.id === leftPanelHandler.dockPanel.id)) {
+            return true;
+        }
+        return false;
+    }
 };
 __decorate([
     inversify_1.inject(frontend_application_state_1.FrontendApplicationStateService),
@@ -605,6 +772,14 @@ __decorate([
     inversify_1.inject(progress_bar_factory_1.ProgressBarFactory),
     __metadata("design:type", Function)
 ], ViewContainer.prototype, "progressBarFactory", void 0);
+__decorate([
+    inversify_1.inject(shell_1.ApplicationShell),
+    __metadata("design:type", shell_1.ApplicationShell)
+], ViewContainer.prototype, "shell", void 0);
+__decorate([
+    inversify_1.inject(tab_bar_decorator_1.TabBarDecoratorService),
+    __metadata("design:type", tab_bar_decorator_1.TabBarDecoratorService)
+], ViewContainer.prototype, "decoratorService", void 0);
 __decorate([
     inversify_1.postConstruct(),
     __metadata("design:type", Function),
@@ -631,11 +806,14 @@ exports.ViewContainer = ViewContainer;
  * title, toolbar, and collapse / expand handle.
  */
 class ViewContainerPart extends widgets_1.BaseWidget {
-    constructor(wrapped, partId, viewContainerId, toolbarRegistry, toolbarFactory, options = {}) {
+    constructor(wrapped, partId, currentContainerId, originalContainerId, originalContainerTitle, toolbarRegistry, toolbarFactory, options = {}) {
         var _a;
         super();
         this.wrapped = wrapped;
         this.partId = partId;
+        this.currentContainerId = currentContainerId;
+        this.originalContainerId = originalContainerId;
+        this.originalContainerTitle = originalContainerTitle;
         this.toolbarRegistry = toolbarRegistry;
         this.toolbarFactory = toolbarFactory;
         this.options = options;
@@ -649,12 +827,14 @@ class ViewContainerPart extends widgets_1.BaseWidget {
         this.onTitleChanged = this.onTitleChangedEmitter.event;
         this.onDidFocusEmitter = new event_1.Emitter();
         this.onDidFocus = this.onDidFocusEmitter.event;
+        this.onPartMovedEmitter = new event_1.Emitter();
+        this.onDidMove = this.onPartMovedEmitter.event;
         this.onDidChangeDescriptionEmitter = new event_1.Emitter();
         this.onDidChangeDescription = this.onDidChangeDescriptionEmitter.event;
         this.toShowHeader = new disposable_1.DisposableCollection();
         wrapped.parent = this;
         wrapped.disposed.connect(() => this.dispose());
-        this.id = `${viewContainerId}--${wrapped.id}`;
+        this.id = `${originalContainerId}--${wrapped.id}`;
         this.addClass('part');
         const fireTitleChanged = () => this.onTitleChangedEmitter.fire(undefined);
         this.wrapped.title.changed.connect(fireTitleChanged);
@@ -691,6 +871,15 @@ class ViewContainerPart extends widgets_1.BaseWidget {
             this.hide();
         }
     }
+    get viewContainer() {
+        return this.parent ? this.parent.parent : undefined;
+    }
+    get currentViewContainerId() {
+        return this.currentContainerId;
+    }
+    get headerElement() {
+        return this.header;
+    }
     get collapsed() {
         return this._collapsed;
     }
@@ -718,6 +907,10 @@ class ViewContainerPart extends widgets_1.BaseWidget {
         this.update();
         this.collapsedEmitter.fire(collapsed);
     }
+    onPartMoved(newContainer) {
+        this.currentContainerId = newContainer.id;
+        this.onPartMovedEmitter.fire(newContainer);
+    }
     setHidden(hidden) {
         if (!this.canHide) {
             return;
@@ -787,7 +980,7 @@ class ViewContainerPart extends widgets_1.BaseWidget {
         const disposable = new disposable_1.DisposableCollection();
         const header = document.createElement('div');
         header.tabIndex = 0;
-        header.classList.add('theia-header', 'header');
+        header.classList.add('theia-header', 'header', 'theia-view-container-part-header');
         disposable.push(widgets_1.addEventListener(header, 'click', event => {
             if (this.toolbar && this.toolbar.shouldHandleMouseEvent(event)) {
                 return;
@@ -807,7 +1000,16 @@ class ViewContainerPart extends widgets_1.BaseWidget {
         title.classList.add('label', 'noselect');
         const description = document.createElement('span');
         description.classList.add('description');
-        const updateTitle = () => title.innerText = this.wrapped.title.label;
+        const updateTitle = () => {
+            var _a;
+            if (this.currentContainerId !== this.originalContainerId && ((_a = this.originalContainerTitle) === null || _a === void 0 ? void 0 : _a.label)) {
+                // Creating a title in format: <original_container_title>: <part_title>.
+                title.innerText = this.originalContainerTitle.label + ': ' + this.wrapped.title.label;
+            }
+            else {
+                title.innerText = this.wrapped.title.label;
+            }
+        };
         const updateCaption = () => title.title = this.wrapped.title.caption || this.wrapped.title.label;
         const updateDescription = () => {
             description.innerText = DescriptionWidget.is(this.wrapped) && !this.collapsed && this.wrapped.description || '';
@@ -818,8 +1020,9 @@ class ViewContainerPart extends widgets_1.BaseWidget {
         disposable.pushAll([
             this.onTitleChanged(updateTitle),
             this.onTitleChanged(updateCaption),
+            this.onDidMove(updateTitle),
             this.onDidChangeDescription(updateDescription),
-            this.onCollapsed(updateDescription),
+            this.onCollapsed(updateDescription)
         ]);
         header.appendChild(title);
         header.appendChild(description);
@@ -929,9 +1132,24 @@ class ViewContainerLayout extends widgets_1.SplitLayout {
     get widgets() {
         return algorithm_1.toArray(this.iter());
     }
+    attachWidget(index, widget) {
+        var _a;
+        super.attachWidget(index, widget);
+        if (index > -1 && this.parent && this.parent.node.contains((_a = this.widgets[index + 1]) === null || _a === void 0 ? void 0 : _a.node)) {
+            // Set the correct attach index to the DOM elements.
+            const ref = this.widgets[index + 1].node;
+            this.parent.node.insertBefore(widget.node, ref);
+            this.parent.node.insertBefore(this.handles[index], ref);
+            this.parent.fit();
+        }
+    }
     moveWidget(fromIndex, toIndex, widget) {
         const ref = this.widgets[toIndex < fromIndex ? toIndex : toIndex + 1];
         super.moveWidget(fromIndex, toIndex, widget);
+        // Keep the order of `_widgets` array just as done before (by `super`) for the `_items` array -
+        // to prevent later bugs relying on index.
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        algorithm_1.ArrayExt.move(this._widgets, fromIndex, toIndex);
         if (ref) {
             this.parent.node.insertBefore(this.handles[toIndex], ref.node);
         }