@datalayer/jupyter-react 2.0.4 → 2.0.5
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/lumino/Lumino.js +11 -0
- package/lib/components/lumino/Lumino.js.map +1 -1
- package/lib/components/lumino/LuminoBox.js +9 -0
- package/lib/components/lumino/LuminoBox.js.map +1 -1
- package/lib/components/notebook/Notebook.css +6 -9
- package/lib/components/notebook/Notebook.js +1 -1
- package/lib/components/notebook/NotebookBase.js +59 -6
- package/lib/components/notebook/NotebookBase.js.map +1 -1
- package/lib/components/notebook/cell/sidebar/CellSidebarExtension.js +11 -1
- package/lib/components/notebook/cell/sidebar/CellSidebarExtension.js.map +1 -1
- package/lib/components/notebook/toolbar/NotebookToolbar.js +21 -48
- package/lib/components/notebook/toolbar/NotebookToolbar.js.map +1 -1
- package/lib/components/terminal/Terminal.d.ts +8 -1
- package/lib/components/terminal/Terminal.js +5 -2
- package/lib/components/terminal/Terminal.js.map +1 -1
- package/lib/lazy/LazyTerminal.d.ts +1 -1
- package/lib/state/JupyterReactState.d.ts +7 -0
- package/lib/state/JupyterReactState.js +4 -0
- package/lib/state/JupyterReactState.js.map +1 -1
- package/lib/theme/JupyterLabCss.js +0 -4
- package/lib/theme/JupyterLabCss.js.map +1 -1
- package/lib/theme/JupyterReactTheme.d.ts +1 -0
- package/lib/theme/JupyterReactTheme.js +9 -1
- package/lib/theme/JupyterReactTheme.js.map +1 -1
- package/package.json +1 -1
- package/style/base.css +133 -0
|
@@ -5,6 +5,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
5
5
|
* MIT License
|
|
6
6
|
*/
|
|
7
7
|
import { useRef, useEffect } from 'react';
|
|
8
|
+
import { MessageLoop } from '@lumino/messaging';
|
|
8
9
|
import { Widget } from '@lumino/widgets';
|
|
9
10
|
export const Lumino = ({ id = 'lumino-id', height = '100%', children, }) => {
|
|
10
11
|
const ref = useRef(null);
|
|
@@ -30,7 +31,17 @@ export const Lumino = ({ id = 'lumino-id', height = '100%', children, }) => {
|
|
|
30
31
|
catch (e) {
|
|
31
32
|
console.warn('Exception while attaching Lumino widget.', e);
|
|
32
33
|
}
|
|
34
|
+
// Observe the container for size changes and notify the Lumino widget.
|
|
35
|
+
// Lumino widgets rely on explicit resize messages to re-layout; they do
|
|
36
|
+
// not react to CSS / browser resize on their own.
|
|
37
|
+
const observer = new ResizeObserver(() => {
|
|
38
|
+
if (children.isAttached) {
|
|
39
|
+
MessageLoop.sendMessage(children, Widget.ResizeMessage.UnknownSize);
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
observer.observe(ref.current);
|
|
33
43
|
return () => {
|
|
44
|
+
observer.disconnect();
|
|
34
45
|
try {
|
|
35
46
|
if (children && (children.isAttached || children.node.isConnected)) {
|
|
36
47
|
Widget.detach(children);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Lumino.js","sourceRoot":"","sources":["../../../src/components/lumino/Lumino.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAQzC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,EACrB,EAAE,GAAG,WAAW,EAChB,MAAM,GAAG,MAAM,EACf,QAAQ,GACI,EAAE,EAAE;IAChB,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC;gBACH,sCAAsC;gBACtC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACzB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;oBACrC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;wBACxB,QAAQ,CAAC,IAAI,EAAE,CAAC;oBAClB,CAAC;oBACD,6BAA6B;oBAC7B,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACN,8BAA8B;oBAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;oBACvC,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;YAC9D,CAAC;YACD,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC;oBACH,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;wBACnE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpB,OAAO,CACL,cAAK,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAI,CACxE,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
1
|
+
{"version":3,"file":"Lumino.js","sourceRoot":"","sources":["../../../src/components/lumino/Lumino.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAQzC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,EACrB,EAAE,GAAG,WAAW,EAChB,MAAM,GAAG,MAAM,EACf,QAAQ,GACI,EAAE,EAAE;IAChB,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC;gBACH,sCAAsC;gBACtC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACzB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;oBACrC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;wBACxB,QAAQ,CAAC,IAAI,EAAE,CAAC;oBAClB,CAAC;oBACD,6BAA6B;oBAC7B,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACN,8BAA8B;oBAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;oBACvC,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;YAC9D,CAAC;YACD,uEAAuE;YACvE,wEAAwE;YACxE,kDAAkD;YAClD,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE;gBACvC,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACxB,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,UAAU,EAAE,CAAC;gBACtB,IAAI,CAAC;oBACH,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;wBACnE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpB,OAAO,CACL,cAAK,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAI,CACxE,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
5
5
|
* MIT License
|
|
6
6
|
*/
|
|
7
7
|
import { useRef, useEffect } from 'react';
|
|
8
|
+
import { MessageLoop } from '@lumino/messaging';
|
|
8
9
|
import { Widget, BoxPanel } from '@lumino/widgets';
|
|
9
10
|
import { Box } from '@primer/react';
|
|
10
11
|
export const LuminoBox = ({ id = 'lumino-box-id', height = '100%', children, }) => {
|
|
@@ -20,7 +21,15 @@ export const LuminoBox = ({ id = 'lumino-box-id', height = '100%', children, })
|
|
|
20
21
|
catch (e) {
|
|
21
22
|
console.warn('Exception while attaching Lumino widget.', e);
|
|
22
23
|
}
|
|
24
|
+
// Observe the container for size changes and notify the Lumino widget.
|
|
25
|
+
const observer = new ResizeObserver(() => {
|
|
26
|
+
if (boxPanel.isAttached) {
|
|
27
|
+
MessageLoop.sendMessage(boxPanel, Widget.ResizeMessage.UnknownSize);
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
observer.observe(ref.current);
|
|
23
31
|
return () => {
|
|
32
|
+
observer.disconnect();
|
|
24
33
|
try {
|
|
25
34
|
if (boxPanel.isAttached || boxPanel.node.isConnected) {
|
|
26
35
|
boxPanel.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LuminoBox.js","sourceRoot":"","sources":["../../../src/components/lumino/LuminoBox.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAQpC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,EAAE,GAAG,eAAe,EACpB,MAAM,GAAG,MAAM,EACf,QAAQ,GACO,EAAE,EAAE;IACnB,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC;YACrB,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;YAC9D,CAAC;YACD,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC;oBACH,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;wBACrD,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACnB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,SAAS;oBACT,yEAAyE;gBAC3E,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpB,OAAO,CACL,KAAC,GAAG,IACF,KAAK,EAAE;YACL,MAAM;YACN,SAAS,EAAE,MAAM;YACjB,KAAK,EAAE,MAAM;SACd,YAED,cAAK,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,GAAI,GACrB,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"LuminoBox.js","sourceRoot":"","sources":["../../../src/components/lumino/LuminoBox.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAQpC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,EAAE,GAAG,eAAe,EACpB,MAAM,GAAG,MAAM,EACf,QAAQ,GACO,EAAE,EAAE;IACnB,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC;YACrB,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;YAC9D,CAAC;YACD,uEAAuE;YACvE,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE;gBACvC,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACxB,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,UAAU,EAAE,CAAC;gBACtB,IAAI,CAAC;oBACH,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;wBACrD,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACnB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,SAAS;oBACT,yEAAyE;gBAC3E,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpB,OAAO,CACL,KAAC,GAAG,IACF,KAAK,EAAE;YACL,MAAM;YACN,SAAS,EAAE,MAAM;YACjB,KAAK,EAAE,MAAM;SACd,YAED,cAAK,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,GAAI,GACrB,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
|
@@ -12,15 +12,12 @@
|
|
|
12
12
|
min-height: fit-content;
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
background-color: rgba(128, 128, 128, 0.374);
|
|
22
|
-
border-radius: 10px;
|
|
23
|
-
}
|
|
15
|
+
/*
|
|
16
|
+
* Scrollbar styling is now handled globally in style/base.css
|
|
17
|
+
* with proper color-mode awareness via [data-color-mode] selectors.
|
|
18
|
+
* Removed the unscoped ::-webkit-scrollbar rules that applied globally
|
|
19
|
+
* and didn't adapt to dark mode.
|
|
20
|
+
*/
|
|
24
21
|
|
|
25
22
|
.dla-CellSidebar-Container {
|
|
26
23
|
position: relative;
|
|
@@ -374,6 +374,41 @@ export function NotebookBase(props) {
|
|
|
374
374
|
}
|
|
375
375
|
}
|
|
376
376
|
}, [adapter, id]);
|
|
377
|
+
// Propagate kernel status to the notebook store so that toolbar buttons
|
|
378
|
+
// (run, run-all, interrupt, …) can enable/disable themselves reactively.
|
|
379
|
+
useEffect(() => {
|
|
380
|
+
if (!panel) {
|
|
381
|
+
return;
|
|
382
|
+
}
|
|
383
|
+
const sessionContext = panel.context.sessionContext;
|
|
384
|
+
// ISessionContext.statusChanged tracks kernel status across kernel
|
|
385
|
+
// changes automatically — no need to manually subscribe per-kernel.
|
|
386
|
+
const onStatusChanged = (_, status) => {
|
|
387
|
+
notebookStore.getState().changeKernelStatus({ id, kernelStatus: status });
|
|
388
|
+
};
|
|
389
|
+
sessionContext.statusChanged.connect(onStatusChanged);
|
|
390
|
+
// Push the current status if a kernel is already connected
|
|
391
|
+
// (handles the case where the kernel was set before this effect ran).
|
|
392
|
+
const kernel = sessionContext.session?.kernel;
|
|
393
|
+
if (kernel) {
|
|
394
|
+
notebookStore
|
|
395
|
+
.getState()
|
|
396
|
+
.changeKernelStatus({ id, kernelStatus: kernel.status });
|
|
397
|
+
}
|
|
398
|
+
// Also wait for the session context to be ready, in case the kernel
|
|
399
|
+
// connection is still being established.
|
|
400
|
+
sessionContext.ready.then(() => {
|
|
401
|
+
const k = sessionContext.session?.kernel;
|
|
402
|
+
if (k) {
|
|
403
|
+
notebookStore
|
|
404
|
+
.getState()
|
|
405
|
+
.changeKernelStatus({ id, kernelStatus: k.status });
|
|
406
|
+
}
|
|
407
|
+
});
|
|
408
|
+
return () => {
|
|
409
|
+
sessionContext.statusChanged.disconnect(onStatusChanged);
|
|
410
|
+
};
|
|
411
|
+
}, [panel, id]);
|
|
377
412
|
useEffect(() => {
|
|
378
413
|
let isMounted = true;
|
|
379
414
|
let onActiveCellChanged = null;
|
|
@@ -535,14 +570,32 @@ export function useKernelId(options = {}) {
|
|
|
535
570
|
}
|
|
536
571
|
// Start a new default kernel if none found and one requested.
|
|
537
572
|
if (!foundKernelId && startDefaultKernel && isMounted) {
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
573
|
+
// First, try to reuse an existing running kernel (e.g. pre-warmed)
|
|
574
|
+
await kernels.refreshRunning();
|
|
575
|
+
const runningKernels = [...kernels.running()];
|
|
576
|
+
if (runningKernels.length > 0) {
|
|
577
|
+
// Connect to the first running kernel instead of starting a new one
|
|
578
|
+
const connection = kernels.connectTo({ model: runningKernels[0] });
|
|
579
|
+
if (isMounted) {
|
|
580
|
+
foundKernelId = connection.id;
|
|
581
|
+
setKernelId(foundKernelId);
|
|
582
|
+
// Don't track as startedConnection since we didn't create this kernel
|
|
583
|
+
}
|
|
584
|
+
else {
|
|
585
|
+
connection.dispose();
|
|
586
|
+
}
|
|
543
587
|
}
|
|
544
588
|
else {
|
|
545
|
-
|
|
589
|
+
// No running kernels found, start a new one as fallback
|
|
590
|
+
const connection = await kernels.startNew();
|
|
591
|
+
if (isMounted) {
|
|
592
|
+
foundKernelId = connection.id;
|
|
593
|
+
setKernelId(foundKernelId);
|
|
594
|
+
setStartedConnection(connection);
|
|
595
|
+
}
|
|
596
|
+
else {
|
|
597
|
+
connection.dispose();
|
|
598
|
+
}
|
|
546
599
|
}
|
|
547
600
|
}
|
|
548
601
|
if (isMounted) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotebookBase.js","sourceRoot":"","sources":["../../../src/components/notebook/NotebookBase.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"NotebookBase.js","sourceRoot":"","sources":["../../../src/components/notebook/NotebookBase.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,16 @@ import { ReactWidget } from '@jupyterlab/apputils';
|
|
|
3
3
|
import { Signal } from '@lumino/signaling';
|
|
4
4
|
import { CellSidebar } from './CellSidebar.js';
|
|
5
5
|
import { JupyterReactTheme } from '../../../../theme/index.js';
|
|
6
|
+
import { useJupyterReactStore } from '../../../../state/index.js';
|
|
7
|
+
/**
|
|
8
|
+
* Wrapper component that reads the backgroundColor from the Zustand store
|
|
9
|
+
* and passes it to JupyterReactTheme. This ensures sidebar extensions
|
|
10
|
+
* render with the same background as the notebook.
|
|
11
|
+
*/
|
|
12
|
+
function ThemedSidebarWrapper({ children, }) {
|
|
13
|
+
const backgroundColor = useJupyterReactStore(state => state.backgroundColor);
|
|
14
|
+
return (_jsx(JupyterReactTheme, { backgroundColor: backgroundColor, children: children }));
|
|
15
|
+
}
|
|
6
16
|
class CellSidebarFactory {
|
|
7
17
|
panel;
|
|
8
18
|
commands;
|
|
@@ -46,7 +56,7 @@ class CellSidebarFactory {
|
|
|
46
56
|
const cell = this._getCell(model);
|
|
47
57
|
if (cell) {
|
|
48
58
|
const SidebarFactory = this.factory;
|
|
49
|
-
const sidebar = ReactWidget.create(_jsx(
|
|
59
|
+
const sidebar = ReactWidget.create(_jsx(ThemedSidebarWrapper, { children: _jsx(SidebarFactory, { commands: this.commands, model: model, nbgrader: this.nbgrader }) }));
|
|
50
60
|
// Position sidebar wrapper
|
|
51
61
|
sidebar.node.style.width = `${this.sidebarWidth}px`;
|
|
52
62
|
sidebar.node.style.position = 'absolute';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CellSidebarExtension.js","sourceRoot":"","sources":["../../../../../src/components/notebook/cell/sidebar/CellSidebarExtension.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAOnD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAA0B,MAAM,eAAe,CAAC;AAKpE,OAAO,EAAE,iBAAiB,EAAa,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"CellSidebarExtension.js","sourceRoot":"","sources":["../../../../../src/components/notebook/cell/sidebar/CellSidebarExtension.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAOnD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAA0B,MAAM,eAAe,CAAC;AAKpE,OAAO,EAAE,iBAAiB,EAAa,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD;;;;GAIG;AACH,SAAS,oBAAoB,CAAC,EAC5B,QAAQ,GAGT;IACC,MAAM,eAAe,GAAG,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7E,OAAO,CACL,KAAC,iBAAiB,IAAC,eAAe,EAAE,eAAe,YAChD,QAAQ,GACS,CACrB,CAAC;AACJ,CAAC;AAED,MAAM,kBAAkB;IAeV;IACA;IACA;IACA;IACA;IAlBJ,WAAW,GAAG,KAAK,CAAC;IACpB,SAAS,GAAG,IAAI,OAAO,EAAsB,CAAC;IAEtD;;;;;;;;;OASG;IACH,YACY,KAAoB,EACpB,QAAyB,EACzB,WAAoB,KAAK,EACzB,eAAuB,GAAG,EAC1B,UAA0D,WAAW;QAJrE,UAAK,GAAL,KAAK,CAAe;QACpB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAA8D;QAE/E,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAChD,IAAI,CAAC,eAAe,EACpB,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACvE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAEO,WAAW,CAAC,KAAiB;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC;YACpC,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAChC,KAAC,oBAAoB,cACnB,KAAC,cAAc,IACb,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,GACvB,GACmB,CACxB,CAAC;YACF,2BAA2B;YAC3B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,IAAI,CAAC,YAAY,IAAI,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;YAC5B,IAAI,CAAC,MAAsB,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACnC,MAAM,aAAa,GAAG,GAAG,EAAE;gBACzB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC7B,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,CAAC,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAEO,QAAQ,CAAC,KAAiB;QAChC,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;IAC5E,CAAC;IAEO,cAAc,CAAC,KAAiB;QACtC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEO,eAAe,CACrB,KAAe,EACf,OAAiD;QAEjD,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/D,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEO,eAAe,CAAC,OAAiB;QACvC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;QACnC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;gBAC1B,IAAI,EAAE,KAAK;gBACX,QAAQ,EAAE,CAAC;gBACX,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC5B,QAAQ,EAAE,CAAC,CAAC;gBACZ,SAAS,EAAE,EAAE;aACd,CAAC,CAAC;QACL,CAAC;QACD,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF;AAUD;;GAEG;AACH,MAAM,OAAO,oBAAoB;IACrB,OAAO,CAAiD;IACxD,QAAQ,CAAmB;IAC3B,QAAQ,CAAW;IACnB,YAAY,CAAU;IACtB,SAAS,CAAa;IACvB,SAAS,CAAO;IAEzB;;;;OAIG;IACH,YAAY,UAAwC,EAAE;QACpD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,WAAW,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,KAAoB;QAC5B,uEAAuE;QACvE,sEAAsE;QACtE,uBAAuB;QACvB,MAAM,OAAO,GAAG,IAAI,kBAAkB,CACpC,KAAK,EACL,IAAI,CAAC,QAAS,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,KAA8B;QACjC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IACjC,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}
|
|
@@ -7,63 +7,36 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
7
7
|
import { useState } from 'react';
|
|
8
8
|
import { IconButton, Button, ButtonGroup } from '@primer/react';
|
|
9
9
|
import { Box } from '@datalayer/primer-addons';
|
|
10
|
-
import { PlusIcon, PlayIcon,
|
|
10
|
+
import { PlusIcon, PlayIcon, SquareFillIcon, TrashIcon, DownloadIcon, IterationsIcon, CodeIcon, MarkdownIcon, } from '@primer/octicons-react';
|
|
11
11
|
import { useNotebookStore } from '../NotebookState.js';
|
|
12
12
|
export const NotebookToolbar = (props) => {
|
|
13
13
|
const { notebookId } = props;
|
|
14
14
|
const notebookStore = useNotebookStore();
|
|
15
|
-
const [
|
|
15
|
+
const [insertType, setInsertType] = useState('code');
|
|
16
16
|
const kernelStatus = notebookStore.selectKernelStatus(notebookId);
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
const isBusy = kernelStatus === 'busy';
|
|
18
|
+
const isIdle = kernelStatus === 'idle';
|
|
19
|
+
// ---- Handlers ----
|
|
20
|
+
const handleSave = () => notebookStore.save({ id: notebookId, date: new Date() });
|
|
21
|
+
const handleRun = () => notebookStore.run(notebookId);
|
|
22
|
+
const handleRunAll = () => notebookStore.runAll(notebookId);
|
|
23
|
+
const handleInterrupt = () => notebookStore.interrupt(notebookId);
|
|
24
|
+
const handleDelete = () => notebookStore.delete(notebookId);
|
|
25
|
+
const handleInsert = () => notebookStore.insertBelow(notebookId, insertType);
|
|
26
|
+
return (_jsxs(Box, { sx: {
|
|
27
|
+
display: 'flex',
|
|
28
|
+
alignItems: 'center',
|
|
29
|
+
justifyContent: 'space-between',
|
|
21
30
|
width: '100%',
|
|
31
|
+
px: 3,
|
|
32
|
+
py: '6px',
|
|
22
33
|
borderBottomWidth: 1,
|
|
23
34
|
borderBottomStyle: 'solid',
|
|
24
35
|
borderColor: 'border.default',
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
gap: '0.75vw',
|
|
30
|
-
}, children: [_jsx(IconButton, { variant: "invisible", size: "small", color: "primary", "aria-label": "Save", title: "Save", onClick: e => {
|
|
31
|
-
e.preventDefault();
|
|
32
|
-
notebookStore.save({
|
|
33
|
-
id: notebookId,
|
|
34
|
-
date: new Date(),
|
|
35
|
-
});
|
|
36
|
-
}, icon: ZapIcon }), _jsx(IconButton, { variant: "invisible", size: "small", color: "secondary", "aria-label": "Run cell", title: "Run cell", onClick: e => {
|
|
37
|
-
e.preventDefault();
|
|
38
|
-
notebookStore.run(notebookId);
|
|
39
|
-
}, style: { color: 'grey' }, icon: PlayIcon, disabled: kernelStatus !== 'idle' }), _jsx(IconButton, { variant: "invisible", size: "small", color: "secondary", "aria-label": "Run all cells", title: "Run all cells", onClick: e => {
|
|
40
|
-
e.preventDefault();
|
|
41
|
-
notebookStore.runAll(notebookId);
|
|
42
|
-
}, style: { color: 'grey' }, icon: PaperAirplaneIcon, disabled: kernelStatus !== 'idle' }), _jsx(IconButton, { variant: "invisible", size: "small", color: "error", "aria-label": "Interrupt", onClick: e => {
|
|
43
|
-
e.preventDefault();
|
|
44
|
-
notebookStore.interrupt(notebookId);
|
|
45
|
-
}, icon: StopIcon, disabled: kernelStatus !== 'busy' }), _jsx(IconButton, { variant: "invisible", size: "small", color: "error", "aria-label": "Delete", title: "Delete", onClick: e => {
|
|
46
|
-
e.preventDefault();
|
|
47
|
-
notebookStore.delete(notebookId);
|
|
48
|
-
}, icon: TrashIcon })] }), _jsxs(Box, { sx: {
|
|
49
|
-
display: 'flex',
|
|
50
|
-
width: '50%',
|
|
51
|
-
paddingRight: '7vw',
|
|
52
|
-
gap: '0.75vw',
|
|
53
|
-
justifyContent: 'flex-end',
|
|
54
|
-
alignItems: 'center',
|
|
55
|
-
}, children: [_jsx(IconButton, { variant: "invisible", size: "small", color: "primary", "aria-label": "Insert cell", title: "Insert cell", onClick: e => {
|
|
56
|
-
e.preventDefault();
|
|
57
|
-
if (type === 'raw') {
|
|
58
|
-
notebookStore.insertBelow(notebookId, 'raw');
|
|
59
|
-
}
|
|
60
|
-
else if (type === 'code') {
|
|
61
|
-
notebookStore.insertBelow(notebookId, 'code');
|
|
62
|
-
}
|
|
63
|
-
else if (type === 'markdown') {
|
|
64
|
-
notebookStore.insertBelow(notebookId, 'markdown');
|
|
65
|
-
}
|
|
66
|
-
}, style: { color: 'grey' }, icon: PlusIcon }), _jsxs(ButtonGroup, { children: [_jsx(Button, { variant: type === 'code' ? 'primary' : 'invisible', onClick: () => handleChangeCellType('code'), size: "small", children: "Code" }), _jsx(Button, { variant: type === 'markdown' ? 'primary' : 'invisible', onClick: () => handleChangeCellType('markdown'), size: "small", children: "Markdown" }), _jsx(Button, { variant: type === 'raw' ? 'primary' : 'invisible', onClick: () => handleChangeCellType('raw'), size: "small", children: "Raw" })] })] })] }));
|
|
36
|
+
bg: 'canvas.subtle',
|
|
37
|
+
gap: 2,
|
|
38
|
+
minHeight: '36px',
|
|
39
|
+
}, children: [_jsxs(Box, { sx: { display: 'flex', alignItems: 'center', gap: 1 }, children: [_jsx(IconButton, { variant: "invisible", size: "small", "aria-label": "Save notebook", description: "Save notebook (\u2318S)", onClick: handleSave, icon: DownloadIcon }), _jsx(Box, { sx: { width: '1px', height: 16, bg: 'border.default', mx: 1 } }), _jsx(IconButton, { variant: "invisible", size: "small", "aria-label": "Run cell", description: "Run cell (\u21E7\u21B5)", onClick: handleRun, icon: PlayIcon, disabled: !isIdle, sx: { color: 'success.fg' } }), _jsx(IconButton, { variant: "invisible", size: "small", "aria-label": "Run all cells", description: "Run all cells", onClick: handleRunAll, icon: IterationsIcon, disabled: !isIdle }), _jsx(IconButton, { variant: "invisible", size: "small", "aria-label": "Interrupt kernel", description: "Interrupt kernel (\u2318I)", onClick: handleInterrupt, icon: SquareFillIcon, disabled: !isBusy, sx: { color: isBusy ? 'danger.fg' : undefined } }), _jsx(Box, { sx: { width: '1px', height: 16, bg: 'border.default', mx: 1 } }), _jsx(IconButton, { variant: "invisible", size: "small", "aria-label": "Delete cell", description: "Delete cell", onClick: handleDelete, icon: TrashIcon })] }), _jsxs(Box, { sx: { display: 'flex', alignItems: 'center', gap: 1 }, children: [_jsx(IconButton, { variant: "invisible", size: "small", "aria-label": `Insert ${insertType} cell below`, description: `Insert ${insertType} cell below`, onClick: handleInsert, icon: PlusIcon }), _jsxs(ButtonGroup, { children: [_jsx(Button, { variant: insertType === 'code' ? 'primary' : 'invisible', size: "small", onClick: () => setInsertType('code'), leadingVisual: CodeIcon, children: "Code" }), _jsx(Button, { variant: insertType === 'markdown' ? 'primary' : 'invisible', size: "small", onClick: () => setInsertType('markdown'), leadingVisual: MarkdownIcon, children: "Markdown" })] })] })] }));
|
|
67
40
|
};
|
|
68
41
|
export default NotebookToolbar;
|
|
69
42
|
//# sourceMappingURL=NotebookToolbar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotebookToolbar.js","sourceRoot":"","sources":["../../../../src/components/notebook/toolbar/NotebookToolbar.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"NotebookToolbar.js","sourceRoot":"","sources":["../../../../src/components/notebook/toolbar/NotebookToolbar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,16 @@
|
|
|
1
|
+
import { ServerConnection } from '@jupyterlab/services';
|
|
1
2
|
import { ITerminal } from '@jupyterlab/terminal';
|
|
2
|
-
export declare const Terminal: ({ height, colormode, ...rest }: Terminal.ITerminalOptions) => import("react/jsx-runtime").JSX.Element;
|
|
3
|
+
export declare const Terminal: ({ height, colormode, serverSettings: serverSettingsProp, ...rest }: Terminal.ITerminalOptions) => import("react/jsx-runtime").JSX.Element;
|
|
3
4
|
export declare namespace Terminal {
|
|
4
5
|
interface ITerminalOptions {
|
|
5
6
|
height?: string;
|
|
6
7
|
colormode?: ITerminal.Theme;
|
|
8
|
+
/**
|
|
9
|
+
* Server connection settings to use for the terminal.
|
|
10
|
+
* When provided, the terminal connects to this specific server
|
|
11
|
+
* instead of using the global Jupyter store settings.
|
|
12
|
+
*/
|
|
13
|
+
serverSettings?: ServerConnection.ISettings;
|
|
7
14
|
/**
|
|
8
15
|
* Code to be executed at terminal startup
|
|
9
16
|
*/
|
|
@@ -10,9 +10,12 @@ import TerminalAdapter from './TerminalAdapter.js';
|
|
|
10
10
|
import { useJupyter } from './../../jupyter/JupyterUse.js';
|
|
11
11
|
import LuminoBox from '../lumino/LuminoBox.js';
|
|
12
12
|
import useTerminalStore from './TerminalState.js';
|
|
13
|
-
export const Terminal = ({ height = '100%', colormode = 'dark', ...rest }) => {
|
|
13
|
+
export const Terminal = ({ height = '100%', colormode = 'dark', serverSettings: serverSettingsProp, ...rest }) => {
|
|
14
14
|
const terminalStore = useTerminalStore();
|
|
15
|
-
const { serverSettings } = useJupyter({
|
|
15
|
+
const { serverSettings: serverSettingsFromStore } = useJupyter({
|
|
16
|
+
terminals: true,
|
|
17
|
+
});
|
|
18
|
+
const serverSettings = serverSettingsProp ?? serverSettingsFromStore;
|
|
16
19
|
const [adapter, setAdapter] = useState();
|
|
17
20
|
useEffect(() => {
|
|
18
21
|
if (serverSettings) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../src/components/terminal/Terminal.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../src/components/terminal/Terminal.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,iBAAiB,CAAC;AAE/C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EACvB,MAAM,GAAG,MAAM,EACf,SAAS,GAAG,MAAM,EAClB,cAAc,EAAE,kBAAkB,EAClC,GAAG,IAAI,EACmB,EAAE,EAAE;IAC9B,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,EAAE,cAAc,EAAE,uBAAuB,EAAE,GAAG,UAAU,CAAC;QAC7D,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,kBAAkB,IAAI,uBAAuB,CAAC;IACrE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAmB,CAAC;IAC1D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC;gBAClC,cAAc;gBACd,MAAM;gBACN,SAAS;gBACT,GAAG,IAAI;aACR,CAAC,CAAC;YACH,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAClC,UAAU,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IACrB,OAAO,OAAO,CAAC,CAAC,CAAC,CACf,KAAC,GAAG,IACF,EAAE,EAAE;YACF,gBAAgB,EAAE;gBAChB,MAAM,EAAE,GAAG,MAAM,aAAa;aAC/B;SACF,YAED,KAAC,SAAS,cAAE,OAAO,CAAC,KAAK,GAAa,GAClC,CACP,CAAC,CAAC,CAAC,CACF,mBAAK,CACN,CAAC;AACJ,CAAC,CAAC;AAmBF,eAAe,QAAQ,CAAC"}
|
|
@@ -25,5 +25,5 @@ export declare const LazyTerminal: React.FC<ILazyTerminalProps>;
|
|
|
25
25
|
/**
|
|
26
26
|
* Raw lazy Terminal component without Suspense boundary
|
|
27
27
|
*/
|
|
28
|
-
export declare const LazyTerminalRaw: React.LazyExoticComponent<({ height, colormode, ...rest }: TerminalNamespace.ITerminalOptions) => import("react/jsx-runtime").JSX.Element>;
|
|
28
|
+
export declare const LazyTerminalRaw: React.LazyExoticComponent<({ height, colormode, serverSettings: serverSettingsProp, ...rest }: TerminalNamespace.ITerminalOptions) => import("react/jsx-runtime").JSX.Element>;
|
|
29
29
|
export default LazyTerminal;
|
|
@@ -25,6 +25,12 @@ export type JupyterReactState = {
|
|
|
25
25
|
terminalStore: TerminalState;
|
|
26
26
|
version: string;
|
|
27
27
|
colormode: Colormode;
|
|
28
|
+
/**
|
|
29
|
+
* Optional background color override.
|
|
30
|
+
* When set (e.g. by JupyterReactTheme), notebook extensions such as
|
|
31
|
+
* cell sidebars can read this value and render with the same background.
|
|
32
|
+
*/
|
|
33
|
+
backgroundColor?: string;
|
|
28
34
|
/**
|
|
29
35
|
* JupyterLabApp adapter.
|
|
30
36
|
*/
|
|
@@ -37,6 +43,7 @@ export type JupyterReactState = {
|
|
|
37
43
|
setServiceManager: (serviceManager?: ServiceManager.IManager) => void;
|
|
38
44
|
setVersion: (version: string) => void;
|
|
39
45
|
setColormode: (colormode: Colormode) => void;
|
|
46
|
+
setBackgroundColor: (backgroundColor?: string) => void;
|
|
40
47
|
};
|
|
41
48
|
export declare const jupyterReactStore: import("zustand").StoreApi<JupyterReactState>;
|
|
42
49
|
export declare function useJupyterReactStore(): JupyterReactState;
|
|
@@ -41,6 +41,7 @@ export const jupyterReactStore = createStore((set, get) => ({
|
|
|
41
41
|
outputStore: outputsStore.getState(),
|
|
42
42
|
terminalStore: terminalStore.getState(),
|
|
43
43
|
colormode: 'light',
|
|
44
|
+
backgroundColor: undefined,
|
|
44
45
|
setJupyterLabAdapter: (jupyterLabAdapter) => {
|
|
45
46
|
set(_state => ({ jupyterLabAdapter }));
|
|
46
47
|
},
|
|
@@ -66,6 +67,9 @@ export const jupyterReactStore = createStore((set, get) => ({
|
|
|
66
67
|
setupPrimerPortals(resolved);
|
|
67
68
|
set(_state => ({ colormode }));
|
|
68
69
|
},
|
|
70
|
+
setBackgroundColor: (backgroundColor) => {
|
|
71
|
+
set(_state => ({ backgroundColor }));
|
|
72
|
+
},
|
|
69
73
|
}));
|
|
70
74
|
// Module-level flag to ensure config is only initialized once
|
|
71
75
|
// This prevents render-during-render warnings when multiple components
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupyterReactState.js","sourceRoot":"","sources":["../../src/state/JupyterReactState.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EACL,cAAc,GAGf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAkB,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAc,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAgB,MAAM,oCAAoC,CAAC;AAChF,OAAO,EACL,aAAa,GAEd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAe,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EACL,aAAa,GAEd,MAAM,sCAAsC,CAAC;AAG9C,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"JupyterReactState.js","sourceRoot":"","sources":["../../src/state/JupyterReactState.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EACL,cAAc,GAGf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAkB,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAc,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAgB,MAAM,oCAAoC,CAAC;AAChF,OAAO,EACL,aAAa,GAEd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAe,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EACL,aAAa,GAEd,MAAM,sCAAsC,CAAC;AAG9C,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AA2CnE,qCAAqC;AACrC,sFAAsF;AACtF,yFAAyF;AACzF,MAAM,cAAc,GAAmB,iBAAiB,CAAC;IACvD,aAAa,EAAE,KAAK;IACpB,IAAI,EAAE,KAAK;IACX,gBAAgB,EAAE,SAAS;IAC3B,kBAAkB,EAAE,SAAS;IAC7B,SAAS,EAAE,KAAK;CACjB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,WAAW,CAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC7E,OAAO,EAAE,EAAE;IACX,iBAAiB,EAAE,SAAS;IAC5B,aAAa,EAAE,cAAc;IAC7B,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,SAAS;IACjB,cAAc,EAAE,SAAS;IACzB,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;IACjC,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;IACrC,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;IACvC,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE;IACpC,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;IACvC,SAAS,EAAE,OAAO;IAClB,eAAe,EAAE,SAAS;IAC1B,oBAAoB,EAAE,CAAC,iBAAuC,EAAE,EAAE;QAChE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC;IACD,gBAAgB,EAAE,CAAC,aAA8B,EAAE,EAAE;QACnD,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IACrC,CAAC;IACD,iBAAiB,EAAE,CAAC,cAAwC,EAAE,EAAE;QAC9D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,UAAU,EAAE,OAAO,CAAC,EAAE;QACpB,IAAI,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;YAC9B,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IACD,YAAY,EAAE,SAAS,CAAC,EAAE;QACxB,4DAA4D;QAC5D,iEAAiE;QACjE,MAAM,QAAQ,GACZ,SAAS,KAAK,MAAM;YAClB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC,OAAO;gBACzD,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,OAAO;YACX,CAAC,CAAC,SAAS,CAAC;QAChB,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC7B,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;IACD,kBAAkB,EAAE,CAAC,eAAwB,EAAE,EAAE;QAC/C,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;CACF,CAAC,CAAC,CAAC;AAEJ,8DAA8D;AAC9D,uEAAuE;AACvE,oDAAoD;AACpD,IAAI,6BAA6B,GAAG,KAAK,CAAC;AAQ1C,MAAM,UAAU,oBAAoB,CAClC,QAA0C;IAE1C,OAAO,QAAQ,CAAC,iBAAiB,EAAE,QAAS,CAAC,CAAC;AAChD,CAAC;AAKD,MAAM,UAAU,6BAA6B,CAC3C,KAAoB;IAEpB,MAAM,EACJ,iBAAiB,GAAG,mBAAmB,EACvC,QAAQ,GAAG,EAAE,EACb,kBAAkB,GAAG,KAAK,CAAC,cAAc,EAAE,cAAc,CAAC,KAAK,EAC/D,gBAAgB,GAAG,KAAK,CAAC,cAAc,EAAE,cAAc,CAAC,OAAO,EAC/D,IAAI,GAAG,KAAK,EACZ,UAAU,EACV,cAAc,EAAE,mBAAmB,EACnC,kBAAkB,GAAG,KAAK,EAC1B,SAAS,GAAG,KAAK,EACjB,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,EAC7C,qBAAqB,GAAG,KAAK,CAAC,qBAAqB,IAAI,CAAC,CAAC,GAC1D,GAAG,KAAK,CAAC;IAEV,MAAM,aAAa,GAAG,OAAO,CAAiB,GAAG,EAAE;QACjD,8DAA8D;QAC9D,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAC,aAAc,CAAC;QAEhE,2BAA2B;QAC3B,MAAM,MAAM,GAAG,iBAAiB,CAAC;YAC/B,aAAa,EAAE,KAAK;YACpB,IAAI;YACJ,gBAAgB;YAChB,kBAAkB;YAClB,SAAS;SACV,CAAC,CAAC;QAEH,wEAAwE;QACxE,MAAM,WAAW,GACf,WAAW,CAAC,gBAAgB,KAAK,MAAM,CAAC,gBAAgB;YACxD,WAAW,CAAC,kBAAkB,KAAK,MAAM,CAAC,kBAAkB,CAAC;QAE/D,iFAAiF;QACjF,IAAI,WAAW,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAClD,6BAA6B,GAAG,IAAI,CAAC;YACrC,cAAc,CAAC,GAAG,EAAE;gBAClB,iBAAiB,CAAC,QAAQ,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBACtD,6BAA6B,GAAG,KAAK,CAAC,CAAC,gCAAgC;YACzE,CAAC,CAAC,CAAC;QACL,CAAC;QAED,iEAAiE;QACjE,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC,CAAC;IAE5D,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAElD,mBAAmB,CAAC,CAAC;IACvB,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAU,CAAC;IAC1C,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,GAAG,QAAQ,CACjC,kBAAkB,IAAI,qBAAqB,GAAG,CAAC,CAAC,CACjD,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,mBAAmB,EAAE,CAAC;YACxB,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;YACvC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE1B,qCAAqC;IACrC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,cAAc,GAAG,IAAI,kBAAkB,EAAE,CAAC;YAChD,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAClC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QACD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,IAAI,IAAI,EAAE,CAAC;gBACT,wBAAwB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;oBACnD,iBAAiB,CAAC,QAAQ,EAAE,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;oBAC/D,iBAAiB,CAAC,cAAc,CAAC,CAAC;gBACpC,CAAC,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YACD,MAAM,cAAc,GAAG,oBAAoB,CACzC,aAAa,CAAC,gBAAgB,EAC9B,aAAa,CAAC,kBAAkB,CACjC,CAAC;YACF,iBAAiB,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC9C,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,QAAQ,GACZ,mBAAmB,EAAE,GAAG,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC;oBAC3D,OAAO,CAAC,IAAI,CACV,oDAAoD,EACpD,QAAQ,CACT,CAAC;oBACF,8CAA8C;gBAChD,CAAC;gBACD,IAAI,kBAAkB,IAAI,qBAAqB,GAAG,CAAC,CAAC,EAAE,CAAC;oBACrD,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;gBACJ,CAAC;gBACD,IACE,kBAAkB;oBAClB,CAAC,kBAAkB,IAAI,qBAAqB,GAAG,CAAC,CAAC,CAAC,EAClD,CAAC;oBACD,MAAM,IAAI,KAAK,CACb,4GAA4G,CAC7G,CAAC;gBACJ,CAAC;gBACD,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;gBAC9D,iBAAiB,CAAC,cAAc,CAAC,CAAC;gBAClC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEzC,4BAA4B;IAC5B,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC5C,IAAI,qBAAqB,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC/B,MAAM,cAAc,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC9D,MAAM,KAAK,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAC;gBAC9C,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC;oBAChC,aAAa,EAAE,cAAc,CAAC,OAAO;oBACrC,UAAU,EAAE,KAAK,CAAC,IAAI;oBACtB,cAAc,EAAE,KAAK,CAAC,IAAI;oBAC1B,WAAW,EAAE,KAAK;oBAClB,kBAAkB,EAAE,cAAc,CAAC,WAAW;oBAC9C,cAAc,EAAE,cAAc,CAAC,QAAQ;iBACxC,CAAC,CAAC;gBACH,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,CAAC;wBACH,MAAM,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC;oBAC/C,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;oBAC7D,CAAC;gBACH,CAAC;gBACD,SAAS,CAAC,cAAc,CAAC,CAAC;gBAC1B,iBAAiB,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,cAAc,CAAC;gBACrD,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,iBAAiB,CAAC,QAAQ,EAAE,CAAC,eAAe,GAAG,KAAK,CAAC;YACvD,CAAC;iBAAM,IAAI,kBAAkB,EAAE,CAAC;gBAC9B,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC;oBAC/B,UAAU,EAAE,iBAAiB;oBAC7B,cAAc,EAAE,iBAAiB;oBACjC,aAAa,EAAE,cAAc,CAAC,OAAO;oBACrC,kBAAkB,EAAE,cAAc,CAAC,WAAW;oBAC9C,cAAc,EAAE,cAAc,CAAC,QAAQ;iBACxC,CAAC,CAAC;gBACH,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;oBAClC,IAAI,QAAQ,EAAE,CAAC;wBACb,IAAI,CAAC;4BACH,MAAM,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC;wBAC9C,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;wBAC7D,CAAC;oBACH,CAAC;oBACD,SAAS,CAAC,aAAa,CAAC,CAAC;oBACzB,iBAAiB,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,aAAa,CAAC;oBACpD,YAAY,CAAC,KAAK,CAAC,CAAC;oBACpB,iBAAiB,CAAC,QAAQ,EAAE,CAAC,eAAe,GAAG,KAAK,CAAC;gBACvD,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,OAAO,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AACrC,CAAC;AAED,eAAe,oBAAoB,CAAC"}
|
|
@@ -75,7 +75,6 @@ export function JupyterLabCss(props) {
|
|
|
75
75
|
document.body.querySelectorAll('link[rel="stylesheet"]').forEach(link => {
|
|
76
76
|
const href = link.getAttribute('href') || '';
|
|
77
77
|
if (href.includes(oppositeTheme)) {
|
|
78
|
-
console.log(`[JupyterLabCss] Removing conflicting theme link: ${href}`);
|
|
79
78
|
link.remove();
|
|
80
79
|
}
|
|
81
80
|
});
|
|
@@ -87,7 +86,6 @@ export function JupyterLabCss(props) {
|
|
|
87
86
|
if (node instanceof HTMLLinkElement && node.rel === 'stylesheet') {
|
|
88
87
|
const href = node.getAttribute('href') || '';
|
|
89
88
|
if (href.includes(oppositeTheme)) {
|
|
90
|
-
console.log(`[JupyterLabCss] Observer removing conflicting theme link: ${href}`);
|
|
91
89
|
node.remove();
|
|
92
90
|
}
|
|
93
91
|
}
|
|
@@ -96,7 +94,6 @@ export function JupyterLabCss(props) {
|
|
|
96
94
|
});
|
|
97
95
|
observer.observe(document.body, { childList: true });
|
|
98
96
|
// Inject the JupyterLab theme stylesheet in a retrievable node.
|
|
99
|
-
console.log(`[JupyterLabCss] Loading theme variables for colormode: ${colormode}`);
|
|
100
97
|
theme
|
|
101
98
|
?.then(module => {
|
|
102
99
|
const css = module.default;
|
|
@@ -112,7 +109,6 @@ export function JupyterLabCss(props) {
|
|
|
112
109
|
document.body.insertAdjacentHTML('beforeend', `<style ${DATA_JUPYTERLAB_THEME}="${colormode}">
|
|
113
110
|
${css}
|
|
114
111
|
</style>`);
|
|
115
|
-
console.log(`[JupyterLabCss] Injected style tag for ${colormode} at end of body`);
|
|
116
112
|
}
|
|
117
113
|
})
|
|
118
114
|
.catch(err => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupyterLabCss.js","sourceRoot":"","sources":["../../src/theme/JupyterLabCss.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAEtD,MAAM,WAAW,GAAG,iBAAiB,CAAK;;;;;;CAMzC,CAAC;AAMF;;GAEG;AACH,IAAI,QAAQ,GAAG,KAAK,CAAC;AAErB;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,KAAyB;IACrD,MAAM,EAAE,SAAS,GAAG,OAAO,EAAE,GAAG,KAAK,CAAC;IACtC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ;YACR,OAAO;QACT,CAAC;QACD,QAAQ,GAAG,IAAI,CAAC;QAChB,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC9C,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAChD,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAChD,MAAM,CAAC,kCAAkC,CAAC,CAAC;QAC3C,MAAM,CAAC,2CAA2C,CAAC,CAAC;QACpD,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAChD,MAAM,CAAC,oCAAoC,CAAC,CAAC;QAC7C,MAAM,CAAC,sCAAsC,CAAC,CAAC;QAC/C,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAChD,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAChD,MAAM,CAAC,kCAAkC,CAAC,CAAC;QAC3C,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC9C,MAAM,CAAC,wCAAwC,CAAC,CAAC;QACjD,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC9C,MAAM,CAAC,0CAA0C,CAAC,CAAC;QACnD,cAAc;QACd,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC9C,MAAM,CAAC,gDAAgD,CAAC,CAAC;IAC3D,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC;QACV,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,KAAK;oBACH,MAAM,CAAC,2DAA2D,CAAC,CAAC;gBACtE,MAAM;YACR,CAAC;YACD,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,KAAK;oBACH,MAAM,CAAC,0DAA0D,CAAC,CAAC;gBACrE,MAAM;YACR,CAAC;QACH,CAAC;QAED,8CAA8C;QAC9C,MAAM,aAAa,GACjB,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,sBAAsB,CAAC;QAE1E;;;;;;WAMG;QACH,SAAS,2BAA2B;YAClC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACtE,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC7C,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;oBACjC,
|
|
1
|
+
{"version":3,"file":"JupyterLabCss.js","sourceRoot":"","sources":["../../src/theme/JupyterLabCss.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import React, { CSSProperties } from 'react';
|
|
|
2
2
|
import { Colormode } from '../theme';
|
|
3
3
|
import '@primer/primitives/dist/css/functional/themes/light.css';
|
|
4
4
|
import '@primer/primitives/dist/css/functional/themes/dark.css';
|
|
5
|
+
import '../../style/base.css';
|
|
5
6
|
import '@primer/primitives/dist/css/base/typography/typography.css';
|
|
6
7
|
import '@primer/primitives/dist/css/functional/size/border.css';
|
|
7
8
|
import '@primer/primitives/dist/css/functional/size/breakpoints.css';
|
|
@@ -12,6 +12,9 @@ import { loadJupyterConfig } from '../jupyter/index.js';
|
|
|
12
12
|
import { useJupyterReactStore } from '../state/index.js';
|
|
13
13
|
import '@primer/primitives/dist/css/functional/themes/light.css';
|
|
14
14
|
import '@primer/primitives/dist/css/functional/themes/dark.css';
|
|
15
|
+
// Color-mode-aware scrollbar styles for JupyterLab containers.
|
|
16
|
+
// Must be loaded alongside the theme since it relies on [data-color-mode].
|
|
17
|
+
import '../../style/base.css';
|
|
15
18
|
import '@primer/primitives/dist/css/base/typography/typography.css';
|
|
16
19
|
import '@primer/primitives/dist/css/functional/size/border.css';
|
|
17
20
|
import '@primer/primitives/dist/css/functional/size/breakpoints.css';
|
|
@@ -36,7 +39,7 @@ export function useJupyterReactColormode() {
|
|
|
36
39
|
*/
|
|
37
40
|
export function JupyterReactTheme(props) {
|
|
38
41
|
const { children, colormode: colormodeProps = 'light', loadJupyterLabCss = true, theme = jupyterLabTheme, backgroundColor, ...rest } = props;
|
|
39
|
-
const { colormode: colormodeFromStore, setColormode: setColormodeStore, jupyterLabAdapter, } = useJupyterReactStore();
|
|
42
|
+
const { colormode: colormodeFromStore, setColormode: setColormodeStore, setBackgroundColor: setBackgroundColorStore, jupyterLabAdapter, } = useJupyterReactStore();
|
|
40
43
|
const hasColormodeProp = 'colormode' in props;
|
|
41
44
|
// Resolve 'auto' → actual OS preference ('light' or 'dark').
|
|
42
45
|
const resolveColormode = (cm) => {
|
|
@@ -86,6 +89,11 @@ export function JupyterReactTheme(props) {
|
|
|
86
89
|
syncedRef.current = true;
|
|
87
90
|
}
|
|
88
91
|
}
|
|
92
|
+
// Sync backgroundColor prop → store so notebook extensions (sidebars, etc.)
|
|
93
|
+
// can read it from the store and render with the same background.
|
|
94
|
+
useEffect(() => {
|
|
95
|
+
setBackgroundColorStore(backgroundColor);
|
|
96
|
+
}, [backgroundColor, setBackgroundColorStore]);
|
|
89
97
|
useEffect(() => {
|
|
90
98
|
function colorSchemeFromMedia({ matches }) {
|
|
91
99
|
// When colormode is 'auto', react to OS changes in real time.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupyterReactTheme.js","sourceRoot":"","sources":["../../src/theme/JupyterReactTheme.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"JupyterReactTheme.js","sourceRoot":"","sources":["../../src/theme/JupyterReactTheme.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/style/base.css
CHANGED
|
@@ -3,3 +3,136 @@
|
|
|
3
3
|
*
|
|
4
4
|
* MIT License
|
|
5
5
|
*/
|
|
6
|
+
|
|
7
|
+
/*
|
|
8
|
+
* Color-mode-aware scrollbar styles for JupyterLab containers.
|
|
9
|
+
*
|
|
10
|
+
* Scoped to elements inside [data-color-mode] (Primer's BaseStyles wrapper)
|
|
11
|
+
* that have JupyterLab classes, so they only apply inside JupyterReactTheme
|
|
12
|
+
* and don't leak to the rest of the page.
|
|
13
|
+
*
|
|
14
|
+
* Uses [data-color-mode="dark"] to switch to the dark palette.
|
|
15
|
+
* In light mode, scrollbars are transparent/subtle (matching browser default).
|
|
16
|
+
* In dark mode, scrollbars use translucent light-grey to blend with dark backgrounds.
|
|
17
|
+
*
|
|
18
|
+
* These replace the unscoped ::-webkit-scrollbar rules that were previously
|
|
19
|
+
* in Notebook.css and didn't adapt to dark mode.
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
/* ── Scrollbar sizing (both modes) ──────────────────────────────────────── */
|
|
23
|
+
|
|
24
|
+
[data-color-mode] .jp-Notebook ::-webkit-scrollbar,
|
|
25
|
+
[data-color-mode] .jp-WindowedPanel-outer::-webkit-scrollbar {
|
|
26
|
+
width: 8px;
|
|
27
|
+
height: 8px;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/* ── Light mode ─────────────────────────────────────────────────────────── */
|
|
31
|
+
|
|
32
|
+
[data-color-mode='light'] .jp-Notebook ::-webkit-scrollbar-track,
|
|
33
|
+
[data-color-mode='light'] .jp-WindowedPanel-outer::-webkit-scrollbar-track {
|
|
34
|
+
background: transparent;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
[data-color-mode='light'] .jp-Notebook ::-webkit-scrollbar-thumb,
|
|
38
|
+
[data-color-mode='light'] .jp-WindowedPanel-outer::-webkit-scrollbar-thumb {
|
|
39
|
+
background-color: rgba(128, 128, 128, 0.35);
|
|
40
|
+
border-radius: 4px;
|
|
41
|
+
border: 2px solid transparent;
|
|
42
|
+
background-clip: content-box;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
[data-color-mode='light'] .jp-Notebook ::-webkit-scrollbar-thumb:hover,
|
|
46
|
+
[data-color-mode='light']
|
|
47
|
+
.jp-WindowedPanel-outer::-webkit-scrollbar-thumb:hover {
|
|
48
|
+
background-color: rgba(128, 128, 128, 0.55);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
[data-color-mode='light'] .jp-Notebook ::-webkit-scrollbar-corner,
|
|
52
|
+
[data-color-mode='light'] .jp-WindowedPanel-outer::-webkit-scrollbar-corner {
|
|
53
|
+
background: transparent;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/* ── Dark mode ──────────────────────────────────────────────────────────── */
|
|
57
|
+
|
|
58
|
+
[data-color-mode='dark'] .jp-Notebook ::-webkit-scrollbar-track,
|
|
59
|
+
[data-color-mode='dark'] .jp-WindowedPanel-outer::-webkit-scrollbar-track {
|
|
60
|
+
background: transparent;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
[data-color-mode='dark'] .jp-Notebook ::-webkit-scrollbar-thumb,
|
|
64
|
+
[data-color-mode='dark'] .jp-WindowedPanel-outer::-webkit-scrollbar-thumb {
|
|
65
|
+
background-color: rgba(160, 160, 160, 0.3);
|
|
66
|
+
border-radius: 4px;
|
|
67
|
+
border: 2px solid transparent;
|
|
68
|
+
background-clip: content-box;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
[data-color-mode='dark'] .jp-Notebook ::-webkit-scrollbar-thumb:hover,
|
|
72
|
+
[data-color-mode='dark']
|
|
73
|
+
.jp-WindowedPanel-outer::-webkit-scrollbar-thumb:hover {
|
|
74
|
+
background-color: rgba(160, 160, 160, 0.5);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
[data-color-mode='dark'] .jp-Notebook ::-webkit-scrollbar-corner,
|
|
78
|
+
[data-color-mode='dark'] .jp-WindowedPanel-outer::-webkit-scrollbar-corner {
|
|
79
|
+
background: transparent;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/* ── Firefox (scrollbar-color / scrollbar-width) ────────────────────────── */
|
|
83
|
+
|
|
84
|
+
[data-color-mode='light'] .jp-WindowedPanel-outer {
|
|
85
|
+
scrollbar-width: thin;
|
|
86
|
+
scrollbar-color: rgba(128, 128, 128, 0.35) transparent;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
[data-color-mode='dark'] .jp-WindowedPanel-outer {
|
|
90
|
+
scrollbar-width: thin;
|
|
91
|
+
scrollbar-color: rgba(160, 160, 160, 0.3) transparent;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/* ── Lumino custom ScrollBar widget ─────────────────────────────────────
|
|
95
|
+
* Override the hardcoded light-grey colors from @lumino/widgets/style/scrollbar.css
|
|
96
|
+
* and @jupyterlab/application/style/scrollbar.css with theme-aware values.
|
|
97
|
+
*/
|
|
98
|
+
|
|
99
|
+
[data-color-mode] .lm-ScrollBar-track {
|
|
100
|
+
background: transparent;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
[data-color-mode] .lm-ScrollBar-thumb {
|
|
104
|
+
background: rgba(128, 128, 128, 0.35);
|
|
105
|
+
border-radius: 4px;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
[data-color-mode] .lm-ScrollBar-thumb:hover {
|
|
109
|
+
background: rgba(128, 128, 128, 0.55);
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
[data-color-mode] .lm-ScrollBar-button {
|
|
113
|
+
background-color: transparent;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
[data-color-mode='dark'] .lm-ScrollBar-track {
|
|
117
|
+
background: transparent;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
[data-color-mode='dark'] .lm-ScrollBar-thumb {
|
|
121
|
+
background: rgba(160, 160, 160, 0.3);
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
[data-color-mode='dark'] .lm-ScrollBar-thumb:hover {
|
|
125
|
+
background: rgba(160, 160, 160, 0.5);
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
[data-color-mode='dark'] .lm-ScrollBar-button {
|
|
129
|
+
background-color: transparent;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
[data-color-mode='dark'] .lm-ScrollBar[data-orientation='horizontal'] {
|
|
133
|
+
border-top-color: rgba(128, 128, 128, 0.2);
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
[data-color-mode='dark'] .lm-ScrollBar[data-orientation='vertical'] {
|
|
137
|
+
border-left-color: rgba(128, 128, 128, 0.2);
|
|
138
|
+
}
|