@theia/core 1.59.0-next.72 → 1.60.0-next.43

package/src/browser/shell/application-shell.ts

@@ -15,13 +15,13 @@
 // *****************************************************************************
 
 import { injectable, inject, optional, postConstruct } from 'inversify';
-import { ArrayExt, find, toArray, each } from '@phosphor/algorithm';
+import { ArrayExt, find, toArray, each } from '@lumino/algorithm';
 import {
     BoxLayout, BoxPanel, DockLayout, DockPanel, FocusTracker, Layout, Panel, SplitLayout,
     SplitPanel, TabBar, Widget, Title
-} from '@phosphor/widgets';
-import { Message } from '@phosphor/messaging';
-import { IDragEvent } from '@phosphor/dragdrop';
+} from '@lumino/widgets';
+import { Message } from '@lumino/messaging';
+import { Drag } from '@lumino/dragdrop';
 import { RecursivePartial, Event as CommonEvent, DisposableCollection, Disposable, environment, isObject, UntitledResourceResolver, UNTITLED_SCHEME } from '../../common';
 import { animationFrame } from '../browser';
 import { Saveable, SaveableWidget, SaveOptions } from '../saveable';
@@ -169,7 +169,7 @@ interface WidgetDragState {
     leftExpanded: boolean;
     rightExpanded: boolean;
     bottomExpanded: boolean;
-    lastDragOver?: IDragEvent;
+    lastDragOver?: Drag.Event;
     leaveTimeout?: number;
 }
 
@@ -264,6 +264,9 @@ export class ApplicationShell extends Widget {
         return this._mainPanelRenderer;
     }
 
+    protected initializedDeferred = new Deferred<void>();
+    initialized = this.initializedDeferred.promise;
+
     /**
      * Construct a new application shell.
      */
@@ -322,6 +325,7 @@ export class ApplicationShell extends Widget {
                 });
             }
         });
+        this.initializedDeferred.resolve();
     }
 
     protected initializeShell(): void {
@@ -386,39 +390,39 @@ export class ApplicationShell extends Widget {
     }
 
     protected override onBeforeAttach(msg: Message): void {
-        document.addEventListener('p-dragenter', this, true);
-        document.addEventListener('p-dragover', this, true);
-        document.addEventListener('p-dragleave', this, true);
-        document.addEventListener('p-drop', this, true);
+        document.addEventListener('lm-dragenter', this, true);
+        document.addEventListener('lm-dragover', this, true);
+        document.addEventListener('lm-dragleave', this, true);
+        document.addEventListener('lm-drop', this, true);
     }
 
     protected override onAfterDetach(msg: Message): void {
-        document.removeEventListener('p-dragenter', this, true);
-        document.removeEventListener('p-dragover', this, true);
-        document.removeEventListener('p-dragleave', this, true);
-        document.removeEventListener('p-drop', this, true);
+        document.removeEventListener('lm-dragenter', this, true);
+        document.removeEventListener('lm-dragover', this, true);
+        document.removeEventListener('lm-dragleave', this, true);
+        document.removeEventListener('lm-drop', this, true);
     }
 
     handleEvent(event: Event): void {
         switch (event.type) {
-            case 'p-dragenter':
-                this.onDragEnter(event as IDragEvent);
+            case 'lm-dragenter':
+                this.onDragEnter(event as Drag.Event);
                 break;
-            case 'p-dragover':
-                this.onDragOver(event as IDragEvent);
+            case 'lm-dragover':
+                this.onDragOver(event as Drag.Event);
                 break;
-            case 'p-drop':
-                this.onDrop(event as IDragEvent);
+            case 'lm-drop':
+                this.onDrop(event as Drag.Event);
                 break;
-            case 'p-dragleave':
-                this.onDragLeave(event as IDragEvent);
+            case 'lm-dragleave':
+                this.onDragLeave(event as Drag.Event);
                 break;
         }
     }
 
-    protected onDragEnter({ mimeData }: IDragEvent): void {
+    protected onDragEnter({ mimeData }: Drag.Event): void {
         if (!this.dragState) {
-            if (mimeData && mimeData.hasData('application/vnd.phosphor.widget-factory')) {
+            if (mimeData && mimeData.hasData('application/vnd.lumino.widget-factory')) {
                 // The drag contains a widget, so we'll track it and expand side panels as needed
                 this.dragState = {
                     startTime: performance.now(),
@@ -430,7 +434,7 @@ export class ApplicationShell extends Widget {
         }
     }
 
-    protected onDragOver(event: IDragEvent): void {
+    protected onDragOver(event: Drag.Event): void {
         const state = this.dragState;
         if (state) {
             state.lastDragOver = event;
@@ -499,7 +503,7 @@ export class ApplicationShell extends Widget {
         }
     }
 
-    protected onDrop(event: IDragEvent): void {
+    protected onDrop(event: Drag.Event): void {
         const state = this.dragState;
         if (state) {
             if (state.leaveTimeout) {
@@ -521,7 +525,7 @@ export class ApplicationShell extends Widget {
         }
     }
 
-    protected onDragLeave(event: IDragEvent): void {
+    protected onDragLeave(event: Drag.Event): void {
         const state = this.dragState;
         if (state) {
             state.lastDragOver = undefined;
@@ -606,7 +610,7 @@ export class ApplicationShell extends Widget {
 
         dockPanel.node.addEventListener('dblclick', event => {
             const el = event.target as Element;
-            if (el.id === MAIN_AREA_ID || el.classList.contains('p-TabBar-content')) {
+            if (el.id === MAIN_AREA_ID || el.classList.contains('lm-TabBar-content')) {
                 this.onDidDoubleClickMainAreaEmitter.fire();
             }
         });
@@ -663,7 +667,7 @@ export class ApplicationShell extends Widget {
             }
             this.refreshBottomPanelToggleButton();
         }, this);
-        dockPanel.node.addEventListener('p-dragenter', event => {
+        dockPanel.node.addEventListener('lm-dragenter', event => {
             // Make sure that the main panel hides its overlay when the bottom panel is expanded
             this.mainPanel.overlay.hide(0);
         });
@@ -796,7 +800,7 @@ export class ApplicationShell extends Widget {
             const index = parent.widgets.indexOf(this.bottomPanel) - 1;
             if (index >= 0) {
                 const handle = parent.handles[index];
-                if (!handle.classList.contains('p-mod-hidden')) {
+                if (!handle.classList.contains('lm-mod-hidden')) {
                     const parentHeight = parent.node.clientHeight;
                     return parentHeight - handle.offsetTop;
                 }
@@ -1037,7 +1041,7 @@ export class ApplicationShell extends Widget {
      */
     findWidgetForElement(element: HTMLElement): Widget | undefined {
         let widgetNode: HTMLElement | null = element;
-        while (widgetNode && !widgetNode.classList.contains('p-Widget')) {
+        while (widgetNode && !widgetNode.classList.contains('lm-Widget')) {
             widgetNode = widgetNode.parentElement;
         }
         if (widgetNode) {
@@ -1067,7 +1071,7 @@ export class ApplicationShell extends Widget {
         if (event?.target instanceof HTMLElement) {
             const tabNode = event.target;
 
-            const titleIndex = Array.from(tabBar.contentNode.getElementsByClassName('p-TabBar-tab'))
+            const titleIndex = Array.from(tabBar.contentNode.getElementsByClassName('lm-TabBar-tab'))
                 .findIndex(node => node.contains(tabNode));
 
             if (titleIndex !== -1) {
@@ -1198,7 +1202,7 @@ export class ApplicationShell extends Widget {
                 panel.markAsCurrent(widget!.title);
             }
             // Add checks to ensure that the 'sash' for left panel is displayed correctly
-            if (newValue.node.className === 'p-Widget theia-view-container p-DockPanel-widget') {
+            if (newValue.node.className === 'lm-Widget theia-view-container lm-DockPanel-widget') {
                 // Set the z-index so elements with `position: fixed` contained in the active widget are displayed correctly
                 this.setZIndex(newValue.node, '1');
             }

package/src/browser/shell/shell-layout-restorer.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject, named } from 'inversify';
-import { Widget } from '@phosphor/widgets';
+import { Widget } from '@lumino/widgets';
 import { FrontendApplication } from '../frontend-application';
 import { WidgetManager, WidgetConstructionOptions } from '../widget-manager';
 import { StorageService } from '../storage-service';

package/src/browser/shell/side-panel-handler.ts

@@ -15,11 +15,11 @@
 // *****************************************************************************
 
 import { injectable, inject } from 'inversify';
-import { find, map, toArray, some } from '@phosphor/algorithm';
-import { TabBar, Widget, DockPanel, Title, Panel, BoxPanel, BoxLayout, SplitPanel, PanelLayout } from '@phosphor/widgets';
-import { MimeData } from '@phosphor/coreutils';
-import { Drag } from '@phosphor/dragdrop';
-import { AttachedProperty } from '@phosphor/properties';
+import { find, map, toArray, some } from '@lumino/algorithm';
+import { TabBar, Widget, DockPanel, Title, Panel, BoxPanel, BoxLayout, SplitPanel, PanelLayout } from '@lumino/widgets';
+import { MimeData } from '@lumino/coreutils';
+import { Drag } from '@lumino/dragdrop';
+import { AttachedProperty } from '@lumino/properties';
 import { TabBarRendererFactory, TabBarRenderer, SHELL_TABBAR_CONTEXT_MENU, SideTabBar } from './tab-bars';
 import { SidebarMenuWidget, SidebarMenu, SidebarBottomMenuWidgetFactory, SidebarTopMenuWidgetFactory } from './sidebar-menu-widget';
 import { SplitPositionHandler, SplitPositionOptions } from './split-panels';
@@ -240,7 +240,8 @@ export class SidePanelHandler {
         this.contextMenuRenderer.render({
             args: [title.owner],
             menuPath: SIDE_PANEL_TOOLBAR_CONTEXT_MENU,
-            anchor: e
+            anchor: e,
+            context: e.currentTarget instanceof HTMLElement ? e.currentTarget : this.tabBar.node
         });
     }
 
@@ -556,12 +557,12 @@ export class SidePanelHandler {
             const index = parent.widgets.indexOf(this.container);
             if (this.side === 'left') {
                 const handle = parent.handles[index];
-                if (!handle.classList.contains('p-mod-hidden')) {
+                if (!handle.classList.contains('lm-mod-hidden')) {
                     return handle.offsetLeft;
                 }
             } else if (this.side === 'right') {
                 const handle = parent.handles[index - 1];
-                if (!handle.classList.contains('p-mod-hidden')) {
+                if (!handle.classList.contains('lm-mod-hidden')) {
                     const parentWidth = parent.node.clientWidth;
                     return parentWidth - handle.offsetLeft;
                 }
@@ -632,13 +633,13 @@ export class SidePanelHandler {
         const clonedTab = tab.cloneNode(true) as HTMLElement;
         clonedTab.style.width = '';
         clonedTab.style.height = '';
-        const label = clonedTab.getElementsByClassName('p-TabBar-tabLabel')[0] as HTMLElement;
+        const label = clonedTab.getElementsByClassName('lm-TabBar-tabLabel')[0] as HTMLElement;
         label.style.width = '';
         label.style.height = '';
 
         // Create and start a drag to move the selected tab to another panel
         const mimeData = new MimeData();
-        mimeData.setData('application/vnd.phosphor.widget-factory', () => title.owner);
+        mimeData.setData('application/vnd.lumino.widget-factory', () => title.owner);
         const drag = new Drag({
             mimeData,
             dragImage: clonedTab,
@@ -646,10 +647,10 @@ export class SidePanelHandler {
             supportedActions: 'move',
         });
 
-        tab.classList.add('p-mod-hidden');
+        tab.classList.add('lm-mod-hidden');
         drag.start(clientX, clientY).then(() => {
             // The promise is resolved when the drag has ended
-            tab.classList.remove('p-mod-hidden');
+            tab.classList.remove('lm-mod-hidden');
         });
     }
 

package/src/browser/shell/side-panel-toolbar.ts

@@ -14,9 +14,9 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Widget, Title } from '@phosphor/widgets';
+import { Widget, Title } from '@lumino/widgets';
 import { TabBarToolbar, TabBarToolbarRegistry, TabBarToolbarFactory } from './tab-bar-toolbar';
-import { Message } from '@phosphor/messaging';
+import { Message } from '@lumino/messaging';
 import { BaseWidget } from '../widgets';
 import { Emitter } from '../../common/event';
 import { ContextMenuAccess, Anchor } from '../context-menu-renderer';

package/src/browser/shell/sidebar-bottom-menu-widget.tsx

@@ -32,7 +32,8 @@ export class SidebarBottomMenuWidget extends SidebarMenuWidget {
             anchor: {
                 x: button.left + button.width,
                 y: button.top + button.height,
-            }
+            },
+            context: e.currentTarget
         });
     }
 

package/src/browser/shell/sidebar-menu-widget.tsx

@@ -152,6 +152,7 @@ export class SidebarMenuWidget extends ReactWidget {
                 x: button.left + button.width,
                 y: button.top,
             },
+            context: e.currentTarget,
             onHide: () => {
                 this.preservingContext = false;
                 if (this.preservedContext) {

package/src/browser/shell/split-panels.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable } from 'inversify';
-import { SplitPanel, SplitLayout, Widget } from '@phosphor/widgets';
+import { SplitPanel, SplitLayout, Widget } from '@lumino/widgets';
 
 export interface SplitPositionOptions {
     /** The side of the side panel that shall be resized. */

package/src/browser/shell/tab-bar-decorator.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import debounce = require('lodash.debounce');
-import { Title, Widget } from '@phosphor/widgets';
+import { Title, Widget } from '@lumino/widgets';
 import { inject, injectable, named } from 'inversify';
 import { ContributionProvider, Emitter, Event } from '../../common';
 import { ColorRegistry } from '../color-registry';

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx

@@ -309,7 +309,7 @@ export class TabBarToolbar extends ReactWidget {
             menuPath: TAB_BAR_TOOLBAR_CONTEXT_MENU,
             args: [this.current],
             anchor,
-            context: this.current?.node,
+            context: this.current?.node || this.node,
             onHide: () => toDisposeOnHide.dispose(),
             skipSingleRootNode: true,
         });
@@ -375,7 +375,7 @@ export class TabBarToolbar extends ReactWidget {
             menuPath,
             args: [this.current],
             anchor,
-            context: this.current?.node,
+            context: this.current?.node || this.node,
             contextKeyService: contextMatcher,
             onHide: () => toDisposeOnHide.dispose()
         });
@@ -436,7 +436,7 @@ export namespace TabBarToolbar {
 
     export namespace Styles {
 
-        export const TAB_BAR_TOOLBAR = 'p-TabBar-toolbar';
+        export const TAB_BAR_TOOLBAR = 'lm-TabBar-toolbar';
         export const TAB_BAR_TOOLBAR_ITEM = 'item';
 
     }

package/src/browser/shell/tab-bars.spec.ts

@@ -18,7 +18,7 @@ import { enableJSDOM } from '../test/jsdom';
 let disableJSDOM = enableJSDOM();
 import { expect } from 'chai';
 
-import { Title, Widget } from '@phosphor/widgets';
+import { Title, Widget } from '@lumino/widgets';
 import { TabBarRenderer } from './tab-bars';
 
 disableJSDOM();