@jupyterlab/ui-components 4.1.2 → 4.1.4

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.
@@ -195,8 +195,8 @@ export declare class ReactiveToolbar extends Toolbar<Widget> {
195
195
  private _saveWidgetWidth;
196
196
  private _getWidgetWidth;
197
197
  protected readonly popupOpener: ToolbarPopupOpener;
198
- private readonly _widgetWidths;
199
198
  private readonly _resizer;
199
+ private readonly _widgetWidths;
200
200
  private _widgetPositions;
201
201
  private _zoom;
202
202
  private _zoomChanged;
@@ -328,14 +328,14 @@ export class ReactiveToolbar extends Toolbar {
328
328
  constructor() {
329
329
  super();
330
330
  this.popupOpener = new ToolbarPopupOpener();
331
- this._widgetWidths = {};
331
+ this._widgetWidths = new Map();
332
332
  this._widgetPositions = new Map();
333
333
  this._zoomChanged = true;
334
334
  this.insertItem(0, TOOLBAR_OPENER_NAME, this.popupOpener);
335
335
  this.popupOpener.hide();
336
336
  this._resizer = new Throttler(async (callTwice = false) => {
337
337
  await this._onResize(callTwice);
338
- }, 300);
338
+ }, 500);
339
339
  }
340
340
  /**
341
341
  * Dispose of the widget and its descendant widgets.
@@ -378,11 +378,6 @@ export class ReactiveToolbar extends Toolbar {
378
378
  insertRelative(at, offset, name, widget) {
379
379
  const targetPosition = this._widgetPositions.get(at);
380
380
  const position = (targetPosition !== null && targetPosition !== void 0 ? targetPosition : 0) + offset;
381
- this._widgetPositions.forEach((value, key) => {
382
- if (key !== TOOLBAR_OPENER_NAME && value >= position) {
383
- this._widgetPositions.set(key, value + 1);
384
- }
385
- });
386
381
  return this.insertItem(position, name, widget);
387
382
  }
388
383
  /**
@@ -402,6 +397,7 @@ export class ReactiveToolbar extends Toolbar {
402
397
  * The item can be removed from the toolbar by setting its parent to `null`.
403
398
  */
404
399
  insertItem(index, name, widget) {
400
+ var _a;
405
401
  let status;
406
402
  if (widget instanceof ToolbarPopupOpener) {
407
403
  status = super.insertItem(index, name, widget);
@@ -410,10 +406,29 @@ export class ReactiveToolbar extends Toolbar {
410
406
  const j = Math.max(0, Math.min(index, this.layout.widgets.length - 1));
411
407
  status = super.insertItem(j, name, widget);
412
408
  }
413
- // Save the widgets position when a new widget is inserted.
409
+ // Save the widgets position when a widget is inserted or moved.
414
410
  if (name !== TOOLBAR_OPENER_NAME &&
415
- this._widgetPositions.get(name) === undefined) {
411
+ this._widgetPositions.get(name) !== index) {
412
+ // If the widget is inserted, set its current position as last.
413
+ const currentPosition = (_a = this._widgetPositions.get(name)) !== null && _a !== void 0 ? _a : this._widgetPositions.size;
414
+ // Change the position of moved widgets.
415
+ this._widgetPositions.forEach((value, key) => {
416
+ if (key !== TOOLBAR_OPENER_NAME) {
417
+ if (value >= index && value < currentPosition) {
418
+ this._widgetPositions.set(key, value + 1);
419
+ }
420
+ else if (value <= index && value > currentPosition) {
421
+ this._widgetPositions.set(key, value - 1);
422
+ }
423
+ }
424
+ });
425
+ // Save the new position of the widget.
416
426
  this._widgetPositions.set(name, index);
427
+ // Invokes resizing to ensure correct display of items after an addition, only
428
+ // if the toolbar is rendered.
429
+ if (this.isVisible) {
430
+ void this._onResize();
431
+ }
417
432
  }
418
433
  return status;
419
434
  }
@@ -464,21 +479,33 @@ export class ReactiveToolbar extends Toolbar {
464
479
  }
465
480
  const toolbarWidth = this.node.clientWidth;
466
481
  const opener = this.popupOpener;
467
- const openerWidth = 30;
482
+ const openerWidth = 32;
468
483
  // left and right padding.
469
484
  const toolbarPadding = 2 + 5;
470
485
  let width = opener.isHidden ? toolbarPadding : toolbarPadding + openerWidth;
471
486
  this._getWidgetsToRemove(width, toolbarWidth, openerWidth)
472
487
  .then(values => {
473
- var _a;
488
+ var _a, _b;
474
489
  let { width, widgetsToRemove } = values;
475
490
  while (widgetsToRemove.length > 0) {
476
- // Insert the widget in the right position in the opener popup.
491
+ // Insert the widget at the right position in the opener popup, relatively
492
+ // to the saved position of the first item of the popup toolbar.
493
+ // Get the saved position of the widget to insert.
477
494
  const widget = widgetsToRemove.pop();
478
495
  const name = Private.nameProperty.get(widget);
479
- width -= this._widgetWidths[name];
496
+ width -= this._widgetWidths.get(name) || 0;
480
497
  const position = (_a = this._widgetPositions.get(name)) !== null && _a !== void 0 ? _a : 0;
481
- const index = opener.widgetCount() + position - this._widgetPositions.size;
498
+ // Get the saved position of the first item in the popup toolbar.
499
+ // If there is no widget, set the value at last item.
500
+ let openerFirstIndex = this._widgetPositions.size;
501
+ const openerFirst = opener.widgetAt(0);
502
+ if (openerFirst) {
503
+ const openerFirstName = Private.nameProperty.get(openerFirst);
504
+ openerFirstIndex =
505
+ (_b = this._widgetPositions.get(openerFirstName)) !== null && _b !== void 0 ? _b : openerFirstIndex;
506
+ }
507
+ // Insert the widget in the popup toolbar.
508
+ const index = position - openerFirstIndex;
482
509
  opener.insertWidget(index, widget);
483
510
  }
484
511
  if (opener.widgetCount() > 0) {
@@ -532,6 +559,7 @@ export class ReactiveToolbar extends Toolbar {
532
559
  });
533
560
  }
534
561
  async _getWidgetsToRemove(width, toolbarWidth, openerWidth) {
562
+ var _a;
535
563
  const opener = this.popupOpener;
536
564
  const layout = this.layout;
537
565
  const toIndex = layout.widgets.length - 1;
@@ -539,18 +567,20 @@ export class ReactiveToolbar extends Toolbar {
539
567
  let index = 0;
540
568
  while (index < toIndex) {
541
569
  const widget = layout.widgets[index];
570
+ const name = Private.nameProperty.get(widget);
542
571
  // Compute the widget size only if
543
572
  // - the zoom has changed.
544
573
  // - the widget size has not been computed yet.
545
574
  let widgetWidth;
546
575
  if (this._zoomChanged) {
547
- widgetWidth = await this._saveWidgetWidth(widget);
576
+ widgetWidth = await this._saveWidgetWidth(name, widget);
548
577
  }
549
578
  else {
550
579
  // The widget widths can be 0px if it has been added to the toolbar but
551
580
  // not rendered, this is why we must use '||' instead of '??'.
552
581
  widgetWidth =
553
- this._getWidgetWidth(widget) || (await this._saveWidgetWidth(widget));
582
+ this._getWidgetWidth(widget) ||
583
+ (await this._saveWidgetWidth(name, widget));
554
584
  }
555
585
  width += widgetWidth;
556
586
  if (widgetsToRemove.length === 0 &&
@@ -558,7 +588,12 @@ export class ReactiveToolbar extends Toolbar {
558
588
  width + openerWidth > toolbarWidth) {
559
589
  width += openerWidth;
560
590
  }
561
- if (width > toolbarWidth) {
591
+ // Remove the widget if it is out of the toolbar or incorrectly positioned.
592
+ // Incorrect positioning can occur when the widget is added after the toolbar
593
+ // has been rendered and should be in the popup. E.g. debugger icon with a
594
+ // narrow notebook toolbar.
595
+ if (width > toolbarWidth ||
596
+ ((_a = this._widgetPositions.get(name)) !== null && _a !== void 0 ? _a : 0) > index) {
562
597
  widgetsToRemove.push(widget);
563
598
  }
564
599
  index++;
@@ -569,20 +604,19 @@ export class ReactiveToolbar extends Toolbar {
569
604
  widgetsToRemove: widgetsToRemove
570
605
  };
571
606
  }
572
- async _saveWidgetWidth(widget) {
607
+ async _saveWidgetWidth(name, widget) {
573
608
  if (widget instanceof ReactWidget) {
574
609
  await widget.renderPromise;
575
610
  }
576
- const widgetName = Private.nameProperty.get(widget);
577
611
  const widgetWidth = widget.hasClass(TOOLBAR_SPACER_CLASS)
578
612
  ? 2
579
613
  : widget.node.clientWidth;
580
- this._widgetWidths[widgetName] = widgetWidth;
614
+ this._widgetWidths.set(name, widgetWidth);
581
615
  return widgetWidth;
582
616
  }
583
617
  _getWidgetWidth(widget) {
584
618
  const widgetName = Private.nameProperty.get(widget);
585
- return this._widgetWidths[widgetName];
619
+ return this._widgetWidths.get(widgetName) || 0;
586
620
  }
587
621
  }
588
622
  /**
@@ -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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/ui-components",
3
- "version": "4.1.2",
3
+ "version": "4.1.4",
4
4
  "description": "JupyterLab - UI components written in React",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -43,10 +43,10 @@
43
43
  "dependencies": {
44
44
  "@jupyter/react-components": "^0.15.2",
45
45
  "@jupyter/web-components": "^0.15.2",
46
- "@jupyterlab/coreutils": "^6.1.2",
47
- "@jupyterlab/observables": "^5.1.2",
48
- "@jupyterlab/rendermime-interfaces": "^3.9.2",
49
- "@jupyterlab/translation": "^4.1.2",
46
+ "@jupyterlab/coreutils": "^6.1.4",
47
+ "@jupyterlab/observables": "^5.1.4",
48
+ "@jupyterlab/rendermime-interfaces": "^3.9.4",
49
+ "@jupyterlab/translation": "^4.1.4",
50
50
  "@lumino/algorithm": "^2.0.1",
51
51
  "@lumino/commands": "^2.2.0",
52
52
  "@lumino/coreutils": "^2.1.2",
@@ -64,7 +64,7 @@
64
64
  "typestyle": "^2.0.4"
65
65
  },
66
66
  "devDependencies": {
67
- "@jupyterlab/testing": "^4.1.2",
67
+ "@jupyterlab/testing": "^4.1.4",
68
68
  "@types/jest": "^29.2.0",
69
69
  "@types/react": "^18.0.26",
70
70
  "jest": "^29.2.0",
@@ -376,7 +376,7 @@ export class ReactiveToolbar extends Toolbar<Widget> {
376
376
  this.popupOpener.hide();
377
377
  this._resizer = new Throttler(async (callTwice = false) => {
378
378
  await this._onResize(callTwice);
379
- }, 300);
379
+ }, 500);
380
380
  }
381
381
 
382
382
  /**
@@ -429,11 +429,6 @@ export class ReactiveToolbar extends Toolbar<Widget> {
429
429
  ): boolean {
430
430
  const targetPosition = this._widgetPositions.get(at);
431
431
  const position = (targetPosition ?? 0) + offset;
432
- this._widgetPositions.forEach((value, key) => {
433
- if (key !== TOOLBAR_OPENER_NAME && value >= position) {
434
- this._widgetPositions.set(key, value + 1);
435
- }
436
- });
437
432
  return this.insertItem(position, name, widget);
438
433
  }
439
434
 
@@ -465,12 +460,34 @@ export class ReactiveToolbar extends Toolbar<Widget> {
465
460
  status = super.insertItem(j, name, widget);
466
461
  }
467
462
 
468
- // Save the widgets position when a new widget is inserted.
463
+ // Save the widgets position when a widget is inserted or moved.
469
464
  if (
470
465
  name !== TOOLBAR_OPENER_NAME &&
471
- this._widgetPositions.get(name) === undefined
466
+ this._widgetPositions.get(name) !== index
472
467
  ) {
468
+ // If the widget is inserted, set its current position as last.
469
+ const currentPosition =
470
+ this._widgetPositions.get(name) ?? this._widgetPositions.size;
471
+
472
+ // Change the position of moved widgets.
473
+ this._widgetPositions.forEach((value, key) => {
474
+ if (key !== TOOLBAR_OPENER_NAME) {
475
+ if (value >= index && value < currentPosition) {
476
+ this._widgetPositions.set(key, value + 1);
477
+ } else if (value <= index && value > currentPosition) {
478
+ this._widgetPositions.set(key, value - 1);
479
+ }
480
+ }
481
+ });
482
+
483
+ // Save the new position of the widget.
473
484
  this._widgetPositions.set(name, index);
485
+
486
+ // Invokes resizing to ensure correct display of items after an addition, only
487
+ // if the toolbar is rendered.
488
+ if (this.isVisible) {
489
+ void this._onResize();
490
+ }
474
491
  }
475
492
  return status;
476
493
  }
@@ -526,7 +543,7 @@ export class ReactiveToolbar extends Toolbar<Widget> {
526
543
  }
527
544
  const toolbarWidth = this.node.clientWidth;
528
545
  const opener = this.popupOpener;
529
- const openerWidth = 30;
546
+ const openerWidth = 32;
530
547
  // left and right padding.
531
548
  const toolbarPadding = 2 + 5;
532
549
  let width = opener.isHidden ? toolbarPadding : toolbarPadding + openerWidth;
@@ -535,13 +552,27 @@ export class ReactiveToolbar extends Toolbar<Widget> {
535
552
  .then(values => {
536
553
  let { width, widgetsToRemove } = values;
537
554
  while (widgetsToRemove.length > 0) {
538
- // Insert the widget in the right position in the opener popup.
555
+ // Insert the widget at the right position in the opener popup, relatively
556
+ // to the saved position of the first item of the popup toolbar.
557
+
558
+ // Get the saved position of the widget to insert.
539
559
  const widget = widgetsToRemove.pop() as Widget;
540
560
  const name = Private.nameProperty.get(widget);
541
- width -= this._widgetWidths![name];
561
+ width -= this._widgetWidths.get(name) || 0;
542
562
  const position = this._widgetPositions.get(name) ?? 0;
543
- const index =
544
- opener.widgetCount() + position - this._widgetPositions.size;
563
+
564
+ // Get the saved position of the first item in the popup toolbar.
565
+ // If there is no widget, set the value at last item.
566
+ let openerFirstIndex = this._widgetPositions.size;
567
+ const openerFirst = opener.widgetAt(0);
568
+ if (openerFirst) {
569
+ const openerFirstName = Private.nameProperty.get(openerFirst);
570
+ openerFirstIndex =
571
+ this._widgetPositions.get(openerFirstName) ?? openerFirstIndex;
572
+ }
573
+
574
+ // Insert the widget in the popup toolbar.
575
+ const index = position - openerFirstIndex;
545
576
  opener.insertWidget(index, widget);
546
577
  }
547
578
  if (opener.widgetCount() > 0) {
@@ -606,17 +637,19 @@ export class ReactiveToolbar extends Toolbar<Widget> {
606
637
  let index = 0;
607
638
  while (index < toIndex) {
608
639
  const widget = layout.widgets[index];
640
+ const name = Private.nameProperty.get(widget);
609
641
  // Compute the widget size only if
610
642
  // - the zoom has changed.
611
643
  // - the widget size has not been computed yet.
612
644
  let widgetWidth: number;
613
645
  if (this._zoomChanged) {
614
- widgetWidth = await this._saveWidgetWidth(widget);
646
+ widgetWidth = await this._saveWidgetWidth(name, widget);
615
647
  } else {
616
648
  // The widget widths can be 0px if it has been added to the toolbar but
617
649
  // not rendered, this is why we must use '||' instead of '??'.
618
650
  widgetWidth =
619
- this._getWidgetWidth(widget) || (await this._saveWidgetWidth(widget));
651
+ this._getWidgetWidth(widget) ||
652
+ (await this._saveWidgetWidth(name, widget));
620
653
  }
621
654
  width += widgetWidth;
622
655
  if (
@@ -626,12 +659,18 @@ export class ReactiveToolbar extends Toolbar<Widget> {
626
659
  ) {
627
660
  width += openerWidth;
628
661
  }
629
- if (width > toolbarWidth) {
662
+ // Remove the widget if it is out of the toolbar or incorrectly positioned.
663
+ // Incorrect positioning can occur when the widget is added after the toolbar
664
+ // has been rendered and should be in the popup. E.g. debugger icon with a
665
+ // narrow notebook toolbar.
666
+ if (
667
+ width > toolbarWidth ||
668
+ (this._widgetPositions.get(name) ?? 0) > index
669
+ ) {
630
670
  widgetsToRemove.push(widget);
631
671
  }
632
672
  index++;
633
673
  }
634
-
635
674
  this._zoomChanged = false;
636
675
  return {
637
676
  width: width,
@@ -639,27 +678,28 @@ export class ReactiveToolbar extends Toolbar<Widget> {
639
678
  };
640
679
  }
641
680
 
642
- private async _saveWidgetWidth(widget: Widget): Promise<number> {
681
+ private async _saveWidgetWidth(
682
+ name: string,
683
+ widget: Widget
684
+ ): Promise<number> {
643
685
  if (widget instanceof ReactWidget) {
644
686
  await widget.renderPromise;
645
687
  }
646
- const widgetName = Private.nameProperty.get(widget);
647
-
648
688
  const widgetWidth = widget.hasClass(TOOLBAR_SPACER_CLASS)
649
689
  ? 2
650
690
  : widget.node.clientWidth;
651
- this._widgetWidths![widgetName] = widgetWidth;
691
+ this._widgetWidths.set(name, widgetWidth);
652
692
  return widgetWidth;
653
693
  }
654
694
 
655
695
  private _getWidgetWidth(widget: Widget): number {
656
696
  const widgetName = Private.nameProperty.get(widget);
657
- return this._widgetWidths![widgetName];
697
+ return this._widgetWidths.get(widgetName) || 0;
658
698
  }
659
699
 
660
700
  protected readonly popupOpener: ToolbarPopupOpener = new ToolbarPopupOpener();
661
- private readonly _widgetWidths: { [key: string]: number } = {};
662
701
  private readonly _resizer: Throttler;
702
+ private readonly _widgetWidths = new Map<string, number>();
663
703
  private _widgetPositions = new Map<string, number>();
664
704
  // The zoom property is not the real browser zoom, but a value proportional to
665
705
  // the zoom, which is modified when the zoom changes.
package/style/toolbar.css CHANGED
@@ -74,6 +74,10 @@ button.jp-ToolbarButtonComponent .jp-ToolbarButtonComponent-label {
74
74
  font-family: var(--jp-ui-font-family);
75
75
  }
76
76
 
77
+ jp-button.jp-Toolbar-kernelName {
78
+ color: var(--jp-ui-font-color1);
79
+ }
80
+
77
81
  .jp-ToolbarButtonComponent::part(content) {
78
82
  display: flex;
79
83
  align-items: center;