@darajs/core 1.29.4 → 1.29.7
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/README.md +3 -2
- package/dist/actions/download-variable.d.ts +8 -0
- package/dist/actions/download-variable.d.ts.map +1 -1
- package/dist/actions/download-variable.js +12 -3
- package/dist/actions/download-variable.js.map +1 -1
- package/dist/actions/navigate-to.js +1 -1
- package/dist/actions/navigate-to.js.map +1 -1
- package/dist/api/http.d.ts.map +1 -1
- package/dist/api/http.js +14 -0
- package/dist/api/http.js.map +1 -1
- package/dist/api/websocket.d.ts +293 -102
- package/dist/api/websocket.d.ts.map +1 -1
- package/dist/api/websocket.js +140 -7
- package/dist/api/websocket.js.map +1 -1
- package/dist/auth/basic/basic-auth-login.js +7 -7
- package/dist/auth/basic/basic-auth-login.js.map +1 -1
- package/dist/auth/basic/basic-auth-logout.js +1 -1
- package/dist/auth/basic/basic-auth-logout.js.map +1 -1
- package/dist/auth/default/default-auth-login.js +4 -4
- package/dist/auth/default/default-auth-login.js.map +1 -1
- package/dist/auth/oidc/oidc-login.js +3 -3
- package/dist/auth/oidc/oidc-login.js.map +1 -1
- package/dist/auth/oidc/oidc-logout.js +2 -2
- package/dist/auth/oidc/oidc-logout.js.map +1 -1
- package/dist/auth/oidc/sso-callback.js +2 -2
- package/dist/auth/oidc/sso-callback.js.map +1 -1
- package/dist/auth/origin-security.d.ts.map +1 -1
- package/dist/auth/origin-security.js +8 -2
- package/dist/auth/origin-security.js.map +1 -1
- package/dist/components/link.js +1 -2
- package/dist/components/link.js.map +1 -1
- package/dist/components/menu-link.d.ts.map +1 -1
- package/dist/components/menu-link.js +1 -2
- package/dist/components/menu-link.js.map +1 -1
- package/dist/components/menu.d.ts.map +1 -1
- package/dist/components/menu.js +1 -2
- package/dist/components/menu.js.map +1 -1
- package/dist/components/side-bar-frame.d.ts.map +1 -1
- package/dist/components/side-bar-frame.js +7 -1
- package/dist/components/side-bar-frame.js.map +1 -1
- package/dist/components/top-bar-frame.d.ts.map +1 -1
- package/dist/components/top-bar-frame.js +7 -2
- package/dist/components/top-bar-frame.js.map +1 -1
- package/dist/{dara_core-1.29.4-py3-none-any.whl → dara_core-1.29.7-py3-none-any.whl} +0 -0
- package/dist/devtools/backend-errors/backend-errors.d.ts.map +1 -1
- package/dist/devtools/backend-errors/backend-errors.js +0 -1
- package/dist/devtools/backend-errors/backend-errors.js.map +1 -1
- package/dist/devtools/devtools-content.d.ts.map +1 -1
- package/dist/devtools/devtools-content.js +2 -3
- package/dist/devtools/devtools-content.js.map +1 -1
- package/dist/devtools/floating-button.js +3 -3
- package/dist/devtools/floating-button.js.map +1 -1
- package/dist/devtools/resizer.js +1 -1
- package/dist/pages/error-page.js +2 -2
- package/dist/pages/error-page.js.map +1 -1
- package/dist/pages/error-status-code-page.js +2 -2
- package/dist/pages/error-status-code-page.js.map +1 -1
- package/dist/pages/route-error-boundary.js +1 -1
- package/dist/pages/route-error-boundary.js.map +1 -1
- package/dist/router/fetching.d.ts.map +1 -1
- package/dist/router/fetching.js +57 -32
- package/dist/router/fetching.js.map +1 -1
- package/dist/shared/context/global-task-context.js +1 -1
- package/dist/shared/context/global-task-context.js.map +1 -1
- package/dist/shared/context/variable-context.d.ts +5 -0
- package/dist/shared/context/variable-context.d.ts.map +1 -1
- package/dist/shared/context/variable-context.js.map +1 -1
- package/dist/shared/dynamic-component/dynamic-component.d.ts.map +1 -1
- package/dist/shared/dynamic-component/dynamic-component.js +13 -6
- package/dist/shared/dynamic-component/dynamic-component.js.map +1 -1
- package/dist/shared/error-handling/error-display.js +6 -6
- package/dist/shared/error-handling/error-display.js.map +1 -1
- package/dist/shared/interactivity/derived-variable.d.ts +14 -8
- package/dist/shared/interactivity/derived-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/derived-variable.js +180 -129
- package/dist/shared/interactivity/derived-variable.js.map +1 -1
- package/dist/shared/interactivity/filtering.js +2 -1
- package/dist/shared/interactivity/filtering.js.map +1 -1
- package/dist/shared/interactivity/persistence.js +6 -5
- package/dist/shared/interactivity/persistence.js.map +1 -1
- package/dist/shared/interactivity/plain-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/plain-variable.js +2 -2
- package/dist/shared/interactivity/plain-variable.js.map +1 -1
- package/dist/shared/interactivity/polling.d.ts +116 -0
- package/dist/shared/interactivity/polling.d.ts.map +1 -0
- package/dist/shared/interactivity/polling.js +723 -0
- package/dist/shared/interactivity/polling.js.map +1 -0
- package/dist/shared/interactivity/resolve-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/resolve-variable.js +18 -11
- package/dist/shared/interactivity/resolve-variable.js.map +1 -1
- package/dist/shared/interactivity/server-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/server-variable.js +2 -1
- package/dist/shared/interactivity/server-variable.js.map +1 -1
- package/dist/shared/interactivity/store.d.ts +6 -0
- package/dist/shared/interactivity/store.d.ts.map +1 -1
- package/dist/shared/interactivity/store.js +21 -1
- package/dist/shared/interactivity/store.js.map +1 -1
- package/dist/shared/interactivity/stream-variable.d.ts +1 -1
- package/dist/shared/interactivity/stream-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/stream-variable.js +108 -43
- package/dist/shared/interactivity/stream-variable.js.map +1 -1
- package/dist/shared/interactivity/use-action.d.ts.map +1 -1
- package/dist/shared/interactivity/use-action.js +5 -5
- package/dist/shared/interactivity/use-action.js.map +1 -1
- package/dist/shared/interactivity/use-server-component.d.ts +9 -0
- package/dist/shared/interactivity/use-server-component.d.ts.map +1 -1
- package/dist/shared/interactivity/use-server-component.js +132 -79
- package/dist/shared/interactivity/use-server-component.js.map +1 -1
- package/dist/shared/interactivity/use-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/use-variable.js +2 -2
- package/dist/shared/interactivity/use-variable.js.map +1 -1
- package/dist/shared/root/authenticated-root.js +3 -3
- package/dist/shared/root/authenticated-root.js.map +1 -1
- package/dist/shared/root/insecure-origin-banner.js +2 -2
- package/dist/shared/root/insecure-origin-banner.js.map +1 -1
- package/dist/shared/utils/get-icon.d.ts.map +1 -1
- package/dist/shared/utils/get-icon.js.map +1 -1
- package/dist/shared/utils/use-component-styles.js +1 -2
- package/dist/shared/utils/use-component-styles.js.map +1 -1
- package/dist/types/core.d.ts +8 -8
- package/dist/types/core.d.ts.map +1 -1
- package/dist/types/utils.d.ts +3 -3
- package/dist/types/utils.d.ts.map +1 -1
- package/dist/types/utils.js.map +1 -1
- package/dist/umd/dara.core.umd.cjs +1786 -657
- package/dist/vitest-setup.js +2 -0
- package/dist/vitest-setup.js.map +1 -1
- package/package.json +18 -17
|
@@ -14,11 +14,11 @@ import { ErrorBoundary } from 'react-error-boundary';
|
|
|
14
14
|
import DefaultFallback from '../../components/fallback/default';
|
|
15
15
|
import { hasMarkers } from '../../components/for/templating';
|
|
16
16
|
import ProgressTracker from '../../components/progress-tracker';
|
|
17
|
-
import { FallbackCtx, VariableCtx, useTaskContext } from '../../shared/context';
|
|
17
|
+
import { FallbackCtx, VariableCtx, useRequestExtras, useTaskContext } from '../../shared/context';
|
|
18
18
|
import { ErrorDisplay, isSelectorError } from '../../shared/error-handling';
|
|
19
19
|
import { useRefreshSelector, useVariable } from '../../shared/interactivity';
|
|
20
|
-
import
|
|
21
|
-
import {
|
|
20
|
+
import { usePollScope, usePolling } from '../../shared/interactivity/polling';
|
|
21
|
+
import useServerComponent, { getServerComponentRequestKey, usePollServerComponent, useRefreshServerComponent, } from '../../shared/interactivity/use-server-component';
|
|
22
22
|
import { isDerivedVariable, isPyComponent, } from '../../types';
|
|
23
23
|
import { UserError, isInvalidComponent, isRawString } from '../../types/core';
|
|
24
24
|
import { cleanProps } from './clean-props';
|
|
@@ -200,21 +200,25 @@ function DynamicComponent(props) {
|
|
|
200
200
|
}
|
|
201
201
|
const { hasRunningTasks, cleanupRunningTasks } = useTaskContext();
|
|
202
202
|
const variables = useRef(new Set());
|
|
203
|
+
const pollScope = usePollScope();
|
|
204
|
+
const variableContext = { pollScope, variables };
|
|
203
205
|
/*
|
|
204
206
|
When this component unmounts, then cancel any pending tasks for this component. This is required because recoil uses
|
|
205
207
|
React.Suspense which at the time of writing does not support cancellation
|
|
206
208
|
This does not necessarily cancel the task, on the backend we keep track of number of subscribers,
|
|
207
209
|
'cancelling' the task actually decrements the number of subs; the task is only cancelled once there are 0 subscribers left
|
|
208
210
|
*/
|
|
211
|
+
// The ref itself is stable; its Set is intentionally read when cleanup runs.
|
|
212
|
+
// oxlint-disable react-hooks/exhaustive-deps
|
|
209
213
|
useEffect(() => {
|
|
210
214
|
return () => {
|
|
211
215
|
// If there are running tasks and this component is subscribed to variables
|
|
212
216
|
if (variables.current.size > 0 && hasRunningTasks()) {
|
|
213
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
214
217
|
cleanupRunningTasks(...variables.current.values());
|
|
215
218
|
}
|
|
216
219
|
};
|
|
217
220
|
}, [cleanupRunningTasks, hasRunningTasks]);
|
|
221
|
+
// oxlint-enable react-hooks/exhaustive-deps
|
|
218
222
|
const [fallback] = useState(() => { var _a, _b, _c, _d; return getFallbackComponent((_b = (_a = props.component) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.fallback, (_d = (_c = props.component) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.track_progress, variables); });
|
|
219
223
|
// No component provided explicitly, return null
|
|
220
224
|
if (!props.component) {
|
|
@@ -225,7 +229,7 @@ function DynamicComponent(props) {
|
|
|
225
229
|
// 2) setting inherited from a parent component
|
|
226
230
|
// 3) default value of 200ms
|
|
227
231
|
const suspend = (_f = (_e = (_d = (_c = (_b = (_a = props.component) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.fallback) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.suspend_render) !== null && _e !== void 0 ? _e : fallbackCtx === null || fallbackCtx === void 0 ? void 0 : fallbackCtx.suspend) !== null && _f !== void 0 ? _f : 200;
|
|
228
|
-
return (_jsx(ErrorBoundary, { fallbackRender: (fallbackProps) => { var _a, _b; return (_jsx(ErrorDisplay, Object.assign({ config: (_b = (_a = props.component) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.error_handler }, fallbackProps))); }, onReset: onResetErrorBoundary, children: _jsx(FallbackCtx.Provider, { value: { suspend }, children: _jsx(VariableCtx.Provider, { value:
|
|
232
|
+
return (_jsx(ErrorBoundary, { fallbackRender: (fallbackProps) => { var _a, _b; return (_jsx(ErrorDisplay, Object.assign({ config: (_b = (_a = props.component) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.error_handler }, fallbackProps))); }, onReset: onResetErrorBoundary, children: _jsx(FallbackCtx.Provider, { value: { suspend }, children: _jsx(VariableCtx.Provider, { value: variableContext, children: _jsx(Suspense, { fallback: fallback, children: component }) }) }) }));
|
|
229
233
|
}
|
|
230
234
|
function useResolveDynamicKwargPollingIntervals(dynamicKwargs) {
|
|
231
235
|
const derivedPollingIntervals = useMemo(() => {
|
|
@@ -256,11 +260,14 @@ function PythonWrapper(props) {
|
|
|
256
260
|
var _a;
|
|
257
261
|
const component = useServerComponent(props.name, props.uid, props.dynamic_kwargs, props.component.loop_instance_uid);
|
|
258
262
|
const refresh = useRefreshServerComponent(props.uid, props.component.loop_instance_uid);
|
|
263
|
+
const extras = useRequestExtras();
|
|
264
|
+
const poll = usePollServerComponent(props.uid, props.component.loop_instance_uid, extras);
|
|
259
265
|
const [componentPollingInterval] = useVariable((_a = props.polling_interval) !== null && _a !== void 0 ? _a : null);
|
|
260
266
|
const resolvedKwargPollingIntervals = useResolveDynamicKwargPollingIntervals(props.dynamic_kwargs);
|
|
261
267
|
// Poll to update the component if polling_interval is set
|
|
262
268
|
const pollingInterval = useMemo(() => computePollingInterval(resolvedKwargPollingIntervals, componentPollingInterval), [resolvedKwargPollingIntervals, componentPollingInterval]);
|
|
263
|
-
|
|
269
|
+
const pollingKey = getServerComponentRequestKey(props.uid, props.component.loop_instance_uid, extras);
|
|
270
|
+
usePolling(pollingKey, pollingInterval, poll);
|
|
264
271
|
if (component === null) {
|
|
265
272
|
return null;
|
|
266
273
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-component.js","sourceRoot":"","sources":["../../../js/shared/dynamic-component/dynamic-component.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAEH,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,SAAS,EACT,eAAe,EACf,OAAO,EACP,MAAM,EACN,QAAQ,GACX,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"dynamic-component.js","sourceRoot":"","sources":["../../../js/shared/dynamic-component/dynamic-component.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,9 @@ const StyledErrorDisplay = styled.div `
|
|
|
13
13
|
|
|
14
14
|
height: min-content;
|
|
15
15
|
padding: 1rem;
|
|
16
|
+
border-radius: 0.25rem;
|
|
16
17
|
|
|
17
18
|
background-color: ${(props) => transparentize(0.9, props.theme.colors.error)};
|
|
18
|
-
border-radius: 0.25rem;
|
|
19
19
|
`;
|
|
20
20
|
const ErrorDisplayWrapper = injectCss(StyledErrorDisplay);
|
|
21
21
|
const IconWrapper = styled.div `
|
|
@@ -61,15 +61,15 @@ const RetryButton = styled.button `
|
|
|
61
61
|
|
|
62
62
|
width: 40px;
|
|
63
63
|
height: 40px;
|
|
64
|
-
|
|
65
|
-
color: ${(props) => props.theme.colors.error};
|
|
66
|
-
|
|
67
|
-
background-color: inherit;
|
|
68
64
|
border: none;
|
|
69
65
|
border: 1px solid;
|
|
70
66
|
border-color: ${(props) => props.theme.colors.error};
|
|
71
67
|
border-radius: 5px;
|
|
72
68
|
|
|
69
|
+
color: ${(props) => props.theme.colors.error};
|
|
70
|
+
|
|
71
|
+
background-color: inherit;
|
|
72
|
+
|
|
73
73
|
transition-timing-function: ease;
|
|
74
74
|
transition-duration: 100ms;
|
|
75
75
|
transition-property: color, border-color;
|
|
@@ -80,8 +80,8 @@ const RetryButton = styled.button `
|
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
&:hover {
|
|
83
|
-
color: ${(props) => props.theme.colors.errorHover};
|
|
84
83
|
border-color: ${(props) => props.theme.colors.errorHover};
|
|
84
|
+
color: ${(props) => props.theme.colors.errorHover};
|
|
85
85
|
|
|
86
86
|
i {
|
|
87
87
|
transform: rotate(180deg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-display.js","sourceRoot":"","sources":["../../../js/shared/error-handling/error-display.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAsB,MAAM,sBAAsB,CAAC;AAE1D,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAA4B,SAAS,EAAE,MAAM,cAAc,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAA
|
|
1
|
+
{"version":3,"file":"error-display.js","sourceRoot":"","sources":["../../../js/shared/error-handling/error-display.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ import { type WebSocketClientInterface } from '../../api';
|
|
|
13
13
|
import { type RequestExtras } from '../../api/http';
|
|
14
14
|
import { type DerivedVariable, type GlobalTaskContext, type ResolvedDerivedVariable, type ResolvedServerVariable, type ResolvedSwitchVariable } from '../../types';
|
|
15
15
|
import { type Deferred } from '../utils/deferred';
|
|
16
|
+
import { type PollScope } from './polling';
|
|
16
17
|
import { type TriggerIndexValue } from './store';
|
|
17
18
|
import { type TriggerInfo } from './triggers';
|
|
18
19
|
export interface DerivedVariableValueResponse<T> {
|
|
@@ -29,6 +30,7 @@ interface FetchDerivedVariableArgs {
|
|
|
29
30
|
cache: DerivedVariable['cache'];
|
|
30
31
|
extras: RequestExtras;
|
|
31
32
|
force_key?: string | null;
|
|
33
|
+
signal?: AbortSignal;
|
|
32
34
|
/**
|
|
33
35
|
* selector instance key - each selector's requests should be treated separately
|
|
34
36
|
*/
|
|
@@ -50,7 +52,7 @@ interface FetchDerivedVariableArgs {
|
|
|
50
52
|
* - `values`, values to pass in the request
|
|
51
53
|
* - `wsClient`, websocket client
|
|
52
54
|
*/
|
|
53
|
-
export declare function fetchDerivedVariable<T>({ cache, extras, force_key, variableUid, values, wsClient, }: FetchDerivedVariableArgs): Promise<DerivedVariableResponse<T>>;
|
|
55
|
+
export declare function fetchDerivedVariable<T>({ cache, extras, force_key, signal, variableUid, values, wsClient, }: FetchDerivedVariableArgs): Promise<DerivedVariableResponse<T>>;
|
|
54
56
|
/**
|
|
55
57
|
* Resolve a value to a format understood by the backend, resolving atoms to values.
|
|
56
58
|
*
|
|
@@ -98,7 +100,7 @@ interface PreviousResult {
|
|
|
98
100
|
* DerivedVariable resolution result meaning that the value changed since last time
|
|
99
101
|
* and should be refetched.
|
|
100
102
|
*/
|
|
101
|
-
interface CurrentResult {
|
|
103
|
+
export interface CurrentResult {
|
|
102
104
|
/**
|
|
103
105
|
* List of new 'relevant' values which should be used to update the depsRegistry entry if refetch was successful
|
|
104
106
|
*/
|
|
@@ -149,9 +151,10 @@ export type DerivedResult = PreviousResult | CurrentResult | CachedResponse;
|
|
|
149
151
|
* @param resolvedVariables resolved values of dependant variables - turned into primitives and Resolved forms
|
|
150
152
|
* @param get getter function to resolve atoms to values
|
|
151
153
|
* @param triggerList list of trigger info objects
|
|
152
|
-
* @param
|
|
154
|
+
* @param selfTriggers triggers owned by this request identity
|
|
155
|
+
* @param childTriggers triggers owned by nested variables
|
|
153
156
|
*/
|
|
154
|
-
export declare function resolveDerivedValue({ key, variables, deps, resolvedVariables, resolutionStrategy, triggerList,
|
|
157
|
+
export declare function resolveDerivedValue({ key, variables, deps, resolvedVariables, resolutionStrategy, triggerList, selfTriggers, childTriggers, }: {
|
|
155
158
|
key: string;
|
|
156
159
|
variables: any[];
|
|
157
160
|
deps: any[];
|
|
@@ -165,7 +168,8 @@ export declare function resolveDerivedValue({ key, variables, deps, resolvedVari
|
|
|
165
168
|
params: Params<string>;
|
|
166
169
|
};
|
|
167
170
|
triggerList: Array<TriggerInfo>;
|
|
168
|
-
|
|
171
|
+
selfTriggers: TriggerIndexValue[];
|
|
172
|
+
childTriggers: TriggerIndexValue[];
|
|
169
173
|
}): DerivedResult;
|
|
170
174
|
/**
|
|
171
175
|
* Get or register a recoil selector for a given derived variable result object.
|
|
@@ -208,12 +212,13 @@ export declare function getOrRegisterDerivedVariable(variable: DerivedVariable,
|
|
|
208
212
|
* Otherwise, returns an object with values so be sent to the backend
|
|
209
213
|
* and handles to resolve the cached promise to the result.
|
|
210
214
|
*/
|
|
211
|
-
export declare function preloadDerivedValue({ key, variables, deps, triggerList,
|
|
215
|
+
export declare function preloadDerivedValue({ key, variables, deps, triggerList, selfTriggers, childTriggers, snapshot, params, }: {
|
|
212
216
|
key: string;
|
|
213
217
|
variables: any[];
|
|
214
218
|
deps: any[];
|
|
215
219
|
triggerList: Array<TriggerInfo>;
|
|
216
|
-
|
|
220
|
+
selfTriggers: TriggerIndexValue[];
|
|
221
|
+
childTriggers: TriggerIndexValue[];
|
|
217
222
|
snapshot: Snapshot;
|
|
218
223
|
params: Params<string>;
|
|
219
224
|
}): {
|
|
@@ -232,7 +237,8 @@ export declare function preloadDerivedVariable(variable: DerivedVariable, snapsh
|
|
|
232
237
|
* @param taskContext global task context
|
|
233
238
|
* @param search search query
|
|
234
239
|
* @param extras request extras to be merged into the options
|
|
240
|
+
* @param pollScope render-local scope for requests started before commit
|
|
235
241
|
*/
|
|
236
|
-
export declare function useDerivedVariable(variable: DerivedVariable, WsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras, pollingInterval?: number): RecoilValue<any>;
|
|
242
|
+
export declare function useDerivedVariable(variable: DerivedVariable, WsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras, pollingInterval?: number, pollScope?: PollScope): RecoilValue<any>;
|
|
237
243
|
export {};
|
|
238
244
|
//# sourceMappingURL=derived-variable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,QAAQ,EAKhB,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}
|