@datalayer/jupyter-react 0.18.9 → 0.18.11

package/lib/components/notebook/Notebook.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /*
  * Copyright (c) 2021-2023 Datalayer, Inc.
  *
@@ -9,7 +9,7 @@ import { createPortal } from 'react-dom';
 import { Box } from '@primer/react';
 import { useJupyter } from './../../jupyter';
 import { asObservable, Lumino } from '../lumino';
-import { CellMetadataEditor } from './cell/metadata/CellMetadataEditor';
+import { CellMetadataEditor } from './cell/metadata';
 import { newUuid } from '../../utils';
 import { useNotebookStore } from './NotebookState';
 import { NotebookAdapter } from './NotebookAdapter';
@@ -26,14 +26,18 @@ export const Notebook = (props) => {
         lite: props.lite,
         serverless: props.serverless,
         serviceManager: props.serviceManager,
+        useRunningKernelId: props.useRunningKernelId,
+        useRunningKernelIndex: props.useRunningKernelIndex,
     });
-    const { Toolbar, height, maxHeight, nbformat, nbgrader, path, readonly, url, serverless, } = props;
-    const notebookStore = useNotebookStore();
+    const { Toolbar, extensions, height, maxHeight, nbformat, nbgrader, path, readonly, serverless, url, } = props;
     const [id, _] = useState(props.id || newUuid());
     const [adapter, setAdapter] = useState();
+    const [extensionComponents, setExtensionComponents] = useState(new Array());
     const kernel = props.kernel ?? defaultKernel;
+    const notebookStore = useNotebookStore();
     const portals = notebookStore.selectNotebookPortals(id);
-    const bootstrapAdapter = () => {
+    // Bootstrap the Notebook Adapter.
+    const bootstrapAdapter = (serviceManager, kernel) => {
         const adapter = new NotebookAdapter({
             ...props,
             id,
@@ -41,13 +45,22 @@ export const Notebook = (props) => {
             kernel,
             serviceManager,
         });
-        console.log('Notebook Adapter is created', adapter);
         // Update the local state.
         setAdapter(adapter);
+        extensions.forEach(extension => {
+            extension.init({
+                notebookId: id,
+                commands: adapter.commands,
+            });
+            extension.createNew(adapter.notebookPanel, adapter.context);
+            setExtensionComponents(extensionComponents.concat(extension.component ?? _jsx(_Fragment, {})));
+        });
         // Update the global state.
         notebookStore.update({ id, state: { adapter } });
         // Update the global state based on events.
-        adapter.notebookPanel?.model?.contentChanged.connect((notebookModel, _) => { notebookStore.changeModel({ id, notebookModel }); });
+        adapter.notebookPanel?.model?.contentChanged.connect((notebookModel, _) => {
+            notebookStore.changeModel({ id, notebookModel });
+        });
         /*
         adapter.notebookPanel?.model!.sharedModel.changed.connect((_, notebookChange) => {
           notebookStore.notebookChange({ id, notebookChange });
@@ -67,7 +80,7 @@ export const Notebook = (props) => {
         adapter.notebookPanel?.sessionContext.statusChanged.connect((_, kernelStatus) => {
             notebookStore.changeKernelStatus({ id, kernelStatus });
         });
-        // Add more behavior for the UI.
+        // Add more UI behavior when the Service Manager is ready...
         adapter.serviceManager.ready.then(() => {
             if (!readonly) {
                 const cellModel = adapter.notebookPanel.content.activeCell;
@@ -87,66 +100,74 @@ export const Notebook = (props) => {
             }
         });
     };
-    const createAdapter = (kernel) => {
+    //
+    const createAdapter = (serviceManager, kernel) => {
         if (!kernel) {
-            bootstrapAdapter();
+            bootstrapAdapter(serviceManager, kernel);
         }
         else {
             kernel.ready.then(() => {
-                bootstrapAdapter();
+                bootstrapAdapter(serviceManager, kernel);
             });
         }
     };
     const disposeAdapter = () => {
-        if (adapter) {
-            notebookStore.dispose(id);
-            setAdapter(undefined);
-        }
+        adapter?.notebookPanel?.disposed.connect((slot, _) => {
+            if (adapter) {
+                notebookStore.dispose(id);
+                setAdapter(undefined);
+            }
+        });
+        adapter?.notebookPanel?.dispose();
     };
+    // Mutation Effects.
     useEffect(() => {
-        return () => {
-            disposeAdapter();
-        };
-    }, []);
+        if (serviceManager && serverless) {
+            createAdapter(serviceManager, kernel);
+        }
+        else if (serviceManager && kernel) {
+            createAdapter(serviceManager, kernel);
+        }
+    }, [serviceManager, kernel]);
     useEffect(() => {
-        /*
-        if (adapter && (adapter.lite !== lite || adapter.serviceManager !== serviceManager)) {
-          if (adapter) {
-            adapter.setServiceManager(serviceManager!, lite!);
-          } else {
-            createAdapter(kernel);
-          }
-        } else
-        */
-        if (serviceManager && (kernel || serverless)) {
-            if (adapter) {
-                disposeAdapter();
-            }
-            createAdapter(kernel);
+        if (adapter && adapter.kernel !== kernel) {
+            adapter.setKernel(kernel);
+        }
+    }, [kernel]);
+    useEffect(() => {
+        if (adapter && adapter.readonly !== readonly) {
+            adapter.setReadonly(readonly);
+        }
+    }, [readonly]);
+    useEffect(() => {
+        if (adapter && adapter.serverless !== serverless) {
+            adapter.setServerless(serverless);
         }
-    }, [serviceManager, kernel, serverless, lite]);
+    }, [serverless]);
     useEffect(() => {
-        if (adapter && nbformat && adapter.nbformat !== nbformat) {
+        if (adapter && adapter.nbformat !== nbformat) {
             adapter.setNbformat(nbformat);
         }
     }, [nbformat]);
     useEffect(() => {
         if (adapter && path && adapter.path !== path) {
             disposeAdapter();
-            createAdapter();
+            createAdapter(serviceManager);
         }
     }, [path]);
     useEffect(() => {
         if (adapter && url && adapter.url !== url) {
             disposeAdapter();
-            createAdapter();
+            createAdapter(serviceManager);
         }
     }, [url]);
+    // Dispose Effects.
     useEffect(() => {
-        if (adapter && url && adapter.readonly !== readonly) {
-            adapter.setReadonly(readonly);
-        }
-    }, [readonly]);
+        return () => {
+            disposeAdapter();
+        };
+    }, []);
+    //
     return (_jsxs(Box, { style: { height, width: '100%', position: 'relative' }, id: "dla-Jupyter-Notebook", children: [Toolbar && _jsx(Toolbar, { notebookId: id }), _jsxs(Box, { className: "dla-Box-Notebook", sx: {
                     '& .dla-Jupyter-Notebook': {
                         height,
@@ -191,7 +212,7 @@ export const Notebook = (props) => {
                         left: `${props.cellSidebarMargin + 10}px`,
                         height: 'auto',
                     },
-                    '& .jp-Cell .dla-CellHeader-Container': {
+                    '& .jp-Cell .dla-CellSidebar-Container': {
                         padding: '4px 8px',
                         width: `${props.cellSidebarMargin + 10}px`,
                         marginLeft: 'auto',
@@ -202,16 +223,20 @@ export const Notebook = (props) => {
                     '.dla-Box-Notebook': {
                         position: 'relative',
                     },
-                }, children: [_jsx(_Fragment, { children: portals?.map((portal) => portal) }), _jsx(Box, { children: adapter &&
-                            (_jsx(Lumino, { id: id, children: adapter.panel })) })] })] }));
+                }, children: [_jsx(_Fragment, { children: portals?.map((portal) => portal) }), _jsx(Box, { children: extensionComponents.map((extensionComponent, index) => {
+                            return (_jsx(Box, { id: `${extensionComponent}-${index}`, children: extensionComponent }));
+                        }) }), _jsx(Box, { children: adapter &&
+                            _jsx(Lumino, { id: id, children: adapter.panel }) })] })] }));
 };
 Notebook.defaultProps = {
     cellMetadataPanel: false,
     cellSidebarMargin: 120,
+    extensions: [],
     height: '100vh',
     maxHeight: '100vh',
     nbgrader: false,
     readonly: false,
+    renderId: 0,
     renderers: [],
     serverless: false,
 };

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":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAQpC,OAAO,EAAE,UAAU,EAAgB,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,gBAAgB,CAAC;AAoDxB;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAqB,EAAE,EAAE;IAChD,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QACzD,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;QAC5C,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;KACnD,CAAC,CAAC;IACH,MAAM,EACJ,OAAO,EACP,UAAU,EACV,MAAM,EACN,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,GAAG,GACJ,GAAG,KAAK,CAAC;IACV,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC;IAChD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAmB,CAAC;IAC1D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,EAAe,CAAC,CAAC;IACzF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,aAAa,CAAC;IAC7C,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,aAAa,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;IACxD,kCAAkC;IAClC,MAAM,gBAAgB,GAAG,CAAC,cAAwC,EAAE,MAAe,EAAE,EAAE;QACrF,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC;YAClC,GAAG,KAAK;YACR,EAAE;YACF,IAAI;YACJ,MAAM;YACN,cAAc;SACf,CAAC,CAAC;QACH,0BAA0B;QAC1B,UAAU,CAAC,OAAO,CAAC,CAAC;QACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC7B,SAAS,CAAC,IAAI,CAAC;gBACb,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,CAAC,CAAA;YACF,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,aAAc,EAAE,OAAO,CAAC,OAAQ,CAAC,CAAC;YAC9D,sBAAsB,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,IAAI,mBAAK,CAAC,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;QACH,2BAA2B;QAC3B,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QACjD,2CAA2C;QAC3C,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE;YACxE,aAAa,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAA;QAClD,CAAC,CAAC,CAAC;QACH;;;;;;;UAOE;QACF,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE;YACxE,IAAI,SAAS,KAAK,IAAI,EAAE;gBACtB,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;aAC9D;iBAAM;gBACL,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;aACnD;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,aAAa,EAAE,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE;YAC9E,aAAa,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QACH,4DAA4D;QAC5D,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACrC,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,SAAS,GAAG,OAAO,CAAC,aAAc,CAAC,OAAO,CAAC,UAAU,CAAC;gBAC5D,IAAI,SAAS,EAAE;oBACb,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;iBACnD;gBACD,MAAM,kBAAkB,GAAG,YAAY,CAAC,OAAO,CAAC,aAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;gBAC1F,kBAAkB,CAAC,SAAS,CAAC,CAAC,SAA2B,EAAE,EAAE;oBAC3D,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;oBAClD,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAmB,CAAC;oBAC7E,IAAI,QAAQ,EAAE;wBACZ,MAAM,mBAAmB,GAAG,CAC1B,KAAC,GAAG,IAAC,EAAE,EAAE,CAAC,YACR,KAAC,kBAAkB,IACjB,UAAU,EAAE,EAAE,EACd,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,QAAQ,GAClB,GACE,CACP,CAAC;wBACF,MAAM,MAAM,GAAG,YAAY,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;wBAC3D,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;qBAClF;gBACH,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAA;IACD,EAAE;IACF,MAAM,aAAa,GAAG,CAAC,cAAwC,EAAE,MAAe,EAAE,EAAE;QAClF,IAAI,CAAC,MAAM,EAAE;YACX,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;SAC1C;aAAM;YACL,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACrB,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAA;IACD,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACnD,IAAI,OAAO,EAAE;gBACX,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC1B,UAAU,CAAC,SAAS,CAAC,CAAC;aACvB;QACH,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;IACpC,CAAC,CAAA;IACD,oBAAoB;IACpB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,cAAc,IAAI,UAAU,EAAE;YAChC,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;SACvC;aACI,IAAI,cAAc,IAAI,MAAM,EAAE;YACjC,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;SACvC;IACH,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YACxC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAC3B;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAC5C,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC/B;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACf,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,UAAU,KAAK,UAAU,EAAE;YAChD,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;SACnC;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IACjB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAC5C,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC/B;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACf,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE;YAC5C,cAAc,EAAE,CAAC;YACjB,aAAa,CAAC,cAAc,CAAC,CAAC;SAC/B;IACH,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACX,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,GAAG,IAAI,OAAO,CAAC,GAAG,KAAK,GAAG,EAAE;YACzC,cAAc,EAAE,CAAC;YACjB,aAAa,CAAC,cAAc,CAAC,CAAC;SAC/B;IACH,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACV,mBAAmB;IACnB,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,cAAc,EAAE,CAAC;QACnB,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,EAAE;IACF,OAAO,CACL,MAAC,GAAG,IAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,EAAC,sBAAsB,aACnF,OAAO,IAAI,KAAC,OAAO,IAAC,UAAU,EAAE,EAAE,GAAI,EACvC,MAAC,GAAG,IAAC,SAAS,EAAC,kBAAkB,EAC/B,EAAE,EAAE;oBACF,yBAAyB,EAAE;wBACzB,MAAM;wBACN,SAAS;wBACT,KAAK,EAAE,MAAM;wBACb,SAAS,EAAE,QAAQ;qBACpB;oBACD,mCAAmC,EAAE;wBACnC,SAAS,EAAE,MAAM;qBAClB;oBACD,gBAAgB,EAAE;wBAChB,IAAI,EAAE,qBAAqB;wBAC3B,MAAM,EAAE,MAAM;wBACd,SAAS,EAAE,QAAQ;qBACpB;oBACD,qBAAqB,EAAE;wBACrB,MAAM,EAAE,iBAAiB;wBACzB,KAAK,EAAE,iBAAiB;qBACzB;oBACD,eAAe,EAAE;wBACf,OAAO,EAAE,MAAM;wBACf,MAAM,EAAE,CAAC;qBACV;oBACD,qDAAqD,EAAE;wBACrD,QAAQ,EAAE,MAAM;qBACjB;oBACD,+CAA+C,EAAE;wBAC/C,OAAO,EAAE,MAAM;qBAChB;oBACD,0BAA0B,EAAE;wBAC1B,OAAO,EAAE,MAAM;qBAChB;oBACD,YAAY,EAAE;wBACZ,KAAK,EAAE,eAAe,KAAK,CAAC,iBAAiB,KAAK;qBACnD;oBACD,uBAAuB,EAAE;wBACvB,KAAK,EAAE,eAAe,KAAK,CAAC,iBAAiB,GAAG,EAAE,KAAK;qBACxD;oBACD,2BAA2B,EAAE;wBAC3B,QAAQ,EAAE,UAAU;wBACpB,GAAG,EAAE,MAAM;wBACX,IAAI,EAAE,GAAG,KAAK,CAAC,iBAAiB,GAAG,EAAE,IAAI;wBACzC,MAAM,EAAE,MAAM;qBACf;oBACD,uCAAuC,EAAE;wBACvC,OAAO,EAAE,SAAS;wBAClB,KAAK,EAAE,GAAG,KAAK,CAAC,iBAAiB,GAAG,EAAE,IAAI;wBAC1C,UAAU,EAAE,MAAM;qBACnB;oBACD,wBAAwB,EAAE;wBACxB,MAAM,EAAE,iBAAiB;qBAC1B;oBACD,mBAAmB,EAAE;wBACnB,QAAQ,EAAE,UAAU;qBACrB;iBACF,aAED,4BACG,OAAO,EAAE,GAAG,CAAC,CAAC,MAAyB,EAAE,EAAE,CAAC,MAAM,CAAC,GACnD,EACH,KAAC,GAAG,cACD,mBAAmB,CAAC,GAAG,CAAC,CAAC,kBAAkB,EAAE,KAAK,EAAE,EAAE;4BACrD,OAAO,CACL,KAAC,GAAG,IAAC,EAAE,EAAE,GAAG,kBAAkB,IAAI,KAAK,EAAE,YACtC,kBAAkB,GACf,CACP,CAAA;wBAAA,CAAC,CACH,GACG,EACN,KAAC,GAAG,cACD,OAAO;4BACN,KAAC,MAAM,IAAC,EAAE,EAAE,EAAE,YACX,OAAO,CAAC,KAAK,GACP,GAEP,IACF,IACF,CACP,CAAC;AACJ,CAAC,CAAA;AAED,QAAQ,CAAC,YAAY,GAAG;IACtB,iBAAiB,EAAE,KAAK;IACxB,iBAAiB,EAAE,GAAG;IACtB,UAAU,EAAE,EAAE;IACd,MAAM,EAAE,OAAO;IACf,SAAS,EAAE,OAAO;IAClB,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,CAAC;IACX,SAAS,EAAE,EAAE;IACb,UAAU,EAAE,KAAK;CACS,CAAC;AAE7B,eAAe,QAAQ,CAAC"}

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

@@ -1,11 +1,11 @@
 import { CommandRegistry } from '@lumino/commands';
 import { BoxPanel } from '@lumino/widgets';
 import { ServiceManager } from '@jupyterlab/services';
-import { NotebookPanel } from '@jupyterlab/notebook';
-import { CompletionHandler } from '@jupyterlab/completer';
+import { Context } from '@jupyterlab/docregistry';
 import { INotebookContent, CellType } from '@jupyterlab/nbformat';
-import { Lite } from '../../jupyter/lite';
-import { Kernel } from '../../jupyter/kernel';
+import { CompletionHandler } from '@jupyterlab/completer';
+import { NotebookPanel, INotebookModel } from '@jupyterlab/notebook';
+import { Lite, Kernel } from '../../jupyter';
 import { INotebookProps } from './Notebook';
 export declare class NotebookAdapter {
     private _CellSidebar?;
@@ -21,7 +21,7 @@ export declare class NotebookAdapter {
     private _nbgrader;
     private _notebookModelFactory?;
     private _notebookPanel?;
-    private _url?;
+    private _onKernelConnection?;
     private _path?;
     private _readonly;
     private _renderers;
@@ -29,6 +29,9 @@ export declare class NotebookAdapter {
     private _serverless;
     private _serviceManager;
     private _tracker?;
+    private _url?;
+    private _contentFactory;
+    private _mimeTypeService;
     constructor(props: INotebookProps);
     loadFromUrl(url: string): Promise<any>;
     notebookKeydownListener: (event: KeyboardEvent) => void;
@@ -44,12 +47,16 @@ export declare class NotebookAdapter {
     get nbformat(): INotebookContent | undefined;
     get kernel(): Kernel | undefined;
     get notebookPanel(): NotebookPanel | undefined;
+    get context(): Context<INotebookModel> | undefined;
+    set notebookPanel(notebookPanel: NotebookPanel | undefined);
     get panel(): BoxPanel;
     get commands(): CommandRegistry;
     get serviceManager(): ServiceManager.IManager;
-    setNbformat(nbformat: INotebookContent): void;
-    setServiceManager(serviceManager: ServiceManager.IManager, lite: Lite): void;
+    setNbformat(nbformat?: INotebookContent): void;
+    setServiceManager(serviceManager: ServiceManager.IManager, lite?: Lite): void;
+    setKernel(kernel?: Kernel): void;
     setReadonly(readonly: boolean): void;
+    setServerless(serverless: boolean): void;
     setPath(path: string): void;
     assignKernel(kernel: Kernel): void;
     setDefaultCellType: (cellType: CellType) => void;