@jupyterlab/ui-components 4.7.0-alpha.2 → 4.7.0-beta.0

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.
@@ -184,17 +184,14 @@ export declare class ReactiveToolbar extends Toolbar<Widget> {
184
184
  */
185
185
  onBeforeHide(msg: Message): void;
186
186
  protected onResize(msg: Widget.ResizeMessage): void;
187
+ /**
188
+ * Invoke the resizer when an item in the toolbar no longer has the width
189
+ * used to place the items, for example when the kernel name changes.
190
+ */
191
+ private _onItemResize;
187
192
  /**
188
193
  * Move the toolbar items between the reactive toolbar and the popup toolbar,
189
194
  * depending on the width of the toolbar and the width of each item.
190
- *
191
- * @param callTwice - whether to call the function twice.
192
- *
193
- * **NOTES**
194
- * The `callTwice` parameter is useful when the toolbar is displayed the first time,
195
- * because the size of the items is unknown before their first rendering. The first
196
- * call will usually add all the items in the main toolbar, and the second call will
197
- * reorganize the items between the main toolbar and the popup toolbar.
198
195
  */
199
196
  private _onResize;
200
197
  private _getWidgetsToRemove;
@@ -205,8 +202,7 @@ export declare class ReactiveToolbar extends Toolbar<Widget> {
205
202
  private readonly _widgetWidths;
206
203
  private _widgetPositions;
207
204
  private _movingToPopup;
208
- private _zoom;
209
- private _zoomChanged;
205
+ private _itemResizeObserver;
210
206
  }
211
207
  /**
212
208
  * The namespace for Toolbar class statics.
@@ -329,7 +325,7 @@ export declare class ToolbarButton extends ReactWidget {
329
325
  render(): JSX.Element;
330
326
  private _pressed;
331
327
  private _enabled;
332
- private _onClick;
328
+ private _onClick?;
333
329
  }
334
330
  /**
335
331
  * Namespace for CommandToolbarButtonComponent.
@@ -334,11 +334,11 @@ export class ReactiveToolbar extends Toolbar {
334
334
  this._widgetWidths = new Map();
335
335
  this._widgetPositions = new Map();
336
336
  this._movingToPopup = new Set();
337
- this._zoomChanged = true;
337
+ this._itemResizeObserver = new ResizeObserver(this._onItemResize.bind(this));
338
338
  this.insertItem(0, TOOLBAR_OPENER_NAME, this.popupOpener);
339
339
  this.popupOpener.hide();
340
- this._resizer = new Throttler(async (callTwice = false) => {
341
- await this._onResize(callTwice);
340
+ this._resizer = new Throttler(async () => {
341
+ await this._onResize();
342
342
  }, 500);
343
343
  }
344
344
  /**
@@ -351,9 +351,11 @@ export class ReactiveToolbar extends Toolbar {
351
351
  if (this._resizer) {
352
352
  this._resizer.dispose();
353
353
  }
354
+ this._itemResizeObserver.disconnect();
354
355
  super.dispose();
355
356
  }
356
357
  onChildRemoved(msg) {
358
+ this._itemResizeObserver.unobserve(msg.child.node);
357
359
  // If the widget is being moved to the popup opener, keep tracking its
358
360
  // intended position so it can be restored to the right slot later.
359
361
  // NOTE: we cannot check msg.child.parent here because Lumino fires
@@ -438,6 +440,11 @@ export class ReactiveToolbar extends Toolbar {
438
440
  // at the end of this function.
439
441
  const j = Math.max(0, Math.min(index, this.layout.widgets.length - 1));
440
442
  status = super.insertItem(j, name, widget);
443
+ if (status && !widget.hasClass(TOOLBAR_SPACER_CLASS)) {
444
+ // Watch the border box: a padding change, for example from a theme,
445
+ // leaves the content box as it is but changes the width the layout uses.
446
+ this._itemResizeObserver.observe(widget.node, { box: 'border-box' });
447
+ }
441
448
  if (j !== index) {
442
449
  // This happens if the widget has been inserted at a wrong position:
443
450
  // - not enough widgets in the toolbar to insert it at the expected index
@@ -466,11 +473,9 @@ export class ReactiveToolbar extends Toolbar {
466
473
  // Save the new position of the widget.
467
474
  this._widgetPositions.set(name, index);
468
475
  // Invokes resizing to ensure correct display of items after an addition, only
469
- // if the toolbar is rendered. Call the resizer twice (callTwice = true) so that
470
- // widgets that have not yet been painted (clientWidth === 0) get a chance to be
471
- // rendered before the second pass recalculates the layout.
476
+ // if the toolbar is rendered.
472
477
  if (this.isVisible) {
473
- void this._resizer.invoke(true);
478
+ void this._resizer.invoke();
474
479
  }
475
480
  }
476
481
  return status;
@@ -481,7 +486,7 @@ export class ReactiveToolbar extends Toolbar {
481
486
  * Invokes resizing to ensure correct display of items.
482
487
  */
483
488
  onAfterShow(msg) {
484
- void this._resizer.stop().then(() => void this._resizer.invoke(true));
489
+ void this._resizer.stop().then(() => void this._resizer.invoke());
485
490
  }
486
491
  /**
487
492
  * A message handler invoked on a `'before-hide'` message.
@@ -494,29 +499,40 @@ export class ReactiveToolbar extends Toolbar {
494
499
  }
495
500
  onResize(msg) {
496
501
  super.onResize(msg);
497
- // Check if the resize event is due to a zoom change.
498
- const zoom = Math.round((window.outerWidth / window.innerWidth) * 100);
499
- if (zoom !== this._zoom) {
500
- this._zoomChanged = true;
501
- this._zoom = zoom;
502
- }
503
502
  if (msg.width > 0 && this._resizer) {
504
503
  void this._resizer.invoke();
505
504
  }
506
505
  }
506
+ /**
507
+ * Invoke the resizer when an item in the toolbar no longer has the width
508
+ * used to place the items, for example when the kernel name changes.
509
+ */
510
+ _onItemResize(entries) {
511
+ if (!this.isVisible) {
512
+ return;
513
+ }
514
+ const widgets = this.layout.widgets;
515
+ const resized = entries.some(entry => {
516
+ const widget = widgets.find(w => w.node === entry.target);
517
+ return (widget !== undefined &&
518
+ widget.node.clientWidth !== this._getWidgetWidth(widget));
519
+ });
520
+ if (resized) {
521
+ void this._resizer.invoke();
522
+ }
523
+ }
507
524
  /**
508
525
  * Move the toolbar items between the reactive toolbar and the popup toolbar,
509
526
  * depending on the width of the toolbar and the width of each item.
510
- *
511
- * @param callTwice - whether to call the function twice.
512
- *
513
- * **NOTES**
514
- * The `callTwice` parameter is useful when the toolbar is displayed the first time,
515
- * because the size of the items is unknown before their first rendering. The first
516
- * call will usually add all the items in the main toolbar, and the second call will
517
- * reorganize the items between the main toolbar and the popup toolbar.
518
527
  */
519
- async _onResize(callTwice = false) {
528
+ async _onResize() {
529
+ // Wait for all the items to render before measuring any of them. Waiting
530
+ // between two measurements would let an item that is already measured
531
+ // change its width, and the resizer drops the call that the item observer
532
+ // makes while this method runs.
533
+ await Promise.all(this.layout.widgets.map(widget => widget instanceof ReactWidget ? widget.renderPromise : undefined)).catch(msg => {
534
+ console.error('Error while computing the ReactiveToolbar', msg);
535
+ });
520
536
  if (!(this.parent && this.parent.isAttached)) {
521
537
  return;
522
538
  }
@@ -595,9 +611,6 @@ export class ReactiveToolbar extends Toolbar {
595
611
  else {
596
612
  opener.hide();
597
613
  }
598
- if (callTwice) {
599
- await this._onResize();
600
- }
601
614
  })
602
615
  .catch(msg => {
603
616
  console.error('Error while computing the ReactiveToolbar', msg);
@@ -608,28 +621,22 @@ export class ReactiveToolbar extends Toolbar {
608
621
  const opener = this.popupOpener;
609
622
  const widgets = [...this.layout.widgets];
610
623
  const toIndex = widgets.length - 1;
624
+ const widths = widgets
625
+ .slice(0, toIndex)
626
+ .map(widget => this._saveWidgetWidth(Private.nameProperty.get(widget), widget));
627
+ // Count the opener only if the items do not all fit without it. Otherwise
628
+ // the last items move to the popup although they all fit in the toolbar.
629
+ const fitWithoutOpener = widths.reduce((total, itemWidth) => total + itemWidth, width) <=
630
+ toolbarWidth;
611
631
  const widgetsToRemove = [];
612
632
  let index = 0;
613
633
  while (index < toIndex) {
614
634
  const widget = widgets[index];
615
635
  const name = Private.nameProperty.get(widget);
616
- // Compute the widget size only if
617
- // - the zoom has changed.
618
- // - the widget size has not been computed yet.
619
- let widgetWidth;
620
- if (this._zoomChanged) {
621
- widgetWidth = await this._saveWidgetWidth(name, widget);
622
- }
623
- else {
624
- // The widget widths can be 0px if it has been added to the toolbar but
625
- // not rendered, this is why we must use '||' instead of '??'.
626
- widgetWidth =
627
- this._getWidgetWidth(widget) ||
628
- (await this._saveWidgetWidth(name, widget));
629
- }
630
- width += widgetWidth;
636
+ width += widths[index];
631
637
  if (widgetsToRemove.length === 0 &&
632
638
  opener.isHidden &&
639
+ !fitWithoutOpener &&
633
640
  width + openerWidth > toolbarWidth) {
634
641
  width += openerWidth;
635
642
  }
@@ -643,16 +650,12 @@ export class ReactiveToolbar extends Toolbar {
643
650
  }
644
651
  index++;
645
652
  }
646
- this._zoomChanged = false;
647
653
  return {
648
654
  width: width,
649
655
  widgetsToRemove: widgetsToRemove
650
656
  };
651
657
  }
652
- async _saveWidgetWidth(name, widget) {
653
- if (widget instanceof ReactWidget) {
654
- await widget.renderPromise;
655
- }
658
+ _saveWidgetWidth(name, widget) {
656
659
  const widgetWidth = widget.hasClass(TOOLBAR_SPACER_CLASS)
657
660
  ? 2
658
661
  : widget.node.clientWidth;
@@ -716,10 +719,13 @@ export function ToolbarButtonComponent(props) {
716
719
  }
717
720
  : undefined;
718
721
  const handleKeyDown = (event) => {
719
- var _a;
720
722
  const { key } = event;
721
- if (key === 'Enter' || key === ' ') {
722
- (_a = props.onClick) === null || _a === void 0 ? void 0 : _a.call(props, event);
723
+ if ((key === 'Enter' || key === ' ') && props.onClick) {
724
+ // Stop the browser from clicking the button, and then also
725
+ // passing the key to whatever the action focused
726
+ // (a cell editor, a dialog button).
727
+ event.preventDefault();
728
+ props.onClick(event);
723
729
  }
724
730
  };
725
731
  const getTooltip = () => {
@@ -818,14 +824,15 @@ export class ToolbarButton extends ReactWidget {
818
824
  */
819
825
  get onClick() {
820
826
  return (event) => {
827
+ var _a;
821
828
  // Toggle the `pressed` state of the button when clicked
822
829
  this.pressed = !this.pressed;
823
830
  // Call the original click handler, if defined
824
- this._onClick(event);
831
+ (_a = this._onClick) === null || _a === void 0 ? void 0 : _a.call(this, event);
825
832
  };
826
833
  }
827
834
  render() {
828
- return (React.createElement(ToolbarButtonComponent, { ...this.props, noFocusOnClick: this.props.noFocusOnClick, pressed: this.pressed, enabled: this.enabled, onClick: this.onClick }));
835
+ return (React.createElement(ToolbarButtonComponent, { ...this.props, noFocusOnClick: this.props.noFocusOnClick, pressed: this.pressed, enabled: this.enabled, onClick: this._onClick ? this.onClick : undefined }));
829
836
  }
830
837
  }
831
838
  /**
@@ -861,7 +868,7 @@ export class CommandToolbarButton extends ReactWidget {
861
868
  addCommandToolbarButtonClass(this);
862
869
  this.setCommandAttributes(commands, id, args);
863
870
  commands.commandChanged.connect((_, change) => {
864
- if (change.id === props.id) {
871
+ if (change.id === props.id || change.type === 'many-changed') {
865
872
  this.setCommandAttributes(commands, id, args);
866
873
  }
867
874
  }, this);
@@ -1 +1 @@
1
- {"version":3,"file":"toolbar.js","sourceRoot":"","sources":["../../src/components/toolbar.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toolbar.js","sourceRoot":"","sources":["../../src/components/toolbar.tsx"],"names":[],"mappings":"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"}
@@ -35,6 +35,11 @@ export declare abstract class ReactWidget extends Widget {
35
35
  * Called after the widget is attached to the DOM
36
36
  */
37
37
  protected onAfterAttach(msg: Message): void;
38
+ /**
39
+ * The parent of the widget.
40
+ */
41
+ get parent(): Widget | null;
42
+ set parent(value: Widget | null);
38
43
  /**
39
44
  * Called before the widget is detached from the DOM.
40
45
  */
@@ -43,6 +48,10 @@ export declare abstract class ReactWidget extends Widget {
43
48
  * Dispose the widget.
44
49
  */
45
50
  dispose(): void;
51
+ /**
52
+ * Unmount the React tree, if one is mounted.
53
+ */
54
+ private _unmount;
46
55
  /**
47
56
  * Render the React nodes to the DOM.
48
57
  *
@@ -51,6 +60,7 @@ export declare abstract class ReactWidget extends Widget {
51
60
  private renderDOM;
52
61
  renderPromise?: Promise<void>;
53
62
  private _rootDOM;
63
+ private _moving;
54
64
  }
55
65
  /**
56
66
  * An abstract ReactWidget with a model.
@@ -12,6 +12,7 @@ export class ReactWidget extends Widget {
12
12
  constructor() {
13
13
  super();
14
14
  this._rootDOM = null;
15
+ this._moving = false;
15
16
  }
16
17
  /**
17
18
  * Creates a new `ReactWidget` that renders a constant element.
@@ -40,15 +41,40 @@ export class ReactWidget extends Widget {
40
41
  // Make *sure* the widget is rendered.
41
42
  MessageLoop.sendMessage(this, Widget.Msg.UpdateRequest);
42
43
  }
44
+ /**
45
+ * The parent of the widget.
46
+ */
47
+ get parent() {
48
+ return super.parent;
49
+ }
50
+ set parent(value) {
51
+ // A move to a detached parent, or to one without a layout to attach the
52
+ // widget, unmounts at once, while the node is still in the document.
53
+ this._moving = value !== null && value.isAttached && value.layout !== null;
54
+ try {
55
+ super.parent = value;
56
+ }
57
+ finally {
58
+ this._moving = false;
59
+ }
60
+ }
43
61
  /**
44
62
  * Called before the widget is detached from the DOM.
45
63
  */
46
64
  onBeforeDetach(msg) {
47
- // Unmount the component so it can tear down.
48
- if (this._rootDOM !== null) {
49
- this._rootDOM.unmount();
50
- this._rootDOM = null;
65
+ if (this._moving) {
66
+ // A widget moved to an attached parent is attached again synchronously
67
+ // and keeps its component state; unmount if the layout did not attach it.
68
+ queueMicrotask(() => {
69
+ if (!this.isAttached) {
70
+ this._unmount();
71
+ }
72
+ });
73
+ return;
51
74
  }
75
+ // Unmount while the node is in the document, so that cleanups can still
76
+ // detach or measure what they rendered.
77
+ this._unmount();
52
78
  }
53
79
  /**
54
80
  * Dispose the widget.
@@ -57,14 +83,27 @@ export class ReactWidget extends Widget {
57
83
  if (this.isDisposed) {
58
84
  return;
59
85
  }
60
- // `onBeforeDetach` unmounts on a normal detach, but a widget disposed
61
- // while already detached would keep its React root mounted forever,
62
- // along with every subscription made by the rendered components.
63
- if (this._rootDOM !== null) {
64
- this._rootDOM.unmount();
86
+ // A widget disposed while already detached receives no `before-detach`
87
+ // message, and without this call its React root would stay mounted with
88
+ // every subscription of its components.
89
+ try {
90
+ this._unmount();
91
+ }
92
+ finally {
93
+ super.dispose();
94
+ }
95
+ }
96
+ /**
97
+ * Unmount the React tree, if one is mounted.
98
+ */
99
+ _unmount() {
100
+ const root = this._rootDOM;
101
+ if (root !== null) {
102
+ // Forget the root first: a cleanup that throws would otherwise leave a
103
+ // root that cannot render again.
65
104
  this._rootDOM = null;
105
+ root.unmount();
66
106
  }
67
- super.dispose();
68
107
  }
69
108
  /**
70
109
  * Render the React nodes to the DOM.
@@ -93,8 +132,7 @@ export class ReactWidget extends Widget {
93
132
  }
94
133
  else {
95
134
  // If the virtual node is null, unmount the node content
96
- this._rootDOM.unmount();
97
- this._rootDOM = null;
135
+ this._unmount();
98
136
  requestIdleCallback(() => resolve());
99
137
  }
100
138
  });
@@ -1 +1 @@
1
- {"version":3,"file":"vdom.js","sourceRoot":"","sources":["../../src/components/vdom.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vdom.js","sourceRoot":"","sources":["../../src/components/vdom.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/ui-components",
3
- "version": "4.7.0-alpha.2",
3
+ "version": "4.7.0-beta.0",
4
4
  "description": "JupyterLab - UI components written in React",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -42,10 +42,10 @@
42
42
  "dependencies": {
43
43
  "@jupyter/react-components": "^0.17.1",
44
44
  "@jupyter/web-components": "^0.17.1",
45
- "@jupyterlab/coreutils": "^6.7.0-alpha.2",
46
- "@jupyterlab/observables": "^5.7.0-alpha.2",
47
- "@jupyterlab/rendermime-interfaces": "^3.15.0-alpha.2",
48
- "@jupyterlab/translation": "^4.7.0-alpha.2",
45
+ "@jupyterlab/coreutils": "^6.7.0-beta.0",
46
+ "@jupyterlab/observables": "^5.7.0-beta.0",
47
+ "@jupyterlab/rendermime-interfaces": "^3.15.0-beta.0",
48
+ "@jupyterlab/translation": "^4.7.0-beta.0",
49
49
  "@lumino/algorithm": "^2.0.5",
50
50
  "@lumino/commands": "^2.3.4",
51
51
  "@lumino/coreutils": "^2.2.3",
@@ -55,7 +55,7 @@
55
55
  "@lumino/properties": "^2.0.5",
56
56
  "@lumino/signaling": "^2.1.6",
57
57
  "@lumino/virtualdom": "^2.0.5",
58
- "@lumino/widgets": "^2.9.0",
58
+ "@lumino/widgets": "^2.10.0",
59
59
  "@rjsf/core": "^5.13.4",
60
60
  "@rjsf/utils": "^5.13.4",
61
61
  "react": "^18.2.0",
@@ -63,7 +63,7 @@
63
63
  "typestyle": "^2.0.4"
64
64
  },
65
65
  "devDependencies": {
66
- "@jupyterlab/testing": "^4.7.0-alpha.2",
66
+ "@jupyterlab/testing": "^4.7.0-beta.0",
67
67
  "@types/jest": "^29.2.0",
68
68
  "@types/react": "^18.0.26",
69
69
  "jest": "^29.2.0",
@@ -390,8 +390,8 @@ export class ReactiveToolbar extends Toolbar<Widget> {
390
390
  super(options);
391
391
  this.insertItem(0, TOOLBAR_OPENER_NAME, this.popupOpener);
392
392
  this.popupOpener.hide();
393
- this._resizer = new Throttler(async (callTwice = false) => {
394
- await this._onResize(callTwice);
393
+ this._resizer = new Throttler(async () => {
394
+ await this._onResize();
395
395
  }, 500);
396
396
  }
397
397
 
@@ -406,11 +406,13 @@ export class ReactiveToolbar extends Toolbar<Widget> {
406
406
  if (this._resizer) {
407
407
  this._resizer.dispose();
408
408
  }
409
+ this._itemResizeObserver.disconnect();
409
410
 
410
411
  super.dispose();
411
412
  }
412
413
 
413
414
  protected onChildRemoved(msg: Widget.ChildMessage): void {
415
+ this._itemResizeObserver.unobserve(msg.child.node);
414
416
  // If the widget is being moved to the popup opener, keep tracking its
415
417
  // intended position so it can be restored to the right slot later.
416
418
  // NOTE: we cannot check msg.child.parent here because Lumino fires
@@ -504,6 +506,11 @@ export class ReactiveToolbar extends Toolbar<Widget> {
504
506
  Math.min(index, (this.layout as ToolbarLayout).widgets.length - 1)
505
507
  );
506
508
  status = super.insertItem(j, name, widget);
509
+ if (status && !widget.hasClass(TOOLBAR_SPACER_CLASS)) {
510
+ // Watch the border box: a padding change, for example from a theme,
511
+ // leaves the content box as it is but changes the width the layout uses.
512
+ this._itemResizeObserver.observe(widget.node, { box: 'border-box' });
513
+ }
507
514
 
508
515
  if (j !== index) {
509
516
  // This happens if the widget has been inserted at a wrong position:
@@ -539,11 +546,9 @@ export class ReactiveToolbar extends Toolbar<Widget> {
539
546
  this._widgetPositions.set(name, index);
540
547
 
541
548
  // Invokes resizing to ensure correct display of items after an addition, only
542
- // if the toolbar is rendered. Call the resizer twice (callTwice = true) so that
543
- // widgets that have not yet been painted (clientWidth === 0) get a chance to be
544
- // rendered before the second pass recalculates the layout.
549
+ // if the toolbar is rendered.
545
550
  if (this.isVisible) {
546
- void this._resizer.invoke(true);
551
+ void this._resizer.invoke();
547
552
  }
548
553
  }
549
554
  return status;
@@ -555,7 +560,7 @@ export class ReactiveToolbar extends Toolbar<Widget> {
555
560
  * Invokes resizing to ensure correct display of items.
556
561
  */
557
562
  onAfterShow(msg: Message): void {
558
- void this._resizer.stop().then(() => void this._resizer.invoke(true));
563
+ void this._resizer.stop().then(() => void this._resizer.invoke());
559
564
  }
560
565
 
561
566
  /**
@@ -570,14 +575,28 @@ export class ReactiveToolbar extends Toolbar<Widget> {
570
575
 
571
576
  protected onResize(msg: Widget.ResizeMessage): void {
572
577
  super.onResize(msg);
578
+ if (msg.width > 0 && this._resizer) {
579
+ void this._resizer.invoke();
580
+ }
581
+ }
573
582
 
574
- // Check if the resize event is due to a zoom change.
575
- const zoom = Math.round((window.outerWidth / window.innerWidth) * 100);
576
- if (zoom !== this._zoom) {
577
- this._zoomChanged = true;
578
- this._zoom = zoom;
583
+ /**
584
+ * Invoke the resizer when an item in the toolbar no longer has the width
585
+ * used to place the items, for example when the kernel name changes.
586
+ */
587
+ private _onItemResize(entries: ResizeObserverEntry[]): void {
588
+ if (!this.isVisible) {
589
+ return;
579
590
  }
580
- if (msg.width > 0 && this._resizer) {
591
+ const widgets = (this.layout as ToolbarLayout).widgets;
592
+ const resized = entries.some(entry => {
593
+ const widget = widgets.find(w => w.node === entry.target);
594
+ return (
595
+ widget !== undefined &&
596
+ widget.node.clientWidth !== this._getWidgetWidth(widget)
597
+ );
598
+ });
599
+ if (resized) {
581
600
  void this._resizer.invoke();
582
601
  }
583
602
  }
@@ -585,16 +604,19 @@ export class ReactiveToolbar extends Toolbar<Widget> {
585
604
  /**
586
605
  * Move the toolbar items between the reactive toolbar and the popup toolbar,
587
606
  * depending on the width of the toolbar and the width of each item.
588
- *
589
- * @param callTwice - whether to call the function twice.
590
- *
591
- * **NOTES**
592
- * The `callTwice` parameter is useful when the toolbar is displayed the first time,
593
- * because the size of the items is unknown before their first rendering. The first
594
- * call will usually add all the items in the main toolbar, and the second call will
595
- * reorganize the items between the main toolbar and the popup toolbar.
596
607
  */
597
- private async _onResize(callTwice = false) {
608
+ private async _onResize() {
609
+ // Wait for all the items to render before measuring any of them. Waiting
610
+ // between two measurements would let an item that is already measured
611
+ // change its width, and the resizer drops the call that the item observer
612
+ // makes while this method runs.
613
+ await Promise.all(
614
+ (this.layout as ToolbarLayout).widgets.map(widget =>
615
+ widget instanceof ReactWidget ? widget.renderPromise : undefined
616
+ )
617
+ ).catch(msg => {
618
+ console.error('Error while computing the ReactiveToolbar', msg);
619
+ });
598
620
  if (!(this.parent && this.parent.isAttached)) {
599
621
  return;
600
622
  }
@@ -673,9 +695,6 @@ export class ReactiveToolbar extends Toolbar<Widget> {
673
695
  } else {
674
696
  opener.hide();
675
697
  }
676
- if (callTwice) {
677
- await this._onResize();
678
- }
679
698
  })
680
699
  .catch(msg => {
681
700
  console.error('Error while computing the ReactiveToolbar', msg);
@@ -690,6 +709,16 @@ export class ReactiveToolbar extends Toolbar<Widget> {
690
709
  const opener = this.popupOpener;
691
710
  const widgets = [...(this.layout as ToolbarLayout).widgets];
692
711
  const toIndex = widgets.length - 1;
712
+ const widths = widgets
713
+ .slice(0, toIndex)
714
+ .map(widget =>
715
+ this._saveWidgetWidth(Private.nameProperty.get(widget), widget)
716
+ );
717
+ // Count the opener only if the items do not all fit without it. Otherwise
718
+ // the last items move to the popup although they all fit in the toolbar.
719
+ const fitWithoutOpener =
720
+ widths.reduce((total, itemWidth) => total + itemWidth, width) <=
721
+ toolbarWidth;
693
722
 
694
723
  const widgetsToRemove = [];
695
724
 
@@ -697,23 +726,11 @@ export class ReactiveToolbar extends Toolbar<Widget> {
697
726
  while (index < toIndex) {
698
727
  const widget = widgets[index];
699
728
  const name = Private.nameProperty.get(widget);
700
- // Compute the widget size only if
701
- // - the zoom has changed.
702
- // - the widget size has not been computed yet.
703
- let widgetWidth: number;
704
- if (this._zoomChanged) {
705
- widgetWidth = await this._saveWidgetWidth(name, widget);
706
- } else {
707
- // The widget widths can be 0px if it has been added to the toolbar but
708
- // not rendered, this is why we must use '||' instead of '??'.
709
- widgetWidth =
710
- this._getWidgetWidth(widget) ||
711
- (await this._saveWidgetWidth(name, widget));
712
- }
713
- width += widgetWidth;
729
+ width += widths[index];
714
730
  if (
715
731
  widgetsToRemove.length === 0 &&
716
732
  opener.isHidden &&
733
+ !fitWithoutOpener &&
717
734
  width + openerWidth > toolbarWidth
718
735
  ) {
719
736
  width += openerWidth;
@@ -730,20 +747,13 @@ export class ReactiveToolbar extends Toolbar<Widget> {
730
747
  }
731
748
  index++;
732
749
  }
733
- this._zoomChanged = false;
734
750
  return {
735
751
  width: width,
736
752
  widgetsToRemove: widgetsToRemove
737
753
  };
738
754
  }
739
755
 
740
- private async _saveWidgetWidth(
741
- name: string,
742
- widget: Widget
743
- ): Promise<number> {
744
- if (widget instanceof ReactWidget) {
745
- await widget.renderPromise;
746
- }
756
+ private _saveWidgetWidth(name: string, widget: Widget): number {
747
757
  const widgetWidth = widget.hasClass(TOOLBAR_SPACER_CLASS)
748
758
  ? 2
749
759
  : widget.node.clientWidth;
@@ -761,10 +771,9 @@ export class ReactiveToolbar extends Toolbar<Widget> {
761
771
  private readonly _widgetWidths = new Map<string, number>();
762
772
  private _widgetPositions = new Map<string, number>();
763
773
  private _movingToPopup = new Set<Widget>();
764
- // The zoom property is not the real browser zoom, but a value proportional to
765
- // the zoom, which is modified when the zoom changes.
766
- private _zoom: number;
767
- private _zoomChanged = true;
774
+ private _itemResizeObserver = new ResizeObserver(
775
+ this._onItemResize.bind(this)
776
+ );
768
777
  }
769
778
 
770
779
  /**
@@ -884,8 +893,12 @@ export function ToolbarButtonComponent(
884
893
 
885
894
  const handleKeyDown = (event: React.KeyboardEvent) => {
886
895
  const { key } = event;
887
- if (key === 'Enter' || key === ' ') {
888
- props.onClick?.(event);
896
+ if ((key === 'Enter' || key === ' ') && props.onClick) {
897
+ // Stop the browser from clicking the button, and then also
898
+ // passing the key to whatever the action focused
899
+ // (a cell editor, a dialog button).
900
+ event.preventDefault();
901
+ props.onClick(event);
889
902
  }
890
903
  };
891
904
 
@@ -962,7 +975,7 @@ export class ToolbarButton extends ReactWidget {
962
975
  addToolbarButtonClass(this);
963
976
  this._enabled = props.enabled ?? true;
964
977
  this._pressed = this._enabled! && (props.pressed ?? false);
965
- this._onClick = props.onClick!;
978
+ this._onClick = props.onClick;
966
979
  }
967
980
 
968
981
  /**
@@ -1024,7 +1037,7 @@ export class ToolbarButton extends ReactWidget {
1024
1037
  this.pressed = !this.pressed;
1025
1038
 
1026
1039
  // Call the original click handler, if defined
1027
- this._onClick(event);
1040
+ this._onClick?.(event);
1028
1041
  };
1029
1042
  }
1030
1043
 
@@ -1035,14 +1048,14 @@ export class ToolbarButton extends ReactWidget {
1035
1048
  noFocusOnClick={this.props.noFocusOnClick}
1036
1049
  pressed={this.pressed}
1037
1050
  enabled={this.enabled}
1038
- onClick={this.onClick}
1051
+ onClick={this._onClick ? this.onClick : undefined}
1039
1052
  />
1040
1053
  );
1041
1054
  }
1042
1055
 
1043
1056
  private _pressed: boolean;
1044
1057
  private _enabled: boolean;
1045
- private _onClick: (event?: React.SyntheticEvent) => void;
1058
+ private _onClick?: (event?: React.SyntheticEvent) => void;
1046
1059
  }
1047
1060
 
1048
1061
  /**
@@ -1135,7 +1148,7 @@ export class CommandToolbarButton extends ReactWidget {
1135
1148
  addCommandToolbarButtonClass(this);
1136
1149
  this.setCommandAttributes(commands, id, args);
1137
1150
  commands.commandChanged.connect((_, change) => {
1138
- if (change.id === props.id) {
1151
+ if (change.id === props.id || change.type === 'many-changed') {
1139
1152
  this.setCommandAttributes(commands, id, args);
1140
1153
  }
1141
1154
  }, this);
@@ -60,15 +60,40 @@ export abstract class ReactWidget extends Widget {
60
60
  MessageLoop.sendMessage(this, Widget.Msg.UpdateRequest);
61
61
  }
62
62
 
63
+ /**
64
+ * The parent of the widget.
65
+ */
66
+ get parent(): Widget | null {
67
+ return super.parent;
68
+ }
69
+ set parent(value: Widget | null) {
70
+ // A move to a detached parent, or to one without a layout to attach the
71
+ // widget, unmounts at once, while the node is still in the document.
72
+ this._moving = value !== null && value.isAttached && value.layout !== null;
73
+ try {
74
+ super.parent = value;
75
+ } finally {
76
+ this._moving = false;
77
+ }
78
+ }
79
+
63
80
  /**
64
81
  * Called before the widget is detached from the DOM.
65
82
  */
66
83
  protected onBeforeDetach(msg: Message): void {
67
- // Unmount the component so it can tear down.
68
- if (this._rootDOM !== null) {
69
- this._rootDOM.unmount();
70
- this._rootDOM = null;
84
+ if (this._moving) {
85
+ // A widget moved to an attached parent is attached again synchronously
86
+ // and keeps its component state; unmount if the layout did not attach it.
87
+ queueMicrotask(() => {
88
+ if (!this.isAttached) {
89
+ this._unmount();
90
+ }
91
+ });
92
+ return;
71
93
  }
94
+ // Unmount while the node is in the document, so that cleanups can still
95
+ // detach or measure what they rendered.
96
+ this._unmount();
72
97
  }
73
98
 
74
99
  /**
@@ -78,14 +103,27 @@ export abstract class ReactWidget extends Widget {
78
103
  if (this.isDisposed) {
79
104
  return;
80
105
  }
81
- // `onBeforeDetach` unmounts on a normal detach, but a widget disposed
82
- // while already detached would keep its React root mounted forever,
83
- // along with every subscription made by the rendered components.
84
- if (this._rootDOM !== null) {
85
- this._rootDOM.unmount();
106
+ // A widget disposed while already detached receives no `before-detach`
107
+ // message, and without this call its React root would stay mounted with
108
+ // every subscription of its components.
109
+ try {
110
+ this._unmount();
111
+ } finally {
112
+ super.dispose();
113
+ }
114
+ }
115
+
116
+ /**
117
+ * Unmount the React tree, if one is mounted.
118
+ */
119
+ private _unmount(): void {
120
+ const root = this._rootDOM;
121
+ if (root !== null) {
122
+ // Forget the root first: a cleanup that throws would otherwise leave a
123
+ // root that cannot render again.
86
124
  this._rootDOM = null;
125
+ root.unmount();
87
126
  }
88
- super.dispose();
89
127
  }
90
128
 
91
129
  /**
@@ -113,8 +151,7 @@ export abstract class ReactWidget extends Widget {
113
151
  requestIdleCallback(() => resolve());
114
152
  } else {
115
153
  // If the virtual node is null, unmount the node content
116
- this._rootDOM.unmount();
117
- this._rootDOM = null;
154
+ this._unmount();
118
155
  requestIdleCallback(() => resolve());
119
156
  }
120
157
  });
@@ -123,6 +160,7 @@ export abstract class ReactWidget extends Widget {
123
160
  // Set whenever a new render is triggered and resolved when it is finished.
124
161
  renderPromise?: Promise<void>;
125
162
  private _rootDOM: Root | null = null;
163
+ private _moving = false;
126
164
  }
127
165
 
128
166
  /**