npm - @datalayer/jupyter-react - Versions diffs - 1.0.4 → 1.0.7 - Mend

@datalayer/jupyter-react 1.0.4 → 1.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

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

@@ -1,14 +1,11 @@
-import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { INotebookContent } from '@jupyterlab/nbformat';
-import { INotebookModel, NotebookPanel } from '@jupyterlab/notebook';
 import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
 import { Kernel as JupyterKernel, ServiceManager } from '@jupyterlab/services';
-import { CommandRegistry } from '@lumino/commands';
 import { KernelTransfer, OnSessionConnection } from '../../state';
-import { ICollaborative, Kernel, Lite } from './../../jupyter';
-import { NotebookAdapter } from './NotebookAdapter';
+import { ICollaborationProvider, Kernel, Lite } from './../../jupyter';
 import { INotebookToolbarProps } from './toolbar';
 import './Notebook.css';
+import { DatalayerNotebookExtension } from './NotebookExtensions';
 export type ExternalIPyWidgets = {
     name: string;
     version: string;
@@ -16,21 +13,11 @@ export type ExternalIPyWidgets = {
 export type BundledIPyWidgets = ExternalIPyWidgets & {
     module: any;
 };
-export type IDatalayerNotebookExtensionProps = {
-    notebookId: string;
-    commands: CommandRegistry;
-    panel: NotebookPanel;
-    adapter?: NotebookAdapter;
-};
-export type DatalayerNotebookExtension = DocumentRegistry.IWidgetExtension<NotebookPanel, INotebookModel> & {
-    init(props: IDatalayerNotebookExtensionProps): void;
-    get component(): JSX.Element | null;
-};
 export type INotebookProps = {
     Toolbar?: (props: INotebookToolbarProps) => JSX.Element;
     cellMetadataPanel?: boolean;
     cellSidebarMargin?: number;
-    collaborative?: ICollaborative;
+    collaborative?: ICollaborationProvider;
     extensions?: DatalayerNotebookExtension[];
     height?: string;
     id: string;

package/lib/components/notebook/Notebook.js CHANGED Viewed

@@ -16,7 +16,7 @@ import { WebsocketProvider as YWebsocketProvider } from 'y-websocket';
 import { jupyterReactStore, } from '../../state';
 import { newUuid, sleep } from '../../utils';
 import { asObservable, Lumino } from '../lumino';
-import { COLLABORATION_ROOM_URL_PATH, fetchSessionId, requestDocSession, useJupyter } from './../../jupyter';
+import { COLLABORATION_ROOM_URL_PATH, requestDatalayerollaborationSessionId, requestJupyterCollaborationSession, useJupyter } from './../../jupyter';
 import { CellMetadataEditor } from './cell/metadata';
 import { NotebookAdapter } from './NotebookAdapter';
 import { useNotebookStore } from './NotebookState';
@@ -152,7 +152,7 @@ export const Notebook = (props) => {
         // As the server has the content source of truth, we
         // must ensure that the shared model is pristine before
         // to connect to the server. More over we should ensure,
-        // the connection is disposed in case the server room is
+        // the connection is disposed in case the server document is
         // reset for any reason while the client is still alive.
         let provider = null;
         let ready = new PromiseDelegate();
@@ -160,7 +160,7 @@ export const Notebook = (props) => {
         let sharedModel = null;
         const onConnectionClose = (event) => {
             if (event.code > 1000) {
-                console.error('Connection with the room has been closed unexpectedly.', event);
+                console.error('Connection with the document has been closed unexpectedly.', event);
                 provider?.disconnect();
                 // If sessionId has expired - reset the client model
                 if (event.code === 4002) {
@@ -196,10 +196,10 @@ export const Notebook = (props) => {
                 // Setup Collaboration.
                 if (collaborative == 'jupyter') {
                     const token = jupyterReactStore.getState().jupyterConfig?.jupyterServerToken;
-                    const session = await requestDocSession('json', 'notebook', path);
-                    const roomURL = URLExt.join(serviceManager?.serverSettings.wsUrl, COLLABORATION_ROOM_URL_PATH);
-                    const roomName = `${session.format}:${session.type}:${session.fileId}`;
-                    provider = new YWebsocketProvider(roomURL, roomName, ydoc, {
+                    const session = await requestJupyterCollaborationSession('json', 'notebook', path);
+                    const documentURL = URLExt.join(serviceManager?.serverSettings.wsUrl, COLLABORATION_ROOM_URL_PATH);
+                    const documentName = `${session.format}:${session.type}:${session.fileId}`;
+                    provider = new YWebsocketProvider(documentURL, documentName, ydoc, {
                         disableBc: true,
                         params: {
                             sessionId: session.sessionId,
@@ -210,13 +210,13 @@ export const Notebook = (props) => {
                 }
                 else if (collaborative == 'datalayer') {
                     const { runUrl, token } = jupyterReactStore.getState().datalayerConfig ?? {};
-                    const roomName = id;
-                    const roomURL = URLExt.join(runUrl, `/api/spacer/v1/rooms`);
-                    const sessionId = await fetchSessionId({
-                        url: URLExt.join(roomURL, roomName),
+                    const documentName = id;
+                    const documentURL = URLExt.join(runUrl, `/api/spacer/v1/documents`);
+                    const sessionId = await requestDatalayerollaborationSessionId({
+                        url: URLExt.join(documentURL, documentName),
                         token,
                     });
-                    provider = new YWebsocketProvider(roomURL.replace(/^http/, 'ws'), roomName, ydoc, {
+                    provider = new YWebsocketProvider(documentURL.replace(/^http/, 'ws'), documentName, ydoc, {
                         disableBc: true,
                         params: {
                             sessionId,
@@ -229,7 +229,7 @@ export const Notebook = (props) => {
                     provider.on('sync', onSync);
                     provider.on('connection-close', onConnectionClose);
                     console.log('Collaboration is setup with websocket provider.');
-                    // Create a new model using the one synchronize with the collaboration room
+                    // Create a new model using the one synchronize with the collaboration document
                     const model = new NotebookModel({
                         collaborationEnabled: true,
                         disableDocumentWideUndoRedo: true,

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

	@@ -1 +1 @@
1	- {"version":3,"file":"Notebook.js","sourceRoot":"","sources":["../../../src/components/notebook/Notebook.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,EAAkB,aAAa,EAAiB,MAAM,sBAAsB,CAAC;AAIpF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,iBAAiB,IAAI,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,iBAAiB,GAAwC,MAAM,aAAa,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAgC,iBAAiB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3I,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,gBAAgB,CAAC;AA0BxB,MAAM,WAAW,GAAG,iBAAiB,CAAK;;;;;;;CAOzC,CAAA;AAmCD;;;;;;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,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;QAC5C,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;KACnD,CAAC,CAAC;IACH,MAAM,EACJ,OAAO,EACP,aAAa,EACb,UAAU,EACV,MAAM,EACN,SAAS,EACT,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,CAC5D,IAAI,KAAK,EAAe,CACzB,CAAC;IACF,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;IAExD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAElD,kCAAkC;IAClC,MAAM,gBAAgB,GAAG,KAAK;IAChC,oCAAoC;IAChC,cAAwC,EACxC,MAAe,EACf,EAAE;QACF,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,UAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9B,SAAS,CAAC,IAAI,CAAC;gBACb,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,KAAK,EAAE,OAAO,CAAC,aAAc;gBAC7B,OAAO;aACR,CAAC,CAAC;YACH,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,8CAA8C;QAC9C,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QACjD,+CAA+C;QAC/C,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;YAClE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACnB,aAAa,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YACnE,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE;YACxE,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACvB,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;YACpD,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,aAAa,EAAE,cAAc,CAAC,aAAa,CAAC,OAAO,CACzD,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE;YAClB,aAAa,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QACzD,CAAC,CACF,CAAC;QACF,0DAA0D;QAC1D,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACrC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,SAAS,GAAG,OAAO,CAAC,aAAc,CAAC,OAAO,CAAC,UAAU,CAAC;gBAC5D,IAAI,SAAS,EAAE,CAAC;oBACd,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;gBACpD,CAAC;gBACD,MAAM,kBAAkB,GAAG,YAAY,CACrC,OAAO,CAAC,aAAc,CAAC,OAAO,CAAC,iBAAiB,CACjD,CAAC;gBACF,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,CACtC,gBAAgB,CACC,CAAC;oBACpB,IAAI,QAAQ,EAAE,CAAC;wBACb,MAAM,mBAAmB,GAAG,CAC1B,KAAC,GAAG,IAAC,EAAE,EAAE,CAAC,YACR,KAAC,kBAAkB,IACjB,SAAS,EAAE,SAAS,CAAC,KAAK,GAC1B,GACE,CACP,CAAC;wBACF,MAAM,MAAM,GAAG,YAAY,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;wBAC3D,aAAa,CAAC,gBAAgB,CAAC;4BAC7B,EAAE;4BACF,aAAa,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;yBACzC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IACF,EAAE;IACF,MAAM,aAAa,GAAG,CACpB,cAAwC,EACxC,MAAe,EACf,EAAE;QACF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACrB,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IACF,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACnD,IAAI,OAAO,EAAE,CAAC;gBACZ,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC1B,UAAU,CAAC,SAAS,CAAC,CAAC;YACxB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;IACpC,CAAC,CAAC;IACF,oBAAoB;IACpB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,cAAc,IAAI,UAAU,EAAE,CAAC;YACjC,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,cAAc,IAAI,MAAM,EAAE,CAAC;YACpC,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;IACH,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;IAE7B,SAAS,CAAC,GAAG,EAAE;QACb,oDAAoD;QACpD,uDAAuD;QACvD,wDAAwD;QACxD,wDAAwD;QACxD,wDAAwD;QACxD,IAAI,QAAQ,GAA8B,IAAI,CAAC;QAC/C,IAAI,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;QAClC,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,WAAW,GAAqB,IAAI,CAAC;QAEzC,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAAE,EAAE;YACvC,IAAI,KAAK,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;gBACtB,OAAO,CAAC,KAAK,CACX,wDAAwD,EACxD,KAAK,CACN,CAAC;gBAEF,QAAQ,EAAE,UAAU,EAAE,CAAC;gBAEvB,oDAAoD;gBACpD,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;oBACxB,QAAQ,EAAE,OAAO,EAAE,CAAC;oBACpB,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;oBACnC,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;oBAC9B,IAAI,SAAS,EAAE,CAAC;wBACd,YAAY,CAAC,IAAI,CAAC,CAAC;wBACnB,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;6BAChD,KAAK,CAAC,KAAK,CAAC,EAAE;4BACb,OAAO,CAAC,KAAK,CACX,2CAA2C,EAC3C,KAAK,CACN,CAAC;wBACJ,CAAC,CAAC;6BACD,OAAO,CAAC,GAAG,EAAE;4BACZ,IAAI,SAAS,EAAE,CAAC;gCACd,YAAY,CAAC,KAAK,CAAC,CAAC;4BACtB,CAAC;wBACH,CAAC,CAAC,CAAC;oBACP,CAAC;gBACH,CAAC;gBACD,yBAAyB;YAC3B,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAE,EAAE;YACnC,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC9B,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YACxB,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,OAAO,EAAE,aAAa,IAAI,SAAS,EAAE,CAAC;gBACxC,WAAW,GAAG,IAAI,SAAS,EAAE,CAAC;gBAC9B,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;gBACxC,uBAAuB;gBACvB,IAAI,aAAa,IAAI,SAAS,EAAE,CAAC;oBAC/B,MAAM,KAAK,GACT,iBAAiB,CAAC,QAAQ,EAAE,CAAC,aAAa,EAAE,kBAAkB,CAAC;oBACjE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,IAAK,CAAC,CAAC;oBACnE,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CACzB,cAAc,EAAE,cAAc,CAAC,KAAM,EACrC,2BAA2B,CAC5B,CAAC;oBACF,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBACvE,QAAQ,GAAG,IAAI,kBAAkB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;wBACzD,SAAS,EAAE,IAAI;wBACf,MAAM,EAAE;4BACN,SAAS,EAAE,OAAO,CAAC,SAAS;4BAC5B,KAAK,EAAE,KAAM;yBACd;wBACD,SAAS;qBACV,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,aAAa,IAAI,WAAW,EAAE,CAAC;oBACxC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAC,eAAe,IAAI,EAAE,CAAC;oBAC7E,MAAM,QAAQ,GAAG,EAAE,CAAC;oBACpB,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAO,EAAE,sBAAsB,CAAC,CAAC;oBAC7D,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC;wBACrC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;wBACnC,KAAK;qBACN,CAAC,CAAC;oBACH,QAAQ,GAAG,IAAI,kBAAkB,CAC/B,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,EAC9B,QAAQ,EACR,IAAI,EACJ;wBACE,SAAS,EAAE,IAAI;wBACf,MAAM,EAAE;4BACN,SAAS;4BACT,KAAK,EAAE,KAAM;yBACd;wBACD,SAAS;qBACV,CACF,CAAC;gBACJ,CAAC;gBACD,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBAC5B,QAAQ,CAAC,EAAE,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;oBACnD,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;oBAC/D,2EAA2E;oBAC3E,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC;wBAC9B,oBAAoB,EAAE,IAAI;wBAC1B,2BAA2B,EAAE,IAAI;wBACjC,WAAW;qBACZ,CAAC,CAAC;oBACH,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC;oBACrD,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;oBAC5C,2DAA2D;oBAC3D,QAAQ,EAAE,OAAO,EAAE,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,aAAa,EAAE,CAAC;YAClB,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;iBAChD,KAAK,CAAC,KAAK,CAAC,EAAE;gBACb,OAAO,CAAC,KAAK,CAAC,2CAA2C,EAAE,KAAK,CAAC,CAAC;YACpE,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE;gBACZ,IAAI,SAAS,EAAE,CAAC;oBACd,YAAY,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC,CAAC,CAAC;QACP,CAAC;QAED,OAAO,GAAG,EAAE;YACV,SAAS,GAAG,KAAK,CAAC;YAClB,IAAI,QAAQ,EAAE,CAAC;gBACb,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;oBACjE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBAC9B,QAAQ,EAAE,GAAG,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;oBACrD,QAAQ,EAAE,UAAU,EAAE,CAAC;oBACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;gBACtB,CAAC,CAAC,CAAC;YACL,CAAC;YACD,WAAW,EAAE,OAAO,EAAE,CAAC;QACzB,CAAC,CAAC;IAEJ,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC;IAE5C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACzC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC7C,OAAO,CAAC,WAAW,CAAC,QAAS,CAAC,CAAC;QACjC,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACf,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;YACjD,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IACjB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC7C,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;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,CAAC;YAC7C,cAAc,EAAE,CAAC;YACjB,aAAa,CAAC,cAAc,CAAC,CAAC;QAChC,CAAC;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,CAAC;YAC1C,cAAc,EAAE,CAAC;YACjB,aAAa,CAAC,cAAc,CAAC,CAAC;QAChC,CAAC;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,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,EAAE;IACF,OAAO,CACL,MAAC,GAAG,IACF,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,EACtD,EAAE,EAAC,sBAAsB,aAExB,OAAO,IAAI,KAAC,OAAO,IAAC,UAAU,EAAE,EAAE,GAAI,EACvC,MAAC,GAAG,IACF,SAAS,EAAC,kBAAkB,EAC5B,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,iBAAkB,KAAK;qBACpD;oBACD,uBAAuB,EAAE;wBACvB,KAAK,EAAE,eAAe,KAAK,CAAC,iBAAkB,GAAG,EAAE,KAAK;qBACzD;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,WAAW,KAAE,EACd,KAAC,GAAG,cACD,mBAAmB,CAAC,GAAG,CAAC,CAAC,kBAAkB,EAAE,KAAK,EAAE,EAAE;4BACrD,OAAO,CACL,KAAC,GAAG,cACD,kBAAkB,IADX,GAAG,kBAAkB,IAAI,KAAK,EAAE,CAEpC,CACP,CAAC;wBACJ,CAAC,CAAC,GACE,EACL,SAAS,CAAC,CAAC;wBACV,KAAC,MAAM,KAAG;wBACZ,CAAC;4BACC,KAAC,GAAG,cAAE,OAAO,IAAI,KAAC,MAAM,IAAC,EAAE,EAAE,EAAE,YAAG,OAAO,CAAC,KAAK,GAAU,GAAO,IAE9D,IACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,QAAQ,CAAC,YAAY,GAAG;IACtB,iBAAiB,EAAE,KAAK;IACxB,iBAAiB,EAAE,GAAG;IACtB,aAAa,EAAE,SAAS;IACxB,UAAU,EAAE,EAAE;IACd,MAAM,EAAE,OAAO;IACf,aAAa,EAAE,EAAE;IACjB,SAAS,EAAE,OAAO;IAClB,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,CAAC;IACX,SAAS,EAAE,EAAE;IACb,UAAU,EAAE,KAAK;IACjB,kBAAkB,EAAE,KAAK;CACC,CAAC;AAE7B,eAAe,QAAQ,CAAC"}
1	+ {"version":3,"file":"Notebook.js","sourceRoot":"","sources":["../../../src/components/notebook/Notebook.tsx"],"names":[],"mappings":"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"}

package/lib/components/notebook/Notebook2.d.ts CHANGED Viewed

@@ -5,18 +5,18 @@ import type { IRenderMime } from '@jupyterlab/rendermime-interfaces';
 import type { ServiceManager } from '@jupyterlab/services';
 import type { CommandRegistry } from '@lumino/commands';
 import type { OnSessionConnection } from '../../state';
-import { type CollaborationServer } from './Notebook2Base';
-import type { DatalayerNotebookExtension } from './Notebook';
+import type { DatalayerNotebookExtension } from './NotebookExtensions';
 import type { INotebookToolbarProps } from './toolbar';
 import './Notebook.css';
+import { ICollaborationServer } from '../../jupyter';
 /**
  * Simple notebook component properties
  */
 export interface INotebook2Props {
     /**
-     * Collaboration server providing the document rooms.
+     * Collaboration server providing the document documents.
      */
-    collaborationServer?: CollaborationServer;
+    collaborationServer?: ICollaborationServer;
     /**
      * Custom command registry.
      *

package/lib/components/notebook/Notebook2.js CHANGED Viewed

@@ -5,10 +5,19 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * MIT License
  */
 import { useEffect, useState } from 'react';
+import { createGlobalStyle } from 'styled-components';
 import { Box } from '@primer/react';
 import { Loader } from '../utils';
 import { useKernelId, useNotebookModel, Notebook2Base } from './Notebook2Base';
 import './Notebook.css';
+const GlobalStyle = createGlobalStyle `
+  .dla-Box-Notebook .jp-Cell .dla-CellSidebar-Container {
+    display: none;
+  }
+  .dla-Box-Notebook .jp-Cell.jp-mod-active .dla-CellSidebar-Container {
+    display: block;
+  }
+`;
 /**
  * Simple notebook component without adapter and stores.
  *
@@ -92,7 +101,7 @@ export function Notebook2(props) {
                     '.dla-Box-Notebook': {
                         position: 'relative',
                     },
-                }, children: [children, model && serviceManager &&
+                }, children: [children, _jsx(GlobalStyle, {}), model && serviceManager &&
                         _jsx(Notebook2Base, { commands: commands, id: id, extensions: extensions, kernelId: kernelId, model: model, path: path, renderers: renderers, serviceManager: serviceManager, onSessionConnectionChanged: onSessionConnection })] })] }));
 }
 //# sourceMappingURL=Notebook2.js.map

package/lib/components/notebook/Notebook2.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Notebook2.js","sourceRoot":"","sources":["../../../src/components/notebook/Notebook2.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;~~AAMnD~~,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,~~EAA4B~~,MAAM,iBAAiB,CAAC;~~AAIzG~~,OAAO,gBAAgB,CAAC;~~AAqFxB~~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~~EACR~~,KAAK,IAAI,cAAc;wBACtB,KAAC,aAAa,IACZ,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,EAAE,EACN,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,0BAA0B,EAAE,mBAAmB,GAC/C,IAEA,IACF,CACP,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"Notebook2.js","sourceRoot":"","sources":["../../../src/components/notebook/Notebook2.tsx"],"names":[],"mappings":"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"}

package/lib/components/notebook/Notebook2Base.d.ts CHANGED Viewed

@@ -1,10 +1,11 @@
 import type { INotebookContent } from '@jupyterlab/nbformat';
 import { NotebookModel } from '@jupyterlab/notebook';
 import { type IRenderMime } from '@jupyterlab/rendermime';
-import type { Kernel, ServerConnection, ServiceManager } from '@jupyterlab/services';
+import type { Kernel, ServiceManager } from '@jupyterlab/services';
 import { CommandRegistry } from '@lumino/commands';
+import { ICollaborationServer } from '../../jupyter';
 import type { OnSessionConnection } from '../../state';
-import type { DatalayerNotebookExtension } from './Notebook';
+import type { DatalayerNotebookExtension } from './NotebookExtensions';
 /**
  * Base notebook component properties
  */
@@ -91,36 +92,25 @@ export declare function useKernelId(options?: {
      */
     startDefaultKernel?: boolean;
 } | undefined): string | undefined;
-export type CollaborationServer = {
+type IOptions = {
     /**
-     * Base server URL
+     * Collaboration server providing the documents
      */
-    baseURL: string;
+    collaborationServer?: ICollaborationServer;
     /**
-     * Notebook room name to connect to.
-     */
-    roomName: string;
-    /**
-     * JWT token
-     */
-    token: string;
-    /**
-     * Server type
-     */
-    type: 'datalayer';
-} | {
-    /**
-     * Notebook path
+     * Notebook content.
      */
-    path: string;
+    nbformat?: INotebookContent;
     /**
-     * Jupyter server settings
+     * Whether the model is read-only or not.
+     *
+     * Default: false
      */
-    serverSettings: ServerConnection.ISettings;
+    readonly?: boolean;
     /**
-     * Server type
+     * URL to fetch the notebook content from.
      */
-    type: 'jupyter';
+    url?: string;
 };
 /**
  * Hook to handle a notebook model.
@@ -130,23 +120,5 @@ export type CollaborationServer = {
  * - {@link url}: A URL to fetch the notebook content from
  * - {@link collaborationServer}: Parameters to connect to a collaboration server
  */
-export declare function useNotebookModel(options: {
-    /**
-     * Collaboration server providing the document rooms
-     */
-    collaborationServer?: CollaborationServer;
-    /**
-     * Notebook content.
-     */
-    nbformat?: INotebookContent;
-    /**
-     * Whether the model is read-only or not.
-     *
-     * Default: false
-     */
-    readonly?: boolean;
-    /**
-     * URL to fetch the notebook content from.
-     */
-    url?: string;
-}): NotebookModel | null;
+export declare function useNotebookModel(options: IOptions): NotebookModel | null;
+export {};

package/lib/components/notebook/Notebook2Base.js CHANGED Viewed

@@ -26,7 +26,7 @@ import { Box } from '@primer/react';
 import { Banner } from '@primer/react/experimental';
 import { EditorView } from 'codemirror';
 import { WebsocketProvider } from 'y-websocket';
-import { COLLABORATION_ROOM_URL_PATH, fetchSessionId, requestDocSession, WIDGET_MIMETYPE, WidgetLabRenderer, WidgetManager } from '../../jupyter';
+import { COLLABORATION_ROOM_URL_PATH, requestDatalayerollaborationSessionId, requestJupyterCollaborationSession, WIDGET_MIMETYPE, WidgetLabRenderer, WidgetManager } from '../../jupyter';
 import { newUuid, remoteUserCursors } from '../../utils';
 import { Lumino } from '../lumino';
 import { Loader } from '../utils';
@@ -373,7 +373,7 @@ export function useNotebookModel(options) {
     const { collaborationServer, nbformat, readonly = false, url } = options;
     // Generate the notebook model
     // There are three posibilities (by priority order):
-    // - Connection to a collaborative room
+    // - Connection to a collaborative document
     // - Provided notebook content
     // - Provided URL to fetch notebook content from
     const [model, setModel] = useState(null);
@@ -384,7 +384,7 @@ export function useNotebookModel(options) {
             // As the server has the content source of thruth, we
             // must ensure that the shared model is pristine before
             // to connect to the server. More over we should ensure,
-            // the connection is disposed in case the server room is
+            // the connection is disposed in case the server document is
             // reset for any reason while the client is still alive.
             let provider = null;
             let ready = new PromiseDelegate();
@@ -392,7 +392,7 @@ export function useNotebookModel(options) {
             let sharedModel = null;
             const onConnectionClose = (event) => {
                 if (event.code > 1000) {
-                    console.error('Connection with the room has been closed unexpectedly.', event);
+                    console.error('Connection with the document has been closed unexpectedly.', event);
                     provider?.disconnect();
                     // If sessionId has expired - reset the client model
                     if (event.code === 4002) {
@@ -418,33 +418,33 @@ export function useNotebookModel(options) {
                 ready = new PromiseDelegate();
                 sharedModel = new YNotebook();
                 const { ydoc, awareness } = sharedModel;
-                let roomURL = '';
-                let roomName = '';
+                let documentURL = '';
+                let documentName = '';
                 const params = {};
-                // Setup Collaboration
+                // Setup Collaboration.
                 if (collaborationServer.type === 'jupyter') {
                     const { path, serverSettings } = collaborationServer;
-                    const session = await requestDocSession('json', 'notebook', path, serverSettings);
-                    roomURL = URLExt.join(serverSettings.wsUrl, COLLABORATION_ROOM_URL_PATH);
-                    roomName = `${session.format}:${session.type}:${session.fileId}`;
+                    const session = await requestJupyterCollaborationSession('json', 'notebook', path, serverSettings);
+                    documentURL = URLExt.join(serverSettings.wsUrl, COLLABORATION_ROOM_URL_PATH);
+                    documentName = `${session.format}:${session.type}:${session.fileId}`;
                     params.sessionId = session.sessionId;
                     if (serverSettings.token) {
                         params.token = serverSettings.token;
                     }
                 }
                 else if (collaborationServer.type === 'datalayer') {
-                    const { baseURL, roomName: roomName_, token } = collaborationServer;
-                    roomName = roomName_; // Set non local variable
-                    const serverURL = URLExt.join(baseURL, '/api/spacer/v1/rooms');
-                    roomURL = serverURL.replace(/^http/, 'ws');
-                    params.sessionId = await fetchSessionId({
-                        url: URLExt.join(serverURL, roomName),
+                    const { baseURL, documentName: documentName_, token } = collaborationServer;
+                    documentName = documentName_; // Set non local variable.
+                    const serverURL = URLExt.join(baseURL, '/api/spacer/v1/documents');
+                    documentURL = serverURL.replace(/^http/, 'ws');
+                    params.sessionId = await requestDatalayerollaborationSessionId({
+                        url: URLExt.join(serverURL, documentName),
                         token,
                     });
                     params.token = token;
                 }
                 if (params.sessionId) {
-                    provider = new WebsocketProvider(roomURL, roomName, ydoc, {
+                    provider = new WebsocketProvider(documentURL, documentName, ydoc, {
                         disableBc: true,
                         params,
                         awareness,
@@ -460,7 +460,7 @@ export function useNotebookModel(options) {
                         provider?.destroy();
                     };
                     if (isMounted) {
-                        // Create a new model using the one synchronized with the collaboration room.
+                        // Create a new model using the one synchronized with the collaboration document.
                         const model = new NotebookModel({
                             collaborationEnabled: true,
                             disableDocumentWideUndoRedo: true,

package/lib/components/notebook/Notebook2Base.js.map CHANGED Viewed

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

package/lib/components/notebook/NotebookExtensions.d.ts ADDED Viewed

@@ -0,0 +1,14 @@
+import { DocumentRegistry } from "@jupyterlab/docregistry";
+import { INotebookModel, NotebookPanel } from "@jupyterlab/notebook";
+import { CommandRegistry } from '@lumino/commands';
+import { NotebookAdapter } from './NotebookAdapter';
+export type IDatalayerNotebookExtensionProps = {
+    notebookId: string;
+    commands: CommandRegistry;
+    panel: NotebookPanel;
+    adapter?: NotebookAdapter;
+};
+export type DatalayerNotebookExtension = DocumentRegistry.IWidgetExtension<NotebookPanel, INotebookModel> & {
+    init(props: IDatalayerNotebookExtensionProps): void;
+    get component(): JSX.Element | null;
+};

package/lib/components/notebook/NotebookExtensions.js ADDED Viewed

@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2021-2023 Datalayer, Inc.
+ *
+ * MIT License
+ */
+export {};
+//# sourceMappingURL=NotebookExtensions.js.map

package/lib/components/notebook/NotebookExtensions.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"NotebookExtensions.js","sourceRoot":"","sources":["../../../src/components/notebook/NotebookExtensions.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/lib/components/notebook/cell/sidebar/CellSidebarExtension.d.ts CHANGED Viewed

@@ -1,9 +1,15 @@
+import type React from 'react';
 import type { NotebookPanel } from '@jupyterlab/notebook';
 import type { CommandRegistry } from '@lumino/commands';
 import type { IDisposable } from '@lumino/disposable';
-import type React from 'react';
-import type { DatalayerNotebookExtension, IDatalayerNotebookExtensionProps } from '../../Notebook';
 import { type ICellSidebarProps } from './CellSidebar';
+import { DatalayerNotebookExtension, IDatalayerNotebookExtensionProps } from '../../NotebookExtensions';
+type ICellSidebarExtensionOptions = {
+    commands?: CommandRegistry;
+    factory?: React.JSXElementConstructor<ICellSidebarProps>;
+    nbgrader?: boolean;
+    sidebarWidth?: number;
+};
 /**
  * Cell sidebar extension for notebook panels.
  */
@@ -12,6 +18,7 @@ export declare class CellSidebarExtension implements DatalayerNotebookExtension
     protected commands?: CommandRegistry;
     protected nbgrader?: boolean;
     protected sidebarWidth?: number;
+    readonly component: null;
     /**
      * Constructor
      *
@@ -19,13 +26,7 @@ export declare class CellSidebarExtension implements DatalayerNotebookExtension
      * @param factory Cell sidebar React component factory
      * @param nbgrader Whether to activate nbgrader feature or not.
      */
-    constructor(options?: {
-        commands?: CommandRegistry;
-        factory?: React.JSXElementConstructor<ICellSidebarProps>;
-        nbgrader?: boolean;
-        sidebarWidth?: number;
-    });
-    readonly component: null;
+    constructor(options?: ICellSidebarExtensionOptions);
     createNew(panel: NotebookPanel): IDisposable;
     init(props: IDatalayerNotebookExtensionProps): void;
 }

package/lib/components/notebook/cell/sidebar/CellSidebarExtension.js CHANGED Viewed

@@ -1,9 +1,4 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-/*
- * Copyright (c) 2021-2023 Datalayer, Inc.
- *
- * MIT License
- */
 import { ReactWidget } from '@jupyterlab/apputils';
 import { Signal } from '@lumino/signaling';
 import { JupyterReactTheme } from '../../../../theme';
@@ -47,8 +42,8 @@ class CellSidebarFactory {
     _addSidebar(model) {
         const cell = this._getCell(model);
         if (cell) {
-            const Element = this.factory;
-            const sidebar = ReactWidget.create(_jsx(JupyterReactTheme, { children: _jsx(Element, { commands: this.commands, model: model, nbgrader: this.nbgrader }) }));
+            const SidebarFactory = this.factory;
+            const sidebar = ReactWidget.create(_jsx(JupyterReactTheme, { children: _jsx(SidebarFactory, { commands: this.commands, model: model, nbgrader: this.nbgrader }) }));
             // Position sidebar wrapper
             sidebar.node.style.width = `${this.sidebarWidth}px`;
             sidebar.node.style.position = 'absolute';
@@ -96,6 +91,7 @@ export class CellSidebarExtension {
     commands;
     nbgrader;
     sidebarWidth;
+    component;
     /**
      * Constructor
      *
@@ -109,7 +105,6 @@ export class CellSidebarExtension {
         this.nbgrader = options.nbgrader;
         this.sidebarWidth = options.sidebarWidth;
     }
-    component;
     createNew(panel) {
         // We assume the extension was either created within JupyterLab passing
         // the app commands registry or through Datalayer workflow that set it

package/lib/components/notebook/cell/sidebar/CellSidebarExtension.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CellSidebarExtension.js","sourceRoot":"","sources":["../../../../../src/components/notebook/cell/sidebar/CellSidebarExtension.tsx"],"names":[],"mappings":";~~AAAA;;;;GAIG;AAEH~~,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;~~AAMnD~~,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;~~AAG3C~~,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;~~AAEtD~~,OAAO,EAAE,WAAW,EAA0B,MAAM,eAAe,CAAC;~~AAEpE~~,MAAM,kBAAkB;IAYV;IACA;IACA;IACA;IACA;IAfJ,WAAW,GAAG,KAAK,CAAC;IACpB,SAAS,GAAG,IAAI,OAAO,EAAsB,CAAC;IAEtD;;;;;;OAMG;IACH,YACY,KAAoB,EACpB,QAAyB,EACzB,WAAoB,KAAK,EACzB,eAAuB,GAAG,EAC1B,UAA0D,WAAW;QAJrE,UAAK,GAAL,KAAK,CAAe;QACpB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAA8D;QAE/E,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAChD,IAAI,CAAC,eAAe,EACpB,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACvE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAEO,WAAW,CAAC,KAAiB;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,~~OAAO~~,GAAG,IAAI,CAAC,OAAO,CAAC;~~YAC7B~~,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAChC,KAAC,iBAAiB,cAChB,KAAC,~~OAAO~~,~~IACN~~,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,GACvB,GACgB,CACrB,CAAC;YACF,2BAA2B;YAC3B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,IAAI,CAAC,YAAY,IAAI,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;YAC5B,IAAI,CAAC,MAAsB,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACnC,MAAM,aAAa,GAAG,GAAG,EAAE;gBACzB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC7B,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,CAAC,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAEO,QAAQ,CAAC,KAAiB;QAChC,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;IAC5E,CAAC;IAEO,cAAc,CAAC,KAAiB;QACtC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEO,eAAe,CACrB,KAAe,EACf,OAAiD;QAEjD,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/D,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEO,eAAe,CAAC,OAAiB;QACvC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;QACnC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;gBAC1B,IAAI,EAAE,KAAK;gBACX,QAAQ,EAAE,CAAC;gBACX,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC5B,QAAQ,EAAE,CAAC,CAAC;gBACZ,SAAS,EAAE,EAAE;aACd,CAAC,CAAC;QACL,CAAC;QACD,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF;~~AAED~~;;GAEG;AACH,MAAM,OAAO,oBAAoB;IACrB,OAAO,CAAiD;IACxD,QAAQ,CAAmB;IAC3B,QAAQ,CAAW;IACnB,YAAY,CAAU;~~IAEhC~~;;;;;;OAMG;IACH,~~YACE~~,~~UAKI~~,EAAE;~~QAEN~~,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,WAAW,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3C,CAAC;~~IAEQ~~,SAAS,~~CAAO;IAEzB,SAAS,~~CAAC,KAAoB;QAC5B,uEAAuE;QACvE,sEAAsE;QACtE,uBAAuB;QACvB,MAAM,OAAO,GAAG,IAAI,kBAAkB,CACpC,KAAK,EACL,IAAI,CAAC,QAAS,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,KAAuC;QAC1C,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IACjC,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}
1	+ {"version":3,"file":"CellSidebarExtension.js","sourceRoot":"","sources":["../../../../../src/components/notebook/cell/sidebar/CellSidebarExtension.tsx"],"names":[],"mappings":"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"}

package/lib/components/notebook/index.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ export * from './Notebook2';
 export * from './Notebook2Base';
 export * from './NotebookAdapter';
 export * from './NotebookCommands';
+export * from './NotebookExtensions';
 export * from './NotebookState';
 export * from './cell';
 export * from './content';

package/lib/components/notebook/index.js CHANGED Viewed

@@ -8,6 +8,7 @@ export * from './Notebook2';
 export * from './Notebook2Base';
 export * from './NotebookAdapter';
 export * from './NotebookCommands';
+export * from './NotebookExtensions';
 export * from './NotebookState';
 export * from './cell';
 export * from './content';

package/lib/components/notebook/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/notebook/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/notebook/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}

package/lib/examples/Cell.js CHANGED Viewed

@@ -22,7 +22,7 @@ const CellExample = () => {
     const cellsStore = useCellsStore();
     const kernelsStore = useKernelsStore();
     console.log('Jupyter Cell Outputs', cellsStore.getAdapter(CELL_ID)?.cell?.outputArea.model.toJSON());
-    return (_jsxs(JupyterReactTheme, { children: [_jsx(Box, { as: "h1", children: "A Jupyter Cell" }), _jsxs(Box, { children: ["Source: ", cellsStore.getSource(CELL_ID)] }), _jsxs(Box, { children: ["Outputs Count: ", cellsStore.getOutputsCount(CELL_ID)] }), _jsxs(Box, { children: ["Kernel State: ", _jsx(Label, { children: defaultKernel && kernelsStore.getExecutionState(defaultKernel.id) })] }), _jsxs(Box, { children: ["Kernel Phase: ", _jsx(Label, { children: defaultKernel && kernelsStore.getExecutionPhase(defaultKernel.id) })] }), _jsxs(Box, { display: "flex", children: [_jsx(Box, { children: "Kernel Indicator:" }), _jsx(Box, { ml: 3, children: _jsx(KernelIndicator, { kernel: defaultKernel && defaultKernel.connection }) })] }), _jsx(Box, { children: _jsx(Button, { onClick: () => cellsStore.execute(CELL_ID), children: "Run cell" }) }), _jsx(Cell, { source: DEFAULT_SOURCE, id: CELL_ID })] }));
+    return (_jsxs(JupyterReactTheme, { children: [_jsx(Box, { as: "h1", children: "A Jupyter Cell" }), _jsxs(Box, { children: ["Source: ", cellsStore.getSource(CELL_ID)] }), _jsxs(Box, { children: ["Outputs Count: ", cellsStore.getOutputsCount(CELL_ID)] }), _jsxs(Box, { children: ["Kernel State: ", _jsx(Label, { children: defaultKernel && kernelsStore.getExecutionState(defaultKernel.id) })] }), _jsxs(Box, { children: ["Kernel Phase: ", _jsx(Label, { children: defaultKernel && kernelsStore.getExecutionPhase(defaultKernel.id) })] }), _jsxs(Box, { display: "flex", children: [_jsx(Box, { children: "Kernel Indicator:" }), _jsx(Box, { ml: 3, children: _jsx(KernelIndicator, { kernel: defaultKernel && defaultKernel.connection }) })] }), _jsx(Box, { children: _jsx(Button, { onClick: () => cellsStore.execute(CELL_ID), children: "Run cell" }) }), _jsx(Cell, { source: DEFAULT_SOURCE, id: CELL_ID, kernel: defaultKernel })] }));
 };
 const div = document.createElement('div');
 document.body.appendChild(div);

package/lib/examples/Cell.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../src/examples/Cell.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAEjC,MAAM,cAAc,GAAG;;;iGAG0E,CAAC;AAElG,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,IAAiB,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACnH,OAAO,CACL,MAAC,iBAAiB,eAChB,KAAC,GAAG,IAAC,EAAE,EAAC,IAAI,+BAAqB,EACjC,MAAC,GAAG,2BACO,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,IAClC,EACN,MAAC,GAAG,kCACc,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,IAC/C,EACN,MAAC,GAAG,iCACY,KAAC,KAAK,cAAE,aAAa,IAAI,YAAY,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,GAAS,IAC5F,EACN,MAAC,GAAG,iCACY,KAAC,KAAK,cAAE,aAAa,IAAI,YAAY,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,GAAS,IAC5F,EACN,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,aACjB,KAAC,GAAG,oCAEE,EACN,KAAC,GAAG,IAAC,EAAE,EAAE,CAAC,YACR,KAAC,eAAe,IAAC,MAAM,EAAE,aAAa,IAAI,aAAa,CAAC,UAAU,GAAG,GACjE,IACF,EACN,KAAC,GAAG,cACF,KAAC,MAAM,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,yBAAmB,GACjE,EACN,KAAC,IAAI,~~IAAC~~,MAAM,EAAE,cAAc,~~EAAE~~,EAAE,EAAE,OAAO,~~GAAG~~,~~IAC1B~~,CACrB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,WAAW,KAAE,CAAC,CAAC"}
1	+ {"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../src/examples/Cell.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAEjC,MAAM,cAAc,GAAG;;;iGAG0E,CAAC;AAElG,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,IAAiB,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACnH,OAAO,CACL,MAAC,iBAAiB,eAChB,KAAC,GAAG,IAAC,EAAE,EAAC,IAAI,+BAAqB,EACjC,MAAC,GAAG,2BACO,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,IAClC,EACN,MAAC,GAAG,kCACc,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,IAC/C,EACN,MAAC,GAAG,iCACY,KAAC,KAAK,cAAE,aAAa,IAAI,YAAY,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,GAAS,IAC5F,EACN,MAAC,GAAG,iCACY,KAAC,KAAK,cAAE,aAAa,IAAI,YAAY,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,GAAS,IAC5F,EACN,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,aACjB,KAAC,GAAG,oCAEE,EACN,KAAC,GAAG,IAAC,EAAE,EAAE,CAAC,YACR,KAAC,eAAe,IAAC,MAAM,EAAE,aAAa,IAAI,aAAa,CAAC,UAAU,GAAG,GACjE,IACF,EACN,KAAC,GAAG,cACF,KAAC,MAAM,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,yBAAmB,GACjE,EACN,KAAC,IAAI,IACH,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,OAAO,EACX,MAAM,EAAE,aAAa,GACrB,IACgB,CACrB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,WAAW,KAAE,CAAC,CAAC"}

package/lib/examples/FileBrowser.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 /*
  * Copyright (c) 2021-2023 Datalayer, Inc.
  *
@@ -10,9 +10,10 @@ import { useJupyter } from './../jupyter/JupyterContext';
 import FileBrowser from '../components/filebrowser/FileBrowser';
 const FileBrowserExample = () => {
     const { serviceManager } = useJupyter();
-    return (serviceManager
-        ? _jsx(FileBrowser, { serviceManager: serviceManager })
-        : _jsx(_Fragment, {}));
+    return (serviceManager ?
+        _jsxs(_Fragment, { children: [_jsx("h1", { children: "Jupyter React - File Browser Example" }), _jsx(FileBrowser, { serviceManager: serviceManager })] })
+        :
+            _jsx(_Fragment, {}));
 };
 const div = document.createElement('div');
 document.body.appendChild(div);

package/lib/examples/FileBrowser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FileBrowser.js","sourceRoot":"","sources":["../../src/examples/FileBrowser.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,WAAW,MAAM,uCAAuC,CAAC;AAEhE,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,OAAO,CACL,cAAc~~;QACZ~~,CAAC,CAAC,KAAC,WAAW,IAAC,cAAc,EAAE,cAAc,GAAG;~~QAChD~~,CAAC,~~CAAC,~~mBAAK,~~CACV~~,CAAA;AACH,CAAC,CAAA;AAED,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CACT,KAAC,iBAAiB,cAChB,KAAC,kBAAkB,KAAG,GACJ,CACrB,CAAC"}
1	+ {"version":3,"file":"FileBrowser.js","sourceRoot":"","sources":["../../src/examples/FileBrowser.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,WAAW,MAAM,uCAAuC,CAAC;AAEhE,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,OAAO,CACL,cAAc,CAAC,CAAC;QACd,8BACE,gEAA6C,EAC7C,KAAC,WAAW,IAAC,cAAc,EAAE,cAAc,GAAG,IAC7C;QACL,CAAC;YACC,mBAAK,CACR,CAAA;AACH,CAAC,CAAA;AAED,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CACT,KAAC,iBAAiB,cAChB,KAAC,kBAAkB,KAAG,GACJ,CACrB,CAAC"}

package/lib/examples/Notebook2.js CHANGED Viewed

@@ -4,31 +4,27 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
  *
  * MIT License
  */
+import { useMemo } from 'react';
 import { createRoot } from 'react-dom/client';
 import { JupyterReactTheme } from '../theme/JupyterReactTheme';
 import { useJupyter } from '../jupyter';
-import { NotebookToolbar } from './../components/notebook/toolbar/NotebookToolbar';
-import { Notebook2 } from '../components/notebook/Notebook2';
+import { Notebook2, CellSidebarExtension, CellSidebarButton } from '../components';
+import { CellToolbarExtension } from './extensions';
 import nbformat from './notebooks/NotebookExample1.ipynb.json';
-const Notebook = () => {
+const Notebook2Example = () => {
     const { serviceManager } = useJupyter();
+    const extensions = useMemo(() => [
+        new CellToolbarExtension(),
+        new CellSidebarExtension({ factory: CellSidebarButton })
+    ], []);
     return (serviceManager ?
-        _jsx(JupyterReactTheme, { children: _jsx(Notebook2, { nbformat: nbformat, id: "notebook-nbformat-id", startDefaultKernel: true, height: "calc(100vh - 2.6rem)" // (Height - Toolbar Height).
-                , cellSidebarMargin: 120, Toolbar: NotebookToolbar,
-                /*
-                collaborationServer={{
-                  baseURL: 'https://prod1.datalayer.run',
-                  token: '',
-                  roomName: '',
-                  type: 'datalayer'
-                }}
-                */
-                serviceManager: serviceManager }) })
+        _jsx(JupyterReactTheme, { children: _jsx(Notebook2, { nbformat: nbformat, id: "notebook-nbformat-id", startDefaultKernel: true, serviceManager: serviceManager, height: "calc(100vh - 2.6rem)" // (Height - Toolbar Height).
+                , extensions: extensions }) })
         :
             _jsx(_Fragment, {}));
 };
 const div = document.createElement('div');
 document.body.appendChild(div);
 const root = createRoot(div);
-root.render(_jsx(Notebook, {}));
+root.render(_jsx(Notebook2Example, {}));
 //# sourceMappingURL=Notebook2.js.map

package/lib/examples/Notebook2.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Notebook2.js","sourceRoot":"","sources":["../../src/examples/Notebook2.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,~~eAAe~~,EAAE,MAAM,~~kDAAkD~~,CAAC;AACnF,OAAO,EAAE,~~SAAS~~,EAAE,MAAM,~~kCAAkC~~,CAAC;~~AAE7D~~,OAAO,QAAQ,MAAM,yCAAyC,CAAC;AAE/D,MAAM,~~QAAQ~~,GAAG,GAAG,EAAE;~~IACpB~~,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,OAAO,CACL,cAAc,CAAC,CAAC;QACd,KAAC,iBAAiB,cAChB,KAAC,SAAS,IACR,QAAQ,EAAE,QAA4B,EACtC,EAAE,EAAC,sBAAsB,EACzB,kBAAkB,QAClB,MAAM,EAAC,sBAAsB,CAAC,6BAA6B;kBAC3D,~~iBAAiB~~,EAAE,~~GAAG~~,~~EACtB~~,~~OAAO,EAAE,eAAe;gBACxB;;;;;;;kBAOE;gBACF,cAAc,EAAE,cAAc,GAC9B,~~GACgB;QACtB,CAAC;YACC,mBAAK,CACR,CAAA;AACH,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,~~QAAQ~~,KAAG,CAAC,CAAC"}
1	+ {"version":3,"file":"Notebook2.js","sourceRoot":"","sources":["../../src/examples/Notebook2.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,QAAQ,MAAM,yCAAyC,CAAC;AAE/D,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,oBAAoB,EAAE;QAC1B,IAAI,oBAAoB,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;KACzD,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CACL,cAAc,CAAC,CAAC;QACd,KAAC,iBAAiB,cAChB,KAAC,SAAS,IACR,QAAQ,EAAE,QAA4B,EACtC,EAAE,EAAC,sBAAsB,EACzB,kBAAkB,QAClB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAC,sBAAsB,CAAC,6BAA6B;kBAC3D,UAAU,EAAE,UAAU,GAStB,GACgB;QACtB,CAAC;YACC,mBAAK,CACR,CAAA;AACH,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,gBAAgB,KAAG,CAAC,CAAC"}

package/lib/examples/NotebookExtension.js CHANGED Viewed

@@ -1,12 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+/*
+ * Copyright (c) 2021-2023 Datalayer, Inc.
+ *
+ * MIT License
+ */
 import { useMemo } from 'react';
 import { createRoot } from 'react-dom/client';
-import { CellSidebarButton } from '../components/notebook/cell/sidebar/CellSidebarButton';
-import { Notebook } from '../components/notebook/Notebook';
-import { JupyterReactTheme } from '../theme/JupyterReactTheme';
-import { NotebookToolbar } from './../components/notebook/toolbar/NotebookToolbar';
+import { Notebook, CellSidebarExtension, CellSidebarButton, NotebookToolbar } from '../components';
+import { JupyterReactTheme } from '../theme';
 import { ExecTimeExtension } from './extensions';
-import { CellSidebarExtension } from '../components';
 import nbformat from './notebooks/NotebookExample1.ipynb.json';
 const NotebookExtension = () => {
     const extensions = useMemo(() => [

package/lib/examples/NotebookExtension.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"NotebookExtension.js","sourceRoot":"","sources":["../../src/examples/NotebookExtension.tsx"],"names":[],"mappings":";~~AAOA~~,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;~~AAC9C~~,OAAO,EAAE,~~iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAC1F,OAAO,EAAE,~~QAAQ,EAAE,~~MAAM~~,~~iCAAiC,CAAC;AAC3D,OAAO,~~EAAE,iBAAiB,EAAE,~~MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,~~eAAe,EAAE,MAAM,~~kDAAkD~~,CAAC;~~AACnF~~,OAAO,EAAE,iBAAiB,EAAE,MAAM,~~cAAc~~,CAAC;~~AAEjD~~,OAAO,EAAE,~~oBAAoB~~,EAAE,MAAM,~~eAAe~~,CAAC;~~AACrD~~,OAAO,QAAQ,MAAM,yCAAyC,CAAC;AAE/D,MAAM,iBAAiB,GAAG,GAAG,EAAE;IAC7B,MAAM,UAAU,GAAG,OAAO,CACxB,GAAG,EAAE,CAAC;QACJ,IAAI,iBAAiB,EAAE;QACvB,IAAI,oBAAoB,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;KACzD,EACD,EAAE,CACH,CAAC;IACF,OAAO,CACL,KAAC,iBAAiB,cAChB,KAAC,QAAQ,IACP,QAAQ,EAAE,QAA4B,EACtC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAC,uBAAuB,EAC1B,MAAM,EAAC,sBAAsB,CAAC,6BAA6B;cAC3D,OAAO,EAAE,eAAe,GACxB,GACgB,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,iBAAiB,KAAG,CAAC,CAAC"}
1	+ {"version":3,"file":"NotebookExtension.js","sourceRoot":"","sources":["../../src/examples/NotebookExtension.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,QAAQ,MAAM,yCAAyC,CAAC;AAE/D,MAAM,iBAAiB,GAAG,GAAG,EAAE;IAC7B,MAAM,UAAU,GAAG,OAAO,CACxB,GAAG,EAAE,CAAC;QACJ,IAAI,iBAAiB,EAAE;QACvB,IAAI,oBAAoB,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;KACzD,EACD,EAAE,CACH,CAAC;IACF,OAAO,CACL,KAAC,iBAAiB,cAChB,KAAC,QAAQ,IACP,QAAQ,EAAE,QAA4B,EACtC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAC,uBAAuB,EAC1B,MAAM,EAAC,sBAAsB,CAAC,6BAA6B;cAC3D,OAAO,EAAE,eAAe,GACxB,GACgB,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,iBAAiB,KAAG,CAAC,CAAC"}

package/lib/examples/NotebookNbformat.js CHANGED Viewed

@@ -1,15 +1,23 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { createRoot } from 'react-dom/client';
-import { Notebook } from '../components/notebook/Notebook';
-import { JupyterReactTheme } from '../theme/JupyterReactTheme';
-import { NotebookToolbar } from './../components/notebook/toolbar/NotebookToolbar';
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+/*
+ * Copyright (c) 2021-2023 Datalayer, Inc.
+ *
+ * MIT License
+ */
 import { useMemo } from 'react';
-import { CellSidebarExtension } from '../components';
+import { createRoot } from 'react-dom/client';
+import { useJupyter } from '../jupyter';
+import { Notebook2, CellSidebarExtension, NotebookToolbar } from '../components';
+import { JupyterReactTheme } from '../theme';
 import nbformat from './notebooks/NotebookExample1.ipynb.json';
 const NotebookNbformat = () => {
+    const { serviceManager } = useJupyter();
     const extensions = useMemo(() => [new CellSidebarExtension()], []);
-    return (_jsx(JupyterReactTheme, { children: _jsx(Notebook, { nbformat: nbformat, id: "notebook-nbformat-id", startDefaultKernel: true, height: "calc(100vh - 2.6rem)" // (Height - Toolbar Height).
-            , extensions: extensions, Toolbar: NotebookToolbar }) }));
+    return (_jsx(JupyterReactTheme, { children: serviceManager ?
+            _jsx(Notebook2, { nbformat: nbformat, id: "notebook-nbformat-id", serviceManager: serviceManager, startDefaultKernel: true, height: "calc(100vh - 2.6rem)" // (Height - Toolbar Height).
+                , extensions: extensions, Toolbar: NotebookToolbar })
+            :
+                _jsx(_Fragment, {}) }));
 };
 const div = document.createElement('div');
 document.body.appendChild(div);

package/lib/examples/NotebookNbformat.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"NotebookNbformat.js","sourceRoot":"","sources":["../../src/examples/NotebookNbformat.tsx"],"names":[],"mappings":";~~AAOA~~,OAAO,EAAE,~~UAAU~~,EAAE,MAAM,~~kBAAkB~~,CAAC;~~AAC9C~~,OAAO,EAAE,~~QAAQ~~,EAAE,MAAM,~~iCAAiC~~,CAAC;~~AAC3D~~,OAAO,EAAE,~~iBAAiB~~,EAAE,MAAM,~~4BAA4B~~,CAAC;~~AAC/D~~,OAAO,EAAE,~~eAAe~~,EAAE,~~MAAM~~,~~kDAAkD,CAAC;AAEnF,OAAO,~~EAAE,~~OAAO~~,EAAE,MAAM,~~OAAO~~,CAAC;~~AAChC~~,OAAO,EAAE,~~oBAAoB~~,EAAE,MAAM,~~eAAe~~,CAAC;~~AACrD~~,OAAO,QAAQ,MAAM,yCAAyC,CAAC;AAE/D,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACnE,OAAO,CACL,KAAC,iBAAiB,~~cAChB~~,KAAC,~~QAAQ~~,~~IACP~~,QAAQ,EAAE,QAA4B,EACtC,EAAE,EAAC,sBAAsB,EACzB,kBAAkB,QAClB,MAAM,EAAC,sBAAsB,CAAC,6BAA6B;~~cAC3D~~,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,eAAe,GACxB,~~GACgB~~,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,gBAAgB,KAAG,CAAC,CAAC"}
1	+ {"version":3,"file":"NotebookNbformat.js","sourceRoot":"","sources":["../../src/examples/NotebookNbformat.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,QAAQ,MAAM,yCAAyC,CAAC;AAE/D,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACnE,OAAO,CACL,KAAC,iBAAiB,cACf,cAAc,CAAC,CAAC;YACf,KAAC,SAAS,IACR,QAAQ,EAAE,QAA4B,EACtC,EAAE,EAAC,sBAAsB,EACzB,cAAc,EAAE,cAAc,EAC9B,kBAAkB,QAClB,MAAM,EAAC,sBAAsB,CAAC,6BAA6B;kBAC3D,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,eAAe,GACxB;YACJ,CAAC;gBACC,mBAAK,GAEW,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,gBAAgB,KAAG,CAAC,CAAC"}

package/lib/examples/Plotly.js CHANGED Viewed

@@ -13,7 +13,7 @@ import { NotebookToolbar } from './../components/notebook/toolbar/NotebookToolba
 const Plotly = () => {
     const extensions = useMemo(() => [new CellSidebarExtension()], []);
     return (_jsx(JupyterReactTheme, { children: _jsx(Notebook, { path: "plotly.ipynb", id: "notebook-plotly-id", height: "calc(100vh - 2.6rem)" // (Height - Toolbar Height).
-            , extensions: extensions, Toolbar: NotebookToolbar }) }));
+            , extensions: extensions, startDefaultKernel: true, Toolbar: NotebookToolbar }) }));
 };
 const div = document.createElement('div');
 document.body.appendChild(div);

package/lib/examples/Plotly.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Plotly.js","sourceRoot":"","sources":["../../src/examples/Plotly.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AAEnF,MAAM,MAAM,GAAG,GAAG,EAAE;IAClB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACnE,OAAO,CACL,KAAC,iBAAiB,cAChB,KAAC,QAAQ,IACP,IAAI,EAAC,cAAc,EACnB,EAAE,EAAC,oBAAoB,EACvB,MAAM,EAAC,sBAAsB,CAAC,6BAA6B;cAC3D,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,eAAe,GACxB,GACgB,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,MAAM,KAAG,CAAC,CAAC"}
1	+ {"version":3,"file":"Plotly.js","sourceRoot":"","sources":["../../src/examples/Plotly.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AAEnF,MAAM,MAAM,GAAG,GAAG,EAAE;IAClB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACnE,OAAO,CACL,KAAC,iBAAiB,cAChB,KAAC,QAAQ,IACP,IAAI,EAAC,cAAc,EACnB,EAAE,EAAC,oBAAoB,EACvB,MAAM,EAAC,sBAAsB,CAAC,6BAA6B;cAC3D,UAAU,EAAE,UAAU,EACtB,kBAAkB,QAClB,OAAO,EAAE,eAAe,GACxB,GACgB,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC1C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7B,IAAI,CAAC,MAAM,CAAC,KAAC,MAAM,KAAG,CAAC,CAAC"}

package/lib/jupyter/collaboration/DatalayerCollaboration.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
-type IfetchSessionId = {
+type IFetchSessionId = {
     url: string;
     token?: string;
 };
 /**
- * Fetch the session ID of a collaborative rooms from Datalayer.
+ * Fetch the session ID of a collaborative documents from Datalayer.
  */
-export declare function fetchSessionId({ url, token }: IfetchSessionId): Promise<string>;
+export declare function requestDatalayerollaborationSessionId({ url, token }: IFetchSessionId): Promise<string>;
 export {};

package/lib/jupyter/collaboration/DatalayerCollaboration.js CHANGED Viewed

@@ -4,9 +4,9 @@
  * MIT License
  */
 /**
- * Fetch the session ID of a collaborative rooms from Datalayer.
+ * Fetch the session ID of a collaborative documents from Datalayer.
  */
-export async function fetchSessionId({ url, token }) {
+export async function requestDatalayerollaborationSessionId({ url, token }) {
     const headers = {
         Accept: 'application/json',
     };

package/lib/jupyter/collaboration/DatalayerCollaboration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DatalayerCollaboration.js","sourceRoot":"","sources":["../../../src/jupyter/collaboration/DatalayerCollaboration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,~~cAAc~~,CAAC,EAAE,GAAG,EAAE,KAAK,EAAmB;~~IAClE~~,MAAM,OAAO,GAAgB;QAC3B,MAAM,EAAE,kBAAkB;KAC3B,CAAC;IACF,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAC;IAC/C,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,KAAK;QACb,OAAO;QACP,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;QACvC,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,UAAU;KAClB,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtC,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC"}
1	+ {"version":3,"file":"DatalayerCollaboration.js","sourceRoot":"","sources":["../../../src/jupyter/collaboration/DatalayerCollaboration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qCAAqC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAmB;IACzF,MAAM,OAAO,GAAgB;QAC3B,MAAM,EAAE,kBAAkB;KAC3B,CAAC;IACF,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAC;IAC/C,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,KAAK;QACb,OAAO;QACP,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;QACvC,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,UAAU;KAClB,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtC,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC"}

package/lib/jupyter/collaboration/ICollaborative.d.ts CHANGED Viewed

@@ -1,2 +1,36 @@
-export type ICollaborative = 'jupyter' | 'datalayer' | undefined;
-export default ICollaborative;
+import { ServerConnection } from "@jupyterlab/services";
+export type IJupyterCollaborationServer = {
+    /**
+     * Base server URL
+     */
+    baseURL: string;
+    /**
+     * Notebook document name to connect to.
+     */
+    documentName: string;
+    /**
+     * JWT token
+     */
+    token: string;
+    /**
+     * Server type
+     */
+    type: 'datalayer';
+};
+export type IDatalayerCollaborationServer = {
+    /**
+     * Notebook path
+     */
+    path: string;
+    /**
+     * Jupyter server settings
+     */
+    serverSettings: ServerConnection.ISettings;
+    /**
+     * Server type
+     */
+    type: 'jupyter';
+};
+export type ICollaborationServer = IJupyterCollaborationServer | IDatalayerCollaborationServer;
+export type ICollaborationProvider = 'jupyter' | 'datalayer' | undefined;
+export default ICollaborationProvider;

package/lib/jupyter/collaboration/JupyterCollaboration.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Contents, ServerConnection } from '@jupyterlab/services';
-export declare const COLLABORATION_ROOM_URL_PATH = "api/collaboration/room";
+export declare const COLLABORATION_ROOM_URL_PATH = "api/collaboration/document";
 export declare const COLLABORATION_SESSION_URL_PATH = "api/collaboration/session";
 /**
  * Document session model
@@ -22,6 +22,6 @@ export interface ISessionModel {
      */
     sessionId: string;
 }
-export declare function requestDocSession(format: string, type: string, path: string, serverSettings?: ServerConnection.ISettings): Promise<ISessionModel>;
+export declare function requestJupyterCollaborationSession(format: string, type: string, path: string, serverSettings?: ServerConnection.ISettings): Promise<ISessionModel>;
 declare const _default: {};
 export default _default;

package/lib/jupyter/collaboration/JupyterCollaboration.js CHANGED Viewed

@@ -5,9 +5,9 @@
  */
 import { URLExt } from '@jupyterlab/coreutils';
 import { ServerConnection } from '@jupyterlab/services';
-export const COLLABORATION_ROOM_URL_PATH = 'api/collaboration/room';
+export const COLLABORATION_ROOM_URL_PATH = 'api/collaboration/document';
 export const COLLABORATION_SESSION_URL_PATH = 'api/collaboration/session';
-export async function requestDocSession(format, type, path, serverSettings) {
+export async function requestJupyterCollaborationSession(format, type, path, serverSettings) {
     const settings = serverSettings ?? ServerConnection.makeSettings();
     const url = URLExt.join(settings.baseUrl, COLLABORATION_SESSION_URL_PATH, encodeURIComponent(path));
     const body = {

package/lib/jupyter/collaboration/JupyterCollaboration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JupyterCollaboration.js","sourceRoot":"","sources":["../../../src/jupyter/collaboration/JupyterCollaboration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAY,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAElE,MAAM,CAAC,MAAM,2BAA2B,GAAG,~~wBAAwB~~,CAAC;~~AAEpE~~,MAAM,CAAC,MAAM,8BAA8B,GAAG,2BAA2B,CAAC;AAwB1E,MAAM,CAAC,KAAK,UAAU,~~iBAAiB~~,~~CACrC~~,MAAc,EACd,IAAY,EACZ,IAAY,EACZ,cAA2C;IAE3C,MAAM,QAAQ,GAAG,cAAc,IAAI,gBAAgB,CAAC,YAAY,EAAE,CAAC;IACnE,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,8BAA8B,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IACpG,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;KACvC,CAAC;IACF,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,KAAc,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,gBAAgB,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,eAAe,EAAE,CAAC"}
1	+ {"version":3,"file":"JupyterCollaboration.js","sourceRoot":"","sources":["../../../src/jupyter/collaboration/JupyterCollaboration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAY,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAElE,MAAM,CAAC,MAAM,2BAA2B,GAAG,4BAA4B,CAAC;AAExE,MAAM,CAAC,MAAM,8BAA8B,GAAG,2BAA2B,CAAC;AAwB1E,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,MAAc,EACd,IAAY,EACZ,IAAY,EACZ,cAA2C;IAE3C,MAAM,QAAQ,GAAG,cAAc,IAAI,gBAAgB,CAAC,YAAY,EAAE,CAAC;IACnE,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,8BAA8B,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IACpG,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;KACvC,CAAC;IACF,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,KAAc,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,gBAAgB,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,eAAe,EAAE,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@datalayer/jupyter-react",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Jupyter React - React.js components 100% compatible with Jupyter.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -67,7 +67,7 @@
     "@codemirror/lang-python": "^6.0.1",
     "@codemirror/state": "^6.2.0",
     "@codemirror/view": "^6.7.0",
-    "@datalayer/primer-addons": "^1.0.0",
+    "@datalayer/primer-addons": "^1.0.3",
     "@jupyter-widgets/base": "^6.0.0",
     "@jupyter-widgets/controls": "^5.0.0",
     "@jupyter-widgets/html-manager": "^1.0.0",