diff --git a/src/index.ts b/src/index.ts index 58464c0..8d6e81b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,11 +11,10 @@ import { VariableInspectorManager, IVariableInspectorManager } from './manager'; import { Languages } from './inspectorscripts'; -import { ICommandPalette, WidgetTracker } from '@jupyterlab/apputils'; +import { WidgetTracker } from '@jupyterlab/apputils'; import { ILabShell, - ILayoutRestorer, JupyterFrontEnd, JupyterFrontEndPlugin, } from '@jupyterlab/application'; @@ -26,28 +25,15 @@ import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook'; import { listIcon } from '@jupyterlab/ui-components'; -namespace CommandIDs { - export const open = 'variableinspector:open'; -} - /** * A service providing variable introspection. */ const variableinspector: JupyterFrontEndPlugin = { id: '@lckr/jupyterlab_variableinspector', - requires: [ICommandPalette, ILayoutRestorer, ILabShell], provides: IVariableInspectorManager, autoStart: true, - activate: ( - app: JupyterFrontEnd, - palette: ICommandPalette, - restorer: ILayoutRestorer, - labShell: ILabShell - ): IVariableInspectorManager => { + activate: (app: JupyterFrontEnd): IVariableInspectorManager => { const manager = new VariableInspectorManager(); - const category = 'Variable Inspector'; - const command = CommandIDs.open; - const label = 'Open Variable Inspector'; const namespace = 'variableinspector'; const tracker = new WidgetTracker({ namespace }); @@ -58,7 +44,6 @@ const variableinspector: JupyterFrontEndPlugin = { const panel = new VariableInspectorPanel(); panel.id = 'jp-variableinspector'; - panel.title.label = 'Variable Inspector'; panel.title.icon = listIcon; panel.title.closable = true; panel.disposed.connect(() => { @@ -67,36 +52,17 @@ const variableinspector: JupyterFrontEndPlugin = { } }); - //Track the inspector panel + // Track the inspector panel tracker.add(panel); return panel; } - // Enable state restoration - restorer.restore(tracker, { - command, - args: () => null, - name: () => 'variableinspector', - }); - - // Add command to palette - app.commands.addCommand(command, { - label, - execute: () => { - if (!manager.panel || manager.panel.isDisposed) { - manager.panel = newPanel(); - } - if (!manager.panel.isAttached) { - labShell.add(manager.panel, 'main'); - } - if (manager.source) { - manager.source.performInspection(); - } - labShell.activateById(manager.panel.id); - }, - }); - palette.addItem({ command, category }); + manager.panel = newPanel(); + if (manager.source) { + manager.source.performInspection(); + } + app.shell.add(manager.panel, 'right'); console.log( 'JupyterLab extension @lckr/jupyterlab_variableinspector is activated!' @@ -206,11 +172,6 @@ const consoles: JupyterFrontEndPlugin = { } }); }); - - app.contextMenu.addItem({ - command: CommandIDs.open, - selector: '.jp-CodeConsole', - }); }, }; @@ -302,11 +263,6 @@ const notebooks: JupyterFrontEndPlugin = { } }); }); - - app.contextMenu.addItem({ - command: CommandIDs.open, - selector: '.jp-Notebook', - }); }, }; diff --git a/style/index.css b/style/index.css index c92dedd..86bd8c4 100644 --- a/style/index.css +++ b/style/index.css @@ -5,6 +5,7 @@ flex-direction: column; overflow: auto; font-size: var(--jp-ui-font-size1); + background: var(--jp-layout-color1); } .jp-VarInspector-table {