diff --git a/packages/statusbar-extension/src/defaults/filePath.tsx b/packages/statusbar-extension/src/defaults/filePath.tsx index 83487000aaf1..a502607950fe 100644 --- a/packages/statusbar-extension/src/defaults/filePath.tsx +++ b/packages/statusbar-extension/src/defaults/filePath.tsx @@ -11,15 +11,22 @@ import { JupyterLab, ApplicationShell } from '@jupyterlab/application'; -import { IStatusBar, TextItem } from '@jupyterlab/statusbar'; -import { DocumentRegistry } from '@jupyterlab/docregistry'; + import { VDomModel, VDomRenderer } from '@jupyterlab/apputils'; + +import { PathExt } from '@jupyterlab/coreutils'; + +import { IDocumentManager } from '@jupyterlab/docmanager'; + +import { DocumentRegistry } from '@jupyterlab/docregistry'; + +import { IStatusBar, TextItem } from '@jupyterlab/statusbar'; + import { IDisposable } from '@phosphor/disposable'; + import { ISignal } from '@phosphor/signaling'; -import { Token } from '@phosphor/coreutils'; -import { PathExt } from '@jupyterlab/coreutils'; + import { Widget, Title } from '@phosphor/widgets'; -import { IDocumentManager } from '@jupyterlab/docmanager'; namespace FilePathComponent { export interface IProps { @@ -192,15 +199,9 @@ export namespace IFilePath { } } -// tslint:disable-next-line:variable-name -export const IFilePath = new Token( - '@jupyterlab/statusbar:IFilePath' -); - -export const filePathItem: JupyterLabPlugin = { - id: '@jupyterlab/statusbar:file-path-item', +export const filePathStatus: JupyterLabPlugin = { + id: '@jupyterlab/statusbar:file-path-status', autoStart: true, - provides: IFilePath, requires: [IStatusBar, IDocumentManager], activate: ( app: JupyterLab, @@ -216,7 +217,5 @@ export const filePathItem: JupyterLabPlugin = { return true; } }); - - return item; } }; diff --git a/packages/statusbar-extension/src/defaults/lineCol.tsx b/packages/statusbar-extension/src/defaults/lineCol.tsx index e2fef09a94d8..2ce6e0d02894 100644 --- a/packages/statusbar-extension/src/defaults/lineCol.tsx +++ b/packages/statusbar-extension/src/defaults/lineCol.tsx @@ -4,34 +4,55 @@ /** * Part of Jupyterlab status bar defaults. */ + import React from 'react'; -import { TextItem } from '@jupyterlab/statusbar'; + import { JupyterLabPlugin, JupyterLab, ApplicationShell } from '@jupyterlab/application'; -import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook'; + import { VDomRenderer, VDomModel, ReactElementWidget } from '@jupyterlab/apputils'; -import { CodeEditor } from '@jupyterlab/codeeditor'; -import { IEditorTracker, FileEditor } from '@jupyterlab/fileeditor'; -import { ISignal } from '@phosphor/signaling'; + import { Cell, CodeCell } from '@jupyterlab/cells'; + +import { + IConsoleTracker, + ConsolePanel, + CodeConsole +} from '@jupyterlab/console'; + +import { CodeEditor } from '@jupyterlab/codeeditor'; + import { IDocumentWidget } from '@jupyterlab/docregistry'; -import { IDisposable } from '@phosphor/disposable'; -import { Token } from '@phosphor/coreutils'; -import { Widget } from '@phosphor/widgets'; -import { IStatusContext } from '../contexts'; + +import { IEditorTracker, FileEditor } from '@jupyterlab/fileeditor'; + +import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook'; + import { IStatusBar, interactiveItem, showPopup, - Popup + Popup, + TextItem } from '@jupyterlab/statusbar'; + +import { IDisposable } from '@phosphor/disposable'; + +import { Message } from '@phosphor/messaging'; + +import { ISignal } from '@phosphor/signaling'; + +import { Widget } from '@phosphor/widgets'; + +import { IStatusContext } from '../contexts'; + import { lineFormWrapper, lineFormInput, @@ -40,13 +61,8 @@ import { lineFormCaption, lineFormButton } from '../style/lineForm'; + import { classes } from 'typestyle/lib'; -import { Message } from '@phosphor/messaging'; -import { - IConsoleTracker, - ConsolePanel, - CodeConsole -} from '@jupyterlab/console'; namespace LineForm { export interface IProps { @@ -386,13 +402,9 @@ export namespace ILineCol { } } -// tslint:disable-next-line:variable-name -export const ILineCol = new Token('@jupyterlab/statusbar:ILineCol'); - -export const lineColItem: JupyterLabPlugin = { +export const lineColItem: JupyterLabPlugin = { id: '@jupyterlab/statusbar:line-col-item', autoStart: true, - provides: ILineCol, requires: [IStatusBar, INotebookTracker, IEditorTracker, IConsoleTracker], activate: ( app: JupyterLab, @@ -417,7 +429,5 @@ export const lineColItem: JupyterLabPlugin = { { tracker: consoleTracker } ]) }); - - return item; } }; diff --git a/packages/statusbar-extension/src/defaults/memoryUsage.tsx b/packages/statusbar-extension/src/defaults/memoryUsage.tsx index 3577d82becd2..f85390ee541e 100644 --- a/packages/statusbar-extension/src/defaults/memoryUsage.tsx +++ b/packages/statusbar-extension/src/defaults/memoryUsage.tsx @@ -5,15 +5,21 @@ * Part of Jupyterlab status bar defaults. */ import React from 'react'; -import { ISignal } from '@phosphor/signaling'; -import { IDisposable } from '@phosphor/disposable'; -import { Token } from '@phosphor/coreutils'; + import { JupyterLabPlugin, JupyterLab } from '@jupyterlab/application'; + import { VDomModel, VDomRenderer } from '@jupyterlab/apputils'; -import { ServerConnection } from '@jupyterlab/services'; + import { URLExt } from '@jupyterlab/coreutils'; + import { IStatusBar, TextItem } from '@jupyterlab/statusbar'; +import { ServerConnection } from '@jupyterlab/services'; + +import { IDisposable } from '@phosphor/disposable'; + +import { ISignal } from '@phosphor/signaling'; + class MemoryUsage extends VDomRenderer implements IMemoryUsage { constructor() { @@ -247,15 +253,9 @@ namespace Private { } } -// tslint:disable-next-line:variable-name -export const IMemoryUsage = new Token( - '@jupyterlab/statusbar:IMemoryUsage' -); - -export const memoryUsageItem: JupyterLabPlugin = { +export const memoryUsageItem: JupyterLabPlugin = { id: '@jupyterlab/statusbar:memory-usage-item', autoStart: true, - provides: IMemoryUsage, requires: [IStatusBar], activate: (app: JupyterLab, statusBar: IStatusBar) => { let item = new MemoryUsage(); @@ -266,7 +266,5 @@ export const memoryUsageItem: JupyterLabPlugin = { isActive: () => item.model!.metricsAvailable, stateChanged: item.model!.stateChanged }); - - return item; } }; diff --git a/packages/statusbar-extension/src/defaults/runningSessions.tsx b/packages/statusbar-extension/src/defaults/runningSessions.tsx index cdf8d6a3ae01..255965bb0c4d 100644 --- a/packages/statusbar-extension/src/defaults/runningSessions.tsx +++ b/packages/statusbar-extension/src/defaults/runningSessions.tsx @@ -5,13 +5,15 @@ * Part of Jupyterlab status bar defaults. */ import React from 'react'; -import { IconItem } from '@jupyterlab/statusbar'; -import { TextItem } from '@jupyterlab/statusbar'; + import { JupyterLabPlugin, JupyterLab, ApplicationShell } from '@jupyterlab/application'; + +import { VDomRenderer, VDomModel } from '@jupyterlab/apputils'; + import { ServiceManager, Kernel, @@ -19,12 +21,18 @@ import { TerminalManager, SessionManager } from '@jupyterlab/services'; -import { VDomRenderer, VDomModel } from '@jupyterlab/apputils'; -import { ISignal } from '@phosphor/signaling'; + +import { + GroupItem, + IconItem, + IStatusBar, + interactiveItem, + TextItem +} from '@jupyterlab/statusbar'; + import { IDisposable } from '@phosphor/disposable'; -import { Token } from '@phosphor/coreutils'; -import { GroupItem } from '@jupyterlab/statusbar'; -import { IStatusBar, interactiveItem } from '@jupyterlab/statusbar'; + +import { ISignal } from '@phosphor/signaling'; const HALF_SPACING = 4; @@ -169,18 +177,12 @@ export namespace IRunningSessions { } } -// tslint:disable-next-line:variable-name -export const IRunningSessions = new Token( - '@jupyterlab/statusbar:IRunningSessions' -); - /* * Initialization data for the statusbar extension. */ -export const runningSessionsItem: JupyterLabPlugin = { +export const runningSessionsItem: JupyterLabPlugin = { id: '@jupyterlab/statusbar:running-sessions-item', autoStart: true, - provides: IRunningSessions, requires: [IStatusBar], activate: (app: JupyterLab, statusBar: IStatusBar) => { const item = new RunningSessions({ @@ -192,7 +194,5 @@ export const runningSessionsItem: JupyterLabPlugin = { align: 'left', rank: 0 }); - - return item; } }; diff --git a/packages/statusbar-extension/src/defaults/savingStatus.tsx b/packages/statusbar-extension/src/defaults/savingStatus.tsx index 7ccd3e7304b7..f289789d737b 100644 --- a/packages/statusbar-extension/src/defaults/savingStatus.tsx +++ b/packages/statusbar-extension/src/defaults/savingStatus.tsx @@ -5,14 +5,20 @@ import { JupyterLab, ApplicationShell } from '@jupyterlab/application'; -import { IStatusBar, TextItem } from '@jupyterlab/statusbar'; -import { DocumentRegistry } from '@jupyterlab/docregistry'; + import { VDomModel, VDomRenderer } from '@jupyterlab/apputils'; + +import { IDocumentManager } from '@jupyterlab/docmanager'; + +import { DocumentRegistry } from '@jupyterlab/docregistry'; + +import { IStatusBar, TextItem } from '@jupyterlab/statusbar'; + import { IDisposable } from '@phosphor/disposable'; + import { ISignal } from '@phosphor/signaling'; -import { Token } from '@phosphor/coreutils'; + import { Widget } from '@phosphor/widgets'; -import { IDocumentManager } from '@jupyterlab/docmanager'; namespace SavingStatusComponent { export interface IProps { @@ -149,15 +155,9 @@ export namespace ISavingStatus { } } -// tslint:disable-next-line:variable-name -export const ISavingStatus = new Token( - '@jupyterlab/statusbar:ISavingStatus' -); - -export const savingStatusItem: JupyterLabPlugin = { +export const savingStatusItem: JupyterLabPlugin = { id: '@jupyterlab/statusbar:saving-status-item', autoStart: true, - provides: ISavingStatus, requires: [IStatusBar, IDocumentManager], activate: ( app: JupyterLab, @@ -173,7 +173,5 @@ export const savingStatusItem: JupyterLabPlugin = { }, stateChanged: item.model!.stateChanged }); - - return item; } }; diff --git a/packages/statusbar-extension/src/defaults/tabSpace.tsx b/packages/statusbar-extension/src/defaults/tabSpace.tsx index f7e162fd534e..109b0d44e968 100644 --- a/packages/statusbar-extension/src/defaults/tabSpace.tsx +++ b/packages/statusbar-extension/src/defaults/tabSpace.tsx @@ -5,36 +5,49 @@ * Part of Jupyterlab status bar defaults. */ import React from 'react'; -import { TextItem, SettingsConnector } from '@jupyterlab/statusbar'; import { JupyterLabPlugin, JupyterLab, ApplicationShell } from '@jupyterlab/application'; -import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook'; + import { VDomRenderer, VDomModel } from '@jupyterlab/apputils'; -import { IEditorTracker } from '@jupyterlab/fileeditor'; -import { ISignal } from '@phosphor/signaling'; + import { Cell } from '@jupyterlab/cells'; -import { IDisposable } from '@phosphor/disposable'; -import { Token } from '@phosphor/coreutils'; -import { Widget } from '@phosphor/widgets'; -import { IStatusContext } from '../contexts'; -import { CommandRegistry } from '@phosphor/commands'; -import { Menu } from '@phosphor/widgets'; -import { JSONObject } from '@phosphor/coreutils'; -import { showPopup, Popup } from '@jupyterlab/statusbar'; +import { IConsoleTracker, ConsolePanel } from '@jupyterlab/console'; + +import { ISettingRegistry } from '@jupyterlab/coreutils'; + +import { IEditorTracker } from '@jupyterlab/fileeditor'; + +import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook'; + import { IStatusBar, interactiveItem, - clickedItem + clickedItem, + Popup, + showPopup, + TextItem, + SettingsConnector } from '@jupyterlab/statusbar'; -import { IConsoleTracker, ConsolePanel } from '@jupyterlab/console'; -import { ISettingRegistry } from '@jupyterlab/coreutils'; + +import { CommandRegistry } from '@phosphor/commands'; + +import { JSONObject } from '@phosphor/coreutils'; + +import { IDisposable } from '@phosphor/disposable'; + import { Message } from '@phosphor/messaging'; +import { ISignal } from '@phosphor/signaling'; + +import { Menu, Widget } from '@phosphor/widgets'; + +import { IStatusContext } from '../contexts'; + namespace TabSpaceComponent { export interface IProps { tabSpace: number; @@ -389,15 +402,9 @@ export namespace ITabSpace { } } -// tslint:disable-next-line:variable-name -export const ITabSpace = new Token( - '@jupyterlab/statusbar:ITabSpace' -); - -export const tabSpaceItem: JupyterLabPlugin = { +export const tabSpaceItem: JupyterLabPlugin = { id: '@jupyterlab/statusbar:tab-space-item', autoStart: true, - provides: ITabSpace, requires: [ IStatusBar, INotebookTracker, @@ -513,8 +520,6 @@ export const tabSpaceItem: JupyterLabPlugin = { { tracker: consoleTracker } ]) }); - - return item; } }; diff --git a/packages/statusbar-extension/src/index.ts b/packages/statusbar-extension/src/index.ts index 55c851fe25ff..21e39b75410e 100644 --- a/packages/statusbar-extension/src/index.ts +++ b/packages/statusbar-extension/src/index.ts @@ -11,7 +11,7 @@ import { lineColItem, kernelStatus, runningSessionsItem, - filePathItem, + filePathStatus, tabSpaceItem, memoryUsageItem, savingStatusItem @@ -36,7 +36,7 @@ const plugins: JupyterLabPlugin[] = [ lineColItem, kernelStatus, runningSessionsItem, - filePathItem, + filePathStatus, tabSpaceItem, memoryUsageItem, savingStatusItem