@datalayer/jupyter-react 0.0.12 → 0.0.15

package/lib/components/cell/Cell.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, Fragment as _Fragment } from "@emotion/react/jsx-runtime";
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import { useDispatch } from "react-redux";
 import { CodeCell } from '@jupyterlab/cells';
 import { useJupyter } from './../../jupyter/JupyterContext';
-import LuminoAttached from '../../jupyter/lumino/LuminoAttached';
-import { cellActions } from './CellState';
+import Lumino from '../../jupyter/lumino/Lumino';
+import { cellActions, cellReducer } from './CellState';
 import CellAdapter from './CellAdapter';
 import '@jupyterlab/application/style/index.css';
 import '@jupyterlab/codemirror/style/index.css';
@@ -19,12 +19,15 @@ for i in range(10):
     display('String {} added to the DOM in separated DIV.'.format(i))`;
 export const Cell = (props) => {
     const { source, autoStart } = props;
-    const { serviceManager } = useJupyter();
+    const { serverSettings, injectableStore } = useJupyter();
     const dispatch = useDispatch();
     const [adapter, setAdapter] = useState();
+    useMemo(() => {
+        injectableStore.inject('cell', cellReducer);
+    }, []);
     useEffect(() => {
-        if (serviceManager) {
-            const adapter = new CellAdapter(source, serviceManager);
+        if (source) {
+            const adapter = new CellAdapter(source, serverSettings);
             dispatch(cellActions.update({ adapter }));
             dispatch(cellActions.source(props.source));
             adapter.codeCell.model.value.changed.connect((sender, changedArgs) => {
@@ -45,8 +48,12 @@ export const Cell = (props) => {
             });
             setAdapter(adapter);
         }
-    }, [source, serviceManager]);
-    return adapter ? _jsx(LuminoAttached, { children: adapter.panel }, void 0) : _jsx(_Fragment, { children: "Loading..." }, void 0);
+    }, [source]);
+    return adapter
+        ?
+            _jsx(Lumino, { children: adapter.panel }, void 0)
+        :
+            _jsx(_Fragment, { children: "Loading..." }, void 0);
 };
 Cell.defaultProps = {
     source: DEFAULT_SOURCE,

package/lib/components/cell/Cell.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../../src/components/cell/Cell.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,cAAc,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,OAAO,yCAAyC,CAAC;AACjD,OAAO,wCAAwC,CAAC;AAChD,OAAO,mCAAmC,CAAC;AAC3C,OAAO,mDAAmD,CAAC,CAAC,gFAAgF;AAC5I,OAAO,uDAAuD,CAAC;AAC/D,OAAO,uCAAuC,CAAC;AAE/C,OAAO,YAAY,CAAC;AAEpB,MAAM,cAAc,GAAG;;;sEAG+C,CAAA;AAOtE,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAiB,EAAE,EAAE;IACxC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACpC,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAe,CAAC;IACtD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,cAAc,EAAE;YAClB,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YACxD,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YAC1C,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,MAAO,CAAC,CAAC,CAAC;YAC5C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;gBACnE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE;gBACnF,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC5C,IAAI,SAAS,EAAE;oBACb,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;oBAC3E,OAAO,CAAC,IAAI,CAAC,CAAC,GAA0C,EAAE,EAAE;wBAC1D,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC;4BAC1B,eAAe,EAAE,IAAI;yBACtB,CAAC,CAAC,CAAC;oBACN,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,OAAO,CAAC,CAAC;SACrB;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAC7B,OAAO,OAAO,CAAC,CAAC,CAAC,KAAC,cAAc,cAAE,OAAO,CAAC,KAAK,WAAkB,CAAC,CAAC,CAAC,mDAAe,CAAA;AACrF,CAAC,CAAA;AAED,IAAI,CAAC,YAAY,GAAG;IAClB,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE,IAAI;CACO,CAAC;AAEzB,eAAe,IAAI,CAAC"}
+{"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../../src/components/cell/Cell.tsx"],"names":[],"mappings":"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"}

package/lib/components/cell/CellAdapter.d.ts

@@ -1,12 +1,12 @@
 import { BoxPanel } from '@lumino/widgets';
 import { SessionContext } from '@jupyterlab/apputils';
 import { CodeCell } from '@jupyterlab/cells';
-import { ServiceManager } from '@jupyterlab/services';
+import { ServerConnection } from '@jupyterlab/services';
 export declare class CellAdapter {
     private _codeCell;
     private _cellPanel;
     private _sessionContext;
-    constructor(source?: string, serviceManager?: ServiceManager);
+    constructor(source: string, serverSettings: ServerConnection.ISettings);
     get panel(): BoxPanel;
     get codeCell(): CodeCell;
     get sessionContext(): SessionContext;

package/lib/components/cell/CellAdapter.js

@@ -12,31 +12,32 @@ import { requireLoader } from "@jupyter-widgets/html-manager";
 import { WIDGET_MIMETYPE, WidgetRenderer } from "@jupyter-widgets/html-manager/lib/output_renderers";
 import CellCommands from './CellCommands';
 export class CellAdapter {
-    constructor(source, serviceManager) {
+    constructor(source, serverSettings) {
         this.execute = () => {
             CodeCell.execute(this._codeCell, this._sessionContext);
         };
-        if (serviceManager === undefined || source === undefined) {
-            return;
-        }
         this._cellPanel = new BoxPanel();
         this._cellPanel.direction = 'top-to-bottom';
         this._cellPanel.spacing = 0;
-        const serverSettings = serviceManager.serverSettings;
         const kernelManager = new KernelManager({
             serverSettings
         });
-        const specsManager = new KernelSpecManager({
-            serverSettings
-        });
         const sessionManager = new SessionManager({
             serverSettings,
             kernelManager
         });
+        const specsManager = new KernelSpecManager({
+            serverSettings
+        });
         this._sessionContext = new SessionContext({
             sessionManager,
             specsManager,
-            name: 'Jupyter React'
+            name: 'Jupyter React',
+            kernelPreference: {
+                autoStartDefault: true,
+                shouldStart: true,
+                name: 'python3',
+            }
         });
         const mimeService = new CodeMirrorMimeTypeService();
         const commands = new CommandRegistry();
@@ -61,12 +62,12 @@ export class CellAdapter {
                 }
             })
         });
+        this._codeCell = codeCell.initializeState();
+        this._codeCell.addClass('dla-JupyterCell');
         this._sessionContext.kernelChanged.connect((sender, arg) => {
             const kernelConnection = arg.newValue;
             iPyWidgetsClassicManager.registerWithKernel(kernelConnection);
         });
-        this._codeCell = codeCell.initializeState();
-        this._codeCell.addClass('dla-JupyterCell');
         this._sessionContext.kernelChanged.connect(() => {
             var _a, _b;
             void ((_b = (_a = this._sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel) === null || _b === void 0 ? void 0 : _b.info.then(info => {
@@ -75,10 +76,6 @@ export class CellAdapter {
                 this._codeCell.model.mimeType = mimeType;
             }));
         });
-        this._sessionContext.kernelPreference = {
-            autoStartDefault: true,
-            name: 'python3',
-        };
         const editor = this._codeCell.editor;
         const model = new CompleterModel();
         const completer = new Completer({ editor, model });

package/lib/components/cell/CellAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"CellAdapter.js","sourceRoot":"","sources":["../../../src/components/cell/CellAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CellAdapter.js","sourceRoot":"","sources":["../../../src/components/cell/CellAdapter.ts"],"names":[],"mappings":"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"}

package/lib/components/codemirror/CodeMirrorEditor.d.ts

@@ -1,10 +1,10 @@
 import Kernel from './../../jupyter/services/kernel/Kernel';
-import OutputAdapter from './../outputs/OutputAdapter';
+import OutputAdapter from '../output/OutputAdapter';
 export declare const CodeMirrorEditor: (props: {
     code: string;
     codePre?: string | undefined;
     outputAdapter: OutputAdapter;
-    kernel: Kernel;
+    kernel?: Kernel | undefined;
     autoRun: boolean;
     disableRun: boolean;
     sourceId: string;

package/lib/components/codemirror/CodeMirrorEditor.js

@@ -6,8 +6,8 @@ import { EditorState, Compartment } from '@codemirror/state';
 import { keymap, EditorView } from '@codemirror/view';
 import { python } from '@codemirror/lang-python';
 import codeMirrorTheme from './CodeMirrorTheme';
-import OutputToolbar from './../outputs/OutputToolbar';
-import { selectDataset, selectJupyterSetSource, outputActions } from './../outputs/OutputState';
+import CodeMirrorOutputToolbar from './CodeMirrorOutputToolbar';
+import { selectDataset, selectJupyterSetSource, outputActions } from '../output/OutputState';
 export const CodeMirrorEditor = (props) => {
     const { code, codePre, outputAdapter, autoRun, disableRun, sourceId, toolbarPosition, insertText, kernel } = props;
     const dispatch = useDispatch();
@@ -21,7 +21,7 @@ export const CodeMirrorEditor = (props) => {
                 changes: {
                     from: 0,
                     to: view.state.doc.length,
-                    insert: source
+                    insert: source,
                 }
             });
         }
@@ -38,7 +38,7 @@ export const CodeMirrorEditor = (props) => {
     };
     const executeCode = (editorView, code) => {
         if (disableRun) {
-            alert('Code execution is disabled for this snippet editor. There should be a button on the page to run this snippet editor.');
+            alert('Code execution is disabled for this editor. There should be a button on the page to run this editor.');
             return true;
         }
         if (code) {
@@ -100,11 +100,11 @@ export const CodeMirrorEditor = (props) => {
     useEffect(() => {
         setEditorSource(setSource === null || setSource === void 0 ? void 0 : setSource.source);
     }, [setSource]);
-    return (_jsxs(_Fragment, { children: [toolbarPosition === 'up' &&
-                _jsx(OutputToolbar, { editorView: view, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, executeCode: executeCode }, void 0),
+    return (_jsxs(_Fragment, { children: [kernel && toolbarPosition === 'up' &&
+                _jsx(CodeMirrorOutputToolbar, { editorView: view, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, executeCode: executeCode }, void 0),
             _jsx("div", { ref: editorDiv }, void 0),
-            toolbarPosition === 'middle' &&
-                _jsx(OutputToolbar, { editorView: view, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, executeCode: executeCode }, void 0)] }, void 0));
+            kernel && toolbarPosition === 'middle' &&
+                _jsx(CodeMirrorOutputToolbar, { editorView: view, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, executeCode: executeCode }, void 0)] }, void 0));
 };
 export default CodeMirrorEditor;
 //# sourceMappingURL=CodeMirrorEditor.js.map

package/lib/components/codemirror/CodeMirrorEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"CodeMirrorEditor.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorEditor.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CodeMirrorEditor.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorEditor.tsx"],"names":[],"mappings":"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"}

package/lib/components/codemirror/CodeMirrorOutputToolbar.d.ts

@@ -0,0 +1,12 @@
+import { EditorView } from 'codemirror';
+import OutputAdapter from '../output/OutputAdapter';
+import Kernel from '../../jupyter/services/kernel/Kernel';
+declare type Props = {
+    editorView?: EditorView;
+    codePre?: string;
+    kernel: Kernel;
+    outputAdapter: OutputAdapter;
+    executeCode: (editorView?: EditorView, code?: string) => void;
+};
+export declare const CodeMirrorOutputToolbar: (props: Props) => import("@emotion/react/jsx-runtime").JSX.Element;
+export default CodeMirrorOutputToolbar;

package/lib/components/{outputs/OutputToolbar.js → codemirror/CodeMirrorOutputToolbar.js}

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { useEffect, useState, useMemo } from 'react';
 import { useTheme, ActionMenu, ActionList, IconButton, Box } from '@primer/react';
 import { KebabHorizontalIcon, ArrowRightIcon, StopIcon, PaintbrushIcon } from '@primer/octicons-react';
-const OutputToolbarMenu = (props) => {
+const CodeMirrorOutputToolbarMenu = (props) => {
     const { executeCode, outputAdapter, editorView } = props;
     return (_jsxs(ActionMenu, { children: [_jsx(ActionMenu.Anchor, { children: _jsx(IconButton, { icon: KebabHorizontalIcon, variant: "invisible" }, void 0) }, void 0),
             _jsx(ActionMenu.Overlay, { children: _jsxs(ActionList, { children: [_jsxs(ActionList.Item, Object.assign({ onSelect: e => { e.preventDefault(); executeCode(editorView); } }, { children: [_jsx(ActionList.LeadingVisual, { children: _jsx(ArrowRightIcon, {}, void 0) }, void 0),
@@ -11,23 +11,25 @@ const OutputToolbarMenu = (props) => {
                         _jsxs(ActionList.Item, Object.assign({ variant: "danger", onClick: e => { e.preventDefault(); outputAdapter.clearOutput(); } }, { children: [_jsx(ActionList.LeadingVisual, { children: _jsx(PaintbrushIcon, {}, void 0) }, void 0), "Clear outputs"] }), void 0)] }, void 0) }, void 0)] }, void 0));
 };
 const KernelStatus = ({ color }) => (_jsx(Box, { sx: { backgroundColor: color, width: '14px', height: '14px', borderRadius: 3 } }, void 0));
-export const OutputToolbar = (props) => {
+export const CodeMirrorOutputToolbar = (props) => {
     const { executeCode, editorView, kernel, codePre } = props;
     const { theme } = useTheme();
     const okColor = useMemo(() => theme === null || theme === void 0 ? void 0 : theme.colorSchemes.light.colors.success.muted, []);
     const nokColor = useMemo(() => theme === null || theme === void 0 ? void 0 : theme.colorSchemes.light.colors.severe.muted, []);
     const [kernelStatus, setKernelStatus] = useState('unknown');
     useEffect(() => {
-        kernel.getJupyterKernel().then((kernelConnection) => {
-            if (codePre) {
-                executeCode(editorView, codePre);
-            }
-            setKernelStatus(kernelConnection.status);
-            kernelConnection.statusChanged.connect((kernelConnection, status) => {
-                setKernelStatus(status);
+        if (kernel) {
+            kernel.getJupyterKernel().then((kernelConnection) => {
+                if (codePre) {
+                    executeCode(editorView, codePre);
+                }
+                setKernelStatus(kernelConnection.status);
+                kernelConnection.statusChanged.connect((kernelConnection, status) => {
+                    setKernelStatus(status);
+                });
             });
-        });
-    }, []);
+        }
+    }, [kernel]);
     const getKernelStatusColor = (status) => {
         if (status === "idle") {
             return okColor;
@@ -36,7 +38,7 @@ export const OutputToolbar = (props) => {
     };
     return (_jsxs(Box, Object.assign({ display: "flex" }, { children: [_jsx(Box, { flexGrow: 1 }, void 0),
             _jsx(Box, Object.assign({ sx: { paddingTop: '6px' } }, { children: _jsx(KernelStatus, { color: getKernelStatusColor(kernelStatus) }, void 0) }), void 0),
-            _jsx(Box, { children: _jsx(OutputToolbarMenu, Object.assign({}, props), void 0) }, void 0)] }), void 0));
+            _jsx(Box, { children: _jsx(CodeMirrorOutputToolbarMenu, Object.assign({}, props), void 0) }, void 0)] }), void 0));
 };
-export default OutputToolbar;
-//# sourceMappingURL=OutputToolbar.js.map
+export default CodeMirrorOutputToolbar;
+//# sourceMappingURL=CodeMirrorOutputToolbar.js.map

package/lib/components/codemirror/CodeMirrorOutputToolbar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CodeMirrorOutputToolbar.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorOutputToolbar.tsx"],"names":[],"mappings":"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"}

package/lib/components/commands/Commands.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import CommandAdapter from './CommandsAdapter';
-import LuminoAttached from '../../jupyter/lumino/LuminoAttached';
+import Lumino from '../../jupyter/lumino/Lumino';
 export const Commands = () => {
     const commandsAdapter = new CommandAdapter();
-    return _jsx(LuminoAttached, { children: commandsAdapter.panel }, void 0);
+    return _jsx(Lumino, { children: commandsAdapter.panel }, void 0);
 };
 export default Commands;
 //# sourceMappingURL=Commands.js.map

package/lib/components/commands/Commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"Commands.js","sourceRoot":"","sources":["../../../src/components/commands/Commands.tsx"],"names":[],"mappings":";AAAA,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,cAAc,MAAM,qCAAqC,CAAC;AAEjE,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,eAAe,GAAG,IAAI,cAAc,EAAE,CAAC;IAC7C,OAAO,KAAC,cAAc,cAAE,eAAe,CAAC,KAAK,WAAkB,CAAA;AACjE,CAAC,CAAA;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"Commands.js","sourceRoot":"","sources":["../../../src/components/commands/Commands.tsx"],"names":[],"mappings":";AAAA,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,MAAM,MAAM,6BAA6B,CAAC;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,eAAe,GAAG,IAAI,cAAc,EAAE,CAAC;IAC7C,OAAO,KAAC,MAAM,cAAE,eAAe,CAAC,KAAK,WAAU,CAAA;AACjD,CAAC,CAAA;AAED,eAAe,QAAQ,CAAC"}

package/lib/components/console/Console.js

@@ -1,6 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { useJupyter } from './../../jupyter/JupyterContext';
-import LuminoAttached from '../../jupyter/lumino/LuminoAttached';
+import Lumino from '../../jupyter/lumino/Lumino';
 import ConsoleAdapter from './ConsoleAdapter';
 import './Console.css';
 export const Console = () => {
@@ -9,7 +9,7 @@ export const Console = () => {
         return _jsx(_Fragment, { children: "Loading..." }, void 0);
     }
     const consoleAdapter = new ConsoleAdapter(lite, serviceManager);
-    return _jsx(LuminoAttached, { children: consoleAdapter.panel }, void 0);
+    return _jsx(Lumino, { children: consoleAdapter.panel }, void 0);
 };
 export default Console;
 //# sourceMappingURL=Console.js.map

package/lib/components/console/Console.js.map

@@ -1 +1 @@
-{"version":3,"file":"Console.js","sourceRoot":"","sources":["../../../src/components/console/Console.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,cAAc,MAAM,qCAAqC,CAAC;AACjE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,eAAe,CAAC;AAEvB,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE;IAC1B,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IAC9C,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,mDAAe,CAAC;KACxB;IACD,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,cAAe,CAAC,CAAC;IACjE,OAAO,KAAC,cAAc,cAAE,cAAc,CAAC,KAAK,WAAkB,CAAA;AAChE,CAAC,CAAA;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"Console.js","sourceRoot":"","sources":["../../../src/components/console/Console.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,eAAe,CAAC;AAEvB,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE;IAC1B,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IAC9C,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,mDAAe,CAAC;KACxB;IACD,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,cAAe,CAAC,CAAC;IACjE,OAAO,KAAC,MAAM,cAAE,cAAc,CAAC,KAAK,WAAU,CAAA;AAChD,CAAC,CAAA;AAED,eAAe,OAAO,CAAC"}

package/lib/components/filebrowser/FileBrowser.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import FileBrowserAdapter from './FileBrowserAdapter';
-import LuminoAttached from '../../jupyter/lumino/LuminoAttached';
+import Lumino from '../../jupyter/lumino/Lumino';
 export const FileBrowser = () => {
     const fileBrowserAdpater = new FileBrowserAdapter();
-    return _jsx(LuminoAttached, { children: fileBrowserAdpater.panel }, void 0);
+    return _jsx(Lumino, { children: fileBrowserAdpater.panel }, void 0);
 };
 export default FileBrowser;
 //# sourceMappingURL=FileBrowser.js.map

package/lib/components/filebrowser/FileBrowser.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileBrowser.js","sourceRoot":"","sources":["../../../src/components/filebrowser/FileBrowser.tsx"],"names":[],"mappings":";AAAA,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,cAAc,MAAM,qCAAqC,CAAC;AAEjE,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;IACpD,OAAO,KAAC,cAAc,cAAE,kBAAkB,CAAC,KAAK,WAAkB,CAAA;AACpE,CAAC,CAAA;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"FileBrowser.js","sourceRoot":"","sources":["../../../src/components/filebrowser/FileBrowser.tsx"],"names":[],"mappings":";AAAA,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,MAAM,MAAM,6BAA6B,CAAC;AAEjD,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;IACpD,OAAO,KAAC,MAAM,cAAE,kBAAkB,CAAC,KAAK,WAAU,CAAA;AACpD,CAAC,CAAA;AAED,eAAe,WAAW,CAAC"}

package/lib/components/notebook/Notebook.d.ts

@@ -15,9 +15,7 @@ export declare type INotebookProps = {
     readOnly: boolean;
     nbgrader: boolean;
     ipywidgets: 'classic' | 'lab';
-    store?: any;
     kernel?: Kernel;
-    managedContent: boolean;
     cellMetadataPanel: boolean;
     CellSidebar?: (props: any) => JSX.Element;
     cellSidebarMargin: number;

package/lib/components/notebook/Notebook.js

@@ -3,15 +3,12 @@ import { useState, useEffect, useMemo } from "react";
 import { createPortal } from "react-dom";
 import { useDispatch } from "react-redux";
 import { Box } from "@primer/react";
-import { getJupyterServerHttpUrl, getJupyterServerWsUrl } from "./../../jupyter/JupyterConfig";
 import { useJupyter } from "./../../jupyter/JupyterContext";
-import { Kernel } from "./../../jupyter/services/kernel/Kernel";
 import Lumino from '../../jupyter/lumino/LuminoNotebook';
 import { asObservable } from './../../jupyter/lumino/LuminoObservable';
 import CellMetadataEditor from './cell/metadata/CellMetadataEditor';
 import NotebookAdapter from './NotebookAdapter';
 import { notebookActions, selectNotebookPortals, notebookEpics, notebookReducer } from './NotebookState';
-import injectableStore from './../../state/Store';
 import '@jupyterlab/completer/style/index.css';
 import '@jupyterlab/documentsearch/style/index.css';
 import '@jupyterlab/codemirror/style/index.css';
@@ -31,63 +28,57 @@ const LuminoNotebook = (props) => {
  * @returns A Notebook React.js component.
  */
 export const Notebook = (props) => {
-    const { readOnly, cellMetadataPanel, nbgrader, uid } = props;
-    const store = props.store || injectableStore;
+    const { serviceManager, kernel, kernelManager, injectableStore } = useJupyter();
+    const { readOnly, cellMetadataPanel, nbgrader, uid, model } = props;
     const dispatch = useDispatch();
-    const { serverSettings } = useJupyter();
     const portals = selectNotebookPortals();
     const [adapter, setAdapter] = useState();
-    const [_kernel, setKernel] = useState();
     useMemo(() => {
-        store.inject('notebook', notebookReducer, notebookEpics);
+        injectableStore.inject('notebook', notebookReducer, notebookEpics);
     }, []);
     useEffect(() => {
-        const kernel = readOnly
-            ? undefined
-            : new Kernel({
-                baseUrl: getJupyterServerHttpUrl(),
-                wsUrl: getJupyterServerWsUrl(),
-            });
-        const adapter = new NotebookAdapter(Object.assign(Object.assign({}, props), { store,
-            kernel }), serverSettings);
-        setKernel(kernel);
-        setAdapter(adapter);
-        dispatch(notebookActions.update({ adapter }));
-        adapter.serviceManager.ready.then(() => {
-            var _a, _b, _c, _d, _e;
-            adapter.loadNotebook(props.path);
-            if (!readOnly && cellMetadataPanel) {
-                const activeCellChanged$ = asObservable(adapter.notebookPanel.content.activeCellChanged);
-                activeCellChanged$.subscribe((activeCellChanged) => {
+        if (serviceManager && kernelManager && kernel) {
+            //      const kernel = readOnly ? undefined : new Kernel({ kernelManager });
+            const adapter = new NotebookAdapter(Object.assign(Object.assign({}, props), { kernel }), injectableStore, serviceManager);
+            setAdapter(adapter);
+            dispatch(notebookActions.update({ adapter }));
+            adapter.serviceManager.ready.then(() => {
+                var _a, _b, _c, _d, _e;
+                adapter.loadNotebook();
+                if (!readOnly && cellMetadataPanel) {
+                    const activeCellChanged$ = asObservable(adapter.notebookPanel.content.activeCellChanged);
+                    activeCellChanged$.subscribe((activeCellChanged) => {
+                        dispatch(notebookActions.activeCellChange(activeCellChanged));
+                        const panelDiv = document.getElementById('right-panel-id');
+                        if (panelDiv) {
+                            const cellMetadataOptions = (_jsx(Box, Object.assign({ mt: 3 }, { children: _jsx(CellMetadataEditor, { cell: activeCellChanged, nbgrader: nbgrader }, void 0) }), void 0));
+                            const portal = createPortal(cellMetadataOptions, panelDiv);
+                            dispatch(notebookActions.setPortal({ portal, pinned: false }));
+                        }
+                    });
+                }
+                (_b = (_a = adapter.notebookPanel) === null || _a === void 0 ? void 0 : _a.model) === null || _b === void 0 ? void 0 : _b.contentChanged.connect((notebookModel, _) => {
+                    dispatch(notebookActions.modelChange(notebookModel));
+                });
+                (_c = adapter.notebookPanel) === null || _c === void 0 ? void 0 : _c.content.activeCellChanged.connect((_, activeCellChanged) => {
                     dispatch(notebookActions.activeCellChange(activeCellChanged));
-                    const panelDiv = document.getElementById('right-panel-id');
-                    const cellMetadataOptions = (_jsx(Box, Object.assign({ mt: 3 }, { children: _jsx(CellMetadataEditor, { cell: activeCellChanged, nbgrader: nbgrader }, void 0) }), void 0));
-                    const portal = createPortal(cellMetadataOptions, panelDiv);
-                    dispatch(notebookActions.setPortal({ portal, pinned: false }));
                 });
-            }
-            (_b = (_a = adapter.notebookPanel) === null || _a === void 0 ? void 0 : _a.model) === null || _b === void 0 ? void 0 : _b.contentChanged.connect((notebookModel, _) => {
-                dispatch(notebookActions.modelChange(notebookModel));
-            });
-            (_c = adapter.notebookPanel) === null || _c === void 0 ? void 0 : _c.content.activeCellChanged.connect((_, activeCellChanged) => {
-                dispatch(notebookActions.activeCellChange(activeCellChanged));
-            });
-            (_d = adapter.notebookPanel) === null || _d === void 0 ? void 0 : _d.model.sharedModel.changed.connect((_, notebookChange) => {
-                dispatch(notebookActions.notebookChange(notebookChange));
-            });
-            (_e = adapter.notebookPanel) === null || _e === void 0 ? void 0 : _e.sessionContext.statusChanged.connect((_, kernelStatusChanged) => {
-                dispatch(notebookActions.kernelStatusChanged(kernelStatusChanged));
+                (_d = adapter.notebookPanel) === null || _d === void 0 ? void 0 : _d.model.sharedModel.changed.connect((_, notebookChange) => {
+                    dispatch(notebookActions.notebookChange(notebookChange));
+                });
+                (_e = adapter.notebookPanel) === null || _e === void 0 ? void 0 : _e.sessionContext.statusChanged.connect((_, kernelStatusChanged) => {
+                    dispatch(notebookActions.kernelStatusChanged(kernelStatusChanged));
+                });
             });
-        });
-        return () => {
-            setAdapter(undefined);
-            setKernel(undefined);
-            dispatch(notebookActions.setPortal(undefined));
-        };
-    }, [uid]);
+            return () => {
+                setAdapter(undefined);
+                dispatch(notebookActions.setPortal(undefined));
+            };
+        }
+    }, [uid, serviceManager, kernelManager, kernel, model]);
     return (_jsx(Box, { children: _jsxs(Box, Object.assign({ css: {
                 '& .dla-JupyterLab-Notebook': {
-                    height: 'calc(100vh - 220px)',
+                    height: 'calc(100vh - 230px)',
                     overflowY: 'hidden',
                 },
                 '& .jp-Notebook': {
@@ -97,7 +88,6 @@ export const Notebook = (props) => {
                 //            borderBottom: '1px solid #e0e0e0',
                 },
                 '& .jp-Toolbar': {
-                    //            display: readOnly ? 'none' : 'flex',
                     display: 'none',
                     zIndex: 0,
                 },
@@ -132,8 +122,7 @@ Notebook.defaultProps = {
     ipywidgets: 'lab',
     readOnly: false,
     nbgrader: false,
-    managedContent: true,
-    cellMetadataPanel: true,
+    cellMetadataPanel: false,
     cellSidebarMargin: 120,
 };
 export default Notebook;

package/lib/components/notebook/Notebook.js.map

@@ -1 +1 @@
-{"version":3,"file":"Notebook.js","sourceRoot":"","sources":["../../../src/components/notebook/Notebook.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Notebook.js","sourceRoot":"","sources":["../../../src/components/notebook/Notebook.tsx"],"names":[],"mappings":"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"}

package/lib/components/notebook/NotebookAdapter.d.ts

@@ -1,6 +1,6 @@
 import { CommandRegistry } from '@lumino/commands';
 import { BoxPanel } from '@lumino/widgets';
-import { ServerConnection, ServiceManager } from '@jupyterlab/services';
+import { ServiceManager } from '@jupyterlab/services';
 import { NotebookPanel } from '@jupyterlab/notebook';
 import * as nbformat from '@jupyterlab/nbformat';
 import { INotebookProps } from './Notebook';
@@ -20,10 +20,9 @@ export declare class NotebookAdapter {
     private _CellSidebar?;
     private _nbgrader;
     private _readOnly;
-    private _managedContent;
     private _context?;
-    constructor(props: INotebookProps, serverSettings: ServerConnection.ISettings);
-    loadNotebook(notebookPath: string): void;
+    constructor(props: INotebookProps, store: any, serviceManager: ServiceManager);
+    loadNotebook(): void;
     get uid(): string;
     get notebookPanel(): NotebookPanel | undefined;
     get commands(): CommandRegistry;