@jupyterlab/cell-toolbar 4.0.0-alpha.6 → 4.0.0-beta.0

package/lib/celltoolbartracker.d.ts

@@ -1,38 +1,21 @@
-import { ICellModel } from '@jupyterlab/cells';
+import { ToolbarRegistry } from '@jupyterlab/apputils';
+import { CellModel } from '@jupyterlab/cells';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { Notebook, NotebookPanel } from '@jupyterlab/notebook';
-import { IObservableList, IObservableUndoableList } from '@jupyterlab/observables';
-import { ISettingRegistry } from '@jupyterlab/settingregistry';
-import { LabIcon } from '@jupyterlab/ui-components';
+import { IObservableList } from '@jupyterlab/observables';
 import { CommandRegistry } from '@lumino/commands';
 import { IDisposable } from '@lumino/disposable';
-/**
- * Icons for use in toolbar.
- *
- * These are copied from icon.ts, which is not part of the webpack bundle
- * because nothing is imported from it.
- */
-export declare const addAboveIcon: LabIcon;
-export declare const addBelowIcon: LabIcon;
-export declare const deleteIcon: LabIcon;
-export declare const duplicateIcon: LabIcon;
-export declare const moveDownIcon: LabIcon;
-export declare const moveUpIcon: LabIcon;
+import { Widget } from '@lumino/widgets';
+import { IMapChange } from '@jupyter/ydoc';
 /**
  * Watch a notebook so that a cell toolbar appears on the active cell
  */
 export declare class CellToolbarTracker implements IDisposable {
-    constructor(panel: NotebookPanel, commands: CommandRegistry, settings: ISettingRegistry.ISettings | null);
+    constructor(panel: NotebookPanel, toolbar: IObservableList<ToolbarRegistry.IToolbarItem>);
+    _onMetadataChanged(model: CellModel, args: IMapChange): void;
     _onActiveCellChanged(notebook: Notebook): void;
     get isDisposed(): boolean;
     dispose(): void;
-    /**
-     * Callback to react to cells list changes
-     *
-     * @param cells List of notebook cells
-     * @param changed Modification of the list
-     */
-    updateConnectedCells(cells: IObservableUndoableList<ICellModel>, changed: IObservableList.IChangedArgs<ICellModel>): void;
     private _addToolbar;
     private _getCell;
     private _findToolbarWidgets;
@@ -40,7 +23,7 @@ export declare class CellToolbarTracker implements IDisposable {
     /**
      * Call back on settings changes
      */
-    private _onSettingsChanged;
+    private _onToolbarChanged;
     private _changedEventCallback;
     private _resizeEventCallback;
     private _updateCellForToolbarOverlap;
@@ -52,23 +35,26 @@ export declare class CellToolbarTracker implements IDisposable {
      * @returns `true` if the first line of the output overlaps with the cell toolbar, `false` otherwise
      */
     private _markdownOverlapsToolbar;
+    private _outputOverlapsToolbar;
     private _codeOverlapsToolbar;
     private _cellEditorWidgetLeft;
     private _cellEditorWidgetRight;
+    private _cellToolbarRect;
     private _cellToolbarLeft;
-    private _commands;
     private _isDisposed;
     private _panel;
     private _previousActiveCell;
-    private _settings;
+    private _toolbar;
 }
 /**
  * Widget extension that creates a CellToolbarTracker each time a notebook is
  * created.
  */
 export declare class CellBarExtension implements DocumentRegistry.WidgetExtension {
-    constructor(commands: CommandRegistry, settings: ISettingRegistry.ISettings | null);
+    static FACTORY_NAME: string;
+    constructor(commands: CommandRegistry, toolbarFactory?: (widget: Widget) => IObservableList<ToolbarRegistry.IToolbarItem>);
+    protected get defaultToolbarFactory(): (widget: Widget) => IObservableList<ToolbarRegistry.IToolbarItem>;
     createNew(panel: NotebookPanel): IDisposable;
     private _commands;
-    private _settings;
+    private _toolbarFactory;
 }

package/lib/celltoolbartracker.js

@@ -1,87 +1,88 @@
-import { LabIcon } from '@jupyterlab/ui-components';
-import { each } from '@lumino/algorithm';
-import { CellToolbarWidget } from './celltoolbarwidget';
-import { EXTENSION_ID } from './tokens';
-// icon svg import statements
-import addAboveSvg from '../style/icons/addabove.svg';
-import addBelowSvg from '../style/icons/addbelow.svg';
-import deleteSvg from '../style/icons/delete.svg';
-import duplicateSvg from '../style/icons/duplicate.svg';
-import moveDownSvg from '../style/icons/movedown.svg';
-import moveUpSvg from '../style/icons/moveup.svg';
-const DEFAULT_LEFT_MENU = [];
+/* -----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+import { createDefaultFactory } from '@jupyterlab/apputils';
+import { ObservableList } from '@jupyterlab/observables';
+import { ReactWidget, Toolbar } from '@jupyterlab/ui-components';
+import { some } from '@lumino/algorithm';
+import { Signal } from '@lumino/signaling';
+/*
+ * Text mime types
+ */
+const TEXT_MIME_TYPES = [
+    'text/plain',
+    'application/vnd.jupyter.stdout',
+    'application/vnd.jupyter.stderr'
+];
 /**
- * Widget cell toolbar class
+ * Widget cell toolbar classes
  */
-const CELL_BAR_CLASS = 'jp-cell-bar';
+const CELL_TOOLBAR_CLASS = 'jp-cell-toolbar';
+const CELL_MENU_CLASS = 'jp-cell-menu';
 /**
  * Class for a cell whose contents overlap with the cell toolbar
  */
 const TOOLBAR_OVERLAP_CLASS = 'jp-toolbar-overlap';
-/**
- * Icons for use in toolbar.
- *
- * These are copied from icon.ts, which is not part of the webpack bundle
- * because nothing is imported from it.
- */
-export const addAboveIcon = new LabIcon({
-    name: `${EXTENSION_ID}:add-above`,
-    svgstr: addAboveSvg
-});
-export const addBelowIcon = new LabIcon({
-    name: `${EXTENSION_ID}:add-below`,
-    svgstr: addBelowSvg
-});
-export const deleteIcon = new LabIcon({
-    name: `${EXTENSION_ID}:delete`,
-    svgstr: deleteSvg
-});
-export const duplicateIcon = new LabIcon({
-    name: `${EXTENSION_ID}:duplicate`,
-    svgstr: duplicateSvg
-});
-export const moveDownIcon = new LabIcon({
-    name: `${EXTENSION_ID}:move-down`,
-    svgstr: moveDownSvg
-});
-export const moveUpIcon = new LabIcon({
-    name: `${EXTENSION_ID}:move-up`,
-    svgstr: moveUpSvg
-});
 /**
  * Watch a notebook so that a cell toolbar appears on the active cell
  */
 export class CellToolbarTracker {
-    constructor(panel, commands, settings) {
+    constructor(panel, toolbar) {
+        var _a;
         this._isDisposed = false;
-        this._commands = commands;
         this._panel = panel;
-        this._settings = settings;
         this._previousActiveCell = this._panel.content.activeCell;
-        if (this._settings) {
-            this._onSettingsChanged();
-            this._settings.changed.connect(this._onSettingsChanged, this);
-        }
-        const notebookModel = this._panel.context.model;
-        const cells = notebookModel.cells;
-        cells.changed.connect(this.updateConnectedCells, this);
+        this._toolbar = toolbar;
+        this._onToolbarChanged();
+        this._toolbar.changed.connect(this._onToolbarChanged, this);
         // Only add the toolbar to the notebook's active cell (if any) once it has fully rendered and been revealed.
-        panel.revealed.then(() => this._onActiveCellChanged(panel.content));
+        void panel.revealed.then(() => {
+            // Wait one frame (at 60 fps) for the panel to render the first cell, then display the cell toolbar on it if possible.
+            setTimeout(() => {
+                this._onActiveCellChanged(panel.content);
+            }, 1000 / 60);
+        });
+        // Check whether the toolbar should be rendered upon a layout change
+        panel.content.renderingLayoutChanged.connect(this._onActiveCellChanged, this);
         // Handle subsequent changes of active cell.
         panel.content.activeCellChanged.connect(this._onActiveCellChanged, this);
+        (_a = panel.content.activeCell) === null || _a === void 0 ? void 0 : _a.model.metadataChanged.connect(this._onMetadataChanged, this);
+        panel.disposed.connect(() => {
+            var _a;
+            panel.content.activeCellChanged.disconnect(this._onActiveCellChanged);
+            (_a = panel.content.activeCell) === null || _a === void 0 ? void 0 : _a.model.metadataChanged.disconnect(this._onMetadataChanged);
+        });
+    }
+    _onMetadataChanged(model, args) {
+        if (args.key === 'jupyter') {
+            if (typeof args.newValue === 'object' &&
+                args.newValue.source_hidden === true &&
+                (args.type === 'add' || args.type === 'change')) {
+                // Cell just became hidden; remove toolbar
+                this._removeToolbar(model);
+            }
+            // Check whether input visibility changed
+            else if (typeof args.oldValue === 'object' &&
+                args.oldValue.source_hidden === true) {
+                // Cell just became visible; add toolbar
+                this._addToolbar(model);
+            }
+        }
     }
     _onActiveCellChanged(notebook) {
+        if (this._previousActiveCell && !this._previousActiveCell.isDisposed) {
+            // Disposed cells do not have a model anymore.
+            this._removeToolbar(this._previousActiveCell.model);
+            this._previousActiveCell.model.metadataChanged.disconnect(this._onMetadataChanged);
+        }
         const activeCell = notebook.activeCell;
-        if (!activeCell) {
+        if (activeCell === null || activeCell.inputHidden) {
             return;
         }
-        if (this._previousActiveCell !== null &&
-            this._previousActiveCell !== undefined) {
-            this._removeToolbar(this._previousActiveCell.model);
-        }
+        activeCell.model.metadataChanged.connect(this._onMetadataChanged, this);
         this._addToolbar(activeCell.model);
         this._previousActiveCell = activeCell;
-        this._updateCellForToolbarOverlap(activeCell);
     }
     get isDisposed() {
         return this._isDisposed;
@@ -92,46 +93,45 @@ export class CellToolbarTracker {
             return;
         }
         this._isDisposed = true;
-        if (this._settings) {
-            this._settings.changed.disconnect(this._onSettingsChanged, this);
-        }
+        this._toolbar.changed.disconnect(this._onToolbarChanged, this);
         const cells = (_a = this._panel) === null || _a === void 0 ? void 0 : _a.context.model.cells;
         if (cells) {
-            cells.changed.disconnect(this.updateConnectedCells, this);
-            each(cells.iter(), model => this._removeToolbar(model));
+            for (const model of cells) {
+                this._removeToolbar(model);
+            }
         }
         this._panel = null;
-    }
-    /**
-     * Callback to react to cells list changes
-     *
-     * @param cells List of notebook cells
-     * @param changed Modification of the list
-     */
-    updateConnectedCells(cells, changed) {
-        var _a;
-        const activeCell = (_a = this._panel) === null || _a === void 0 ? void 0 : _a.content.activeCell;
-        if (activeCell === null || activeCell === undefined) {
-            return;
-        }
-        if (changed.oldValues.find(m => m === activeCell.model)) {
-            this._removeToolbar(activeCell.model);
-            this._addToolbar(activeCell.model);
-        }
+        Signal.clearData(this);
     }
     _addToolbar(model) {
-        var _a, _b;
         const cell = this._getCell(model);
         if (cell) {
-            const { leftMenu } = (_b = (_a = this._settings) === null || _a === void 0 ? void 0 : _a.composite) !== null && _b !== void 0 ? _b : {};
-            const leftMenu_ = leftMenu === null ? [] : leftMenu !== null && leftMenu !== void 0 ? leftMenu : DEFAULT_LEFT_MENU;
-            const toolbar = new CellToolbarWidget(this._commands, leftMenu_);
-            toolbar.addClass(CELL_BAR_CLASS);
-            cell.layout.insertWidget(0, toolbar);
-            // For rendered markdown, watch for resize events.
-            cell.displayChanged.connect(this._resizeEventCallback, this);
-            // Watch for changes in the cell's contents.
-            cell.model.contentChanged.connect(this._changedEventCallback, this);
+            const toolbarWidget = new Toolbar();
+            toolbarWidget.addClass(CELL_MENU_CLASS);
+            const promises = [];
+            for (const { name, widget } of this._toolbar) {
+                toolbarWidget.addItem(name, widget);
+                if (widget instanceof ReactWidget &&
+                    widget.renderPromise !== undefined) {
+                    widget.update();
+                    promises.push(widget.renderPromise);
+                }
+            }
+            // Wait for all the buttons to be rendered before attaching the toolbar.
+            Promise.all(promises)
+                .then(() => {
+                toolbarWidget.addClass(CELL_TOOLBAR_CLASS);
+                cell.layout.insertWidget(0, toolbarWidget);
+                // For rendered markdown, watch for resize events.
+                cell.displayChanged.connect(this._resizeEventCallback, this);
+                // Watch for changes in the cell's contents.
+                cell.model.contentChanged.connect(this._changedEventCallback, this);
+                // Hide the cell toolbar if it overlaps with cell contents
+                this._updateCellForToolbarOverlap(cell);
+            })
+                .catch(e => {
+                console.error('Error rendering buttons of the cell toolbar: ', e);
+            });
         }
     }
     _getCell(model) {
@@ -141,21 +141,23 @@ export class CellToolbarTracker {
     _findToolbarWidgets(cell) {
         const widgets = cell.layout.widgets;
         // Search for header using the CSS class or use the first one if not found.
-        return widgets.filter(widget => widget.hasClass(CELL_BAR_CLASS)) || [];
+        return widgets.filter(widget => widget.hasClass(CELL_TOOLBAR_CLASS)) || [];
     }
     _removeToolbar(model) {
         const cell = this._getCell(model);
         if (cell) {
-            this._findToolbarWidgets(cell).forEach(widget => widget.dispose());
+            this._findToolbarWidgets(cell).forEach(widget => {
+                widget.dispose();
+            });
             // Attempt to remove the resize and changed event handlers.
             cell.displayChanged.disconnect(this._resizeEventCallback, this);
-            cell.model.contentChanged.disconnect(this._changedEventCallback, this);
         }
+        model.contentChanged.disconnect(this._changedEventCallback, this);
     }
     /**
      * Call back on settings changes
      */
-    _onSettingsChanged() {
+    _onToolbarChanged() {
         var _a;
         // Reset toolbar when settings changes
         const activeCell = (_a = this._panel) === null || _a === void 0 ? void 0 : _a.content.activeCell;
@@ -191,6 +193,7 @@ export class CellToolbarTracker {
         }
     }
     _cellToolbarOverlapsContents(activeCell) {
+        var _a;
         const cellType = activeCell.model.type;
         // If the toolbar is too large for the current cell, hide it.
         const cellLeft = this._cellEditorWidgetLeft(activeCell);
@@ -208,7 +211,12 @@ export class CellToolbarTracker {
             return this._markdownOverlapsToolbar(activeCell);
         }
         // Check for overlap in code content
-        return this._codeOverlapsToolbar(activeCell);
+        if (((_a = this._panel) === null || _a === void 0 ? void 0 : _a.content.renderingLayout) === 'default') {
+            return this._codeOverlapsToolbar(activeCell);
+        }
+        else {
+            return this._outputOverlapsToolbar(activeCell);
+        }
     }
     /**
      * Check for overlap between rendered Markdown and the cell toolbar
@@ -218,6 +226,9 @@ export class CellToolbarTracker {
      */
     _markdownOverlapsToolbar(activeCell) {
         const markdownOutput = activeCell.inputArea; // Rendered markdown appears in the input area
+        if (!markdownOutput) {
+            return false;
+        }
         // Get the rendered markdown as a widget.
         const markdownOutputWidget = markdownOutput.renderedInput;
         const markdownOutputElement = markdownOutputWidget.node;
@@ -234,47 +245,126 @@ export class CellToolbarTracker {
         const toolbarLeft = this._cellToolbarLeft(activeCell);
         return toolbarLeft === null ? false : lineRight > toolbarLeft;
     }
+    _outputOverlapsToolbar(activeCell) {
+        const outputArea = activeCell.outputArea.node;
+        if (outputArea) {
+            const outputs = outputArea.querySelectorAll('[data-mime-type]');
+            const toolbarRect = this._cellToolbarRect(activeCell);
+            if (toolbarRect) {
+                const { left: toolbarLeft, bottom: toolbarBottom } = toolbarRect;
+                return some(outputs, output => {
+                    const node = output.firstElementChild;
+                    if (node) {
+                        const range = new Range();
+                        if (TEXT_MIME_TYPES.includes(output.getAttribute('data-mime-type') || '')) {
+                            // If the node is plain text, it's in a <pre>. To get the true bounding box of the
+                            // text, the node contents need to be selected.
+                            range.selectNodeContents(node);
+                        }
+                        else {
+                            range.selectNode(node);
+                        }
+                        const { right: nodeRight, top: nodeTop } = range.getBoundingClientRect();
+                        // Note: y-coordinate increases toward the bottom of page
+                        return nodeRight > toolbarLeft && nodeTop < toolbarBottom;
+                    }
+                    return false;
+                });
+            }
+        }
+        return false;
+    }
     _codeOverlapsToolbar(activeCell) {
         const editorWidget = activeCell.editorWidget;
         const editor = activeCell.editor;
+        if (!editorWidget || !editor) {
+            return false;
+        }
         if (editor.lineCount < 1) {
             return false; // Nothing in the editor
         }
-        const codeMirrorLines = editorWidget.node.getElementsByClassName('CodeMirror-line');
+        const codeMirrorLines = editorWidget.node.getElementsByClassName('cm-line');
         if (codeMirrorLines.length < 1) {
             return false; // No lines present
         }
-        const lineRight = codeMirrorLines[0].children[0] // First span under first pre
-            .getBoundingClientRect().right;
+        let lineRight = codeMirrorLines[0].getBoundingClientRect().left;
+        const range = document.createRange();
+        range.selectNodeContents(codeMirrorLines[0]);
+        lineRight += range.getBoundingClientRect().width;
         const toolbarLeft = this._cellToolbarLeft(activeCell);
         return toolbarLeft === null ? false : lineRight > toolbarLeft;
     }
     _cellEditorWidgetLeft(activeCell) {
-        return activeCell.editorWidget.node.getBoundingClientRect().left;
+        var _a, _b;
+        return (_b = (_a = activeCell.editorWidget) === null || _a === void 0 ? void 0 : _a.node.getBoundingClientRect().left) !== null && _b !== void 0 ? _b : 0;
     }
     _cellEditorWidgetRight(activeCell) {
-        return activeCell.editorWidget.node.getBoundingClientRect().right;
+        var _a, _b;
+        return (_b = (_a = activeCell.editorWidget) === null || _a === void 0 ? void 0 : _a.node.getBoundingClientRect().right) !== null && _b !== void 0 ? _b : 0;
     }
-    _cellToolbarLeft(activeCell) {
+    _cellToolbarRect(activeCell) {
         const toolbarWidgets = this._findToolbarWidgets(activeCell);
         if (toolbarWidgets.length < 1) {
             return null;
         }
         const activeCellToolbar = toolbarWidgets[0].node;
-        return activeCellToolbar.getBoundingClientRect().left;
+        return activeCellToolbar.getBoundingClientRect();
+    }
+    _cellToolbarLeft(activeCell) {
+        var _a;
+        return ((_a = this._cellToolbarRect(activeCell)) === null || _a === void 0 ? void 0 : _a.left) || null;
     }
 }
+const defaultToolbarItems = [
+    {
+        command: 'notebook:duplicate-below',
+        name: 'duplicate-cell'
+    },
+    {
+        command: 'notebook:move-cell-up',
+        name: 'move-cell-up'
+    },
+    {
+        command: 'notebook:move-cell-down',
+        name: 'move-cell-down'
+    },
+    {
+        command: 'notebook:insert-cell-above',
+        name: 'insert-cell-above'
+    },
+    {
+        command: 'notebook:insert-cell-below',
+        name: 'insert-cell-below'
+    },
+    {
+        command: 'notebook:delete-cell',
+        name: 'delete-cell'
+    }
+];
 /**
  * Widget extension that creates a CellToolbarTracker each time a notebook is
  * created.
  */
-export class CellBarExtension {
-    constructor(commands, settings) {
+class CellBarExtension {
+    constructor(commands, toolbarFactory) {
         this._commands = commands;
-        this._settings = settings;
+        this._toolbarFactory = toolbarFactory !== null && toolbarFactory !== void 0 ? toolbarFactory : this.defaultToolbarFactory;
+    }
+    get defaultToolbarFactory() {
+        const itemFactory = createDefaultFactory(this._commands);
+        return (widget) => new ObservableList({
+            values: defaultToolbarItems.map(item => {
+                return {
+                    name: item.name,
+                    widget: itemFactory(CellBarExtension.FACTORY_NAME, widget, item)
+                };
+            })
+        });
     }
     createNew(panel) {
-        return new CellToolbarTracker(panel, this._commands, this._settings);
+        return new CellToolbarTracker(panel, this._toolbarFactory(panel));
     }
 }
+CellBarExtension.FACTORY_NAME = 'Cell';
+export { CellBarExtension };
 //# sourceMappingURL=celltoolbartracker.js.map

package/lib/celltoolbartracker.js.map

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

package/lib/index.d.ts

@@ -2,5 +2,4 @@
  * @packageDocumentation
  * @module cell-toolbar
  */
-export { CellMenu } from './cellmenu';
-export { CellBarExtension } from './celltoolbartracker';
+export * from './celltoolbartracker';

package/lib/index.js

@@ -6,6 +6,5 @@
  * @packageDocumentation
  * @module cell-toolbar
  */
-export { CellMenu } from './cellmenu';
-export { CellBarExtension } from './celltoolbartracker';
+export * from './celltoolbartracker';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAC/E;;;GAGG;AACF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAC/E;;;GAGG;AACH,cAAc,sBAAsB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/cell-toolbar",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-beta.0",
   "description": "Contextual cell toolbar adapted from jlab-enhanced-cell-toolbar",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -26,11 +26,11 @@
     "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
     "schema/*.json",
     "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}",
-    "style/index.js"
+    "style/index.js",
+    "src/**/*.{ts,tsx}"
   ],
   "scripts": {
     "build": "tsc -b",
-    "build:all": "npm run build",
     "build:test": "tsc --build tsconfig.test.json",
     "clean": "rimraf lib && rimraf tsconfig.tsbuildinfo",
     "test": "jest",
@@ -40,26 +40,25 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/apputils": "^4.0.0-alpha.6",
-    "@jupyterlab/cells": "^4.0.0-alpha.6",
-    "@jupyterlab/docregistry": "^4.0.0-alpha.6",
-    "@jupyterlab/notebook": "^4.0.0-alpha.6",
-    "@jupyterlab/observables": "^5.0.0-alpha.6",
-    "@jupyterlab/settingregistry": "^4.0.0-alpha.6",
-    "@jupyterlab/ui-components": "^4.0.0-alpha.21",
-    "@lumino/algorithm": "^1.9.1",
-    "@lumino/commands": "^1.20.0",
-    "@lumino/disposable": "^1.10.1",
-    "@lumino/widgets": "^1.31.1",
-    "react": "^17.0.1"
+    "@jupyter/ydoc": "^0.3.4",
+    "@jupyterlab/apputils": "^4.0.0-beta.0",
+    "@jupyterlab/cells": "^4.0.0-beta.0",
+    "@jupyterlab/docregistry": "^4.0.0-beta.0",
+    "@jupyterlab/notebook": "^4.0.0-beta.0",
+    "@jupyterlab/observables": "^5.0.0-beta.0",
+    "@jupyterlab/ui-components": "^4.0.0-beta.0",
+    "@lumino/algorithm": "^2.0.0",
+    "@lumino/commands": "^2.0.0",
+    "@lumino/disposable": "^2.0.0",
+    "@lumino/signaling": "^2.0.0",
+    "@lumino/widgets": "^2.0.0"
   },
   "devDependencies": {
-    "@jupyterlab/testutils": "^4.0.0-alpha.6",
-    "@types/jest": "^26.0.10",
-    "jest": "^26.4.2",
+    "@jupyterlab/testing": "^4.0.0-beta.0",
+    "@types/jest": "^29.2.0",
+    "jest": "^29.2.0",
     "rimraf": "~3.0.0",
-    "ts-jest": "^26.3.0",
-    "typescript": "~4.5.2"
+    "typescript": "~5.0.2"
   },
   "publishConfig": {
     "access": "public"