Attach Open Editors after Navigator (#10930)

Fixes a bug where the `initiallyCollapsed` field of OpenEditors was ignored.
eclipse-theia · Mar 28, 2022 · a8b8bbe · a8b8bbe
1 parent b1bd7bd
commit a8b8bbe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/core/src/browser/view-container.ts b/packages/core/src/browser/view-container.ts
@@ -1036,7 +1036,7 @@ export class ViewContainerPart extends BaseWidget {
     set collapsed(collapsed: boolean) {
         // Cannot collapse/expand if the orientation of the container is `horizontal`.
         const orientation = ViewContainer.getOrientation(this.node);
-        if (this._collapsed === collapsed || orientation === 'horizontal' && collapsed) {
+        if (this._collapsed === collapsed || (orientation === 'horizontal' && collapsed)) {
             return;
         }
         this._collapsed = collapsed;

diff --git a/packages/navigator/src/browser/navigator-widget-factory.ts b/packages/navigator/src/browser/navigator-widget-factory.ts
@@ -68,8 +68,8 @@ export class NavigatorWidgetFactory implements WidgetFactory {
         viewContainer.setTitleOptions(EXPLORER_VIEW_CONTAINER_TITLE_OPTIONS);
         const openEditorsWidget = await this.widgetManager.getOrCreateWidget(OpenEditorsWidget.ID);
         const navigatorWidget = await this.widgetManager.getOrCreateWidget(FILE_NAVIGATOR_ID);
-        viewContainer.addWidget(openEditorsWidget, this.openEditorsWidgetOptions);
         viewContainer.addWidget(navigatorWidget, this.fileNavigatorWidgetOptions);
+        viewContainer.addWidget(openEditorsWidget, this.openEditorsWidgetOptions);
         return viewContainer;
     }
 }