@holoviz/panel 1.7.2-a.0 → 1.7.2
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/dist/bundled/notificationarea/panel/1.7.2/dist/bundled/font-awesome/css/all.min.css +2 -0
- package/dist/bundled/panel/1.7.2/dist/bundled/bootstrap5/css/bootstrap.min.css +2 -0
- package/dist/bundled/panel/1.7.2/dist/bundled/bootstrap5/js/bootstrap.bundle.min.js +2 -0
- package/dist/bundled/panel/1.7.2/dist/bundled/font-awesome/css/all.min.css +2 -0
- package/dist/bundled/panel/1.7.2/dist/bundled/jquery/jquery.min.js +2 -0
- package/dist/lib/models/comm_manager.d.ts +1 -0
- package/dist/lib/models/comm_manager.js +7 -1
- package/dist/lib/models/comm_manager.js.map +1 -1
- package/dist/lib/models/react_component.d.ts +18 -0
- package/dist/lib/models/react_component.js +139 -18
- package/dist/lib/models/react_component.js.map +1 -1
- package/dist/lib/models/reactive_esm.d.ts +5 -0
- package/dist/lib/models/reactive_esm.js +47 -2
- package/dist/lib/models/reactive_esm.js.map +1 -1
- package/dist/lib/models/tabulator.js +3 -0
- package/dist/lib/models/tabulator.js.map +1 -1
- package/dist/panel.js +206 -32
- package/dist/panel.js.map +1 -1
- package/dist/panel.json +1 -1
- package/dist/panel.min.js +7 -7
- package/package.json +1 -1
- package/dist/bundled/notificationarea/panel/1.7.2-a.0/dist/bundled/font-awesome/css/all.min.css +0 -2
- package/dist/bundled/panel/1.7.2-a.0/dist/bundled/bootstrap5/css/bootstrap.min.css +0 -2
- package/dist/bundled/panel/1.7.2-a.0/dist/bundled/bootstrap5/js/bootstrap.bundle.min.js +0 -2
- package/dist/bundled/panel/1.7.2-a.0/dist/bundled/font-awesome/css/all.min.css +0 -2
- package/dist/bundled/panel/1.7.2-a.0/dist/bundled/jquery/jquery.min.js +0 -2
|
@@ -28,6 +28,7 @@ export declare class CommManager extends Model {
|
|
|
28
28
|
_event_buffer: DocumentChangedEvent[];
|
|
29
29
|
_timeout: number;
|
|
30
30
|
_blocked: boolean;
|
|
31
|
+
_reconnect: boolean;
|
|
31
32
|
constructor(attrs?: Partial<CommManager.Attrs>);
|
|
32
33
|
initialize(): void;
|
|
33
34
|
protected _document_listener: (event: DocumentChangedEvent) => void;
|
|
@@ -20,6 +20,7 @@ export class CommManager extends Model {
|
|
|
20
20
|
_event_buffer;
|
|
21
21
|
_timeout;
|
|
22
22
|
_blocked;
|
|
23
|
+
_reconnect;
|
|
23
24
|
constructor(attrs) {
|
|
24
25
|
super(attrs);
|
|
25
26
|
}
|
|
@@ -28,6 +29,7 @@ export class CommManager extends Model {
|
|
|
28
29
|
this._receiver = new Receiver();
|
|
29
30
|
this._event_buffer = [];
|
|
30
31
|
this._blocked = false;
|
|
32
|
+
this._reconnect = false;
|
|
31
33
|
this._timeout = Date.now();
|
|
32
34
|
if ((window.PyViz == undefined) || (!window.PyViz.comm_manager)) {
|
|
33
35
|
console.warn("Could not find comm manager on window.PyViz, ensure the extension is loaded.");
|
|
@@ -48,6 +50,7 @@ export class CommManager extends Model {
|
|
|
48
50
|
}
|
|
49
51
|
});
|
|
50
52
|
this._client_comm = this.ns.comm_manager.get_client_comm(this.plot_id, this.client_comm_id, (msg) => this.on_ack(msg));
|
|
53
|
+
this._reconnect = !this._client_comm.active;
|
|
51
54
|
if (this.ns.shared_views == null) {
|
|
52
55
|
this.ns.shared_views = new Map();
|
|
53
56
|
}
|
|
@@ -72,7 +75,10 @@ export class CommManager extends Model {
|
|
|
72
75
|
return;
|
|
73
76
|
}
|
|
74
77
|
this._event_buffer.push(event);
|
|
75
|
-
if (
|
|
78
|
+
if (this._reconnect && this._client_comm.connected) {
|
|
79
|
+
this.on_ack({ metadata: { msg_type: "Ready" } });
|
|
80
|
+
}
|
|
81
|
+
else if (!comm_settings.debounce) {
|
|
76
82
|
this.process_events();
|
|
77
83
|
}
|
|
78
84
|
else if ((!this._blocked || (Date.now() > this._timeout))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comm_manager.js","sourceRoot":"","sources":["../../../models/comm_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAC,IAAI,EAAC,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,2BAA2B,CAAA;AACjD,OAAO,EAAC,QAAQ,EAAC,MAAM,4BAA4B,CAAA;AACnD,OAAO,EAAC,MAAM,EAAC,MAAM,oCAAoC,CAAA;AAEzD,OAAO,EAAC,OAAO,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,IAAI,EAAC,MAAM,2BAA2B,CAAA;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAQ;IAChC,QAAQ,EAAE,IAAI;CACf,CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,IAAI;;;AAiBzC,MAAM,OAAO,WAAY,SAAQ,KAAK;;IAIpC,EAAE,CAAK;IACP,SAAS,CAAU;IACnB,YAAY,CAAK;IACjB,aAAa,CAAwB;IACrC,QAAQ,CAAQ;IAChB,QAAQ,CAAS;
|
|
1
|
+
{"version":3,"file":"comm_manager.js","sourceRoot":"","sources":["../../../models/comm_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,17 @@
|
|
|
1
|
+
import type { StyleSheetLike } from "@bokehjs/core/dom";
|
|
2
|
+
import { InlineStyleSheet } from "@bokehjs/core/dom";
|
|
3
|
+
import type { CSSStyles, CSSStyleSheetDecl } from "@bokehjs/core/css";
|
|
1
4
|
import type * as p from "@bokehjs/core/properties";
|
|
2
5
|
import type { Transform } from "sucrase";
|
|
3
6
|
import { ReactiveESM, ReactiveESMView, model_getter, model_setter } from "./reactive_esm";
|
|
7
|
+
export declare class HostedStyleSheet extends InlineStyleSheet {
|
|
8
|
+
readonly persistent: boolean;
|
|
9
|
+
host_id: string;
|
|
10
|
+
constructor(css?: string | CSSStyleSheetDecl, id?: string, persistent?: boolean, host_id?: string);
|
|
11
|
+
replace(css: string, styles?: CSSStyles): void;
|
|
12
|
+
prepend(css: string, styles?: CSSStyles): void;
|
|
13
|
+
append(css: string, styles?: CSSStyles): void;
|
|
14
|
+
}
|
|
4
15
|
export declare class ReactComponentView extends ReactiveESMView {
|
|
5
16
|
model: ReactComponent;
|
|
6
17
|
style_cache: HTMLHeadElement;
|
|
@@ -8,20 +19,27 @@ export declare class ReactComponentView extends ReactiveESMView {
|
|
|
8
19
|
model_setter: typeof model_setter;
|
|
9
20
|
react_root: any;
|
|
10
21
|
_force_update_callbacks: (() => void)[];
|
|
22
|
+
initialize(): void;
|
|
23
|
+
get use_shadow_dom(): boolean;
|
|
11
24
|
render_esm(): void;
|
|
12
25
|
on_force_update(cb: () => void): void;
|
|
13
26
|
force_update(): void;
|
|
14
27
|
remove(): void;
|
|
28
|
+
get root_view(): ReactComponentView;
|
|
29
|
+
protected _apply_stylesheets(stylesheets: StyleSheetLike[]): void;
|
|
15
30
|
render(): void;
|
|
16
31
|
r_after_render(): void;
|
|
17
32
|
_update_layout(): void;
|
|
18
33
|
update_children(): Promise<void>;
|
|
34
|
+
_on_mounted(): void;
|
|
35
|
+
patch_container(container: HTMLDivElement): void;
|
|
19
36
|
after_rendered(): void;
|
|
20
37
|
}
|
|
21
38
|
export declare namespace ReactComponent {
|
|
22
39
|
type Attrs = p.AttrsOf<Props>;
|
|
23
40
|
type Props = ReactiveESM.Props & {
|
|
24
41
|
root_node: p.Property<string | null>;
|
|
42
|
+
use_shadow_dom: p.Property<boolean>;
|
|
25
43
|
};
|
|
26
44
|
}
|
|
27
45
|
export interface ReactComponent extends ReactComponent.Attrs {
|
|
@@ -1,10 +1,45 @@
|
|
|
1
|
+
import { ClassList, InlineStyleSheet, ImportedStyleSheet } from "@bokehjs/core/dom";
|
|
2
|
+
import { isString } from "@bokehjs/core/util/types";
|
|
1
3
|
import { ReactiveESM, ReactiveESMView, model_getter, model_setter, } from "./reactive_esm";
|
|
4
|
+
export class HostedStyleSheet extends InlineStyleSheet {
|
|
5
|
+
persistent;
|
|
6
|
+
static __name__ = "HostedStyleSheet";
|
|
7
|
+
host_id;
|
|
8
|
+
constructor(css, id, persistent = false, host_id = "") {
|
|
9
|
+
super(css, id, persistent);
|
|
10
|
+
this.persistent = persistent;
|
|
11
|
+
this.host_id = host_id;
|
|
12
|
+
}
|
|
13
|
+
replace(css, styles) {
|
|
14
|
+
css = css.replace(/:host\b/g, `#${this.host_id}`);
|
|
15
|
+
super.replace(css, styles);
|
|
16
|
+
}
|
|
17
|
+
prepend(css, styles) {
|
|
18
|
+
css = css.replace(/:host\b/g, `#${this.host_id}`);
|
|
19
|
+
super.prepend(css, styles);
|
|
20
|
+
}
|
|
21
|
+
append(css, styles) {
|
|
22
|
+
css = css.replace(/:host\b/g, `#${this.host_id}`);
|
|
23
|
+
super.append(css, styles);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
2
26
|
export class ReactComponentView extends ReactiveESMView {
|
|
3
27
|
static __name__ = "ReactComponentView";
|
|
4
28
|
model_getter = model_getter;
|
|
5
29
|
model_setter = model_setter;
|
|
6
|
-
react_root;
|
|
30
|
+
react_root = null;
|
|
7
31
|
_force_update_callbacks = [];
|
|
32
|
+
initialize() {
|
|
33
|
+
super.initialize();
|
|
34
|
+
if (!this.use_shadow_dom) {
|
|
35
|
+
this.display = new HostedStyleSheet("", "display", false, this.model.id);
|
|
36
|
+
this.style = new HostedStyleSheet("", "style", false, this.model.id);
|
|
37
|
+
this.parent_style = new HostedStyleSheet("", "parent", true, this.model.id);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
get use_shadow_dom() {
|
|
41
|
+
return this.model.use_shadow_dom || !(this.parent instanceof ReactComponentView);
|
|
42
|
+
}
|
|
8
43
|
render_esm() {
|
|
9
44
|
if (this.model.compiled === null || this.model.render_module === null) {
|
|
10
45
|
return;
|
|
@@ -36,11 +71,49 @@ export class ReactComponentView extends ReactiveESMView {
|
|
|
36
71
|
}
|
|
37
72
|
}
|
|
38
73
|
remove() {
|
|
39
|
-
super.remove();
|
|
40
74
|
this._force_update_callbacks = [];
|
|
41
|
-
if (this.react_root) {
|
|
75
|
+
if (this.react_root && this.use_shadow_dom) {
|
|
76
|
+
super.remove();
|
|
42
77
|
this.react_root.then((root) => root.unmount());
|
|
43
78
|
}
|
|
79
|
+
else {
|
|
80
|
+
this._applied_stylesheets.forEach((stylesheet) => stylesheet.uninstall());
|
|
81
|
+
for (const cb of (this._lifecycle_handlers.get("remove") || [])) {
|
|
82
|
+
cb();
|
|
83
|
+
}
|
|
84
|
+
this._child_callbacks.clear();
|
|
85
|
+
this._child_rendered.clear();
|
|
86
|
+
this._mounted.clear();
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
get root_view() {
|
|
90
|
+
let root = this;
|
|
91
|
+
if (this.use_shadow_dom) {
|
|
92
|
+
return root;
|
|
93
|
+
}
|
|
94
|
+
while (root.parent instanceof ReactComponentView) {
|
|
95
|
+
root = root.parent;
|
|
96
|
+
}
|
|
97
|
+
return root;
|
|
98
|
+
}
|
|
99
|
+
_apply_stylesheets(stylesheets) {
|
|
100
|
+
const resolved_stylesheets = stylesheets.map((style) => isString(style) ? new InlineStyleSheet(style) : style);
|
|
101
|
+
const styles = this.root_view.shadow_el.querySelectorAll("style");
|
|
102
|
+
const links = this.root_view.shadow_el.querySelectorAll("link");
|
|
103
|
+
resolved_stylesheets.forEach((stylesheet) => {
|
|
104
|
+
if (!this.use_shadow_dom) {
|
|
105
|
+
if (stylesheet instanceof InlineStyleSheet &&
|
|
106
|
+
Array.from(styles).some(style => style.innerHTML === stylesheet.css)) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
if (stylesheet instanceof ImportedStyleSheet &&
|
|
110
|
+
Array.from(links).some(link => link.href === stylesheet.el.href)) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
this._applied_stylesheets.push(stylesheet);
|
|
115
|
+
stylesheet.install(this.root_view.shadow_el);
|
|
116
|
+
});
|
|
44
117
|
}
|
|
45
118
|
render() {
|
|
46
119
|
if (this.react_root) {
|
|
@@ -55,7 +128,9 @@ export class ReactComponentView extends ReactiveESMView {
|
|
|
55
128
|
// React component to ensure anything depending on the DOM
|
|
56
129
|
// structure (e.g. emotion caches) is updated
|
|
57
130
|
super.r_after_render();
|
|
58
|
-
this.
|
|
131
|
+
if (!this.use_shadow_dom) {
|
|
132
|
+
this.force_update();
|
|
133
|
+
}
|
|
59
134
|
}
|
|
60
135
|
_update_layout() {
|
|
61
136
|
super._update_layout();
|
|
@@ -83,10 +158,12 @@ export class ReactComponentView extends ReactiveESMView {
|
|
|
83
158
|
new_views.set(child, [child_view]);
|
|
84
159
|
}
|
|
85
160
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
161
|
+
if (this.use_shadow_dom) {
|
|
162
|
+
for (const view of this._child_rendered.keys()) {
|
|
163
|
+
if (!all_views.includes(view)) {
|
|
164
|
+
this._child_rendered.delete(view);
|
|
165
|
+
view.el.remove();
|
|
166
|
+
}
|
|
90
167
|
}
|
|
91
168
|
}
|
|
92
169
|
for (const child of this.model.children) {
|
|
@@ -97,8 +174,16 @@ export class ReactComponentView extends ReactiveESMView {
|
|
|
97
174
|
}
|
|
98
175
|
}
|
|
99
176
|
this._update_children();
|
|
177
|
+
}
|
|
178
|
+
_on_mounted() {
|
|
100
179
|
this.invalidate_layout();
|
|
101
180
|
}
|
|
181
|
+
patch_container(container) {
|
|
182
|
+
this.el = this.container = container;
|
|
183
|
+
this._update_stylesheets();
|
|
184
|
+
this.class_list = new ClassList(this.container.classList);
|
|
185
|
+
this._apply_html_attributes();
|
|
186
|
+
}
|
|
102
187
|
after_rendered() {
|
|
103
188
|
const handlers = (this._lifecycle_handlers.get("after_render") || []);
|
|
104
189
|
for (const cb of handlers) {
|
|
@@ -152,14 +237,16 @@ import createCache from "@emotion/cache"
|
|
|
152
237
|
import { CacheProvider } from "@emotion/react"`;
|
|
153
238
|
}
|
|
154
239
|
init_code = `
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
240
|
+
if (view.use_shadow_dom) {
|
|
241
|
+
const css_key = id.replace("-", "").replace(/\d/g, (digit) => String.fromCharCode(digit.charCodeAt(0) + 49)).toLowerCase()
|
|
242
|
+
this.mui_cache = createCache({
|
|
243
|
+
key: 'css-'+css_key,
|
|
244
|
+
prepend: true,
|
|
245
|
+
container: view.style_cache,
|
|
246
|
+
})
|
|
247
|
+
}`;
|
|
161
248
|
render_code = `
|
|
162
|
-
if (rendered) {
|
|
249
|
+
if (rendered && ((view.parent?.react_root === undefined) || view.model.use_shadow_dom)) {
|
|
163
250
|
rendered = React.createElement(CacheProvider, {value: this.mui_cache}, rendered)
|
|
164
251
|
}`;
|
|
165
252
|
}
|
|
@@ -176,6 +263,8 @@ async function render(id) {
|
|
|
176
263
|
|
|
177
264
|
class Child extends React.PureComponent {
|
|
178
265
|
|
|
266
|
+
state = {rendered: null}
|
|
267
|
+
|
|
179
268
|
constructor(props) {
|
|
180
269
|
super(props)
|
|
181
270
|
this.render_callback = null
|
|
@@ -202,9 +291,27 @@ async function render(id) {
|
|
|
202
291
|
return view == null ? null : view.el
|
|
203
292
|
}
|
|
204
293
|
|
|
294
|
+
get use_shadow_dom() {
|
|
295
|
+
return this.view?.model.use_shadow_dom || (this.view?.react_root === undefined)
|
|
296
|
+
}
|
|
297
|
+
|
|
205
298
|
componentDidMount() {
|
|
206
299
|
const view = this.view
|
|
207
300
|
if (view == null) { return }
|
|
301
|
+
else if (!this.use_shadow_dom) {
|
|
302
|
+
view.patch_container(this.containerRef.current)
|
|
303
|
+
view.model.render_module.then(async (mod) => {
|
|
304
|
+
this.setState(
|
|
305
|
+
{rendered: await mod.default.render(view.model.id)},
|
|
306
|
+
() => {
|
|
307
|
+
this.props.parent.notify_mount(this.props.name, view.model.id)
|
|
308
|
+
this.view.r_after_render()
|
|
309
|
+
this.view.after_rendered()
|
|
310
|
+
}
|
|
311
|
+
)
|
|
312
|
+
})
|
|
313
|
+
return
|
|
314
|
+
}
|
|
208
315
|
this.updateElement()
|
|
209
316
|
this.props.parent.rerender_(view)
|
|
210
317
|
this.render_callback = (new_views) => {
|
|
@@ -225,14 +332,23 @@ async function render(id) {
|
|
|
225
332
|
if (this.render_callback) {
|
|
226
333
|
this.props.parent.remove_on_child_render(this.props.name, this.render_callback)
|
|
227
334
|
}
|
|
335
|
+
if (!this.use_shadow_dom && this.view._mounted.has(this.props.name)) {
|
|
336
|
+
this.view._mounted.get(this.props.name).delete(this.props.id)
|
|
337
|
+
}
|
|
228
338
|
}
|
|
229
339
|
|
|
230
340
|
componentDidUpdate() {
|
|
231
|
-
this.
|
|
341
|
+
if (this.use_shadow_dom) {
|
|
342
|
+
this.updateElement()
|
|
343
|
+
}
|
|
232
344
|
}
|
|
233
345
|
|
|
234
346
|
render() {
|
|
235
|
-
|
|
347
|
+
const child = this.state.rendered
|
|
348
|
+
const class_name = (this.use_shadow_dom ?
|
|
349
|
+
"child-wrapper" : this.view.model.class_name.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase()
|
|
350
|
+
)
|
|
351
|
+
return React.createElement('div', {id: this.view?.model.id, className: class_name, ref: this.containerRef}, child)
|
|
236
352
|
}
|
|
237
353
|
}
|
|
238
354
|
|
|
@@ -339,6 +455,7 @@ async function render(id) {
|
|
|
339
455
|
}
|
|
340
456
|
|
|
341
457
|
componentDidMount() {
|
|
458
|
+
if (!this.props.view.use_shadow_dom) { return }
|
|
342
459
|
this.props.view.on_force_update(() => {
|
|
343
460
|
${init_code}
|
|
344
461
|
this.forceUpdate()
|
|
@@ -359,6 +476,9 @@ async function render(id) {
|
|
|
359
476
|
|
|
360
477
|
const props = {view, model: react_proxy, data: view.model.data, el: view.container}
|
|
361
478
|
const rendered = React.createElement(Component, props)
|
|
479
|
+
if (!view.model.use_shadow_dom && (view.parent?.react_root !== undefined)) {
|
|
480
|
+
return rendered
|
|
481
|
+
}
|
|
362
482
|
if (rendered) {
|
|
363
483
|
view._changing = true
|
|
364
484
|
let container
|
|
@@ -404,8 +524,9 @@ ${compiled}`;
|
|
|
404
524
|
static __module__ = "panel.models.esm";
|
|
405
525
|
static {
|
|
406
526
|
this.prototype.default_view = ReactComponentView;
|
|
407
|
-
this.define(({ Nullable, Str }) => ({
|
|
527
|
+
this.define(({ Bool, Nullable, Str }) => ({
|
|
408
528
|
root_node: [Nullable(Str), null],
|
|
529
|
+
use_shadow_dom: [Bool, true],
|
|
409
530
|
}));
|
|
410
531
|
}
|
|
411
532
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react_component.js","sourceRoot":"","sources":["../../../models/react_component.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"react_component.js","sourceRoot":"","sources":["../../../models/react_component.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ export declare class ReactiveESMView extends HTMLBoxView {
|
|
|
37
37
|
stylesheets(): StyleSheetLike[];
|
|
38
38
|
connect_signals(): void;
|
|
39
39
|
disconnect_signals(): void;
|
|
40
|
+
_on_mounted(): void;
|
|
40
41
|
notify_mount(child: string, id: string, remove: boolean): void;
|
|
41
42
|
on_event(callback: (data: unknown) => void): void;
|
|
42
43
|
remove_on_event(callback: (data: unknown) => void): boolean;
|
|
@@ -45,9 +46,13 @@ export declare class ReactiveESMView extends HTMLBoxView {
|
|
|
45
46
|
get child_models(): LayoutDOM[];
|
|
46
47
|
render_error(error: SyntaxError): void;
|
|
47
48
|
render(): void;
|
|
49
|
+
get is_managed(): boolean;
|
|
50
|
+
compute_layout(): void;
|
|
51
|
+
protected _update_bbox(): boolean;
|
|
48
52
|
after_rendered(): void;
|
|
49
53
|
render_esm(): void;
|
|
50
54
|
render_children(): void;
|
|
55
|
+
invalidate_layout(): void;
|
|
51
56
|
remove(): void;
|
|
52
57
|
after_resize(): void;
|
|
53
58
|
after_layout(): void;
|
|
@@ -9,6 +9,7 @@ import { transform } from "sucrase";
|
|
|
9
9
|
import { ModelEvent, server_event } from "@bokehjs/core/bokeh_events";
|
|
10
10
|
import { div } from "@bokehjs/core/dom";
|
|
11
11
|
import { ImportedStyleSheet } from "@bokehjs/core/dom";
|
|
12
|
+
import { LayoutDOMView } from "@bokehjs/models/layouts/layout_dom";
|
|
12
13
|
import { isArray } from "@bokehjs/core/util/types";
|
|
13
14
|
import { serializeEvent } from "./event-to-object";
|
|
14
15
|
import { DOMEvent } from "./html";
|
|
@@ -243,6 +244,7 @@ export class ReactiveESMView extends HTMLBoxView {
|
|
|
243
244
|
this._child_callbacks = new Map();
|
|
244
245
|
this.model.disconnect_watchers(this);
|
|
245
246
|
}
|
|
247
|
+
_on_mounted() { }
|
|
246
248
|
notify_mount(child, id, remove) {
|
|
247
249
|
if (!this._mounted.has(child)) {
|
|
248
250
|
this._mounted.set(child, new Set());
|
|
@@ -258,6 +260,7 @@ export class ReactiveESMView extends HTMLBoxView {
|
|
|
258
260
|
children = [children];
|
|
259
261
|
}
|
|
260
262
|
if (children.every((model) => this._mounted.get(child)?.has(model.id))) {
|
|
263
|
+
this._on_mounted();
|
|
261
264
|
for (const cb of this._lifecycle_handlers.get("mounted") || []) {
|
|
262
265
|
cb(child);
|
|
263
266
|
}
|
|
@@ -336,6 +339,40 @@ export class ReactiveESMView extends HTMLBoxView {
|
|
|
336
339
|
element_view.render_to(target);
|
|
337
340
|
}
|
|
338
341
|
}
|
|
342
|
+
get is_managed() {
|
|
343
|
+
return this.parent instanceof LayoutDOMView && !(this.parent instanceof ReactiveESMView);
|
|
344
|
+
}
|
|
345
|
+
compute_layout() {
|
|
346
|
+
if (this.is_managed) {
|
|
347
|
+
super.compute_layout();
|
|
348
|
+
return;
|
|
349
|
+
}
|
|
350
|
+
this.measure_layout();
|
|
351
|
+
this.update_bbox();
|
|
352
|
+
this._compute_layout();
|
|
353
|
+
this.after_layout();
|
|
354
|
+
// Override private property
|
|
355
|
+
this._layout_computed = true;
|
|
356
|
+
}
|
|
357
|
+
_update_bbox() {
|
|
358
|
+
const displayed = (() => {
|
|
359
|
+
// Consider using Element.checkVisibility() in the future.
|
|
360
|
+
// https://w3c.github.io/csswg-drafts/cssom-view-1/#dom-element-checkvisibility
|
|
361
|
+
if (!this.el.isConnected) {
|
|
362
|
+
return false;
|
|
363
|
+
}
|
|
364
|
+
else if (this.el.offsetParent != null) {
|
|
365
|
+
return true;
|
|
366
|
+
}
|
|
367
|
+
else {
|
|
368
|
+
const { position, display } = getComputedStyle(this.el);
|
|
369
|
+
return position == "fixed" && display != "none";
|
|
370
|
+
}
|
|
371
|
+
})();
|
|
372
|
+
// Override private property
|
|
373
|
+
this._is_displayed = displayed;
|
|
374
|
+
return true;
|
|
375
|
+
}
|
|
339
376
|
after_rendered() {
|
|
340
377
|
const handlers = (this._lifecycle_handlers.get("after_render") || []);
|
|
341
378
|
for (const cb of handlers) {
|
|
@@ -379,6 +416,14 @@ export class ReactiveESMView extends HTMLBoxView {
|
|
|
379
416
|
}
|
|
380
417
|
this.after_render();
|
|
381
418
|
}
|
|
419
|
+
invalidate_layout() {
|
|
420
|
+
if (this.is_managed) {
|
|
421
|
+
super.invalidate_layout();
|
|
422
|
+
return;
|
|
423
|
+
}
|
|
424
|
+
this.update_layout();
|
|
425
|
+
this.compute_layout();
|
|
426
|
+
}
|
|
382
427
|
remove() {
|
|
383
428
|
super.remove();
|
|
384
429
|
for (const cb of (this._lifecycle_handlers.get("remove") || [])) {
|
|
@@ -389,8 +434,8 @@ export class ReactiveESMView extends HTMLBoxView {
|
|
|
389
434
|
this._mounted.clear();
|
|
390
435
|
}
|
|
391
436
|
after_resize() {
|
|
392
|
-
super.after_resize();
|
|
393
437
|
if (this._rendered && !this._changing) {
|
|
438
|
+
super.after_resize();
|
|
394
439
|
for (const cb of (this._lifecycle_handlers.get("resize") || [])) {
|
|
395
440
|
cb();
|
|
396
441
|
}
|
|
@@ -633,7 +678,7 @@ export class ReactiveESM extends HTMLBox {
|
|
|
633
678
|
const render_url = URL.createObjectURL(new Blob([code], { type: "text/javascript" }));
|
|
634
679
|
// @ts-ignore
|
|
635
680
|
this.render_module = importShim(render_url);
|
|
636
|
-
MODULE_CACHE.set(this.
|
|
681
|
+
MODULE_CACHE.set(this._render_cache_key, this.render_module);
|
|
637
682
|
}
|
|
638
683
|
}
|
|
639
684
|
_render_code() {
|