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

package/src/browser/view-container.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { interfaces, injectable, inject, postConstruct } from 'inversify';
-import { IIterator, toArray, find, some, every, map, ArrayExt } from '@phosphor/algorithm';
+import { find, some, every, map, ArrayExt } from '@lumino/algorithm';
 import {
     Widget, EXPANSION_TOGGLE_CLASS, COLLAPSED_CLASS, CODICON_TREE_ITEM_CLASSES, MessageLoop, Message, SplitPanel,
     BaseWidget, addEventListener, SplitLayout, LayoutItem, PanelLayout, addKeyListener, waitForRevealed, UnsafeWidgetUtilities, DockPanel, PINNED_CLASS
@@ -34,9 +34,9 @@ import { isEmpty, isObject, nls } from '../common';
 import { WidgetManager } from './widget-manager';
 import { Key } from './keys';
 import { ProgressBarFactory } from './progress-bar-factory';
-import { Drag, IDragEvent } from '@phosphor/dragdrop';
-import { MimeData } from '@phosphor/coreutils';
-import { ElementExt } from '@phosphor/domutils';
+import { Drag } from '@lumino/dragdrop';
+import { MimeData } from '@lumino/coreutils';
+import { ElementExt } from '@lumino/domutils';
 import { TabBarDecoratorService } from './shell/tab-bar-decorator';
 
 export interface ViewContainerTitleOptions {
@@ -170,7 +170,11 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
                 if (event.button === 2 && every(this.containerLayout.iter(), part => !!part.isHidden)) {
                     event.stopPropagation();
                     event.preventDefault();
-                    contextMenuRenderer.render({ menuPath: this.contextMenuPath, anchor: event });
+                    contextMenuRenderer.render({
+                        menuPath: this.contextMenuPath,
+                        anchor: event,
+                        context: event.currentTarget instanceof HTMLElement ? event.currentTarget : this.node
+                    });
                 }
             }),
             commandRegistry.registerCommand({ id: this.globalHideCommandId }, {
@@ -220,7 +224,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
     }
 
     protected updateSplitterVisibility(): void {
-        const className = 'p-first-visible';
+        const className = 'lm-first-visible';
         let firstFound = false;
         for (const part of this.getParts()) {
             if (!part.isHidden && !firstFound) {
@@ -436,7 +440,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
                 if (event.button === 2) {
                     event.preventDefault();
                     event.stopPropagation();
-                    this.contextMenuRenderer.render({ menuPath: this.contextMenuPath, anchor: event });
+                    this.contextMenuRenderer.render({ menuPath: this.contextMenuPath, anchor: event, context: this.node });
                 }
             }),
             newPart.onTitleChanged(() => this.refreshMenu(newPart)),
@@ -713,47 +717,47 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
 
     protected override onBeforeAttach(msg: Message): void {
         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);
+        this.node.addEventListener('lm-dragenter', this, true);
+        this.node.addEventListener('lm-dragover', this, true);
+        this.node.addEventListener('lm-dragleave', this, true);
+        this.node.addEventListener('lm-drop', this, true);
     }
 
     protected override onAfterDetach(msg: Message): void {
         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);
+        this.node.removeEventListener('lm-dragenter', this, true);
+        this.node.removeEventListener('lm-dragover', this, true);
+        this.node.removeEventListener('lm-dragleave', this, true);
+        this.node.removeEventListener('lm-drop', this, true);
     }
 
     handleEvent(event: Event): void {
         switch (event.type) {
-            case 'p-dragenter':
-                this.handleDragEnter(event as IDragEvent);
+            case 'lm-dragenter':
+                this.handleDragEnter(event as Drag.Event);
                 break;
-            case 'p-dragover':
-                this.handleDragOver(event as IDragEvent);
+            case 'lm-dragover':
+                this.handleDragOver(event as Drag.Event);
                 break;
-            case 'p-dragleave':
-                this.handleDragLeave(event as IDragEvent);
+            case 'lm-dragleave':
+                this.handleDragLeave(event as Drag.Event);
                 break;
-            case 'p-drop':
-                this.handleDrop(event as IDragEvent);
+            case 'lm-drop':
+                this.handleDrop(event as Drag.Event);
                 break;
         }
     }
 
-    handleDragEnter(event: IDragEvent): void {
-        if (event.mimeData.hasData('application/vnd.phosphor.view-container-factory')) {
+    handleDragEnter(event: Drag.Event): void {
+        if (event.mimeData.hasData('application/vnd.lumino.view-container-factory')) {
             event.preventDefault();
             event.stopPropagation();
         }
     }
 
     toDisposeOnDragEnd = new DisposableCollection();
-    handleDragOver(event: IDragEvent): void {
-        const factory = event.mimeData.getData('application/vnd.phosphor.view-container-factory');
+    handleDragOver(event: Drag.Event): void {
+        const factory = event.mimeData.getData('application/vnd.lumino.view-container-factory');
         const widget = factory && factory();
         if (!(widget instanceof ViewContainerPart)) {
             return;
@@ -797,17 +801,17 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
         event.dropAction = event.proposedAction;
     };
 
-    handleDragLeave(event: IDragEvent): void {
+    handleDragLeave(event: Drag.Event): void {
         this.toDisposeOnDragEnd.dispose();
-        if (event.mimeData.hasData('application/vnd.phosphor.view-container-factory')) {
+        if (event.mimeData.hasData('application/vnd.lumino.view-container-factory')) {
             event.preventDefault();
             event.stopPropagation();
         }
     };
 
-    handleDrop(event: IDragEvent): void {
+    handleDrop(event: Drag.Event): void {
         this.toDisposeOnDragEnd.dispose();
-        const factory = event.mimeData.getData('application/vnd.phosphor.view-container-factory');
+        const factory = event.mimeData.getData('application/vnd.lumino.view-container-factory');
         const draggedPart = factory && factory();
         if (!(draggedPart instanceof ViewContainerPart)) {
             event.dropAction = 'none';
@@ -834,7 +838,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
                 event => {
                     event.preventDefault();
                     const mimeData = new MimeData();
-                    mimeData.setData('application/vnd.phosphor.view-container-factory', () => part);
+                    mimeData.setData('application/vnd.lumino.view-container-factory', () => part);
                     const clonedHeader = part.headerElement.cloneNode(true) as HTMLElement;
                     clonedHeader.style.width = part.node.style.width;
                     clonedHeader.style.opacity = '0.6';
@@ -844,7 +848,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
                         proposedAction: 'move',
                         supportedActions: 'move'
                     });
-                    part.node.classList.add('p-mod-hidden');
+                    part.node.classList.add('lm-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) {
@@ -852,7 +856,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
                             this.lastVisibleState = this.doStoreState();
                         }
                     });
-                    setTimeout(() => { part.node.classList.remove('p-mod-hidden'); }, 0);
+                    setTimeout(() => { part.node.classList.remove('lm-mod-hidden'); }, 0);
                 }, false));
     }
 
@@ -1364,13 +1368,13 @@ export class ViewContainerLayout extends SplitLayout {
         return (this as any)._items as Array<LayoutItem & ViewContainerLayout.Item>;
     }
 
-    override iter(): IIterator<ViewContainerPart> {
+    iter(): IterableIterator<ViewContainerPart> {
         return map(this.items, item => item.widget);
     }
 
     // @ts-expect-error TS2611 `SplitLayout.widgets` is declared as `readonly widgets` but is implemented as a getter.
     get widgets(): ViewContainerPart[] {
-        return toArray(this.iter());
+        return Array.from(this.iter());
     }
 
     override attachWidget(index: number, widget: ViewContainerPart): void {

package/src/browser/widget-manager.spec.ts

@@ -20,7 +20,7 @@ let disableJsDom = enableJSDOM();
 import { Container, ContainerModule } from 'inversify';
 import { expect } from 'chai';
 import { WidgetManager, WidgetFactory } from './widget-manager';
-import { Widget } from '@phosphor/widgets';
+import { Widget } from '@lumino/widgets';
 import { ILogger } from '../common/logger';
 import { MockLogger } from '../common/test/mock-logger';
 import { bindContributionProvider } from '../common';

package/src/browser/widget-manager.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { inject, named, injectable } from 'inversify';
-import { Widget } from '@phosphor/widgets';
+import { Widget } from '@lumino/widgets';
 import { ILogger, Emitter, Event, ContributionProvider, MaybePromise, WaitUntilEvent } from '../common';
 import stableJsonStringify = require('fast-json-stable-stringify');
 

package/src/browser/widgets/react-widget.tsx

@@ -18,7 +18,7 @@ import * as React from 'react';
 import { injectable, unmanaged } from 'inversify';
 import { Disposable } from '../../common';
 import { BaseWidget, Message } from './widget';
-import { Widget } from '@phosphor/widgets';
+import { Widget } from '@lumino/widgets';
 import { createRoot, Root } from 'react-dom/client';
 
 @injectable()

package/src/browser/widgets/widget.ts

@@ -17,20 +17,20 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { injectable, decorate, unmanaged } from 'inversify';
-import { Title, Widget } from '@phosphor/widgets';
-import { Message, MessageLoop } from '@phosphor/messaging';
+import { Title, Widget } from '@lumino/widgets';
+import { Message, MessageLoop } from '@lumino/messaging';
 import { Emitter, Event, Disposable, DisposableCollection, MaybePromise, isObject } from '../../common';
 import { KeyCode, KeysOrKeyCodes } from '../keyboard/keys';
 
 import PerfectScrollbar from 'perfect-scrollbar';
 import { PreviewableWidget } from '../widgets/previewable-widget';
-import { Slot } from '@phosphor/signaling';
+import { Slot } from '@lumino/signaling';
 
 decorate(injectable(), Widget);
 decorate(unmanaged(), Widget, 0);
 
-export * from '@phosphor/widgets';
-export * from '@phosphor/messaging';
+export * from '@lumino/widgets';
+export * from '@lumino/messaging';
 
 export const ACTION_ITEM = 'action-label';
 
@@ -62,8 +62,8 @@ export const DEFAULT_SCROLL_OPTIONS: PerfectScrollbar.Options = {
 };
 
 /**
- * At a number of places in the code, we have effectively reimplemented Phosphor's Widget.attach and Widget.detach,
- * but omitted the checks that Phosphor expects to be performed for those operations. That is a bad idea, because it
+ * At a number of places in the code, we have effectively reimplemented Lumino's Widget.attach and Widget.detach,
+ * but omitted the checks that Lumino expects to be performed for those operations. That is a bad idea, because it
  * means that we are telling widgets that they are attached or detached when not all the conditions that should apply
  * do apply. We should explicitly mark those locations so that we know where we should go fix them later.
  */
@@ -234,9 +234,11 @@ export class BaseWidget extends Widget implements PreviewableWidget {
     }
 
     override clearFlag(flag: Widget.Flag): void {
+        const wasVisible = this.isVisible;
         super.clearFlag(flag);
-        if (flag === Widget.Flag.IsVisible) {
-            this.handleVisiblityChanged(this.isVisible);
+        const isVisible = this.isVisible;
+        if (isVisible !== wasVisible) {
+            this.handleVisiblityChanged(isVisible);
         }
     }
 }

package/src/common/i18n/localization.ts

@@ -25,7 +25,8 @@ export interface AsyncLocalizationProvider {
 }
 
 export interface Localization extends LanguageInfo {
-    translations: { [key: string]: string };
+    translations: Record<string, string>;
+    replacements?: Record<string, string>;
 }
 
 export interface LanguageInfo {
@@ -50,9 +51,14 @@ export namespace Localization {
     export function localize(localization: Localization | undefined, key: string, defaultValue: string, ...args: FormatType[]): string {
         let value = defaultValue;
         if (localization) {
-            const translation = localization.translations[key];
-            if (translation) {
-                value = normalize(translation);
+            const replacement = localization.replacements?.[defaultValue];
+            if (typeof replacement === 'string') {
+                value = replacement;
+            } else {
+                const translation = localization.translations[key];
+                if (translation) {
+                    value = normalize(translation);
+                }
             }
         }
         return format(value, args);