jupyter-specta 0.3.2 → 0.3.4

package/README.md

@@ -69,6 +69,7 @@ Specta can be configured using the typicall JupyterLite configuration file: `jup
 The following options are available:
 
 - `defaultLayout`: The default layout when opening a file.
+- `executionDelay`: Delay (in miliseconds) before executing cells.
 - `hideTopbar`: Boolean flag to show or hide the top bar.
 - `topBar`: Configuration for the top bar.
 - `slidesTheme`: The theme for the slides layout. The list of available themes can be found [here](https://revealjs.com/themes/).

package/lib/specta_model.d.ts

@@ -6,6 +6,7 @@ import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { ServiceManager } from '@jupyterlab/services';
 import { IExecuteReplyMsg } from '@jupyterlab/services/lib/kernel/messages';
 import { SpectaCellOutput } from './specta_cell_output';
+import { ISignal } from '@lumino/signaling';
 export declare class AppModel {
     private options;
     constructor(options: AppModel.IOptions);
@@ -13,6 +14,7 @@ export declare class AppModel {
      * Whether the handler is disposed.
      */
     get isDisposed(): boolean;
+    get fileChanged(): ISignal<this, CellList>;
     dispose(): void;
     get rendermime(): IRenderMimeRegistry;
     get cells(): CellList | undefined;
@@ -27,6 +29,7 @@ export declare class AppModel {
     private _isDisposed;
     private _manager;
     private _kernelPreference;
+    private _fileChanged;
 }
 export declare namespace AppModel {
     interface IOptions {

package/lib/specta_model.js

@@ -3,10 +3,12 @@ import { OutputAreaModel, SimplifiedOutputArea } from '@jupyterlab/outputarea';
 import { createNotebookContext, createNotebookPanel } from './create_notebook_panel';
 import { SpectaCellOutput } from './specta_cell_output';
 import { emitResizeEvent, readCellConfig } from './tool';
+import { Signal } from '@lumino/signaling';
 export class AppModel {
     constructor(options) {
         this.options = options;
         this._isDisposed = false;
+        this._fileChanged = new Signal(this);
         this._notebookModelJson = options.context.model.toJSON();
         this._kernelPreference = {
             shouldStart: true,
@@ -17,6 +19,9 @@ export class AppModel {
             language: options.context.model.defaultKernelLanguage
         };
         this._manager = options.manager;
+        options.context.fileChanged.connect(e => {
+            this._fileChanged.emit(e.model.cells);
+        });
     }
     /**
      * Whether the handler is disposed.
@@ -24,6 +29,9 @@ export class AppModel {
     get isDisposed() {
         return this._isDisposed;
     }
+    get fileChanged() {
+        return this._fileChanged;
+    }
     dispose() {
         var _a, _b;
         if (this.isDisposed) {

package/lib/specta_widget.d.ts

@@ -1,7 +1,9 @@
+import { CellList } from '@jupyterlab/notebook';
 import { Message } from '@lumino/messaging';
 import { Panel } from '@lumino/widgets';
+import { SpectaCellOutput } from './specta_cell_output';
 import { AppModel } from './specta_model';
-import { ISpectaAppConfig, ISpectaLayoutRegistry } from './token';
+import { ISpectaAppConfig, ISpectaLayout, ISpectaLayoutRegistry } from './token';
 export declare class AppWidget extends Panel {
     constructor(options: AppWidget.IOptions);
     /**
@@ -10,8 +12,12 @@ export declare class AppWidget extends Panel {
     get ready(): Promise<void>;
     get model(): AppModel;
     addSpinner(): void;
+    removeSpinner(): void;
     dispose(): void;
+    generateOutputs(cellList?: CellList): Promise<SpectaCellOutput[]>;
+    getLayout(): ISpectaLayout;
     render(): Promise<void>;
+    rerender(newCells: CellList): Promise<void>;
     protected onCloseRequest(msg: Message): void;
     private _onSelectedLayoutChanged;
     private _model;

package/lib/specta_widget.js

@@ -20,10 +20,22 @@ export class AppWidget extends Panel {
             // Not a specta app, add spinner
             this.addSpinner();
         }
-        this._model.initialize().then(() => {
-            this.render().catch(console.error).then(emitResizeEvent);
+        this._model.initialize().then(async () => {
+            let waitTime = this._spectaAppConfig.executionDelay;
+            if (!waitTime) {
+                waitTime = 100;
+            }
+            else {
+                console.log(`Waiting for ${waitTime}ms`);
+            }
+            await new Promise(resolve => setTimeout(resolve, parseInt(waitTime + '')));
+            await this.render();
+            emitResizeEvent();
         });
         this._layoutRegistry.selectedLayoutChanged.connect(this._onSelectedLayoutChanged, this);
+        this._model.fileChanged.connect((_, newCells) => {
+            this.rerender(newCells);
+        });
     }
     /**
      * A promise that is fulfilled when the model is ready.
@@ -47,6 +59,18 @@ export class AppWidget extends Panel {
         loaderHost.node.appendChild(text);
         this.addWidget(loaderHost);
     }
+    removeSpinner() {
+        if (this._loaderHost) {
+            this._loaderHost.node.style.opacity = '0';
+            setTimeout(() => {
+                var _a;
+                (_a = this.layout) === null || _a === void 0 ? void 0 : _a.removeWidget(this._loaderHost);
+            }, 100);
+        }
+        else {
+            hideAppLoadingIndicator();
+        }
+    }
     dispose() {
         if (this.isDisposed) {
             return;
@@ -54,10 +78,11 @@ export class AppWidget extends Panel {
         this._model.dispose();
         super.dispose();
     }
-    async render() {
-        var _a, _b, _c, _d, _e;
-        const cellList = (_a = this._model.cells) !== null && _a !== void 0 ? _a : [];
-        const layout = (_c = (_b = this._spectaAppConfig) === null || _b === void 0 ? void 0 : _b.defaultLayout) !== null && _c !== void 0 ? _c : 'default';
+    async generateOutputs(cellList) {
+        const outs = [];
+        if (!cellList) {
+            return outs;
+        }
         for (const cell of cellList) {
             const src = cell.sharedModel.source;
             if (src.length === 0) {
@@ -65,29 +90,53 @@ export class AppWidget extends Panel {
             }
             const el = this._model.createCell(cell);
             this._model.executeCell(cell, el);
-            this._outputs.push(el);
+            outs.push(el);
         }
-        const readyCallback = async () => {
-            if (this._loaderHost) {
-                this._loaderHost.node.style.opacity = '0';
-                setTimeout(() => {
-                    var _a;
-                    (_a = this.layout) === null || _a === void 0 ? void 0 : _a.removeWidget(this._loaderHost);
-                }, 100);
-            }
-            else {
-                hideAppLoadingIndicator();
-            }
-        };
-        const spectaLayout = (_d = this._layoutRegistry.get(layout)) !== null && _d !== void 0 ? _d : this._layoutRegistry.getDefaultLayout();
+        return outs;
+    }
+    getLayout() {
+        var _a, _b, _c;
+        const layout = (_b = (_a = this._spectaAppConfig) === null || _a === void 0 ? void 0 : _a.defaultLayout) !== null && _b !== void 0 ? _b : 'default';
+        const spectaLayout = (_c = this._layoutRegistry.get(layout)) !== null && _c !== void 0 ? _c : this._layoutRegistry.getDefaultLayout();
+        return spectaLayout;
+    }
+    async render() {
+        var _a;
+        const cellList = this._model.cells;
+        this._outputs = await this.generateOutputs(cellList);
+        const spectaLayout = this.getLayout();
+        const readyCallback = async () => this.removeSpinner();
         await spectaLayout.render({
             host: this._host,
             items: this._outputs,
-            notebook: (_e = this._model.context) === null || _e === void 0 ? void 0 : _e.model.toJSON(),
+            notebook: (_a = this._model.context) === null || _a === void 0 ? void 0 : _a.model.toJSON(),
             readyCallback,
             spectaConfig: this._spectaAppConfig
         });
     }
+    async rerender(newCells) {
+        var _a;
+        this.addSpinner();
+        for (const element of this._outputs) {
+            element.dispose();
+        }
+        const currentEls = [...this._host.widgets];
+        currentEls.forEach(el => {
+            var _a;
+            (_a = this._host.layout) === null || _a === void 0 ? void 0 : _a.removeWidget(el);
+        });
+        this._outputs = await this.generateOutputs(newCells);
+        const spectaLayout = this.getLayout();
+        await spectaLayout.render({
+            host: this._host,
+            items: this._outputs,
+            notebook: (_a = this._model.context) === null || _a === void 0 ? void 0 : _a.model.toJSON(),
+            readyCallback: async () => { },
+            spectaConfig: this._spectaAppConfig
+        });
+        emitResizeEvent();
+        this.removeSpinner();
+    }
     onCloseRequest(msg) {
         this._model.dispose();
         super.onCloseRequest(msg);

package/lib/token.d.ts

@@ -50,6 +50,7 @@ export interface ISpectaAppConfig {
     hideTopbar?: boolean;
     slidesTheme?: string;
     loadingName?: string;
+    executionDelay?: number;
     labConfig?: {
         setSingleMode?: boolean;
         hideLeftPanel?: boolean;

package/lib/tool.js

@@ -187,7 +187,6 @@ export async function configLabLayout(options) {
     if (!config) {
         return;
     }
-    console.log('vvvvvvvvvvv', config);
     const { setSingleMode, hideLeftPanel, hideRightPanel, hideStatusbar, hideHeader } = config;
     if (setSingleMode) {
         await commands.execute('application:set-mode', {
@@ -213,9 +212,7 @@ export async function configLabLayout(options) {
     }
     if (hideStatusbar) {
         const statusBar = document.getElementById('jp-main-statusbar');
-        console.log('statusBar.clientHeight', statusBar === null || statusBar === void 0 ? void 0 : statusBar.clientHeight);
         if (statusBar && !statusBar.classList.contains('lm-mod-hidden')) {
-            console.log('toggle status');
             await commands.execute('statusbar:toggle');
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyter-specta",
-    "version": "0.3.2",
+    "version": "0.3.4",
     "description": "",
     "keywords": [],
     "homepage": "https://github.com/trungleduc/specta",