@datalayer/jupyter-react 2.0.3 → 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/kernel/KernelActionMenu.js +6 -6
- package/lib/components/kernel/KernelActionMenu.js.map +1 -1
- 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/output/Output.js +1 -7
- package/lib/components/output/Output.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/jupyter/kernel/Kernel.js +14 -2
- package/lib/jupyter/kernel/Kernel.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 +12 -1
- package/lib/state/JupyterReactState.js.map +1 -1
- package/lib/theme/JupyterLabColormode.d.ts +1 -1
- package/lib/theme/JupyterLabCss.js +48 -6
- package/lib/theme/JupyterLabCss.js.map +1 -1
- package/lib/theme/JupyterReactTheme.d.ts +6 -0
- package/lib/theme/JupyterReactTheme.js +97 -50
- package/lib/theme/JupyterReactTheme.js.map +1 -1
- package/lib/tools/core/executor.d.ts +9 -1
- package/lib/tools/core/executor.js.map +1 -1
- package/package.json +1 -1
- package/style/base.css +133 -0
|
@@ -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"}
|
|
@@ -179,13 +179,25 @@ export class Kernel {
|
|
|
179
179
|
* Interrupt the kernel
|
|
180
180
|
*/
|
|
181
181
|
interrupt() {
|
|
182
|
-
|
|
182
|
+
if (!this._kernelConnection) {
|
|
183
|
+
return Promise.resolve();
|
|
184
|
+
}
|
|
185
|
+
return this._kernelConnection.interrupt().catch(err => {
|
|
186
|
+
console.error('[Kernel] Kernel interrupt failed:', err);
|
|
187
|
+
throw err;
|
|
188
|
+
});
|
|
183
189
|
}
|
|
184
190
|
/**
|
|
185
191
|
* Restart the kernel
|
|
186
192
|
*/
|
|
187
193
|
restart() {
|
|
188
|
-
|
|
194
|
+
if (!this._kernelConnection) {
|
|
195
|
+
return Promise.resolve();
|
|
196
|
+
}
|
|
197
|
+
return this._kernelConnection.restart().catch(err => {
|
|
198
|
+
console.error('[Kernel] Kernel restart failed:', err);
|
|
199
|
+
throw err;
|
|
200
|
+
});
|
|
189
201
|
}
|
|
190
202
|
/**
|
|
191
203
|
* Shutdown the kernel
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Kernel.js","sourceRoot":"","sources":["../../../src/jupyter/kernel/Kernel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Kernel.js","sourceRoot":"","sources":["../../../src/jupyter/kernel/Kernel.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
},
|
|
@@ -56,9 +57,19 @@ export const jupyterReactStore = createStore((set, get) => ({
|
|
|
56
57
|
}
|
|
57
58
|
},
|
|
58
59
|
setColormode: colormode => {
|
|
59
|
-
|
|
60
|
+
// Resolve 'auto' to the actual OS preference before calling
|
|
61
|
+
// setupPrimerPortals, which sets DOM data-attributes for Primer.
|
|
62
|
+
const resolved = colormode === 'auto'
|
|
63
|
+
? window.matchMedia('(prefers-color-scheme: dark)').matches
|
|
64
|
+
? 'dark'
|
|
65
|
+
: 'light'
|
|
66
|
+
: colormode;
|
|
67
|
+
setupPrimerPortals(resolved);
|
|
60
68
|
set(_state => ({ colormode }));
|
|
61
69
|
},
|
|
70
|
+
setBackgroundColor: (backgroundColor) => {
|
|
71
|
+
set(_state => ({ backgroundColor }));
|
|
72
|
+
},
|
|
62
73
|
}));
|
|
63
74
|
// Module-level flag to ensure config is only initialized once
|
|
64
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":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export type Colormode = 'light' | 'dark';
|
|
1
|
+
export type Colormode = 'light' | 'dark' | 'auto';
|
|
@@ -62,19 +62,61 @@ export function JupyterLabCss(props) {
|
|
|
62
62
|
break;
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
+
// The opposite theme name we need to suppress
|
|
66
|
+
const oppositeTheme = colormode === 'dark' ? 'theme-light-extension' : 'theme-dark-extension';
|
|
67
|
+
/**
|
|
68
|
+
* Remove any <link> tags from JupyterLab's theme manager that conflict
|
|
69
|
+
* with the desired colormode. The theme manager's loadCSS() appends
|
|
70
|
+
* <link rel="stylesheet"> to <body> asynchronously, so we need both:
|
|
71
|
+
* 1. Immediate cleanup of existing links
|
|
72
|
+
* 2. A MutationObserver to catch links added after our injection
|
|
73
|
+
*/
|
|
74
|
+
function removeConflictingThemeLinks() {
|
|
75
|
+
document.body.querySelectorAll('link[rel="stylesheet"]').forEach(link => {
|
|
76
|
+
const href = link.getAttribute('href') || '';
|
|
77
|
+
if (href.includes(oppositeTheme)) {
|
|
78
|
+
link.remove();
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
// Observe <body> for new <link> nodes added by the theme manager
|
|
83
|
+
const observer = new MutationObserver(mutations => {
|
|
84
|
+
for (const mutation of Array.from(mutations)) {
|
|
85
|
+
for (const node of Array.from(mutation.addedNodes)) {
|
|
86
|
+
if (node instanceof HTMLLinkElement && node.rel === 'stylesheet') {
|
|
87
|
+
const href = node.getAttribute('href') || '';
|
|
88
|
+
if (href.includes(oppositeTheme)) {
|
|
89
|
+
node.remove();
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
observer.observe(document.body, { childList: true });
|
|
65
96
|
// Inject the JupyterLab theme stylesheet in a retrievable node.
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
if (
|
|
97
|
+
theme
|
|
98
|
+
?.then(module => {
|
|
99
|
+
const css = module.default;
|
|
100
|
+
if (css) {
|
|
101
|
+
// Remove any previously injected theme style tag
|
|
70
102
|
document.body
|
|
71
103
|
.querySelector(`style[${DATA_JUPYTERLAB_THEME}]`)
|
|
72
104
|
?.remove();
|
|
73
|
-
|
|
74
|
-
|
|
105
|
+
// Remove any conflicting theme links already in the DOM
|
|
106
|
+
removeConflictingThemeLinks();
|
|
107
|
+
// Inject at the END of body so it takes precedence over
|
|
108
|
+
// any <link> tags the JupyterLab theme manager may have appended.
|
|
109
|
+
document.body.insertAdjacentHTML('beforeend', `<style ${DATA_JUPYTERLAB_THEME}="${colormode}">
|
|
110
|
+
${css}
|
|
75
111
|
</style>`);
|
|
76
112
|
}
|
|
113
|
+
})
|
|
114
|
+
.catch(err => {
|
|
115
|
+
console.error(`[JupyterLabCss] Failed to load theme variables for ${colormode}:`, err);
|
|
77
116
|
});
|
|
117
|
+
return () => {
|
|
118
|
+
observer.disconnect();
|
|
119
|
+
};
|
|
78
120
|
}, [colormode]);
|
|
79
121
|
return (_jsx("div", { id: "dla-JupyterLabCss-id", children: _jsx(GlobalStyle, {}) }));
|
|
80
122
|
}
|
|
@@ -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,
|
|
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';
|
|
@@ -19,6 +20,11 @@ export type IJupyterLabThemeProps = {
|
|
|
19
20
|
* Base styles
|
|
20
21
|
*/
|
|
21
22
|
baseStyles?: CSSProperties;
|
|
23
|
+
/**
|
|
24
|
+
* Background color override. When provided, this replaces the default
|
|
25
|
+
* `var(--bgColor-default)` so each theme can set its own background.
|
|
26
|
+
*/
|
|
27
|
+
backgroundColor?: string;
|
|
22
28
|
};
|
|
23
29
|
/**
|
|
24
30
|
* ThemeProvider component changing color mode with JupyterLab theme
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
/*
|
|
3
3
|
* Copyright (c) 2021-2023 Datalayer, Inc.
|
|
4
4
|
*
|
|
5
5
|
* MIT License
|
|
6
6
|
*/
|
|
7
|
-
import { createContext, useContext, useEffect, useState, } from 'react';
|
|
7
|
+
import { createContext, useContext, useEffect, useRef, useState, } from 'react';
|
|
8
8
|
import { BaseStyles, ThemeProvider } from '@primer/react';
|
|
9
9
|
import { setupPrimerPortals } from '@datalayer/primer-addons';
|
|
10
10
|
import { JupyterLabCss, jupyterLabTheme } from '../theme/index.js';
|
|
@@ -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';
|
|
@@ -35,66 +38,110 @@ export function useJupyterReactColormode() {
|
|
|
35
38
|
* if embedded in Jupyter or with the browser color scheme preference.
|
|
36
39
|
*/
|
|
37
40
|
export function JupyterReactTheme(props) {
|
|
38
|
-
const { children, colormode: colormodeProps = 'light', loadJupyterLabCss = true, theme = jupyterLabTheme, ...rest } = props;
|
|
39
|
-
const { colormode: colormodeFromStore, jupyterLabAdapter } = useJupyterReactStore();
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
const { children, colormode: colormodeProps = 'light', loadJupyterLabCss = true, theme = jupyterLabTheme, backgroundColor, ...rest } = props;
|
|
42
|
+
const { colormode: colormodeFromStore, setColormode: setColormodeStore, setBackgroundColor: setBackgroundColorStore, jupyterLabAdapter, } = useJupyterReactStore();
|
|
43
|
+
const hasColormodeProp = 'colormode' in props;
|
|
44
|
+
// Resolve 'auto' → actual OS preference ('light' or 'dark').
|
|
45
|
+
const resolveColormode = (cm) => {
|
|
46
|
+
if (cm === 'auto') {
|
|
47
|
+
return window.matchMedia('(prefers-color-scheme: dark)').matches
|
|
48
|
+
? 'dark'
|
|
49
|
+
: 'light';
|
|
50
|
+
}
|
|
51
|
+
return cm;
|
|
52
|
+
};
|
|
53
|
+
// Detect JupyterLab synchronously — loadJupyterConfig() only reads the DOM,
|
|
54
|
+
// no need to defer to an effect (which caused a blank first frame).
|
|
55
|
+
const [inJupyterLab] = useState(() => {
|
|
43
56
|
const { insideJupyterLab } = loadJupyterConfig();
|
|
44
|
-
|
|
45
|
-
}
|
|
57
|
+
return insideJupyterLab;
|
|
58
|
+
});
|
|
59
|
+
// Determine the effective colormode:
|
|
60
|
+
// - If a colormode prop is passed, it takes priority (external control)
|
|
61
|
+
// - Otherwise, follow the Zustand store (internal/store control)
|
|
62
|
+
// Then resolve 'auto' to the actual OS preference.
|
|
63
|
+
const effectiveColormode = resolveColormode(hasColormodeProp ? colormodeProps : colormodeFromStore);
|
|
64
|
+
const [colormode, setColormode] = useState(effectiveColormode);
|
|
65
|
+
// Keep a ref to track if we've synced the prop to the store to avoid
|
|
66
|
+
// redundant store updates that trigger re-renders.
|
|
67
|
+
const syncedRef = useRef(false);
|
|
68
|
+
// Sync prop → local state when prop changes (always resolve 'auto')
|
|
46
69
|
useEffect(() => {
|
|
47
|
-
|
|
48
|
-
|
|
70
|
+
const resolved = resolveColormode(hasColormodeProp ? colormodeProps : colormodeFromStore);
|
|
71
|
+
if (colormode !== resolved) {
|
|
72
|
+
setColormode(resolved);
|
|
49
73
|
}
|
|
50
|
-
}, [colormodeFromStore,
|
|
74
|
+
}, [colormodeFromStore, colormode, colormodeProps, hasColormodeProp]);
|
|
75
|
+
// Sync prop → store (so children reading the store directly also get the right value)
|
|
76
|
+
// Store the resolved value, not 'auto'.
|
|
51
77
|
useEffect(() => {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
78
|
+
const resolved = resolveColormode(colormodeProps);
|
|
79
|
+
if (hasColormodeProp && colormodeFromStore !== resolved) {
|
|
80
|
+
setColormodeStore(resolved);
|
|
81
|
+
syncedRef.current = true;
|
|
82
|
+
}
|
|
83
|
+
}, [colormodeFromStore, colormodeProps, hasColormodeProp, setColormodeStore]);
|
|
84
|
+
// Also sync prop to store eagerly on mount to avoid the initial 'light' frame
|
|
85
|
+
if (hasColormodeProp && !syncedRef.current) {
|
|
86
|
+
const resolved = resolveColormode(colormodeProps);
|
|
87
|
+
if (colormodeFromStore !== resolved) {
|
|
88
|
+
setColormodeStore(resolved);
|
|
89
|
+
syncedRef.current = true;
|
|
90
|
+
}
|
|
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]);
|
|
97
|
+
useEffect(() => {
|
|
98
|
+
function colorSchemeFromMedia({ matches }) {
|
|
99
|
+
// When colormode is 'auto', react to OS changes in real time.
|
|
100
|
+
if (hasColormodeProp && colormodeProps === 'auto') {
|
|
101
|
+
const resolved = matches ? 'dark' : 'light';
|
|
102
|
+
setColormode(resolved);
|
|
103
|
+
setupPrimerPortals(resolved);
|
|
67
104
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
themeManager.themeChanged.connect(updateColorMode);
|
|
73
|
-
return () => {
|
|
74
|
-
themeManager.themeChanged.disconnect(updateColorMode);
|
|
75
|
-
};
|
|
76
|
-
}
|
|
105
|
+
}
|
|
106
|
+
function updateColorMode(themeManager) {
|
|
107
|
+
if (hasColormodeProp) {
|
|
108
|
+
return;
|
|
77
109
|
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
110
|
+
const colormode = themeManager.theme && !themeManager.isLight(themeManager.theme)
|
|
111
|
+
? 'dark'
|
|
112
|
+
: 'light';
|
|
113
|
+
setColormode(colormode);
|
|
114
|
+
setupPrimerPortals(colormode);
|
|
115
|
+
}
|
|
116
|
+
if (inJupyterLab) {
|
|
117
|
+
const themeManager = jupyterLabAdapter?.service('@jupyterlab/apputils-extension:themes');
|
|
118
|
+
if (themeManager) {
|
|
119
|
+
updateColorMode(themeManager);
|
|
120
|
+
themeManager.themeChanged.connect(updateColorMode);
|
|
85
121
|
return () => {
|
|
86
|
-
|
|
87
|
-
.matchMedia('(prefers-color-scheme: dark)')
|
|
88
|
-
.removeEventListener('change', colorSchemeFromMedia);
|
|
122
|
+
themeManager.themeChanged.disconnect(updateColorMode);
|
|
89
123
|
};
|
|
90
124
|
}
|
|
91
125
|
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
126
|
+
else {
|
|
127
|
+
colorSchemeFromMedia({
|
|
128
|
+
matches: window.matchMedia('(prefers-color-scheme: dark)').matches,
|
|
129
|
+
});
|
|
130
|
+
window
|
|
131
|
+
.matchMedia('(prefers-color-scheme: dark)')
|
|
132
|
+
.addEventListener('change', colorSchemeFromMedia);
|
|
133
|
+
return () => {
|
|
134
|
+
window
|
|
135
|
+
.matchMedia('(prefers-color-scheme: dark)')
|
|
136
|
+
.removeEventListener('change', colorSchemeFromMedia);
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
}, [inJupyterLab, jupyterLabAdapter, hasColormodeProp, colormodeProps]);
|
|
140
|
+
return (_jsxs(JupyterReactColormodeContext.Provider, { value: colormode, children: [loadJupyterLabCss && _jsx(JupyterLabCss, { colormode: colormode }), _jsx(ThemeProvider, { colorMode: colormode, theme: theme, dayScheme: "light", nightScheme: "dark", children: _jsxs(BaseStyles, { style: {
|
|
141
|
+
backgroundColor: backgroundColor ?? 'var(--bgColor-default)',
|
|
95
142
|
color: 'var(--fgColor-default)',
|
|
96
143
|
fontSize: 'var(--text-body-size-medium)',
|
|
97
|
-
}, ...rest, children: children }
|
|
144
|
+
}, ...rest, children: [backgroundColor && (_jsx("style", { children: `.jp-Notebook { background-color: ${backgroundColor} !important; }` })), children] }) })] }));
|
|
98
145
|
}
|
|
99
146
|
export default JupyterReactTheme;
|
|
100
147
|
//# sourceMappingURL=JupyterReactTheme.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupyterReactTheme.js","sourceRoot":"","sources":["../../src/theme/JupyterReactTheme.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAc,EACZ,aAAa,EAEb,UAAU,EACV,SAAS,EACT,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAa,aAAa,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,OAAO,yDAAyD,CAAC;AACjE,OAAO,wDAAwD,CAAC;AAEhE,OAAO,4DAA4D,CAAC;AACpE,OAAO,wDAAwD,CAAC;AAChE,OAAO,6DAA6D,CAAC;AACrE,OAAO,6DAA6D,CAAC;AACrE,OAAO,2DAA2D,CAAC;AACnE,OAAO,sDAAsD,CAAC;AAC9D,OAAO,0DAA0D,CAAC;AAClE,OAAO,kEAAkE,CAAC;AAE1E,+BAA+B;AAC/B,MAAM,4BAA4B,GAAG,aAAa,CAChD,SAAS,CACV,CAAC;AAEF,gDAAgD;AAChD,MAAM,UAAU,wBAAwB;IACtC,MAAM,SAAS,GAAG,UAAU,CAAC,4BAA4B,CAAC,CAAC;IAC3D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;
|
|
1
|
+
{"version":3,"file":"JupyterReactTheme.js","sourceRoot":"","sources":["../../src/theme/JupyterReactTheme.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAc,EACZ,aAAa,EAEb,UAAU,EACV,SAAS,EACT,MAAM,EACN,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAa,aAAa,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,OAAO,yDAAyD,CAAC;AACjE,OAAO,wDAAwD,CAAC;AAEhE,+DAA+D;AAC/D,2EAA2E;AAC3E,OAAO,sBAAsB,CAAC;AAE9B,OAAO,4DAA4D,CAAC;AACpE,OAAO,wDAAwD,CAAC;AAChE,OAAO,6DAA6D,CAAC;AACrE,OAAO,6DAA6D,CAAC;AACrE,OAAO,2DAA2D,CAAC;AACnE,OAAO,sDAAsD,CAAC;AAC9D,OAAO,0DAA0D,CAAC;AAClE,OAAO,kEAAkE,CAAC;AAE1E,+BAA+B;AAC/B,MAAM,4BAA4B,GAAG,aAAa,CAChD,SAAS,CACV,CAAC;AAEF,gDAAgD;AAChD,MAAM,UAAU,wBAAwB;IACtC,MAAM,SAAS,GAAG,UAAU,CAAC,4BAA4B,CAAC,CAAC;IAC3D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAiBD;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,KAAqD;IAErD,MAAM,EACJ,QAAQ,EACR,SAAS,EAAE,cAAc,GAAG,OAAO,EACnC,iBAAiB,GAAG,IAAI,EACxB,KAAK,GAAG,eAAe,EACvB,eAAe,EACf,GAAG,IAAI,EACR,GAAG,KAAK,CAAC;IACV,MAAM,EACJ,SAAS,EAAE,kBAAkB,EAC7B,YAAY,EAAE,iBAAiB,EAC/B,kBAAkB,EAAE,uBAAuB,EAC3C,iBAAiB,GAClB,GAAG,oBAAoB,EAAE,CAAC;IAC3B,MAAM,gBAAgB,GAAG,WAAW,IAAI,KAAK,CAAC;IAE9C,6DAA6D;IAC7D,MAAM,gBAAgB,GAAG,CAAC,EAAa,EAAoB,EAAE;QAC3D,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;YAClB,OAAO,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC,OAAO;gBAC9D,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,OAAO,CAAC;QACd,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,4EAA4E;IAC5E,oEAAoE;IACpE,MAAM,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE;QACnC,MAAM,EAAE,gBAAgB,EAAE,GAAG,iBAAiB,EAAE,CAAC;QACjD,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,qCAAqC;IACrC,wEAAwE;IACxE,iEAAiE;IACjE,mDAAmD;IACnD,MAAM,kBAAkB,GAAG,gBAAgB,CACzC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CACvD,CAAC;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAE/D,qEAAqE;IACrE,mDAAmD;IACnD,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAEhC,oEAAoE;IACpE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,gBAAgB,CAC/B,gBAAgB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CACvD,CAAC;QACF,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,YAAY,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,EAAE,CAAC,kBAAkB,EAAE,SAAS,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEtE,sFAAsF;IACtF,wCAAwC;IACxC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAClD,IAAI,gBAAgB,IAAI,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YACxD,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC5B,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;QAC3B,CAAC;IACH,CAAC,EAAE,CAAC,kBAAkB,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE9E,8EAA8E;IAC9E,IAAI,gBAAgB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAClD,IAAI,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YACpC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC5B,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,4EAA4E;IAC5E,kEAAkE;IAClE,SAAS,CAAC,GAAG,EAAE;QACb,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAE/C,SAAS,CAAC,GAAG,EAAE;QACb,SAAS,oBAAoB,CAAC,EAAE,OAAO,EAAwB;YAC7D,8DAA8D;YAC9D,IAAI,gBAAgB,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;gBAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC5C,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACvB,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,SAAS,eAAe,CAAC,YAA2B;YAClD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,OAAO;YACT,CAAC;YACD,MAAM,SAAS,GACb,YAAY,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;gBAC7D,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,OAAO,CAAC;YACd,YAAY,CAAC,SAAS,CAAC,CAAC;YACxB,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,YAAY,GAAG,iBAAiB,EAAE,OAAO,CAC7C,uCAAuC,CACvB,CAAC;YACnB,IAAI,YAAY,EAAE,CAAC;gBACjB,eAAe,CAAC,YAAY,CAAC,CAAC;gBAC9B,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;gBACnD,OAAO,GAAG,EAAE;oBACV,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;gBACxD,CAAC,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,oBAAoB,CAAC;gBACnB,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC,OAAO;aACnE,CAAC,CAAC;YACH,MAAM;iBACH,UAAU,CAAC,8BAA8B,CAAC;iBAC1C,gBAAgB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;YACpD,OAAO,GAAG,EAAE;gBACV,MAAM;qBACH,UAAU,CAAC,8BAA8B,CAAC;qBAC1C,mBAAmB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;YACzD,CAAC,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC;IACxE,OAAO,CACL,MAAC,4BAA4B,CAAC,QAAQ,IAAC,KAAK,EAAE,SAAS,aACpD,iBAAiB,IAAI,KAAC,aAAa,IAAC,SAAS,EAAE,SAAS,GAAI,EAC7D,KAAC,aAAa,IACZ,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,EACZ,SAAS,EAAC,OAAO,EACjB,WAAW,EAAC,MAAM,YAElB,MAAC,UAAU,IACT,KAAK,EAAE;wBACL,eAAe,EAAE,eAAe,IAAI,wBAAwB;wBAC5D,KAAK,EAAE,wBAAwB;wBAC/B,QAAQ,EAAE,8BAA8B;qBACzC,KACG,IAAI,aAEP,eAAe,IAAI,CAClB,0BAAQ,oCAAoC,eAAe,gBAAgB,GAAS,CACrF,EACA,QAAQ,IACE,GACC,IACsB,CACzC,CAAC;AACJ,CAAC;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -4,7 +4,14 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @module tools/core/executor
|
|
6
6
|
*/
|
|
7
|
-
|
|
7
|
+
/**
|
|
8
|
+
* Minimal NotebookState interface for tool executor.
|
|
9
|
+
* This avoids importing from UI components which would load React/Primer at runtime.
|
|
10
|
+
* Only used internally by DefaultExecutor.
|
|
11
|
+
*/
|
|
12
|
+
interface NotebookState {
|
|
13
|
+
[key: string]: unknown;
|
|
14
|
+
}
|
|
8
15
|
/**
|
|
9
16
|
* Tool executor interface - abstracts how operations are executed.
|
|
10
17
|
* Platforms can implement this interface to provide custom execution logic.
|
|
@@ -44,3 +51,4 @@ export declare class DefaultExecutor implements ToolExecutor {
|
|
|
44
51
|
*/
|
|
45
52
|
execute(operationName: string, args: unknown): Promise<unknown>;
|
|
46
53
|
}
|
|
54
|
+
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/core/executor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/core/executor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAiCH;;;;;;;;;;GAUG;AACH,MAAM,OAAO,eAAe;IAEhB;IACA;IAFV,YACU,UAAkB,EAClB,KAAoB;QADpB,eAAU,GAAV,UAAU,CAAQ;QAClB,UAAK,GAAL,KAAK,CAAe;IAC3B,CAAC;IAEJ;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,CAAC,aAAqB,EAAE,IAAa;QAChD,iEAAiE;QACjE,MAAM,MAAM,GAAI,IAAI,CAAC,KAA4C,CAC/D,aAAa,CACd,CAAC;QAEF,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb,iBAAiB,aAAa,+BAA+B,CAC9D,CAAC;QACJ,CAAC;QAED,mEAAmE;QACnE,MAAM,OAAO,GACX,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;YACvC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,EAAE;YAClC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;QAE9B,qDAAqD;QACrD,0EAA0E;QAC1E,MAAM,QAAQ,GAAG,MAAuC,CAAC;QACzD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAExD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|