@datalayer/jupyter-react 0.6.3 → 0.6.4
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/app/tabs/ComponentsTab.js +5 -5
- package/lib/app/tabs/ComponentsTab.js.map +1 -1
- package/lib/app/tabs/components/CellComponent.d.ts +2 -0
- package/lib/app/tabs/components/CellComponent.js +8 -0
- package/lib/app/tabs/components/CellComponent.js.map +1 -0
- package/lib/app/tabs/components/FileBrowserComponent.d.ts +2 -0
- package/lib/app/tabs/components/FileBrowserComponent.js +8 -0
- package/lib/app/tabs/components/FileBrowserComponent.js.map +1 -0
- package/lib/app/tabs/components/NotebookComponent.d.ts +2 -0
- package/lib/app/tabs/components/NotebookComponent.js +9 -0
- package/lib/app/tabs/components/NotebookComponent.js.map +1 -0
- package/lib/components/cell/Cell.js +61 -55
- package/lib/components/cell/Cell.js.map +1 -1
- package/lib/components/cell/CellAdapter.d.ts +8 -1
- package/lib/components/cell/CellAdapter.js +62 -25
- package/lib/components/cell/CellAdapter.js.map +1 -1
- package/lib/components/codemirror/CodeMirrorOutputToolbar.js +3 -3
- package/lib/components/codemirror/CodeMirrorOutputToolbar.js.map +1 -1
- package/lib/components/console/ConsoleAdapter.js +1 -1
- package/lib/components/console/ConsoleAdapter.js.map +1 -1
- package/lib/components/filebrowser/FileBrowser.js +12 -2
- package/lib/components/filebrowser/FileBrowser.js.map +1 -1
- package/lib/components/filemanager/FileManagerState.d.ts +15 -0
- package/lib/components/{filebrowser/FileBrowserState.js → filemanager/FileManagerState.js} +9 -9
- package/lib/components/{filebrowser/FileBrowserState.js.map → filemanager/FileManagerState.js.map} +1 -1
- package/lib/components/{filebrowser/FileBrowserAdapter.css → filemanager/lab/FileManagerAdapter.css} +1 -1
- package/lib/components/{filebrowser/FileBrowserAdapter.d.ts → filemanager/lab/FileManagerAdapter.d.ts} +1 -1
- package/lib/components/{filebrowser/FileBrowserAdapter.js → filemanager/lab/FileManagerAdapter.js} +2 -2
- package/lib/components/filemanager/lab/FileManagerAdapter.js.map +1 -0
- package/lib/components/filemanager/lab/FileManagerLab.d.ts +2 -0
- package/lib/components/filemanager/lab/FileManagerLab.js +9 -0
- package/lib/components/filemanager/lab/FileManagerLab.js.map +1 -0
- package/lib/components/notebook/Notebook.js +55 -54
- package/lib/components/notebook/Notebook.js.map +1 -1
- package/lib/components/notebook/NotebookAdapter.d.ts +1 -2
- package/lib/components/notebook/NotebookAdapter.js +114 -48
- package/lib/components/notebook/NotebookAdapter.js.map +1 -1
- package/lib/components/output/Output.js +3 -3
- package/lib/components/output/Output.js.map +1 -1
- package/lib/components/output/OutputAdapter.js +3 -9
- package/lib/components/output/OutputAdapter.js.map +1 -1
- package/lib/examples/All.js +9 -5
- package/lib/examples/All.js.map +1 -1
- package/lib/examples/Bqplot.js +1 -1
- package/lib/examples/IPyReact.js +1 -1
- package/lib/examples/Notebook.js +5 -1
- package/lib/examples/Notebook.js.map +1 -1
- package/lib/examples/NotebookKernelChange.js +4 -4
- package/lib/examples/NotebookKernelChange.js.map +1 -1
- package/lib/examples/NotebookModel.js +5 -1
- package/lib/examples/NotebookModel.js.map +1 -1
- package/lib/examples/NotebookUnmount.js +2 -2
- package/lib/examples/NotebookUnmount.js.map +1 -1
- package/lib/examples/Plotly.js +1 -1
- package/lib/examples/Plotly.js.map +1 -1
- package/lib/index.d.ts +2 -2
- package/lib/index.js +4 -2
- package/lib/index.js.map +1 -1
- package/lib/jupyter/JupyterContext.js +8 -14
- package/lib/jupyter/JupyterContext.js.map +1 -1
- package/lib/jupyter/ipywidgets/IPyWidgetsManager.js +2 -2
- package/lib/jupyter/ipywidgets/IPyWidgetsManager.js.map +1 -1
- package/lib/jupyter/ipywidgets/lab/manager.d.ts +0 -1
- package/lib/jupyter/ipywidgets/lab/manager.js +0 -1
- package/lib/jupyter/ipywidgets/lab/manager.js.map +1 -1
- package/lib/jupyter/ipywidgets/lab/plugin.d.ts +1 -5
- package/lib/jupyter/ipywidgets/lab/plugin.js +13 -35
- package/lib/jupyter/ipywidgets/lab/plugin.js.map +1 -1
- package/lib/jupyter/lab/index.js +3 -3
- package/lib/jupyter/lab/index.js.map +1 -1
- package/lib/jupyter/services/kernel/Kernel.d.ts +18 -4
- package/lib/jupyter/services/kernel/Kernel.js +70 -20
- package/lib/jupyter/services/kernel/Kernel.js.map +1 -1
- package/package.json +1 -1
- package/lib/app/tabs/content/Content.d.ts +0 -3
- package/lib/app/tabs/content/Content.js +0 -8
- package/lib/app/tabs/content/Content.js.map +0 -1
- package/lib/components/filebrowser/FileBrowserAdapter.js.map +0 -1
- package/lib/components/filebrowser/FileBrowserLab.d.ts +0 -2
- package/lib/components/filebrowser/FileBrowserLab.js +0 -9
- package/lib/components/filebrowser/FileBrowserLab.js.map +0 -1
- package/lib/components/filebrowser/FileBrowserState.d.ts +0 -15
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { useState } from 'react';
|
|
3
|
-
import { RingedPlanetIcon } from '@datalayer/icons-react';
|
|
4
3
|
import { Box, NavList } from '@primer/react';
|
|
5
|
-
import
|
|
4
|
+
import FileBrowserComponent from './components/FileBrowserComponent';
|
|
5
|
+
import CellComponent from './components/CellComponent';
|
|
6
|
+
import NotebookComponent from './components/NotebookComponent';
|
|
6
7
|
const MainTab = (props) => {
|
|
7
|
-
const { app } = props;
|
|
8
8
|
const [nav, setNav] = useState(1);
|
|
9
|
-
return (_jsx(_Fragment, { children: _jsxs(Box, { sx: { display: 'flex' }, children: [_jsx(Box, { children:
|
|
9
|
+
return (_jsx(_Fragment, { children: _jsxs(Box, { sx: { display: 'flex' }, children: [_jsx(Box, { children: _jsxs(NavList, { sx: {
|
|
10
10
|
'> *': {
|
|
11
11
|
paddingTop: '0px'
|
|
12
12
|
}
|
|
13
|
-
}, children:
|
|
13
|
+
}, children: [_jsx(NavList.Item, { "aria-current": nav === 1 ? 'page' : undefined, onClick: e => setNav(1), children: "File Browser" }), _jsx(NavList.Item, { "aria-current": nav === 2 ? 'page' : undefined, onClick: e => setNav(2), children: "Cell" }), _jsx(NavList.Item, { "aria-current": nav === 3 ? 'page' : undefined, onClick: e => setNav(3), children: "Notebook" })] }) }), _jsxs(Box, { ml: 3, sx: { width: '100%' }, children: [(nav === 1) && _jsx(FileBrowserComponent, {}), (nav === 2) && _jsx(CellComponent, {}), (nav === 3) && _jsx(NotebookComponent, {})] })] }) }));
|
|
14
14
|
};
|
|
15
15
|
export default MainTab;
|
|
16
16
|
//# sourceMappingURL=ComponentsTab.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentsTab.js","sourceRoot":"","sources":["../../../src/app/tabs/ComponentsTab.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ComponentsTab.js","sourceRoot":"","sources":["../../../src/app/tabs/ComponentsTab.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,oBAAoB,MAAM,mCAAmC,CAAC;AACrE,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAE/D,MAAM,OAAO,GAAG,CAAC,KAA2B,EAAE,EAAE;IAC9C,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClC,OAAO,CACL,4BACE,MAAC,GAAG,IAAC,EAAE,EAAE,EAAC,OAAO,EAAE,MAAM,EAAC,aACxB,KAAC,GAAG,cACF,MAAC,OAAO,IAAC,EAAE,EAAE;4BACX,KAAK,EAAE;gCACL,UAAU,EAAE,KAAK;6BAClB;yBACF,aACC,KAAC,OAAO,CAAC,IAAI,oBAAe,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,6BAEpE,EACf,KAAC,OAAO,CAAC,IAAI,oBAAe,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,qBAEpE,EACf,KAAC,OAAO,CAAC,IAAI,oBAAe,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,yBAEpE,IACP,GACN,EACN,MAAC,GAAG,IAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAC,aAC7B,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,KAAC,oBAAoB,KAAE,EACtC,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,KAAC,aAAa,KAAE,EAC/B,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,KAAC,iBAAiB,KAAE,IAChC,IACF,GACL,CACJ,CAAC;AACJ,CAAC,CAAA;AAED,eAAe,OAAO,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
import { Jupyter } from '../../../jupyter/Jupyter';
|
|
3
|
+
// import Cell from '../../../components/cell/Cell';
|
|
4
|
+
const CellComponent = () => {
|
|
5
|
+
return (_jsx(_Fragment, { children: _jsx(Jupyter, { startDefaultKernel: true }) }));
|
|
6
|
+
};
|
|
7
|
+
export default CellComponent;
|
|
8
|
+
//# sourceMappingURL=CellComponent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CellComponent.js","sourceRoot":"","sources":["../../../../src/app/tabs/components/CellComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,oDAAoD;AAEpD,MAAM,aAAa,GAAG,GAAG,EAAE;IACzB,OAAO,CACL,4BACE,KAAC,OAAO,IAAC,kBAAkB,EAAE,IAAI,GAIvB,GACT,CACJ,CAAA;AACH,CAAC,CAAA;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
import { Jupyter } from '../../../jupyter/Jupyter';
|
|
3
|
+
import { FileBrowser } from '../../../components/filebrowser/FileBrowser';
|
|
4
|
+
const FileBrowserComponent = () => {
|
|
5
|
+
return (_jsx(_Fragment, { children: _jsx(Jupyter, { startDefaultKernel: false, children: _jsx(FileBrowser, {}) }) }));
|
|
6
|
+
};
|
|
7
|
+
export default FileBrowserComponent;
|
|
8
|
+
//# sourceMappingURL=FileBrowserComponent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FileBrowserComponent.js","sourceRoot":"","sources":["../../../../src/app/tabs/components/FileBrowserComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,6CAA6C,CAAC;AAE1E,MAAM,oBAAoB,GAAG,GAAG,EAAE;IAChC,OAAO,CACL,4BACE,KAAC,OAAO,IAAC,kBAAkB,EAAE,KAAK,YAChC,KAAC,WAAW,KAAE,GACN,GACT,CACJ,CAAA;AACH,CAAC,CAAA;AAED,eAAe,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
import { Jupyter } from '../../../jupyter/Jupyter';
|
|
3
|
+
// import Notebook from '../../../components/notebook/Notebook';
|
|
4
|
+
// import CellSidebarNew from "../../../components/notebook/cell/sidebar/CellSidebarNew";
|
|
5
|
+
const NotebookComponent = () => {
|
|
6
|
+
return (_jsx(_Fragment, { children: _jsx(Jupyter, { startDefaultKernel: true }) }));
|
|
7
|
+
};
|
|
8
|
+
export default NotebookComponent;
|
|
9
|
+
//# sourceMappingURL=NotebookComponent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NotebookComponent.js","sourceRoot":"","sources":["../../../../src/app/tabs/components/NotebookComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,gEAAgE;AAChE,yFAAyF;AAEzF,MAAM,iBAAiB,GAAG,GAAG,EAAE;IAC7B,OAAO,CACL,4BACE,KAAC,OAAO,IAAC,kBAAkB,EAAE,IAAI,GAevB,GACT,CACJ,CAAA;AACH,CAAC,CAAA;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -13,6 +13,7 @@ for i in range(10):
|
|
|
13
13
|
display('String {} added to the DOM in separated DIV.'.format(i))`;
|
|
14
14
|
export const Cell = (props) => {
|
|
15
15
|
const { source, autoStart } = props;
|
|
16
|
+
console.log('---', source);
|
|
16
17
|
const { serverSettings, injectableStore, defaultKernel } = useJupyter();
|
|
17
18
|
const dispatch = useDispatch();
|
|
18
19
|
const [adapter, setAdapter] = useState();
|
|
@@ -21,64 +22,69 @@ export const Cell = (props) => {
|
|
|
21
22
|
}, []);
|
|
22
23
|
useEffect(() => {
|
|
23
24
|
if (source && defaultKernel) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
defaultKernel.ready.then(() => {
|
|
26
|
+
const adapter = new CellAdapter({
|
|
27
|
+
source,
|
|
28
|
+
serverSettings,
|
|
29
|
+
kernel: defaultKernel,
|
|
30
|
+
});
|
|
31
|
+
dispatch(cellActions.update({ adapter }));
|
|
32
|
+
dispatch(cellActions.source(props.source));
|
|
33
|
+
adapter.codeCell.model.contentChanged.connect((cellModel, changedArgs) => {
|
|
34
|
+
dispatch(cellActions.source(cellModel.sharedModel.getSource()));
|
|
35
|
+
});
|
|
36
|
+
adapter.codeCell.outputArea.outputLengthChanged.connect((outputArea, outputsCount) => {
|
|
37
|
+
dispatch(cellActions.outputsCount(outputsCount));
|
|
38
|
+
});
|
|
39
|
+
adapter.sessionContext.initialize().then(() => {
|
|
40
|
+
if (autoStart) {
|
|
41
|
+
const execute = CodeCell.execute(adapter.codeCell, adapter.sessionContext);
|
|
42
|
+
execute.then((msg) => {
|
|
43
|
+
dispatch(cellActions.update({
|
|
44
|
+
kernelAvailable: true,
|
|
45
|
+
}));
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
setAdapter(adapter);
|
|
29
50
|
});
|
|
30
|
-
adapter.codeCell.outputArea.outputLengthChanged.connect((outputArea, outputsCount) => {
|
|
31
|
-
dispatch(cellActions.outputsCount(outputsCount));
|
|
32
|
-
});
|
|
33
|
-
adapter.sessionContext.initialize().then(() => {
|
|
34
|
-
if (autoStart) {
|
|
35
|
-
const execute = CodeCell.execute(adapter.codeCell, adapter.sessionContext);
|
|
36
|
-
execute.then((msg) => {
|
|
37
|
-
dispatch(cellActions.update({
|
|
38
|
-
kernelAvailable: true,
|
|
39
|
-
}));
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
setAdapter(adapter);
|
|
44
51
|
}
|
|
45
52
|
}, [source, defaultKernel]);
|
|
46
|
-
return adapter
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
'
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
'
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
'
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
'
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
'
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}, children: _jsx(Lumino, { children: adapter.panel }) })
|
|
53
|
+
return adapter ?
|
|
54
|
+
_jsx(Box, { sx: {
|
|
55
|
+
'& .dla-JupyterCell': {
|
|
56
|
+
position: 'relative !important',
|
|
57
|
+
contain: 'content !important',
|
|
58
|
+
// height: '100% !important',
|
|
59
|
+
// marginTop: '30px',
|
|
60
|
+
},
|
|
61
|
+
'& .jp-Toolbar': {
|
|
62
|
+
height: 'auto !important',
|
|
63
|
+
position: 'relative',
|
|
64
|
+
// display: 'none',
|
|
65
|
+
},
|
|
66
|
+
'& .lm-BoxPanel': {
|
|
67
|
+
// height: 'auto !important',
|
|
68
|
+
// minHeight: 'auto !important',
|
|
69
|
+
position: 'relative',
|
|
70
|
+
},
|
|
71
|
+
'& .jp-Cell': {
|
|
72
|
+
// width: '100%',
|
|
73
|
+
// height: '100% !important',
|
|
74
|
+
position: 'relative',
|
|
75
|
+
},
|
|
76
|
+
'& .jp-CodeCell': {
|
|
77
|
+
height: 'auto !important',
|
|
78
|
+
position: 'relative',
|
|
79
|
+
// top: 'auto !important',
|
|
80
|
+
},
|
|
81
|
+
'& .jp-Cell-outputArea': {
|
|
82
|
+
paddingBottom: '30px',
|
|
83
|
+
},
|
|
84
|
+
'& .jp-CodeMirrorEditor': {
|
|
85
|
+
cursor: 'text !important',
|
|
86
|
+
},
|
|
87
|
+
}, children: _jsx(Lumino, { children: adapter.panel }) })
|
|
82
88
|
:
|
|
83
89
|
_jsx(Box, { children: "Loading Jupyter Cell..." });
|
|
84
90
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../../src/components/cell/Cell.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,cAAc,GAAG;;;sEAG+C,CAAA;AAOtE,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAiB,EAAE,EAAE;IACxC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACpC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,UAAU,EAAE,CAAC;IACxE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAe,CAAC;IACtD,OAAO,CAAC,GAAG,EAAE;QACX,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,IAAI,aAAa,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../../src/components/cell/Cell.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,17 @@ export declare class CellAdapter {
|
|
|
7
7
|
private _panel;
|
|
8
8
|
private _codeCell;
|
|
9
9
|
private _sessionContext;
|
|
10
|
-
constructor(
|
|
10
|
+
constructor(options: CellAdapter.ICellAdapterOptions);
|
|
11
11
|
get panel(): BoxPanel;
|
|
12
12
|
get codeCell(): CodeCell;
|
|
13
13
|
get sessionContext(): SessionContext;
|
|
14
14
|
execute: () => void;
|
|
15
15
|
}
|
|
16
|
+
export declare namespace CellAdapter {
|
|
17
|
+
type ICellAdapterOptions = {
|
|
18
|
+
source: string;
|
|
19
|
+
serverSettings: ServerConnection.ISettings;
|
|
20
|
+
kernel?: Kernel;
|
|
21
|
+
};
|
|
22
|
+
}
|
|
16
23
|
export default CellAdapter;
|
|
@@ -2,47 +2,81 @@ import { BoxPanel, Widget } from '@lumino/widgets';
|
|
|
2
2
|
import { CommandRegistry } from '@lumino/commands';
|
|
3
3
|
import { SessionContext, Toolbar, ToolbarButton } from '@jupyterlab/apputils';
|
|
4
4
|
import { CodeCellModel, CodeCell, Cell } from '@jupyterlab/cells';
|
|
5
|
-
import { CodeMirrorMimeTypeService, EditorLanguageRegistry, CodeMirrorEditorFactory, EditorExtensionRegistry, EditorThemeRegistry
|
|
6
|
-
import { runIcon } from '@jupyterlab/ui-components';
|
|
5
|
+
import { ybinding, CodeMirrorMimeTypeService, EditorLanguageRegistry, CodeMirrorEditorFactory, EditorExtensionRegistry, EditorThemeRegistry } from '@jupyterlab/codemirror';
|
|
7
6
|
import { Completer, CompleterModel, CompletionHandler, ProviderReconciliator, KernelCompleterProvider } from '@jupyterlab/completer';
|
|
8
7
|
import { RenderMimeRegistry, standardRendererFactories as initialFactories } from '@jupyterlab/rendermime';
|
|
9
8
|
import { SessionManager, KernelManager, KernelSpecManager } from '@jupyterlab/services';
|
|
10
9
|
import { createStandaloneCell } from '@jupyter/ydoc';
|
|
11
|
-
import { requireLoader } from "@jupyter-widgets/html-manager";
|
|
10
|
+
import { requireLoader as loader } from "@jupyter-widgets/html-manager";
|
|
12
11
|
import { WIDGET_MIMETYPE, WidgetRenderer } from "@jupyter-widgets/html-manager/lib/output_renderers";
|
|
13
|
-
import {
|
|
12
|
+
import { runIcon } from '@jupyterlab/ui-components';
|
|
13
|
+
import IPyWidgetsManager from "../../jupyter/ipywidgets/IPyWidgetsManager";
|
|
14
14
|
import CellCommands from './CellCommands';
|
|
15
15
|
export class CellAdapter {
|
|
16
16
|
_panel;
|
|
17
17
|
_codeCell;
|
|
18
18
|
_sessionContext;
|
|
19
|
-
constructor(
|
|
20
|
-
const
|
|
19
|
+
constructor(options) {
|
|
20
|
+
const { source, serverSettings, kernel } = options;
|
|
21
|
+
const kernelManager = kernel?.kernelManager ?? new KernelManager({
|
|
21
22
|
serverSettings
|
|
22
23
|
});
|
|
23
|
-
const sessionManager = new SessionManager({
|
|
24
|
+
const sessionManager = kernel?.sessionManager ?? new SessionManager({
|
|
24
25
|
serverSettings,
|
|
25
26
|
kernelManager
|
|
26
27
|
});
|
|
27
|
-
const specsManager = new KernelSpecManager({
|
|
28
|
+
const specsManager = kernel?.kerneSpeclManager ?? new KernelSpecManager({
|
|
28
29
|
serverSettings
|
|
29
30
|
});
|
|
30
|
-
const kernelPreference = kernel
|
|
31
|
-
|
|
32
|
-
id: kernel.
|
|
33
|
-
shouldStart:
|
|
31
|
+
const kernelPreference = kernel ?
|
|
32
|
+
{
|
|
33
|
+
id: kernel.id,
|
|
34
|
+
shouldStart: false,
|
|
34
35
|
autoStartDefault: false,
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
shutdownOnDispose: false,
|
|
37
|
+
}
|
|
38
|
+
:
|
|
39
|
+
{
|
|
40
|
+
name: 'python',
|
|
41
|
+
shouldStart: true,
|
|
42
|
+
autoStartDefault: true,
|
|
43
|
+
shutdownOnDispose: true,
|
|
44
|
+
};
|
|
40
45
|
this._sessionContext = new SessionContext({
|
|
41
|
-
name:
|
|
46
|
+
name: kernel?.path,
|
|
47
|
+
path: kernel?.path,
|
|
42
48
|
sessionManager,
|
|
43
49
|
specsManager,
|
|
44
|
-
|
|
50
|
+
type: 'python',
|
|
51
|
+
kernelPreference,
|
|
45
52
|
});
|
|
53
|
+
/*
|
|
54
|
+
// This is a hack to support handleComms.
|
|
55
|
+
(this._sessionContext as any)._initialize = async (): Promise<boolean> => {
|
|
56
|
+
const manager = (this._sessionContext as any).sessionManager;
|
|
57
|
+
await manager.ready;
|
|
58
|
+
await manager.refreshRunning();
|
|
59
|
+
const model = find(manager.running(), item => {
|
|
60
|
+
return (item as any).path === (this._sessionContext as any)._path;
|
|
61
|
+
});
|
|
62
|
+
if (model) {
|
|
63
|
+
try {
|
|
64
|
+
const session = manager.connectTo({
|
|
65
|
+
model,
|
|
66
|
+
kernelConnectionOptions: {
|
|
67
|
+
handleComms: true,
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
(this._sessionContext as any)._handleNewSession(session);
|
|
71
|
+
}
|
|
72
|
+
catch (err) {
|
|
73
|
+
void (this._sessionContext as any)._handleSessionError(err);
|
|
74
|
+
return Promise.reject(err);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return await (this._sessionContext as any)._startIfNecessary();
|
|
78
|
+
};
|
|
79
|
+
*/
|
|
46
80
|
const themes = new EditorThemeRegistry();
|
|
47
81
|
for (const theme of EditorThemeRegistry.getDefaultThemes()) {
|
|
48
82
|
themes.addTheme(theme);
|
|
@@ -65,16 +99,14 @@ export class CellAdapter {
|
|
|
65
99
|
return registry;
|
|
66
100
|
};
|
|
67
101
|
const languages = new EditorLanguageRegistry();
|
|
68
|
-
// Register default languages.
|
|
69
102
|
for (const language of EditorLanguageRegistry.getDefaultLanguages()) {
|
|
70
103
|
languages.addLanguage(language);
|
|
71
104
|
}
|
|
72
|
-
// Add Jupyter Markdown flavor here to support code block highlighting.
|
|
73
105
|
languages.addLanguage({
|
|
74
106
|
name: 'ipythongfm',
|
|
75
107
|
mime: 'text/x-ipythongfm',
|
|
76
108
|
load: async () => {
|
|
77
|
-
// TODO: add support for LaTeX
|
|
109
|
+
// TODO: add support for LaTeX.
|
|
78
110
|
const m = await import('@codemirror/lang-markdown');
|
|
79
111
|
return m.markdown({
|
|
80
112
|
codeLanguages: (info) => languages.findBest(info)
|
|
@@ -88,7 +120,7 @@ export class CellAdapter {
|
|
|
88
120
|
commands.processKeydownEvent(event);
|
|
89
121
|
}, useCapture);
|
|
90
122
|
const rendermime = new RenderMimeRegistry({ initialFactories });
|
|
91
|
-
const iPyWidgetsClassicManager = new IPyWidgetsManager({ loader
|
|
123
|
+
const iPyWidgetsClassicManager = new IPyWidgetsManager({ loader });
|
|
92
124
|
rendermime.addFactory({
|
|
93
125
|
safe: false,
|
|
94
126
|
mimeTypes: [WIDGET_MIMETYPE],
|
|
@@ -96,7 +128,7 @@ export class CellAdapter {
|
|
|
96
128
|
}, 0);
|
|
97
129
|
const factoryService = new CodeMirrorEditorFactory({
|
|
98
130
|
extensions: editorExtensions(),
|
|
99
|
-
languages
|
|
131
|
+
languages,
|
|
100
132
|
});
|
|
101
133
|
this._codeCell = new CodeCell({
|
|
102
134
|
rendermime,
|
|
@@ -108,13 +140,18 @@ export class CellAdapter {
|
|
|
108
140
|
})
|
|
109
141
|
}),
|
|
110
142
|
contentFactory: new Cell.ContentFactory({
|
|
111
|
-
editorFactory: factoryService.newInlineEditor.bind(factoryService)
|
|
143
|
+
editorFactory: factoryService.newInlineEditor.bind(factoryService),
|
|
112
144
|
}),
|
|
113
145
|
});
|
|
114
146
|
this._codeCell.addClass('dla-JupyterCell');
|
|
115
147
|
this._codeCell.initializeState();
|
|
116
148
|
this._sessionContext.kernelChanged.connect((sender, arg) => {
|
|
117
149
|
const kernelConnection = arg.newValue;
|
|
150
|
+
if (kernelConnection) {
|
|
151
|
+
console.warn('The kernelConnection does not handle Comms', kernelConnection.id);
|
|
152
|
+
kernelConnection.handleComms = true;
|
|
153
|
+
console.log('New Kernel Connection is updated to force Comm support', kernelConnection);
|
|
154
|
+
}
|
|
118
155
|
iPyWidgetsClassicManager.registerWithKernel(kernelConnection);
|
|
119
156
|
});
|
|
120
157
|
this._sessionContext.kernelChanged.connect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CellAdapter.js","sourceRoot":"","sources":["../../../src/components/cell/CellAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"CellAdapter.js","sourceRoot":"","sources":["../../../src/components/cell/CellAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,12 +15,12 @@ export const CodeMirrorOutputToolbar = (props) => {
|
|
|
15
15
|
const [kernelStatus, setKernelStatus] = useState('unknown');
|
|
16
16
|
useEffect(() => {
|
|
17
17
|
if (kernel) {
|
|
18
|
-
kernel.
|
|
18
|
+
kernel.ready.then(() => {
|
|
19
19
|
if (codePre) {
|
|
20
20
|
executeCode(editorView, codePre);
|
|
21
21
|
}
|
|
22
|
-
setKernelStatus(
|
|
23
|
-
|
|
22
|
+
setKernelStatus(kernel.connection.status);
|
|
23
|
+
kernel.connection.statusChanged.connect((kernelConnection, status) => {
|
|
24
24
|
setKernelStatus(status);
|
|
25
25
|
});
|
|
26
26
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeMirrorOutputToolbar.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorOutputToolbar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACjF,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAcvG,MAAM,2BAA2B,GAAG,CAAC,KAAY,EAAE,EAAE;IACnD,MAAM,EAAC,WAAW,EAAE,aAAa,EAAE,UAAU,EAAC,GAAG,KAAK,CAAC;IACvD,OAAO,CACL,MAAC,UAAU,eACT,KAAC,UAAU,CAAC,MAAM,cAChB,KAAC,UAAU,uBAAiB,EAAE,EAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAC,WAAW,GAAE,GAC7D,EACpB,KAAC,UAAU,CAAC,OAAO,cACjB,MAAC,UAAU,eACT,MAAC,UAAU,CAAC,IAAI,IAAC,QAAQ,EAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA,CAAC,CAAC,aAC9E,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,cAAc,KAAG,GACO,EAC3B,KAAC,UAAU,CAAC,cAAc,gCAAgC,gBAE1C,EAClB,MAAC,UAAU,CAAC,IAAI,IAAC,QAAQ,EAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA,CAAC,CAAC,aAChF,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,QAAQ,KAAG,GACa,wBAEX,EAClB,MAAC,UAAU,CAAC,IAAI,IAAC,OAAO,EAAC,QAAQ,EAAC,OAAO,EAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,CAAA,CAAC,CAAC,aAClG,KAAC,UAAU,CAAC,aAAa,cACvB,KAAC,cAAc,KAAG,GACO,qBAEX,IACP,GACM,IACV,CACd,CAAA;AACH,CAAC,CAAA;AAED,MAAM,YAAY,GAA8B,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAC3D,KAAC,GAAG,IAAC,EAAE,EAAE,EAAC,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,EAAC,GAAI,CACtF,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAY,EAAE,EAAE;IACtD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC3D,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClF,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAuB,SAAS,CAAC,CAAC;IAClF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"CodeMirrorOutputToolbar.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorOutputToolbar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RenderMimeRegistry, standardRendererFactories as initialFactories } from '@jupyterlab/rendermime';
|
|
2
2
|
import { CommandRegistry } from '@lumino/commands';
|
|
3
|
-
import { CodeMirrorEditorFactory, CodeMirrorMimeTypeService, EditorLanguageRegistry, EditorExtensionRegistry, EditorThemeRegistry
|
|
3
|
+
import { ybinding, CodeMirrorEditorFactory, CodeMirrorMimeTypeService, EditorLanguageRegistry, EditorExtensionRegistry, EditorThemeRegistry } from '@jupyterlab/codemirror';
|
|
4
4
|
import { BoxPanel } from '@lumino/widgets';
|
|
5
5
|
import { ConsolePanel } from '@jupyterlab/console';
|
|
6
6
|
class ConsoleAdapter {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsoleAdapter.js","sourceRoot":"","sources":["../../../src/components/console/ConsoleAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,IAAI,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC3G,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"ConsoleAdapter.js","sourceRoot":"","sources":["../../../src/components/console/ConsoleAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { useJupyter } from './../../jupyter/JupyterContext';
|
|
|
6
6
|
import Services from './../../jupyter/services/Services';
|
|
7
7
|
const initialTree = {
|
|
8
8
|
id: 'root',
|
|
9
|
-
name: '
|
|
9
|
+
name: 'File Browser',
|
|
10
10
|
};
|
|
11
11
|
export const FileBrowser = () => {
|
|
12
12
|
const [tree, setTree] = useState(initialTree);
|
|
@@ -33,7 +33,17 @@ export const FileBrowser = () => {
|
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
});
|
|
36
|
-
|
|
36
|
+
const renderTree = items;
|
|
37
|
+
renderTree.sort((a, b) => {
|
|
38
|
+
if ((a.id.startsWith("folder_")) && (b.id.startsWith("file_"))) {
|
|
39
|
+
return -1;
|
|
40
|
+
}
|
|
41
|
+
if ((a.id.startsWith("file_")) && (b.id.startsWith("folder_"))) {
|
|
42
|
+
return 1;
|
|
43
|
+
}
|
|
44
|
+
return a.name.localeCompare(b.name);
|
|
45
|
+
});
|
|
46
|
+
return renderTree;
|
|
37
47
|
});
|
|
38
48
|
return folderItems;
|
|
39
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileBrowser.js","sourceRoot":"","sources":["../../../src/components/filebrowser/FileBrowser.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,QAAQ,MAAM,mCAAmC,CAAC;AAQzD,MAAM,WAAW,GAAe;IAC9B,EAAE,EAAE,MAAM;IACV,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"FileBrowser.js","sourceRoot":"","sources":["../../../src/components/filebrowser/FileBrowser.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export type IFileManager = number;
|
|
2
|
+
export interface IFileManagerState {
|
|
3
|
+
outputs: IFileManager;
|
|
4
|
+
}
|
|
5
|
+
export declare const fileBrowserInitialState: IFileManagerState;
|
|
6
|
+
export declare const selectFileManager: () => IFileManagerState;
|
|
7
|
+
export declare enum FileManagerActionType {
|
|
8
|
+
OUTPUTS = "fileBrowser/OUTPUTS",
|
|
9
|
+
EXECUTE = "fileBrowser/EXECUTE"
|
|
10
|
+
}
|
|
11
|
+
export declare const fileBrowserActions: {
|
|
12
|
+
outputs: import("typescript-fsa").ActionCreator<number>;
|
|
13
|
+
execute: import("typescript-fsa").ActionCreator<void>;
|
|
14
|
+
};
|
|
15
|
+
export declare const fileBrowserReducer: import("typescript-fsa-reducers").ReducerBuilder<IFileManagerState, IFileManagerState>;
|