@datalayer/jupyter-react 0.20.0 → 0.20.2

package/lib/utils/cursorExtension.js

@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2021-2023 Datalayer, Inc.
+ *
+ * MIT License
+ */
+// Display remote peer cursors
+//
+// This is a slightly modified version of https://github.com/jupyterlab/jupyter-collaboration/blob/main/packages/collaboration/src/cursors.ts
+// licenced under Copyright (c) Jupyter Development Team and distributed under the terms of the Modified BSD License.
+import { Annotation, EditorSelection, Facet, StateField, } from '@codemirror/state';
+import { EditorView, layer, RectangleMarker, showTooltip, tooltips, ViewPlugin } from '@codemirror/view';
+import { JSONExt } from '@lumino/coreutils';
+import { createAbsolutePositionFromRelativePosition, createRelativePositionFromJSON, createRelativePositionFromTypeIndex, } from 'yjs';
+/**
+ * Facet storing the Yjs document objects
+ */
+const editorAwarenessFacet = Facet.define({
+    combine(configs) {
+        return configs[configs.length - 1];
+    },
+});
+/**
+ * Remote selection theme
+ */
+const remoteSelectionTheme = EditorView.baseTheme({
+    '.jp-remote-cursor': {
+        borderLeft: '1px solid black',
+        marginLeft: '-1px',
+    },
+    '.jp-remote-cursor.jp-mod-primary': {
+        borderLeftWidth: '2px',
+    },
+    '.jp-remote-selection': {
+        opacity: 0.5,
+    },
+    '.cm-tooltip': {
+        border: 'none',
+    },
+    '.cm-tooltip.jp-remote-userInfo': {
+        color: 'var(--jp-ui-inverse-font-color0)',
+        padding: '0px 2px',
+    },
+});
+// TODO fix which user needs update
+const remoteSelectionsAnnotation = Annotation.define();
+/**
+ * Wrapper around RectangleMarker to be able to set the user color for the remote cursor and selection ranges.
+ */
+class RemoteMarker {
+    style;
+    marker;
+    /**
+     * Constructor
+     *
+     * @param style Specific user style to be applied on the marker element
+     * @param marker {@link RectangleMarker} to wrap
+     */
+    constructor(style, marker) {
+        this.style = style;
+        this.marker = marker;
+    }
+    draw() {
+        const elt = this.marker.draw();
+        for (const [key, value] of Object.entries(this.style)) {
+            // @ts-expect-error Unknown key
+            elt.style[key] = value;
+        }
+        return elt;
+    }
+    eq(other) {
+        return (this.marker.eq(other.marker) && JSONExt.deepEqual(this.style, other.style));
+    }
+    update(dom, oldMarker) {
+        for (const [key, value] of Object.entries(this.style)) {
+            // @ts-expect-error Unknown key
+            dom.style[key] = value;
+        }
+        return this.marker.update(dom, oldMarker.marker);
+    }
+}
+/**
+ * Extension defining a new editor layer storing the remote user cursors
+ */
+const remoteCursorsLayer = layer({
+    above: true,
+    markers(view) {
+        const { awareness, ytext } = view.state.facet(editorAwarenessFacet);
+        const ydoc = ytext.doc;
+        const cursors = [];
+        awareness.getStates().forEach((state, clientID) => {
+            if (clientID === awareness.doc.clientID) {
+                return;
+            }
+            const cursors_ = state.cursors;
+            for (const cursor of cursors_ ?? []) {
+                if (!cursor?.anchor || !cursor?.head) {
+                    return;
+                }
+                const anchor = createAbsolutePositionFromRelativePosition(cursor.anchor, ydoc);
+                const head = createAbsolutePositionFromRelativePosition(cursor.head, ydoc);
+                if (anchor?.type !== ytext || head?.type !== ytext) {
+                    return;
+                }
+                const className = cursor.primary ?? true
+                    ? 'jp-remote-cursor jp-mod-primary'
+                    : 'jp-remote-cursor';
+                const cursor_ = EditorSelection.cursor(head.index, head.index > anchor.index ? -1 : 1);
+                for (const piece of RectangleMarker.forRange(view, className, cursor_)) {
+                    // Wrap the rectangle marker to set the user color
+                    cursors.push(new RemoteMarker({ borderLeftColor: state.user?.color ?? 'black' }, piece));
+                }
+            }
+        });
+        return cursors;
+    },
+    update(update, layer) {
+        return !!update.transactions.find(t => t.annotation(remoteSelectionsAnnotation));
+    },
+    class: 'jp-remote-cursors',
+});
+/**
+ * Tooltip extension to display user display name at cursor position
+ */
+function getCursorTooltips(state) {
+    const tooltips = new Array();
+    const { awareness, ytext } = state.facet(editorAwarenessFacet);
+    const ydoc = ytext.doc;
+    for (const [clientID, state] of awareness.getStates()) {
+        if (clientID === awareness.doc.clientID) {
+            continue;
+        }
+        for (const cursor of state.cursors ?? []) {
+            if (!cursor?.head) {
+                continue;
+            }
+            const head = createAbsolutePositionFromRelativePosition(cursor.head, ydoc);
+            if (head?.type !== ytext) {
+                continue;
+            }
+            tooltips.push({
+                pos: head.index,
+                above: true,
+                create: () => {
+                    const dom = document.createElement('div');
+                    dom.classList.add('jp-remote-userInfo');
+                    dom.style.backgroundColor = state.user?.color ?? 'darkgrey';
+                    dom.textContent =
+                        state.user?.display_name ?? 'Anonymous';
+                    return { dom };
+                },
+            });
+        }
+    }
+    return tooltips;
+}
+const remoteCursorTooltipField = StateField.define({
+    create: getCursorTooltips,
+    update(tooltips, tr) {
+        if (!tr.annotation(remoteSelectionsAnnotation))
+            return tooltips;
+        return getCursorTooltips(tr.state);
+    },
+    provide(field) {
+        return showTooltip.computeN([field], state => state.field(field));
+    },
+});
+/**
+ * Extension defining a new editor layer storing the remote selections
+ */
+const remoteSelectionLayer = layer({
+    above: false,
+    markers(view) {
+        const { awareness, ytext } = view.state.facet(editorAwarenessFacet);
+        const ydoc = ytext.doc;
+        const cursors = [];
+        awareness.getStates().forEach((state, clientID) => {
+            if (clientID === awareness.doc.clientID) {
+                return;
+            }
+            const cursors_ = state.cursors;
+            for (const cursor of cursors_ ?? []) {
+                if ((cursor.empty ?? true) || !cursor?.anchor || !cursor?.head) {
+                    return;
+                }
+                const anchor = createAbsolutePositionFromRelativePosition(cursor.anchor, ydoc);
+                const head = createAbsolutePositionFromRelativePosition(cursor.head, ydoc);
+                if (anchor?.type !== ytext || head?.type !== ytext) {
+                    return;
+                }
+                const className = 'jp-remote-selection';
+                for (const piece of RectangleMarker.forRange(view, className, EditorSelection.range(anchor.index, head.index))) {
+                    // Wrap the rectangle marker to set the user color
+                    cursors.push(new RemoteMarker({ backgroundColor: state.user?.color ?? 'black' }, piece));
+                }
+            }
+        });
+        return cursors;
+    },
+    update(update, layer) {
+        return !!update.transactions.find(t => t.annotation(remoteSelectionsAnnotation));
+    },
+    class: 'jp-remote-selections',
+});
+/**
+ * CodeMirror extension exchanging and displaying remote user selection ranges (including cursors)
+ */
+const showCollaborators = ViewPlugin.fromClass(class {
+    editorAwareness;
+    _listener;
+    constructor(view) {
+        this.editorAwareness = view.state.facet(editorAwarenessFacet);
+        this._listener = ({ added, updated, removed }) => {
+            const clients = added.concat(updated).concat(removed);
+            if (clients.findIndex(id => id !== this.editorAwareness.awareness.doc.clientID) >= 0) {
+                // Trick to get the remoteCursorLayers to be updated
+                view.dispatch({ annotations: [remoteSelectionsAnnotation.of([])] });
+            }
+        };
+        this.editorAwareness.awareness.on('change', this._listener);
+    }
+    destroy() {
+        this.editorAwareness.awareness.off('change', this._listener);
+    }
+    /**
+     * Communicate the current user cursor position to all remotes
+     */
+    update(update) {
+        if (!update.docChanged && !update.selectionSet) {
+            return;
+        }
+        const { awareness, ytext } = this.editorAwareness;
+        const localAwarenessState = awareness.getLocalState();
+        // set local awareness state (update cursors)
+        if (localAwarenessState) {
+            const hasFocus = update.view.hasFocus && update.view.dom.ownerDocument.hasFocus();
+            const selection = update.state.selection;
+            const cursors = new Array();
+            if (hasFocus && selection) {
+                for (const r of selection.ranges) {
+                    const primary = r === selection.main;
+                    const anchor = createRelativePositionFromTypeIndex(ytext, r.anchor);
+                    const head = createRelativePositionFromTypeIndex(ytext, r.head);
+                    cursors.push({
+                        anchor,
+                        head,
+                        primary,
+                        empty: r.empty,
+                    });
+                }
+                if (!localAwarenessState.cursors || cursors.length > 0) {
+                    const oldCursors = localAwarenessState.cursors?.map(cursor => {
+                        return {
+                            ...cursor,
+                            anchor: cursor?.anchor
+                                ? createRelativePositionFromJSON(cursor.anchor)
+                                : null,
+                            head: cursor?.head
+                                ? createRelativePositionFromJSON(cursor.head)
+                                : null,
+                        };
+                    });
+                    if (!JSONExt.deepEqual(cursors, oldCursors)) {
+                        // Update cursors
+                        awareness.setLocalStateField('cursors', cursors);
+                    }
+                }
+            }
+        }
+    }
+}, {
+    provide: () => {
+        return [
+            remoteSelectionTheme,
+            remoteCursorsLayer,
+            remoteSelectionLayer,
+            remoteCursorTooltipField,
+            // As we use relative positioning of widget, the tooltip must be positioned absolutely
+            // And we attach the tooltip to the body to avoid overflow rules
+            tooltips({ position: 'absolute', parent: document.body }),
+        ];
+    },
+});
+/**
+ * CodeMirror extension to display remote users cursors
+ *
+ * @param config Editor source and awareness
+ * @returns CodeMirror extension
+ */
+export function remoteUserCursors(config) {
+    return [editorAwarenessFacet.of(config), showCollaborators];
+}
+//# sourceMappingURL=cursorExtension.js.map

package/lib/utils/cursorExtension.js.map

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

package/lib/utils/index.d.ts

@@ -1 +1,2 @@
+export * from './cursorExtension';
 export * from './Utils';

package/lib/utils/index.js

@@ -3,5 +3,6 @@
  *
  * MIT License
  */
+export * from './cursorExtension';
 export * from './Utils';
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalayer/jupyter-react",
-  "version": "0.20.0",
+  "version": "0.20.2",
   "description": "Jupyter React - React.js components 100% compatible with Jupyter.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -12,7 +12,6 @@
   "keywords": [
     "jupyter",
     "jupyterlab",
-    "jupyterlab-extension",
     "react"
   ],
   "repository": {
@@ -20,57 +19,60 @@
     "url": "https://github.com/datalayer/jupyter-ui.git",
     "directory": "packages/react"
   },
-  "packageManager": "yarn@3.5.0",
+  "sideEffects": [
+    "style/*.css",
+    "src/**/*.css",
+    "style/index.js"
+  ],
+  "styleModule": "style/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
-    "build": "gulp resources-to-lib && tsc && webpack && (yarn build:labextension:dev || true)",
-    "build:labextension": "jupyter labextension build .",
-    "build:labextension:dev": "jupyter labextension build --development True .",
+    "build": "gulp resources-to-lib && tsc && webpack",
     "build:lib": "tsc",
-    "build:prod": "gulp resources-to-lib && tsc && yarn clean && yarn build:lib && yarn build:labextension",
+    "build:prod": "gulp resources-to-lib && tsc && npm run clean && npm run build:lib",
     "build:tsc:watch:res": "gulp resources-to-lib-watch",
     "build:tsc:watch:tsc": "tsc --watch",
     "build:webpack": "cross-env BUILD_APP=true webpack-cli build",
     "clean": "rimraf node_modules lib dist build tsconfig.tsbuildinfo",
-    "clean:all": "yarn clean:lib && yarn clean:labextension && yarn clean:lintcache",
+    "clean:all": "npm run clean:lib && npm run clean:labextension && npm run clean:lintcache",
     "clean:labextension": "rimraf datalayer/labextension",
     "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
     "clean:lintcache": "rimraf .eslintcache .stylelintcache",
-    "eslint": "yarn eslint:check --fix",
+    "eslint": "npm eslint:check --fix",
     "eslint:check": "eslint . --cache --ext .ts,.tsx",
-    "install:extension": "yarn build",
-    "jupyterlab": "run-p -c 'jupyterlab:*'",
-    "jupyterlab:start": "jupyter lab --watch --config=./../../dev/config/jupyter_server_config.py",
-    "jupyterlab:watch": "run-p -c watch:src watch:labextension",
+    "install:extension": "npm run build",
     "kill": "./../../dev/sh/kill.sh || true",
-    "lint": "yarn stylelint && yarn prettier && yarn eslint",
-    "lint:check": "yarn stylelint:check && yarn prettier:check && yarn eslint:check",
-    "prettier": "yarn prettier:base --write --list-different",
+    "lint": "npm stylelint && npm prettier && npm eslint",
+    "lint:check": "npm stylelint:check && npm prettier:check && npm eslint:check",
+    "prettier": "npm prettier:base --write --list-different",
     "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
-    "prettier:check": "yarn prettier:base --check",
+    "prettier:check": "npm prettier:base --check",
     "start": "run-p -c 'start:*'",
     "start:webpack": "webpack serve",
     "start-noconfig": "cross-env NO_CONFIG=true webpack serve",
     "start-local": "run-p -c 'start-local:*'",
     "start-local:webpack": "cross-env LOCAL_JUPYTER_SERVER=true webpack serve",
     "start-local:jupyter-server": "cd ./../.. && make start-jupyter-server",
-    "stylelint": "yarn stylelint:check --fix",
+    "stylelint": "npm stylelint:check --fix",
     "stylelint:check": "stylelint --cache \"style/**/*.css\"",
     "test": "jest --coverage",
     "test:visual": "playwright test",
     "typedoc": "typedoc ./src",
-    "watch": "run-p watch:src watch:labextension",
-    "watch:labextension": "jupyter labextension watch .",
+    "watch": "run-p watch:src",
     "watch:src": "tsc -w"
   },
   "dependencies": {
     "@codemirror/lang-python": "^6.0.1",
+    "@codemirror/state": "^6.2.0",
+    "@codemirror/view": "^6.7.0",
     "@datalayer/primer-addons": "^0.3.2",
     "@jupyter-widgets/base": "^6.0.0",
     "@jupyter-widgets/controls": "^5.0.0",
     "@jupyter-widgets/html-manager": "^1.0.0",
     "@jupyter-widgets/jupyterlab-manager": "^5.0.0",
     "@jupyter-widgets/output": "^6.0.0",
-    "@jupyter/collaboration": "^3.1.0",
     "@jupyter/web-components": "^0.15.3",
     "@jupyter/ydoc": "3.0.2",
     "@jupyterlab/application": "^4.0.0",
@@ -141,7 +143,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^3.1.3",
-    "react-inspector": "^5.1.1",
+    "react-inspector": "^6.0.2",
     "react-sparklines": "^1.7.0",
     "rxjs": "^6.6.0",
     "styled-components": "^5.3.10",
@@ -149,7 +151,9 @@
     "usehooks-ts": "^2.9.1",
     "utf-8-validate": "^6.0.3",
     "wildcard-match": "^5.1.2",
+    "y-protocols": "^1.0.5",
     "y-websocket": "^2.1.0",
+    "yjs": "^13.5.40",
     "zustand": "^4.4.1"
   },
   "devDependencies": {
@@ -176,7 +180,6 @@
     "@types/plotly.js": "^2.12.31",
     "@types/react": "^18.2.12",
     "@types/react-dom": "^18.2.5",
-    "@types/react-inspector": "^4.0.2",
     "@types/react-sparklines": "^1.7.5",
     "@types/semver": "^7.5.6",
     "@types/styled-components": "^5.1.26",
@@ -203,7 +206,7 @@
     "mermaid": "^10.9.0",
     "mkdirp": "^1.0.3",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.0.0",
+    "prettier": "3.3.2",
     "process": "^0.11.10",
     "rimraf": "^3.0.2",
     "source-map-loader": "^5.0.0",
@@ -216,10 +219,10 @@
     "stylelint-csstree-validator": "^3.0.0",
     "stylelint-prettier": "^4.0.0",
     "svg-url-loader": "^7.1.1",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "29.0.5",
     "ts-loader": "^9.4.3",
     "typedoc": "^0.25.7",
-    "typescript": "~5.0.3",
+    "typescript": "^5.0.3",
     "url-loader": "^3.0.0",
     "watch": "^1.0.2",
     "webpack": "^5.74.0",
@@ -227,55 +230,6 @@
     "webpack-dev-server": "^4.9.3",
     "whatwg-fetch": "^3.6.2"
   },
-  "sideEffects": [
-    "style/*.css",
-    "src/**/*.css",
-    "style/index.js"
-  ],
-  "styleModule": "style/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "jupyterlab": {
-    "disabledExtensions": [
-      "@jupyterlab/notebook-extension:factory"
-    ],
-    "discovery": {
-      "server": {
-        "managers": [
-          "pip"
-        ],
-        "base": {
-          "name": "jupyter_react"
-        }
-      }
-    },
-    "extension": "./lib/jupyter/lab/plugin.js",
-    "outputDir": "jupyter_react/labextension",
-    "schemaDir": "schema",
-    "sharedPackages": {
-      "react": {
-        "bundled": false,
-        "singleton": true
-      },
-      "react-dom": {
-        "bundled": false,
-        "singleton": true
-      }
-    },
-    "webpackConfig": "./webpack.lab-config.js"
-  },
-  "jupyter-releaser": {
-    "hooks": {
-      "before-build-npm": [
-        "python -m pip install jupyterlab==4.1.0b0",
-        "yarn"
-      ],
-      "before-build-python": [
-        "yarn clean:all"
-      ]
-    }
-  },
   "eslintIgnore": [
     "node_modules",
     "dist",

package/lib/jupyter/lab/__tests__/datalayer.spec.js

@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2021-2023 Datalayer, Inc.
- *
- * MIT License
- */
-describe('@datalayer/jupyter-react', () => {
-    it('should be tested', () => {
-        expect(1 + 1).toEqual(2);
-    });
-});
-//# sourceMappingURL=datalayer.spec.js.map

package/lib/jupyter/lab/__tests__/datalayer.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"datalayer.spec.js","sourceRoot":"","sources":["../../../../src/jupyter/lab/__tests__/datalayer.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC1B,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/jupyter/lab/index.d.ts

@@ -1 +0,0 @@
-export * from './widget';

package/lib/jupyter/lab/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/jupyter/lab/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,UAAU,CAAC"}

package/lib/jupyter/lab/notebook/content/CountdownContentFactory.d.ts

@@ -1,6 +0,0 @@
-import { NotebookPanel } from '@jupyterlab/notebook';
-import { Cell } from '@jupyterlab/cells';
-export declare class CountdownPromptContentFactory extends NotebookPanel.ContentFactory {
-    constructor(options: Cell.ContentFactory.IOptions);
-}
-export default CountdownPromptContentFactory;

package/lib/jupyter/lab/notebook/content/CountdownContentFactory.js

@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2021-2023 Datalayer, Inc.
- *
- * MIT License
- */
-import { NotebookPanel } from '@jupyterlab/notebook';
-// import { IInputPrompt } from '@jupyterlab/cells';
-// import { IOutputPrompt } from '@jupyterlab/outputarea';
-// import CountdownInputPrompt from '../../../../components/notebook/cell/prompt/CountdownInputPrompt';
-// import CountdownOutputPrompt from '../../../../components/notebook/cell/prompt/CountdownOutputPrompt';
-export class CountdownPromptContentFactory extends NotebookPanel.ContentFactory {
-    constructor(options) {
-        super(options);
-    }
-}
-export default CountdownPromptContentFactory;
-//# sourceMappingURL=CountdownContentFactory.js.map

package/lib/jupyter/lab/notebook/content/CountdownContentFactory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CountdownContentFactory.js","sourceRoot":"","sources":["../../../../../src/jupyter/lab/notebook/content/CountdownContentFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,oDAAoD;AACpD,0DAA0D;AAC1D,uGAAuG;AACvG,yGAAyG;AAEzG,MAAM,OAAO,6BAA8B,SAAQ,aAAa,CAAC,cAAc;IAC7E,YAAY,OAAqC;QAC/C,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;CAaF;AAED,eAAe,6BAA6B,CAAC"}

package/lib/jupyter/lab/notebook/content/index.js

@@ -1,6 +0,0 @@
-/*
- * Copyright (c) 2021-2023 Datalayer, Inc.
- *
- * MIT License
- */
-//# sourceMappingURL=index.js.map

package/lib/jupyter/lab/notebook/content/index.js.map

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

package/lib/jupyter/lab/notebook/content/plugin.d.ts

@@ -1,7 +0,0 @@
-import { JupyterFrontEndPlugin } from '@jupyterlab/application';
-import { NotebookPanel } from '@jupyterlab/notebook';
-/**
- * The notebook cell factory provider.
- */
-export declare const contentFactoryPlugin: JupyterFrontEndPlugin<NotebookPanel.IContentFactory>;
-export default contentFactoryPlugin;

package/lib/jupyter/lab/notebook/content/plugin.js

@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2021-2023 Datalayer, Inc.
- *
- * MIT License
- */
-import { NotebookPanel } from '@jupyterlab/notebook';
-import { IEditorServices } from '@jupyterlab/codeeditor';
-import { CountdownPromptContentFactory } from './CountdownContentFactory';
-/**
- * The notebook cell factory provider.
- */
-export const contentFactoryPlugin = {
-    id: '@datalayer/jupyter-react:notebook-content-factory',
-    description: 'Provides the notebook cell factory.',
-    provides: NotebookPanel.IContentFactory,
-    requires: [IEditorServices],
-    autoStart: true,
-    activate: (app, editorServices) => {
-        const editorFactory = editorServices.factoryService.newInlineEditor;
-        return new CountdownPromptContentFactory({ editorFactory });
-    },
-};
-export default contentFactoryPlugin;
-//# sourceMappingURL=plugin.js.map

package/lib/jupyter/lab/notebook/content/plugin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../src/jupyter/lab/notebook/content/plugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE1E;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAC/B;IACE,EAAE,EAAE,mDAAmD;IACvD,WAAW,EAAE,qCAAqC;IAClD,QAAQ,EAAE,aAAa,CAAC,eAAe;IACvC,QAAQ,EAAE,CAAC,eAAe,CAAC;IAC3B,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,CAAC,GAAoB,EAAE,cAA+B,EAAE,EAAE;QAClE,MAAM,aAAa,GAAG,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC;QACpE,OAAO,IAAI,6BAA6B,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC;IAC9D,CAAC;CACF,CAAC;AAEJ,eAAe,oBAAoB,CAAC"}