@datalayer/jupyter-react 0.11.0 → 0.13.0
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.
- package/lib/components/cell/Cell.d.ts +9 -1
- package/lib/components/cell/Cell.js +53 -16
- package/lib/components/cell/Cell.js.map +1 -1
- package/lib/components/cell/CellAdapter.d.ts +9 -3
- package/lib/components/cell/CellAdapter.js +75 -37
- package/lib/components/cell/CellAdapter.js.map +1 -1
- package/lib/components/cell/CellCommands.d.ts +2 -2
- package/lib/components/cell/CellCommands.js +10 -3
- package/lib/components/cell/CellCommands.js.map +1 -1
- package/lib/components/codemirror/CodeMirrorEditor.js +6 -6
- package/lib/components/codemirror/CodeMirrorEditor.js.map +1 -1
- package/lib/components/output/Output.js +3 -2
- package/lib/components/output/Output.js.map +1 -1
- package/lib/components/output/OutputState.d.ts +11 -9
- package/lib/components/output/OutputState.js +23 -24
- package/lib/components/output/OutputState.js.map +1 -1
- package/lib/examples/Cell.js +1 -0
- package/lib/examples/Cell.js.map +1 -1
- package/lib/examples/Output.js +22 -4
- package/lib/examples/Output.js.map +1 -1
- package/package.json +3 -19
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
export type ICellProps = {
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
3
|
+
* Cell type
|
|
4
|
+
*/
|
|
5
|
+
type: 'code' | 'markdown' | 'raw';
|
|
6
|
+
/**
|
|
7
|
+
* Cell source
|
|
4
8
|
*/
|
|
5
9
|
source?: string;
|
|
6
10
|
/**
|
|
7
11
|
* Whether to execute directly the code cell or not.
|
|
8
12
|
*/
|
|
9
13
|
autoStart?: boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Whether to show the toolbar for cell or not
|
|
16
|
+
*/
|
|
17
|
+
showToolbar?: boolean;
|
|
10
18
|
};
|
|
11
19
|
export declare const Cell: {
|
|
12
20
|
(props: ICellProps): import("react/jsx-runtime").JSX.Element;
|
|
@@ -5,42 +5,74 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
5
5
|
* MIT License
|
|
6
6
|
*/
|
|
7
7
|
import { useState, useEffect } from 'react';
|
|
8
|
-
import { CodeCell } from '@jupyterlab/cells';
|
|
8
|
+
import { CodeCell, MarkdownCell } from '@jupyterlab/cells';
|
|
9
9
|
import { Box } from '@primer/react';
|
|
10
10
|
import CellAdapter from './CellAdapter';
|
|
11
11
|
import Lumino from '../lumino/Lumino';
|
|
12
12
|
import { useJupyter } from './../../jupyter/JupyterContext';
|
|
13
13
|
import useCellStore from './CellState';
|
|
14
14
|
export const Cell = (props) => {
|
|
15
|
-
const { source = '', autoStart } = props;
|
|
15
|
+
const { type = 'code', source = '', autoStart, showToolbar = true } = props;
|
|
16
16
|
const { serverSettings, defaultKernel } = useJupyter();
|
|
17
17
|
const cellStore = useCellStore();
|
|
18
18
|
const [adapter, setAdapter] = useState();
|
|
19
|
+
const handleCellInitEvents = (adapter) => {
|
|
20
|
+
adapter.cell.model.contentChanged.connect((cellModel, changedArgs) => {
|
|
21
|
+
cellStore.setSource(cellModel.sharedModel.getSource());
|
|
22
|
+
});
|
|
23
|
+
if (adapter.cell instanceof CodeCell) {
|
|
24
|
+
adapter.cell.outputArea.outputLengthChanged?.connect((outputArea, outputsCount) => {
|
|
25
|
+
cellStore.setOutputsCount(outputsCount);
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
adapter.sessionContext.initialize().then(() => {
|
|
29
|
+
if (!autoStart) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
// Perform auto-start for code or markdown cells
|
|
33
|
+
if (adapter.cell instanceof CodeCell) {
|
|
34
|
+
const execute = CodeCell.execute(adapter.cell, adapter.sessionContext);
|
|
35
|
+
execute.then((msg) => {
|
|
36
|
+
cellStore.setKernelAvailable(true);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
if (adapter.cell instanceof MarkdownCell) {
|
|
40
|
+
adapter.cell.rendered = true;
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
};
|
|
19
44
|
useEffect(() => {
|
|
20
45
|
if (defaultKernel && serverSettings) {
|
|
21
46
|
defaultKernel.ready.then(() => {
|
|
22
47
|
const adapter = new CellAdapter({
|
|
48
|
+
type,
|
|
23
49
|
source,
|
|
24
50
|
serverSettings,
|
|
25
51
|
kernel: defaultKernel,
|
|
52
|
+
boxOptions: { showToolbar }
|
|
26
53
|
});
|
|
27
54
|
cellStore.setAdapter(adapter);
|
|
28
55
|
cellStore.setSource(source);
|
|
29
|
-
adapter
|
|
30
|
-
cellStore.setSource(cellModel.sharedModel.getSource());
|
|
31
|
-
});
|
|
32
|
-
adapter.codeCell.outputArea.outputLengthChanged.connect((outputArea, outputsCount) => {
|
|
33
|
-
cellStore.setOutputsCount(outputsCount);
|
|
34
|
-
});
|
|
35
|
-
adapter.sessionContext.initialize().then(() => {
|
|
36
|
-
if (autoStart) {
|
|
37
|
-
const execute = CodeCell.execute(adapter.codeCell, adapter.sessionContext);
|
|
38
|
-
execute.then((msg) => {
|
|
39
|
-
cellStore.setKernelAvailable(true);
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
});
|
|
56
|
+
handleCellInitEvents(adapter);
|
|
43
57
|
setAdapter(adapter);
|
|
58
|
+
const handleDblClick = (event) => {
|
|
59
|
+
let target = event.target;
|
|
60
|
+
/**
|
|
61
|
+
* Find the DOM searching by the markdown output class (since child elements can be clicked also)
|
|
62
|
+
* If a rendered markdown was found, then back cell to editor mode
|
|
63
|
+
*/
|
|
64
|
+
while (target && !target.classList.contains('jp-MarkdownOutput')) {
|
|
65
|
+
target = target.parentElement;
|
|
66
|
+
}
|
|
67
|
+
if (target && target.classList.contains('jp-MarkdownOutput')) {
|
|
68
|
+
adapter.cell.rendered = false;
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
// Adds the event for double click and the removal on component's destroy
|
|
72
|
+
document.addEventListener('dblclick', handleDblClick);
|
|
73
|
+
return () => {
|
|
74
|
+
document.removeEventListener('dblclick', handleDblClick);
|
|
75
|
+
};
|
|
44
76
|
});
|
|
45
77
|
}
|
|
46
78
|
}, [source, defaultKernel, serverSettings]);
|
|
@@ -63,6 +95,11 @@ export const Cell = (props) => {
|
|
|
63
95
|
height: 'auto !important',
|
|
64
96
|
position: 'relative',
|
|
65
97
|
},
|
|
98
|
+
'& .jp-MarkdownCell': {
|
|
99
|
+
height: 'auto !important',
|
|
100
|
+
minHeight: '65px',
|
|
101
|
+
position: 'relative',
|
|
102
|
+
},
|
|
66
103
|
'& .jp-Cell-outputArea': {
|
|
67
104
|
paddingBottom: '30px',
|
|
68
105
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../../src/components/cell/Cell.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../../src/components/cell/Cell.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,32 @@
|
|
|
1
1
|
import { BoxPanel } from '@lumino/widgets';
|
|
2
2
|
import { SessionContext } from '@jupyterlab/apputils';
|
|
3
|
-
import { CodeCell } from '@jupyterlab/cells';
|
|
3
|
+
import { CodeCell, MarkdownCell, RawCell } from '@jupyterlab/cells';
|
|
4
4
|
import { ServerConnection } from '@jupyterlab/services';
|
|
5
5
|
import Kernel from '../../jupyter/kernel/Kernel';
|
|
6
|
+
interface BoxOptions {
|
|
7
|
+
showToolbar?: boolean;
|
|
8
|
+
}
|
|
6
9
|
export declare class CellAdapter {
|
|
7
|
-
private
|
|
10
|
+
private _cell;
|
|
8
11
|
private _kernel;
|
|
9
12
|
private _panel;
|
|
10
13
|
private _sessionContext;
|
|
14
|
+
private _type;
|
|
11
15
|
constructor(options: CellAdapter.ICellAdapterOptions);
|
|
12
16
|
private setupCell;
|
|
13
17
|
get panel(): BoxPanel;
|
|
14
|
-
get
|
|
18
|
+
get cell(): CodeCell | MarkdownCell | RawCell;
|
|
15
19
|
get sessionContext(): SessionContext;
|
|
16
20
|
get kernel(): Kernel;
|
|
17
21
|
execute: () => void;
|
|
18
22
|
}
|
|
19
23
|
export declare namespace CellAdapter {
|
|
20
24
|
type ICellAdapterOptions = {
|
|
25
|
+
type: 'code' | 'markdown' | 'raw';
|
|
21
26
|
source: string;
|
|
22
27
|
serverSettings: ServerConnection.ISettings;
|
|
23
28
|
kernel: Kernel;
|
|
29
|
+
boxOptions?: BoxOptions;
|
|
24
30
|
};
|
|
25
31
|
}
|
|
26
32
|
export default CellAdapter;
|
|
@@ -7,8 +7,9 @@ import { BoxPanel, Widget } from '@lumino/widgets';
|
|
|
7
7
|
import { find } from '@lumino/algorithm';
|
|
8
8
|
import { CommandRegistry } from '@lumino/commands';
|
|
9
9
|
import { SessionContext, Toolbar, ToolbarButton, } from '@jupyterlab/apputils';
|
|
10
|
-
import { CodeCellModel, CodeCell, Cell } from '@jupyterlab/cells';
|
|
10
|
+
import { CodeCellModel, CodeCell, Cell, MarkdownCell, MarkdownCellModel } from '@jupyterlab/cells';
|
|
11
11
|
import { ybinding, CodeMirrorMimeTypeService, EditorLanguageRegistry, CodeMirrorEditorFactory, EditorExtensionRegistry, EditorThemeRegistry, } from '@jupyterlab/codemirror';
|
|
12
|
+
import { MathJaxTypesetter } from '@jupyterlab/mathjax-extension';
|
|
12
13
|
import { Completer, CompleterModel, CompletionHandler, ProviderReconciliator, KernelCompleterProvider, } from '@jupyterlab/completer';
|
|
13
14
|
import { RenderMimeRegistry, standardRendererFactories as initialFactories, } from '@jupyterlab/rendermime';
|
|
14
15
|
import { SessionManager, KernelManager, KernelSpecManager, } from '@jupyterlab/services';
|
|
@@ -17,18 +18,21 @@ import { createStandaloneCell } from '@jupyter/ydoc';
|
|
|
17
18
|
import { WIDGET_MIMETYPE, WidgetRenderer, } from '@jupyter-widgets/html-manager/lib/output_renderers';
|
|
18
19
|
import { requireLoader as loader } from '../../jupyter/ipywidgets/libembed-amd';
|
|
19
20
|
import ClassicWidgetManager from '../../jupyter/ipywidgets/classic/manager';
|
|
21
|
+
import getMarked from '../notebook/marked/marked';
|
|
20
22
|
import CellCommands from './CellCommands';
|
|
21
23
|
export class CellAdapter {
|
|
22
|
-
|
|
24
|
+
_cell;
|
|
23
25
|
_kernel;
|
|
24
26
|
_panel;
|
|
25
27
|
_sessionContext;
|
|
28
|
+
_type;
|
|
26
29
|
constructor(options) {
|
|
27
|
-
const { source, serverSettings, kernel } = options;
|
|
30
|
+
const { type, source, serverSettings, kernel, boxOptions } = options;
|
|
28
31
|
this._kernel = kernel;
|
|
29
|
-
this.
|
|
32
|
+
this._type = type;
|
|
33
|
+
this.setupCell(type, source, serverSettings, kernel, boxOptions);
|
|
30
34
|
}
|
|
31
|
-
setupCell(source, serverSettings, kernel) {
|
|
35
|
+
setupCell(type = 'code', source, serverSettings, kernel, boxOptions) {
|
|
32
36
|
const kernelManager = kernel.kernelManager ??
|
|
33
37
|
new KernelManager({
|
|
34
38
|
serverSettings,
|
|
@@ -132,7 +136,11 @@ export class CellAdapter {
|
|
|
132
136
|
document.addEventListener('keydown', event => {
|
|
133
137
|
commands.processKeydownEvent(event);
|
|
134
138
|
}, useCapture);
|
|
135
|
-
const rendermime = new RenderMimeRegistry({
|
|
139
|
+
const rendermime = new RenderMimeRegistry({
|
|
140
|
+
initialFactories,
|
|
141
|
+
latexTypesetter: new MathJaxTypesetter(),
|
|
142
|
+
markdownParser: getMarked(languages),
|
|
143
|
+
});
|
|
136
144
|
const iPyWidgetsClassicManager = new ClassicWidgetManager({ loader });
|
|
137
145
|
rendermime.addFactory({
|
|
138
146
|
safe: false,
|
|
@@ -144,21 +152,33 @@ export class CellAdapter {
|
|
|
144
152
|
extensions: editorExtensions(),
|
|
145
153
|
languages,
|
|
146
154
|
});
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
}),
|
|
155
|
-
}),
|
|
156
|
-
contentFactory: new Cell.ContentFactory({
|
|
157
|
-
editorFactory: factoryService.newInlineEditor.bind(factoryService),
|
|
158
|
-
}),
|
|
155
|
+
const cellModel = createStandaloneCell({
|
|
156
|
+
cell_type: type,
|
|
157
|
+
source: source,
|
|
158
|
+
metadata: {},
|
|
159
|
+
});
|
|
160
|
+
const contentFactory = new Cell.ContentFactory({
|
|
161
|
+
editorFactory: factoryService.newInlineEditor.bind(factoryService),
|
|
159
162
|
});
|
|
160
|
-
|
|
161
|
-
|
|
163
|
+
if (type === 'code') {
|
|
164
|
+
this._cell = new CodeCell({
|
|
165
|
+
rendermime,
|
|
166
|
+
model: new CodeCellModel({ sharedModel: cellModel }),
|
|
167
|
+
contentFactory: contentFactory,
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
else if (type === 'markdown') {
|
|
171
|
+
this._cell = new MarkdownCell({
|
|
172
|
+
rendermime,
|
|
173
|
+
model: new MarkdownCellModel({ sharedModel: cellModel }),
|
|
174
|
+
contentFactory: contentFactory,
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
this._cell.addClass('dla-Jupyter-Cell');
|
|
178
|
+
this._cell.initializeState();
|
|
179
|
+
if (this._type === 'markdown') {
|
|
180
|
+
this._cell.rendered = false;
|
|
181
|
+
}
|
|
162
182
|
this._sessionContext.kernelChanged.connect((_, arg) => {
|
|
163
183
|
const kernelConnection = arg.newValue;
|
|
164
184
|
console.log('Current Kernel Connection', kernelConnection);
|
|
@@ -171,19 +191,21 @@ export class CellAdapter {
|
|
|
171
191
|
});
|
|
172
192
|
this._sessionContext.kernelChanged.connect(() => {
|
|
173
193
|
void this._sessionContext.session?.kernel?.info.then(info => {
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
194
|
+
if (this._type === 'code') {
|
|
195
|
+
const lang = info.language_info;
|
|
196
|
+
const mimeType = mimeService.getMimeTypeByLanguage(lang);
|
|
197
|
+
this._cell.model.mimeType = mimeType;
|
|
198
|
+
}
|
|
177
199
|
});
|
|
178
200
|
});
|
|
179
|
-
const editor = this.
|
|
201
|
+
const editor = this._cell.editor;
|
|
180
202
|
const model = new CompleterModel();
|
|
181
203
|
const completer = new Completer({ editor, model });
|
|
182
204
|
const timeout = 1000;
|
|
183
205
|
const provider = new KernelCompleterProvider();
|
|
184
206
|
const reconciliator = new ProviderReconciliator({
|
|
185
207
|
context: {
|
|
186
|
-
widget: this.
|
|
208
|
+
widget: this._cell,
|
|
187
209
|
editor,
|
|
188
210
|
session: this._sessionContext.session,
|
|
189
211
|
},
|
|
@@ -195,7 +217,7 @@ export class CellAdapter {
|
|
|
195
217
|
const provider = new KernelCompleterProvider();
|
|
196
218
|
handler.reconciliator = new ProviderReconciliator({
|
|
197
219
|
context: {
|
|
198
|
-
widget: this.
|
|
220
|
+
widget: this._cell,
|
|
199
221
|
editor,
|
|
200
222
|
session: this._sessionContext.session,
|
|
201
223
|
},
|
|
@@ -204,7 +226,7 @@ export class CellAdapter {
|
|
|
204
226
|
});
|
|
205
227
|
});
|
|
206
228
|
handler.editor = editor;
|
|
207
|
-
CellCommands(commands, this.
|
|
229
|
+
CellCommands(commands, this._cell, this._sessionContext, handler);
|
|
208
230
|
completer.hide();
|
|
209
231
|
completer.addClass('jp-Completer-Cell');
|
|
210
232
|
Widget.attach(completer, document.body);
|
|
@@ -213,7 +235,12 @@ export class CellAdapter {
|
|
|
213
235
|
const runButton = new ToolbarButton({
|
|
214
236
|
icon: runIcon,
|
|
215
237
|
onClick: () => {
|
|
216
|
-
|
|
238
|
+
if (this._type === 'code') {
|
|
239
|
+
CodeCell.execute(this._cell, this._sessionContext);
|
|
240
|
+
}
|
|
241
|
+
else if (this._type === 'markdown') {
|
|
242
|
+
this._cell.rendered = true;
|
|
243
|
+
}
|
|
217
244
|
},
|
|
218
245
|
tooltip: 'Run',
|
|
219
246
|
});
|
|
@@ -222,15 +249,21 @@ export class CellAdapter {
|
|
|
222
249
|
toolbar.addItem('restart', Toolbar.createRestartButton(this._sessionContext));
|
|
223
250
|
// toolbar.addItem('name', Toolbar.createKernelNameItem(this._sessionContext));
|
|
224
251
|
toolbar.addItem('status', Toolbar.createKernelStatusItem(this._sessionContext));
|
|
225
|
-
this.
|
|
226
|
-
|
|
252
|
+
if (this._type === 'code') {
|
|
253
|
+
this._cell.outputsScrolled = false;
|
|
254
|
+
}
|
|
255
|
+
this._cell.activate();
|
|
227
256
|
this._panel = new BoxPanel();
|
|
228
257
|
this._panel.direction = 'top-to-bottom';
|
|
229
258
|
this._panel.spacing = 0;
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
259
|
+
if (boxOptions?.showToolbar !== false) {
|
|
260
|
+
this._panel.addWidget(toolbar);
|
|
261
|
+
}
|
|
262
|
+
this._panel.addWidget(this._cell);
|
|
263
|
+
if (boxOptions?.showToolbar !== false) {
|
|
264
|
+
BoxPanel.setStretch(toolbar, 0);
|
|
265
|
+
}
|
|
266
|
+
BoxPanel.setStretch(this._cell, 1);
|
|
234
267
|
window.addEventListener('resize', () => {
|
|
235
268
|
this._panel.update();
|
|
236
269
|
});
|
|
@@ -239,8 +272,8 @@ export class CellAdapter {
|
|
|
239
272
|
get panel() {
|
|
240
273
|
return this._panel;
|
|
241
274
|
}
|
|
242
|
-
get
|
|
243
|
-
return this.
|
|
275
|
+
get cell() {
|
|
276
|
+
return this._cell;
|
|
244
277
|
}
|
|
245
278
|
get sessionContext() {
|
|
246
279
|
return this._sessionContext;
|
|
@@ -249,7 +282,12 @@ export class CellAdapter {
|
|
|
249
282
|
return this._kernel;
|
|
250
283
|
}
|
|
251
284
|
execute = () => {
|
|
252
|
-
|
|
285
|
+
if (this._type === 'code') {
|
|
286
|
+
CodeCell.execute(this._cell, this._sessionContext);
|
|
287
|
+
}
|
|
288
|
+
else if (this._type === 'markdown') {
|
|
289
|
+
this._cell.rendered = true;
|
|
290
|
+
}
|
|
253
291
|
};
|
|
254
292
|
}
|
|
255
293
|
export default CellAdapter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CellAdapter.js","sourceRoot":"","sources":["../../../src/components/cell/CellAdapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACL,cAAc,EAEd,OAAO,EACP,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"CellAdapter.js","sourceRoot":"","sources":["../../../src/components/cell/CellAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CommandRegistry } from '@lumino/commands';
|
|
2
2
|
import { CompletionHandler } from '@jupyterlab/completer';
|
|
3
|
-
import { CodeCell } from '@jupyterlab/cells';
|
|
3
|
+
import { CodeCell, MarkdownCell, RawCell } from '@jupyterlab/cells';
|
|
4
4
|
import { SessionContext } from '@jupyterlab/apputils';
|
|
5
|
-
export declare const CellCommands: (commandRegistry: CommandRegistry,
|
|
5
|
+
export declare const CellCommands: (commandRegistry: CommandRegistry, cell: CodeCell | MarkdownCell | RawCell, sessionContext: SessionContext, completerHandler: CompletionHandler) => void;
|
|
6
6
|
export default CellCommands;
|
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
*
|
|
4
4
|
* MIT License
|
|
5
5
|
*/
|
|
6
|
-
import { CodeCell } from '@jupyterlab/cells';
|
|
6
|
+
import { CodeCell, MarkdownCell } from '@jupyterlab/cells';
|
|
7
7
|
const cmdIds = {
|
|
8
8
|
invoke: 'completer:invoke',
|
|
9
9
|
select: 'completer:select',
|
|
10
10
|
};
|
|
11
|
-
export const CellCommands = (commandRegistry,
|
|
11
|
+
export const CellCommands = (commandRegistry, cell, sessionContext, completerHandler) => {
|
|
12
12
|
commandRegistry.addCommand(cmdIds.invoke, {
|
|
13
13
|
label: 'Completer: Invoke',
|
|
14
14
|
execute: () => completerHandler.invoke(),
|
|
@@ -18,7 +18,14 @@ export const CellCommands = (commandRegistry, codeCell, sessionContext, complete
|
|
|
18
18
|
execute: () => completerHandler.completer.selectActive(),
|
|
19
19
|
});
|
|
20
20
|
commandRegistry.addCommand('run:cell', {
|
|
21
|
-
execute: () =>
|
|
21
|
+
execute: () => {
|
|
22
|
+
if (cell instanceof CodeCell) {
|
|
23
|
+
CodeCell.execute(cell, sessionContext);
|
|
24
|
+
}
|
|
25
|
+
else if (cell instanceof MarkdownCell) {
|
|
26
|
+
cell.rendered = true;
|
|
27
|
+
}
|
|
28
|
+
},
|
|
22
29
|
});
|
|
23
30
|
commandRegistry.addKeyBinding({
|
|
24
31
|
selector: '.jp-InputArea-editor.jp-mod-completer-enabled',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CellCommands.js","sourceRoot":"","sources":["../../../src/components/cell/CellCommands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"CellCommands.js","sourceRoot":"","sources":["../../../src/components/cell/CellCommands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAW,MAAM,mBAAmB,CAAC;AAGpE,MAAM,MAAM,GAAG;IACb,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,kBAAkB;CAC3B,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,eAAgC,EAChC,IAAuC,EACvC,cAA8B,EAC9B,gBAAmC,EAC7B,EAAE;IACR,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;QACxC,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE;KACzC,CAAC,CAAC;IACH,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;QACxC,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,YAAY,EAAE;KACzD,CAAC,CAAC;IACH,eAAe,CAAC,UAAU,CAAC,UAAU,EAAE;QACrC,OAAO,EAAE,GAAG,EAAE;YACZ,IAAI,IAAI,YAAY,QAAQ,EAAE;gBAC5B,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;aACvC;iBAAM,IAAI,IAAI,YAAY,YAAY,EAAE;gBACtC,IAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC;aACxC;QACH,CAAC;KACF,CAAC,CAAC;IACH,eAAe,CAAC,aAAa,CAAC;QAC5B,QAAQ,EAAE,+CAA+C;QACzD,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,OAAO,EAAE,MAAM,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,eAAe,CAAC,aAAa,CAAC;QAC5B,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,CAAC,aAAa,CAAC;QACrB,OAAO,EAAE,UAAU;KACpB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG;QACf;YACE,QAAQ,EAAE,8CAA8C;YACxD,IAAI,EAAE,CAAC,OAAO,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,MAAM;SACvB;KACF,CAAC;IACF,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
|
@@ -16,8 +16,8 @@ export const CodeMirrorEditor = (props) => {
|
|
|
16
16
|
const { code, codePre, outputAdapter, autoRun, disableRun, sourceId, toolbarPosition, insertText, kernel, } = props;
|
|
17
17
|
const outputStore = useOutputStore();
|
|
18
18
|
const [view, setView] = useState();
|
|
19
|
-
const dataset = outputStore.
|
|
20
|
-
const
|
|
19
|
+
const dataset = outputStore.getDataset(sourceId);
|
|
20
|
+
const source = outputStore.getSource(sourceId);
|
|
21
21
|
const editorDiv = useRef();
|
|
22
22
|
const setEditorSource = (source) => {
|
|
23
23
|
if (view && source) {
|
|
@@ -54,7 +54,7 @@ export const CodeMirrorEditor = (props) => {
|
|
|
54
54
|
return true;
|
|
55
55
|
};
|
|
56
56
|
useEffect(() => {
|
|
57
|
-
outputStore.
|
|
57
|
+
outputStore.setSource({
|
|
58
58
|
sourceId,
|
|
59
59
|
source: code,
|
|
60
60
|
});
|
|
@@ -77,7 +77,7 @@ export const CodeMirrorEditor = (props) => {
|
|
|
77
77
|
EditorView.updateListener.of((viewUpdate) => {
|
|
78
78
|
if (viewUpdate.docChanged) {
|
|
79
79
|
const source = viewUpdate.state.doc.toString();
|
|
80
|
-
outputStore.
|
|
80
|
+
outputStore.setSource({
|
|
81
81
|
sourceId,
|
|
82
82
|
source,
|
|
83
83
|
});
|
|
@@ -101,8 +101,8 @@ export const CodeMirrorEditor = (props) => {
|
|
|
101
101
|
doInsertText(dataset?.dataset);
|
|
102
102
|
}, [dataset]);
|
|
103
103
|
useEffect(() => {
|
|
104
|
-
setEditorSource(
|
|
105
|
-
}, [
|
|
104
|
+
setEditorSource(source?.source);
|
|
105
|
+
}, [source]);
|
|
106
106
|
return (_jsxs(_Fragment, { children: [kernel && toolbarPosition === 'up' && (_jsx(CodeMirrorOutputToolbar, { editorView: view, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, executeCode: executeCode })), _jsx("div", { ref: editorDiv }), kernel && toolbarPosition === 'middle' && (_jsx(CodeMirrorOutputToolbar, { editorView: view, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, executeCode: executeCode }))] }));
|
|
107
107
|
};
|
|
108
108
|
export default CodeMirrorEditor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeMirrorEditor.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorEditor.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,UAAU,EAAc,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAChE,OAAO,cAAc,MAAM,uBAAuB,CAAC;AAEnD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAUhC,EAAE,EAAE;IACH,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,aAAa,EACb,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,UAAU,EACV,MAAM,GACP,GAAG,KAAK,CAAC;IACV,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,EAAc,CAAC;IAC/C,MAAM,OAAO,GAAG,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"CodeMirrorEditor.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorEditor.tsx"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ export const Output = (props) => {
|
|
|
39
39
|
const out = val.data['text/html']; // val.data['application/vnd.jupyter.stdout'];
|
|
40
40
|
if (out) {
|
|
41
41
|
if (out.indexOf(receipt) > -1) {
|
|
42
|
-
outputStore.
|
|
42
|
+
outputStore.setGrade({
|
|
43
43
|
sourceId,
|
|
44
44
|
success: true,
|
|
45
45
|
});
|
|
@@ -51,6 +51,7 @@ export const Output = (props) => {
|
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
53
|
setAdapter(adapter);
|
|
54
|
+
outputStore.setAdapter(sourceId, adapter);
|
|
54
55
|
adapter.outputArea.model.changed.connect((outputModel, args) => {
|
|
55
56
|
setOutputs(outputModel.toJSON());
|
|
56
57
|
});
|
|
@@ -79,7 +80,7 @@ export const Output = (props) => {
|
|
|
79
80
|
};
|
|
80
81
|
}
|
|
81
82
|
}, [kernel]);
|
|
82
|
-
const executeRequest = outputStore.
|
|
83
|
+
const executeRequest = outputStore.getExecute(sourceId);
|
|
83
84
|
useEffect(() => {
|
|
84
85
|
if (adapter && executeRequest && executeRequest.sourceId === id) {
|
|
85
86
|
adapter.execute(executeRequest.source);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/components/output/Output.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAIzC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,cAAc,CAAC;AAsBtB,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC5C,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;IAC/C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,EACJ,OAAO,EAAE,YAAY,EACrB,OAAO,EACP,YAAY,EACZ,IAAI,EACJ,OAAO,EACP,UAAU,EACV,cAAc,EACd,UAAU,EACV,MAAM,EACN,KAAK,EACL,OAAO,EACP,WAAW,EACX,UAAU,EACV,QAAQ,EACR,eAAe,GAChB,GAAG,KAAK,CAAC;IACV,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAqB,QAAQ,CAAC,CAAC;IAC3D,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GACnC,QAAQ,CAAuB,SAAS,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAwB,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7E,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAiB,CAAC;IACxD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,EAAE,EAAE;YACP,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;SACrB;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,EAAE,IAAI,MAAM,EAAE;YAChB,MAAM,OAAO,GACX,YAAY,IAAI,IAAI,aAAa,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;YAClE,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;oBAC1D,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;wBACzB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;4BACzB,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE;gCACnB,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,8CAA8C;gCACjF,IAAI,GAAG,EAAE;oCACP,IAAK,GAAc,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;wCACzC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/components/output/Output.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import OutputAdapter from './OutputAdapter';
|
|
1
2
|
export declare namespace OutputState {
|
|
2
3
|
type ISource = {
|
|
3
4
|
sourceId: string;
|
|
@@ -21,6 +22,7 @@ export declare namespace OutputState {
|
|
|
21
22
|
};
|
|
22
23
|
}
|
|
23
24
|
export type IOutputState = {
|
|
25
|
+
adapter?: OutputAdapter;
|
|
24
26
|
source?: OutputState.ISource;
|
|
25
27
|
dataset?: OutputState.IDataset;
|
|
26
28
|
setSource?: OutputState.ISource;
|
|
@@ -32,16 +34,16 @@ export interface IOutputsState {
|
|
|
32
34
|
}
|
|
33
35
|
export type OutputState = IOutputsState & {
|
|
34
36
|
setOutputs: (outputs: Map<string, IOutputState>) => void;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
selectExecute: (id: string) => OutputState.IExecute | undefined;
|
|
39
|
-
selectGrade: (id: string) => OutputState.IGrade | undefined;
|
|
40
|
-
source: (source: OutputState.ISource) => void;
|
|
41
|
-
dataset: (dataset: OutputState.IDataset) => void;
|
|
42
|
-
execute: (execute: OutputState.IExecute) => void;
|
|
37
|
+
setAdapter: (id: string, adapter: OutputAdapter) => void;
|
|
38
|
+
setDataset: (dataset: OutputState.IDataset) => void;
|
|
39
|
+
setExecute: (execute: OutputState.IExecute) => void;
|
|
43
40
|
setSource: (source: OutputState.ISource) => void;
|
|
44
|
-
|
|
41
|
+
setGrade: (grade: OutputState.IGrade) => void;
|
|
42
|
+
getAdapter: (id: string) => OutputAdapter | undefined;
|
|
43
|
+
getSource: (id: string) => OutputState.ISource | undefined;
|
|
44
|
+
getDataset: (id: string) => OutputState.IDataset | undefined;
|
|
45
|
+
getExecute: (id: string) => OutputState.IExecute | undefined;
|
|
46
|
+
getGrade: (id: string) => OutputState.IGrade | undefined;
|
|
45
47
|
};
|
|
46
48
|
export declare const outputStore: import("zustand").StoreApi<OutputState>;
|
|
47
49
|
export declare function useOutputStore(): OutputState;
|
|
@@ -8,34 +8,18 @@ import { useStore } from 'zustand';
|
|
|
8
8
|
export const outputStore = createStore((set, get) => ({
|
|
9
9
|
outputs: new Map(),
|
|
10
10
|
setOutputs: (outputs) => set((state) => ({ outputs })),
|
|
11
|
-
|
|
12
|
-
return get().outputs.get(id)?.source;
|
|
13
|
-
},
|
|
14
|
-
selectJupyterSetSource: (id) => {
|
|
15
|
-
return get().outputs.get(id)?.setSource;
|
|
16
|
-
},
|
|
17
|
-
selectDataset: (id) => {
|
|
18
|
-
return get().outputs.get(id)?.dataset;
|
|
19
|
-
},
|
|
20
|
-
selectExecute: (id) => {
|
|
21
|
-
return get().outputs.get(id)?.execute;
|
|
22
|
-
},
|
|
23
|
-
selectGrade: (id) => {
|
|
24
|
-
return get().outputs.get(id)?.grade;
|
|
25
|
-
},
|
|
26
|
-
source: (source) => {
|
|
27
|
-
const sourceId = source.sourceId;
|
|
11
|
+
setAdapter: (id, adapter) => {
|
|
28
12
|
const outputs = get().outputs;
|
|
29
|
-
const
|
|
30
|
-
if (
|
|
31
|
-
|
|
13
|
+
const d = outputs.get(id);
|
|
14
|
+
if (d) {
|
|
15
|
+
d.adapter = adapter;
|
|
32
16
|
}
|
|
33
17
|
else {
|
|
34
|
-
outputs.set(
|
|
18
|
+
outputs.set(id, { adapter });
|
|
35
19
|
}
|
|
36
20
|
set((state) => ({ outputs }));
|
|
37
21
|
},
|
|
38
|
-
|
|
22
|
+
setDataset: (dataset) => {
|
|
39
23
|
const sourceId = dataset.sourceId;
|
|
40
24
|
const outputs = get().outputs;
|
|
41
25
|
const d = outputs.get(sourceId);
|
|
@@ -47,7 +31,7 @@ export const outputStore = createStore((set, get) => ({
|
|
|
47
31
|
}
|
|
48
32
|
set((state) => ({ outputs }));
|
|
49
33
|
},
|
|
50
|
-
|
|
34
|
+
setExecute: (execute) => {
|
|
51
35
|
const sourceId = execute.sourceId;
|
|
52
36
|
const outputs = get().outputs;
|
|
53
37
|
const e = outputs.get(sourceId);
|
|
@@ -71,7 +55,7 @@ export const outputStore = createStore((set, get) => ({
|
|
|
71
55
|
}
|
|
72
56
|
set((state) => ({ outputs }));
|
|
73
57
|
},
|
|
74
|
-
|
|
58
|
+
setGrade: (grade) => {
|
|
75
59
|
const sourceId = grade.sourceId;
|
|
76
60
|
const outputs = get().outputs;
|
|
77
61
|
const g = outputs.get(sourceId);
|
|
@@ -83,6 +67,21 @@ export const outputStore = createStore((set, get) => ({
|
|
|
83
67
|
}
|
|
84
68
|
set((state) => ({ outputs }));
|
|
85
69
|
},
|
|
70
|
+
getAdapter: (id) => {
|
|
71
|
+
return get().outputs.get(id)?.adapter;
|
|
72
|
+
},
|
|
73
|
+
getSource: (id) => {
|
|
74
|
+
return get().outputs.get(id)?.source;
|
|
75
|
+
},
|
|
76
|
+
getDataset: (id) => {
|
|
77
|
+
return get().outputs.get(id)?.dataset;
|
|
78
|
+
},
|
|
79
|
+
getExecute: (id) => {
|
|
80
|
+
return get().outputs.get(id)?.execute;
|
|
81
|
+
},
|
|
82
|
+
getGrade: (id) => {
|
|
83
|
+
return get().outputs.get(id)?.grade;
|
|
84
|
+
},
|
|
86
85
|
}));
|
|
87
86
|
export function useOutputStore(selector) {
|
|
88
87
|
return useStore(outputStore, selector);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputState.js","sourceRoot":"","sources":["../../../src/components/output/OutputState.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"OutputState.js","sourceRoot":"","sources":["../../../src/components/output/OutputState.ts"],"names":[],"mappings":"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"}
|
package/lib/examples/Cell.js
CHANGED
|
@@ -18,6 +18,7 @@ for i in range(100):
|
|
|
18
18
|
display('I am a long string which is repeatedly added to the dom in separated divs: %d' % i)`;
|
|
19
19
|
const CellExample = () => {
|
|
20
20
|
const cellStore = useJupyterStore().cellStore();
|
|
21
|
+
console.log('Cell Outputs', (cellStore.adapter?.cell).outputArea.model.toJSON());
|
|
21
22
|
return (_jsxs(Jupyter, { children: [_jsx(Box, { as: "h1", children: "A Jupyter Cell" }), _jsxs(Box, { children: ["Outputs Count: ", cellStore.outputsCount] }), _jsxs(Box, { children: ["Source: ", cellStore.source] }), _jsx(Box, { children: _jsx(Button, { onClick: () => cellStore.execute(), children: "Run cell" }) }), _jsx(Cell, { source: DEFAULT_SOURCE })] }));
|
|
22
23
|
};
|
|
23
24
|
root.render(_jsx(CellExample, {}));
|
package/lib/examples/Cell.js.map
CHANGED
|
@@ -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,MAAM,eAAe,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,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,IAAI,MAAM,yBAAyB,CAAC;AAE3C,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,MAAM,cAAc,GAAG;;;iGAG0E,CAAA;AAEjG,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC,SAAS,EAAE,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAiB,CAAA,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7F,OAAO,CACL,MAAC,OAAO,eACN,KAAC,GAAG,IAAC,EAAE,EAAC,IAAI,+BAAqB,EACjC,MAAC,GAAG,kCACc,SAAS,CAAC,YAAY,IAClC,EACN,MAAC,GAAG,2BACO,SAAS,CAAC,MAAM,IACrB,EACN,KAAC,GAAG,cACF,KAAC,MAAM,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,yBAAmB,GACzD,EACN,KAAC,IAAI,IAAC,MAAM,EAAE,cAAc,GAAG,IACvB,CACX,CAAA;AACH,CAAC,CAAA;AAED,IAAI,CAAC,MAAM,CAAC,KAAC,WAAW,KAAE,CAAC,CAAC"}
|
package/lib/examples/Output.js
CHANGED
|
@@ -6,10 +6,12 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
|
|
|
6
6
|
*/
|
|
7
7
|
import { createRoot } from 'react-dom/client';
|
|
8
8
|
import { Text } from '@primer/react';
|
|
9
|
-
import
|
|
9
|
+
import { useJupyterStore } from './../state';
|
|
10
10
|
import { useJupyter } from '../jupyter/JupyterContext';
|
|
11
|
+
import Jupyter from '../jupyter/Jupyter';
|
|
11
12
|
import Output from '../components/output/Output';
|
|
12
|
-
const
|
|
13
|
+
const SOURCE_ID_1 = '1';
|
|
14
|
+
// const SOURCE_1 = '1+1';
|
|
13
15
|
const OUTPUTS_1 = [
|
|
14
16
|
{
|
|
15
17
|
data: {
|
|
@@ -20,12 +22,28 @@ const OUTPUTS_1 = [
|
|
|
20
22
|
output_type: 'execute_result',
|
|
21
23
|
},
|
|
22
24
|
];
|
|
25
|
+
const SOURCE_ID_2 = '2';
|
|
26
|
+
const SOURCE_2 = '2+2';
|
|
27
|
+
const OUTPUTS_2 = [
|
|
28
|
+
{
|
|
29
|
+
data: {
|
|
30
|
+
'text/plain': ['4'],
|
|
31
|
+
},
|
|
32
|
+
execution_count: 1,
|
|
33
|
+
metadata: {},
|
|
34
|
+
output_type: 'execute_result',
|
|
35
|
+
},
|
|
36
|
+
];
|
|
23
37
|
const OutputWithoutEditor = () => {
|
|
24
|
-
|
|
38
|
+
const outputStore = useJupyterStore().outputStore();
|
|
39
|
+
console.log('Outputs 1', outputStore.getAdapter(SOURCE_ID_1)?.outputArea.model.toJSON());
|
|
40
|
+
return (_jsxs(_Fragment, { children: [_jsx(Text, { as: "h1", children: "Output without Code Editor" }), _jsx(Output, { showEditor: false, sourceId: SOURCE_ID_1, outputs: OUTPUTS_1 })] }));
|
|
25
41
|
};
|
|
26
42
|
const OutputWithEditor = () => {
|
|
27
43
|
const { defaultKernel } = useJupyter();
|
|
28
|
-
|
|
44
|
+
const outputStore = useJupyterStore().outputStore();
|
|
45
|
+
console.log('Outputs 2', outputStore.getAdapter(SOURCE_ID_2)?.outputArea.model.toJSON());
|
|
46
|
+
return (_jsxs(_Fragment, { children: [_jsx(Text, { as: "h1", children: "Output with Code Editor" }), _jsx(Output, { showEditor: true, autoRun: false, kernel: defaultKernel, code: SOURCE_2, sourceId: SOURCE_ID_2, outputs: OUTPUTS_2 })] }));
|
|
29
47
|
};
|
|
30
48
|
const div = document.createElement('div');
|
|
31
49
|
document.body.appendChild(div);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../src/examples/Output.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../src/examples/Output.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,MAAM,MAAM,6BAA6B,CAAC;AAEjD,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,0BAA0B;AAC1B,MAAM,SAAS,GAAc;IAC3B;QACE,IAAI,EAAE;YACJ,YAAY,EAAE,CAAC,GAAG,CAAC;SACpB;QACD,eAAe,EAAE,CAAC;QAClB,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,gBAAgB;KAC9B;CACF,CAAC;AAEF,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,QAAQ,GAAG,KAAK,CAAC;AACvB,MAAM,SAAS,GAAc;IAC3B;QACE,IAAI,EAAE;YACJ,YAAY,EAAE,CAAC,GAAG,CAAC;SACpB;QACD,eAAe,EAAE,CAAC;QAClB,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,gBAAgB;KAC9B;CACF,CAAC;AAEF,MAAM,mBAAmB,GAAG,GAAG,EAAE;IAC/B,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC,WAAW,EAAE,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACzF,OAAO,CACL,8BACE,KAAC,IAAI,IAAC,EAAE,EAAC,IAAI,2CAAkC,EAC/C,KAAC,MAAM,IACL,UAAU,EAAE,KAAK,EACjB,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,SAAS,GAClB,IACD,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC,WAAW,EAAE,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACzF,OAAO,CACL,8BACE,KAAC,IAAI,IAAC,EAAE,EAAC,IAAI,wCAA+B,EAC5C,KAAC,MAAM,IACL,UAAU,EAAE,IAAI,EAChB,OAAO,EAAE,KAAK,EACd,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,SAAS,GAClB,IACD,CACJ,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,CACT,MAAC,OAAO,eACN,KAAC,mBAAmB,KAAG,EACvB,KAAC,gBAAgB,KAAG,IACZ,CACX,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datalayer/jupyter-react",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.13.0",
|
|
4
4
|
"description": "Jupyter React - React.js components 100% compatible with Jupyter.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -108,6 +108,7 @@
|
|
|
108
108
|
"@jupyterlab/mathjax-extension": "^4.0.0",
|
|
109
109
|
"@jupyterlab/metadataform": "^4.0.0",
|
|
110
110
|
"@jupyterlab/nbconvert-css": "^4.0.0",
|
|
111
|
+
"@jupyterlab/nbformat": "^4.0.0",
|
|
111
112
|
"@jupyterlab/notebook": "^4.0.0",
|
|
112
113
|
"@jupyterlab/notebook-extension": "^4.0.0",
|
|
113
114
|
"@jupyterlab/observables": "^5.0.0",
|
|
@@ -261,24 +262,7 @@
|
|
|
261
262
|
"extension": "./lib/jupyter/lab/index.js",
|
|
262
263
|
"outputDir": "jupyter_react/labextension",
|
|
263
264
|
"schemaDir": "schema",
|
|
264
|
-
"webpackConfig": "./webpack.lab-config.js"
|
|
265
|
-
"sharedPackages": {
|
|
266
|
-
"@jupyter/web-components": {
|
|
267
|
-
"bundled": true,
|
|
268
|
-
"singleton": true
|
|
269
|
-
},
|
|
270
|
-
"@jupyter-notebook/tree": {
|
|
271
|
-
"singleton": true
|
|
272
|
-
},
|
|
273
|
-
"@microsoft/fast-element": {
|
|
274
|
-
"bundled": true,
|
|
275
|
-
"singleton": true
|
|
276
|
-
},
|
|
277
|
-
"@microsoft/fast-foundation": {
|
|
278
|
-
"bundled": true,
|
|
279
|
-
"singleton": true
|
|
280
|
-
}
|
|
281
|
-
}
|
|
265
|
+
"webpackConfig": "./webpack.lab-config.js"
|
|
282
266
|
},
|
|
283
267
|
"jupyter-releaser": {
|
|
284
268
|
"hooks": {
|