@jupyterlab/ui-components 4.1.0-beta.0 → 4.1.0-beta.1

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.
@@ -86,7 +86,10 @@ export declare class Toolbar<T extends Widget = Widget> extends Widget {
86
86
  * The item can be removed from the toolbar by setting its parent to `null`.
87
87
  */
88
88
  insertBefore(at: string, name: string, widget: T): boolean;
89
- private _insertRelative;
89
+ /**
90
+ * Insert an item relatively to an other item.
91
+ */
92
+ protected insertRelative(at: string, offset: number, name: string, widget: T): boolean;
90
93
  /**
91
94
  * Handle the DOM events for the widget.
92
95
  *
@@ -141,6 +144,10 @@ export declare class ReactiveToolbar extends Toolbar<Widget> {
141
144
  * The item can be removed from the toolbar by setting its parent to `null`.
142
145
  */
143
146
  insertAfter(at: string, name: string, widget: Widget): boolean;
147
+ /**
148
+ * Insert an item relatively to an other item.
149
+ */
150
+ protected insertRelative(at: string, offset: number, name: string, widget: Widget): boolean;
144
151
  /**
145
152
  * Insert an item into the toolbar at the specified index.
146
153
  *
@@ -158,6 +165,12 @@ export declare class ReactiveToolbar extends Toolbar<Widget> {
158
165
  * The item can be removed from the toolbar by setting its parent to `null`.
159
166
  */
160
167
  insertItem(index: number, name: string, widget: Widget): boolean;
168
+ /**
169
+ * A message handler invoked on an `'after-show'` message.
170
+ *
171
+ * Invokes resizing to ensure correct display of items.
172
+ */
173
+ onAfterShow(msg: Message): void;
161
174
  /**
162
175
  * A message handler invoked on a `'before-hide'` message.
163
176
  *
@@ -165,11 +178,22 @@ export declare class ReactiveToolbar extends Toolbar<Widget> {
165
178
  */
166
179
  onBeforeHide(msg: Message): void;
167
180
  protected onResize(msg: Widget.ResizeMessage): void;
181
+ /**
182
+ * Move the toolbar items between the reactive toolbar and the popup toolbar,
183
+ * depending on the width of the toolbar and the width of each item.
184
+ *
185
+ * @param callTwice - whether to call the function twice.
186
+ *
187
+ * **NOTES**
188
+ * The `callTwice` parameter is useful when the toolbar is displayed the first time,
189
+ * because the size of the items is unknown before their first rendering. The first
190
+ * call will usually add all the items in the main toolbar, and the second call will
191
+ * reorganize the items between the main toolbar and the popup toolbar.
192
+ */
168
193
  private _onResize;
169
194
  private _getWidgetsToRemove;
170
195
  private _saveWidgetWidth;
171
196
  private _getWidgetWidth;
172
- private _saveWidgetPosition;
173
197
  protected readonly popupOpener: ToolbarPopupOpener;
174
198
  private readonly _widgetWidths;
175
199
  private readonly _resizer;
@@ -325,7 +349,7 @@ export declare namespace CommandToolbarButtonComponent {
325
349
  /**
326
350
  * Overrides command label
327
351
  */
328
- label?: string;
352
+ label?: string | CommandRegistry.CommandFunc<string>;
329
353
  /**
330
354
  * Overrides command caption
331
355
  */
@@ -229,7 +229,7 @@ export class Toolbar extends Widget {
229
229
  * The item can be removed from the toolbar by setting its parent to `null`.
230
230
  */
231
231
  insertAfter(at, name, widget) {
232
- return this._insertRelative(at, 1, name, widget);
232
+ return this.insertRelative(at, 1, name, widget);
233
233
  }
234
234
  /**
235
235
  * Insert an item into the toolbar at the before a target item.
@@ -248,9 +248,12 @@ export class Toolbar extends Widget {
248
248
  * The item can be removed from the toolbar by setting its parent to `null`.
249
249
  */
250
250
  insertBefore(at, name, widget) {
251
- return this._insertRelative(at, 0, name, widget);
251
+ return this.insertRelative(at, 0, name, widget);
252
252
  }
253
- _insertRelative(at, offset, name, widget) {
253
+ /**
254
+ * Insert an item relatively to an other item.
255
+ */
256
+ insertRelative(at, offset, name, widget) {
254
257
  const nameWithIndex = map(this.names(), (name, i) => {
255
258
  return { name: name, index: i };
256
259
  });
@@ -330,8 +333,8 @@ export class ReactiveToolbar extends Toolbar {
330
333
  this._zoomChanged = true;
331
334
  this.insertItem(0, TOOLBAR_OPENER_NAME, this.popupOpener);
332
335
  this.popupOpener.hide();
333
- this._resizer = new Throttler(async () => {
334
- await this._onResize();
336
+ this._resizer = new Throttler(async (callTwice = false) => {
337
+ await this._onResize(callTwice);
335
338
  }, 300);
336
339
  }
337
340
  /**
@@ -369,6 +372,19 @@ export class ReactiveToolbar extends Toolbar {
369
372
  }
370
373
  return super.insertAfter(at, name, widget);
371
374
  }
375
+ /**
376
+ * Insert an item relatively to an other item.
377
+ */
378
+ insertRelative(at, offset, name, widget) {
379
+ const targetPosition = this._widgetPositions.get(at);
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
+ return this.insertItem(position, name, widget);
387
+ }
372
388
  /**
373
389
  * Insert an item into the toolbar at the specified index.
374
390
  *
@@ -395,11 +411,20 @@ export class ReactiveToolbar extends Toolbar {
395
411
  status = super.insertItem(j, name, widget);
396
412
  }
397
413
  // Save the widgets position when a new widget is inserted.
398
- if (this._widgetPositions.get(name) === undefined) {
399
- this._saveWidgetPosition();
414
+ if (name !== TOOLBAR_OPENER_NAME &&
415
+ this._widgetPositions.get(name) === undefined) {
416
+ this._widgetPositions.set(name, index);
400
417
  }
401
418
  return status;
402
419
  }
420
+ /**
421
+ * A message handler invoked on an `'after-show'` message.
422
+ *
423
+ * Invokes resizing to ensure correct display of items.
424
+ */
425
+ onAfterShow(msg) {
426
+ void this._resizer.invoke(true);
427
+ }
403
428
  /**
404
429
  * A message handler invoked on a `'before-hide'` message.
405
430
  *
@@ -421,7 +446,19 @@ export class ReactiveToolbar extends Toolbar {
421
446
  void this._resizer.invoke();
422
447
  }
423
448
  }
424
- _onResize() {
449
+ /**
450
+ * Move the toolbar items between the reactive toolbar and the popup toolbar,
451
+ * depending on the width of the toolbar and the width of each item.
452
+ *
453
+ * @param callTwice - whether to call the function twice.
454
+ *
455
+ * **NOTES**
456
+ * The `callTwice` parameter is useful when the toolbar is displayed the first time,
457
+ * because the size of the items is unknown before their first rendering. The first
458
+ * call will usually add all the items in the main toolbar, and the second call will
459
+ * reorganize the items between the main toolbar and the popup toolbar.
460
+ */
461
+ async _onResize(callTwice = false) {
425
462
  if (!(this.parent && this.parent.isAttached)) {
426
463
  return;
427
464
  }
@@ -433,7 +470,7 @@ export class ReactiveToolbar extends Toolbar {
433
470
  let width = opener.isHidden ? toolbarPadding : toolbarPadding + openerWidth;
434
471
  this._getWidgetsToRemove(width, toolbarWidth, openerWidth)
435
472
  .then(values => {
436
- var _a, _b;
473
+ var _a;
437
474
  let { width, widgetsToRemove } = values;
438
475
  while (widgetsToRemove.length > 0) {
439
476
  // Insert the widget in the right position in the opener popup.
@@ -447,29 +484,36 @@ export class ReactiveToolbar extends Toolbar {
447
484
  if (opener.widgetCount() > 0) {
448
485
  const widgetsToAdd = [];
449
486
  let index = 0;
450
- let widget = opener.widgetAt(index);
451
487
  const widgetCount = opener.widgetCount();
452
- width += this._getWidgetWidth(widget);
453
- if (widgetCount === 1 && width - openerWidth <= toolbarWidth) {
454
- width -= openerWidth;
455
- }
456
- while (width < toolbarWidth && index < widgetCount) {
457
- widgetsToAdd.push(widget);
458
- index++;
459
- widget = opener.widgetAt(index);
488
+ while (index < widgetCount) {
489
+ let widget = opener.widgetAt(index);
460
490
  if (widget) {
461
491
  width += this._getWidgetWidth(widget);
492
+ if (widgetCount - widgetsToAdd.length === 1) {
493
+ width -= openerWidth;
494
+ }
495
+ }
496
+ else {
497
+ break;
498
+ }
499
+ if (width < toolbarWidth) {
500
+ widgetsToAdd.push(widget);
462
501
  }
463
502
  else {
464
503
  break;
465
504
  }
505
+ index++;
466
506
  }
467
507
  while (widgetsToAdd.length > 0) {
468
508
  // Insert the widget in the right position in the toolbar.
469
509
  const widget = widgetsToAdd.shift();
470
510
  const name = Private.nameProperty.get(widget);
471
- const index = (_b = this._widgetPositions.get(name)) !== null && _b !== void 0 ? _b : 0;
472
- this.insertItem(index, name, widget);
511
+ if (this._widgetPositions.has(name)) {
512
+ this.insertItem(this._widgetPositions.get(name), name, widget);
513
+ }
514
+ else {
515
+ this.addItem(name, widget);
516
+ }
473
517
  }
474
518
  }
475
519
  if (opener.widgetCount() > 0) {
@@ -479,13 +523,15 @@ export class ReactiveToolbar extends Toolbar {
479
523
  else {
480
524
  opener.hide();
481
525
  }
526
+ if (callTwice) {
527
+ void this._onResize();
528
+ }
482
529
  })
483
530
  .catch(msg => {
484
531
  console.error('Error while computing the ReactiveToolbar', msg);
485
532
  });
486
533
  }
487
534
  async _getWidgetsToRemove(width, toolbarWidth, openerWidth) {
488
- var _a;
489
535
  const opener = this.popupOpener;
490
536
  const layout = this.layout;
491
537
  const toIndex = layout.widgets.length - 1;
@@ -501,8 +547,10 @@ export class ReactiveToolbar extends Toolbar {
501
547
  widgetWidth = await this._saveWidgetWidth(widget);
502
548
  }
503
549
  else {
550
+ // The widget widths can be 0px if it has been added to the toolbar but
551
+ // not rendered, this is why we must use '||' instead of '??'.
504
552
  widgetWidth =
505
- (_a = this._getWidgetWidth(widget)) !== null && _a !== void 0 ? _a : (await this._saveWidgetWidth(widget));
553
+ this._getWidgetWidth(widget) || (await this._saveWidgetWidth(widget));
506
554
  }
507
555
  width += widgetWidth;
508
556
  if (widgetsToRemove.length === 0 &&
@@ -536,12 +584,6 @@ export class ReactiveToolbar extends Toolbar {
536
584
  const widgetName = Private.nameProperty.get(widget);
537
585
  return this._widgetWidths[widgetName];
538
586
  }
539
- _saveWidgetPosition() {
540
- this._widgetPositions.clear();
541
- this.layout.widgets.forEach((widget, index) => {
542
- this._widgetPositions.set(Private.nameProperty.get(widget), index);
543
- });
544
- }
545
587
  }
546
588
  /**
547
589
  * The namespace for Toolbar class statics.
@@ -926,7 +968,7 @@ class ToolbarPopupOpener extends ToolbarButton {
926
968
  var Private;
927
969
  (function (Private) {
928
970
  function propsFromCommand(options) {
929
- var _a, _b, _c;
971
+ var _a, _b;
930
972
  const { commands, id, args } = options;
931
973
  const iconClass = commands.iconClass(id, args);
932
974
  const iconLabel = commands.iconLabel(id, args);
@@ -944,7 +986,10 @@ var Private;
944
986
  if (!commands.isVisible(id, args)) {
945
987
  className += ' lm-mod-hidden';
946
988
  }
947
- let tooltip = commands.caption(id, args) || options.label || label || iconLabel;
989
+ const labelOverride = typeof options.label === 'function'
990
+ ? options.label(args !== null && args !== void 0 ? args : {})
991
+ : options.label;
992
+ let tooltip = commands.caption(id, args) || labelOverride || label || iconLabel;
948
993
  // Shows hot keys in tooltips
949
994
  const binding = commands.keyBindings.find(b => b.command === id);
950
995
  if (binding) {
@@ -963,7 +1008,7 @@ var Private;
963
1008
  tooltip: (_b = options.caption) !== null && _b !== void 0 ? _b : tooltip,
964
1009
  onClick,
965
1010
  enabled,
966
- label: (_c = options.label) !== null && _c !== void 0 ? _c : label,
1011
+ label: labelOverride !== null && labelOverride !== void 0 ? labelOverride : label,
967
1012
  pressed
968
1013
  };
969
1014
  }
@@ -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":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EACL,gCAAgC,EAChC,QAAQ,EACR,SAAS,EACT,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAe,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAW,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAU,WAAW,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEhD,0BAA0B,EAAE,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;AACjE,gCAAgC,EAAE,CAAC;AAEnC;;GAEG;AACH,MAAM,aAAa,GAAG,YAAY,CAAC;AAEnC;;GAEG;AACH,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAE7C;;GAEG;AACH,MAAM,mBAAmB,GAAG,sBAAsB,CAAC;AAEnD;;GAEG;AACH,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAEjD;;;;;;;GAOG;AACH,MAAM,aAAc,SAAQ,WAAW;IAAvC;;QA+GU,WAAM,GAAG,KAAK,CAAC;IACzB,CAAC;IA/GC;;;;;OAKG;IACO,YAAY,CAAC,GAAY;QACjC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,IAAI,CAAC,MAAO,CAAC,UAAU,EAAE;YAC3B,wEAAwE;YACxE,oBAAoB;YACpB,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;gBACxC,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,kCAAkC,CAAC;gBACvE,IAAI,CAAC,MAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;aAC9C;iBAAM;gBACL,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC;gBACvC,IAAI,CAAC,MAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;aAC3C;SACF;QAED,4DAA4D;QAC5D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB,+DAA+D;QAC/D,gEAAgE;QAChE,IAAI,IAAI,CAAC,MAAO,CAAC,MAAM,EAAE;YACvB,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAO,CAAC,MAAO,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;SACtE;QAED,8DAA8D;QAC9D,gEAAgE;QAChE,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAO,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;SACjE;IACH,CAAC;IAED;;OAEG;IACO,eAAe,CAAC,GAAY;QACpC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,IAAI,CAAC,MAAO,CAAC,SAAS,EAAE;YAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;SACrB;IACH,CAAC;IAED;;OAEG;IACO,YAAY,CAAC,GAAwB;QAC7C,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAExB,4CAA4C;QAC5C,IAAI,CAAC,MAAO,CAAC,GAAG,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACO,aAAa,CAAC,GAAwB;QAC9C,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAEzB,4CAA4C;QAC5C,IAAI,CAAC,MAAO,CAAC,GAAG,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACO,cAAc,CAAC,GAAY;QACnC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAE1B,4CAA4C;QAC5C,IAAI,CAAC,MAAO,CAAC,GAAG,EAAE,CAAC;IACrB,CAAC;IAED;;;;;;;;;OASG;IACO,YAAY,CAAC,KAAa,EAAE,MAAc;QAClD,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAElC,4CAA4C;QAC5C,IAAI,CAAC,MAAO,CAAC,GAAG,EAAE,CAAC;IACrB,CAAC;IAED;;;;;;;;;OASG;IACO,YAAY,CAAC,KAAa,EAAE,MAAc;QAClD,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAElC,4CAA4C;QAC5C,IAAI,CAAC,MAAO,CAAC,GAAG,EAAE,CAAC;IACrB,CAAC;CAGF;AAED;;GAEG;AACH,MAAM,OAAO,OAAmC,SAAQ,MAAM;IAC5D;;OAEG;IACH,YAAY,UAA4B,EAAE;;QACxC,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,aAAa,EAAE,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACH,KAAK;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAuB,CAAC;QAC5C,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;YAClC,OAAO,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,IAAY,EAAE,MAAS;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAuB,CAAC;QAC5C,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,KAAa,EAAE,IAAY,EAAE,MAAS;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;QAC7D,IAAI,QAAQ,EAAE;YACZ,OAAO,KAAK,CAAC;SACd;QACD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAuB,CAAC;QAE5C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE/B,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACH,WAAW,CAAC,EAAU,EAAE,IAAY,EAAE,MAAS;QAC7C,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACH,YAAY,CAAC,EAAU,EAAE,IAAY,EAAE,MAAS;QAC9C,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACO,cAAc,CACtB,EAAU,EACV,MAAc,EACd,IAAY,EACZ,MAAS;QAET,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YAClD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;QACvD,IAAI,MAAM,EAAE;YACV,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SAC7D;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;;OASG;IACH,WAAW,CAAC,KAAY;QACtB,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,OAAO;gBACV,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBACxB,MAAM;YACR;gBACE,MAAM;SACT;IACH,CAAC;IAED;;OAEG;IACO,WAAW,CAAC,KAAY;QAChC,iDAAiD;QACjD,KAAK,CAAC,eAAe,EAAE,CAAC;QAExB,qDAAqD;QACrD,qDAAqD;QACrD,IAAI,KAAK,CAAC,MAAM,YAAY,gBAAgB,EAAE;YAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE;gBACjD,OAAO;aACR;SACF;QAED,sDAAsD;QACtD,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC9C,OAAO;SACR;QAED,0EAA0E;QAC1E,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;SACxB;IACH,CAAC;IAED;;OAEG;IACO,aAAa,CAAC,GAAY;QAClC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED;;OAEG;IACO,cAAc,CAAC,GAAY;QACnC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,OAAe;IAClD;;OAEG;IACH;QACE,KAAK,EAAE,CAAC;QA8RS,gBAAW,GAAuB,IAAI,kBAAkB,EAAE,CAAC;QAC7D,kBAAa,GAA8B,EAAE,CAAC;QAEvD,qBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAI7C,iBAAY,GAAG,IAAI,CAAC;QApS1B,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,EAAE;YACxD,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,OAAO;SACR;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;SACzB;QAED,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,WAAW,CAAC,EAAU,EAAE,IAAY,EAAE,MAAc;QAClD,IAAI,EAAE,KAAK,mBAAmB,EAAE;YAC9B,OAAO,KAAK,CAAC;SACd;QACD,OAAO,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACO,cAAc,CACtB,EAAU,EACV,MAAc,EACd,IAAY,EACZ,MAAc;QAEd,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,CAAC,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,CAAC,CAAC,GAAG,MAAM,CAAC;QAChD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC3C,IAAI,GAAG,KAAK,mBAAmB,IAAI,KAAK,IAAI,QAAQ,EAAE;gBACpD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,KAAa,EAAE,IAAY,EAAE,MAAc;QACpD,IAAI,MAAe,CAAC;QACpB,IAAI,MAAM,YAAY,kBAAkB,EAAE;YACxC,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SAChD;aAAM;YACL,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAChB,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAG,IAAI,CAAC,MAAwB,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CACnE,CAAC;YACF,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5C;QAED,2DAA2D;QAC3D,IACE,IAAI,KAAK,mBAAmB;YAC5B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS,EAC7C;YACA,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACxC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,GAAY;QACtB,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,GAAY;QACvB,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QAC7B,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAES,QAAQ,CAAC,GAAyB;QAC1C,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEpB,qDAAqD;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC;QACvE,IAAI,IAAI,KAAK,IAAI,CAAC,KAAK,EAAE;YACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;SACnB;QACD,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClC,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;SAC7B;IACH,CAAC;IAED;;;;;;;;;;;OAWG;IACK,KAAK,CAAC,SAAS,CAAC,SAAS,GAAG,KAAK;QACvC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC5C,OAAO;SACR;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;QAChC,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,0BAA0B;QAC1B,MAAM,cAAc,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,GAAG,WAAW,CAAC;QAE5E,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC;aACvD,IAAI,CAAC,MAAM,CAAC,EAAE;;YACb,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;YACxC,OAAO,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,+DAA+D;gBAC/D,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,EAAY,CAAC;gBAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC9C,KAAK,IAAI,IAAI,CAAC,aAAc,CAAC,IAAI,CAAC,CAAC;gBACnC,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAI,CAAC,CAAC;gBACtD,MAAM,KAAK,GACT,MAAM,CAAC,WAAW,EAAE,GAAG,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBAC/D,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;aACpC;YACD,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE;gBAC5B,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,IAAI,KAAK,GAAG,CAAC,CAAC;gBACd,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;gBAEzC,OAAO,KAAK,GAAG,WAAW,EAAE;oBAC1B,IAAI,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBACpC,IAAI,MAAM,EAAE;wBACV,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;wBACtC,IAAI,WAAW,GAAG,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;4BAC3C,KAAK,IAAI,WAAW,CAAC;yBACtB;qBACF;yBAAM;wBACL,MAAM;qBACP;oBACD,IAAI,KAAK,GAAG,YAAY,EAAE;wBACxB,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;qBAC3B;yBAAM;wBACL,MAAM;qBACP;oBACD,KAAK,EAAE,CAAC;iBACT;gBACD,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC9B,0DAA0D;oBAC1D,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAG,CAAC;oBACrC,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAC9C,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;wBACnC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;qBACjE;yBAAM;wBACL,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;qBAC5B;iBACF;aACF;YACD,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE;gBAC5B,MAAM,CAAC,WAAW,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,EAAE,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,EAAE,CAAC;aACf;YACD,IAAI,SAAS,EAAE;gBACb,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,2CAA2C,EAAE,GAAG,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,KAAa,EACb,YAAoB,EACpB,WAAmB;QAEnB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAuB,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QAE1C,MAAM,eAAe,GAAG,EAAE,CAAC;QAE3B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,KAAK,GAAG,OAAO,EAAE;YACtB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrC,kCAAkC;YAClC,0BAA0B;YAC1B,+CAA+C;YAC/C,IAAI,WAAmB,CAAC;YACxB,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;aACnD;iBAAM;gBACL,uEAAuE;gBACvE,8DAA8D;gBAC9D,WAAW;oBACT,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;aACzE;YACD,KAAK,IAAI,WAAW,CAAC;YACrB,IACE,eAAe,CAAC,MAAM,KAAK,CAAC;gBAC5B,MAAM,CAAC,QAAQ;gBACf,KAAK,GAAG,WAAW,GAAG,YAAY,EAClC;gBACA,KAAK,IAAI,WAAW,CAAC;aACtB;YACD,IAAI,KAAK,GAAG,YAAY,EAAE;gBACxB,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC9B;YACD,KAAK,EAAE,CAAC;SACT;QAED,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,eAAe,EAAE,eAAe;SACjC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,MAAc;QAC3C,IAAI,MAAM,YAAY,WAAW,EAAE;YACjC,MAAM,MAAM,CAAC,aAAa,CAAC;SAC5B;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpD,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC;YACvD,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;QAC5B,IAAI,CAAC,aAAc,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;QAC9C,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,eAAe,CAAC,MAAc;QACpC,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,aAAc,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC;CAUF;AAED;;GAEG;AACH,WAAiB,OAAO;IAqBtB;;;;;;OAMG;IACH,SAAgB,gBAAgB;QAC9B,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAFe,wBAAgB,mBAE/B,CAAA;AACH,CAAC,EA/BgB,OAAO,KAAP,OAAO,QA+BvB;AA0CD;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,KAAoC;;IAEpC,MAAM,aAAa,GAAG,MAAA,KAAK,CAAC,aAAa,mCAAI,KAAK,CAAC;IAEnD,uEAAuE;IACvE,mHAAmH;IACnH,qEAAqE;IACrE,4CAA4C;IAC5C,MAAM,eAAe,GAAG,aAAa;QACnC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,CAAC,KAAuB,EAAE,EAAE;;YAC1B,gDAAgD;YAChD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,MAAA,KAAK,CAAC,OAAO,qDAAI,CAAC;aACnB;QACH,CAAC,CAAC;IAEN,MAAM,WAAW,GAAG,aAAa;QAC/B,CAAC,CAAC,CAAC,KAAuB,EAAE,EAAE;;YAC1B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,MAAA,KAAK,CAAC,OAAO,qDAAI,CAAC;aACnB;QACH,CAAC;QACH,CAAC,CAAC,CAAC,KAAuB,EAAE,EAAE;YAC1B,4CAA4C;YAC5C,KAAK,CAAC,eAAe,EAAE,CAAC;QAC1B,CAAC,CAAC;IAEN,MAAM,aAAa,GAAG,CAAC,KAA0B,EAAE,EAAE;;QACnD,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;QACtB,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,GAAG,EAAE;YAClC,MAAA,KAAK,CAAC,OAAO,qDAAI,CAAC;SACnB;IACH,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,IAAI,KAAK,CAAC,eAAe,EAAE;YACpD,OAAO,KAAK,CAAC,eAAe,CAAC;SAC9B;aAAM,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,cAAc,EAAE;YAChD,OAAO,KAAK,CAAC,cAAc,CAAC;SAC7B;aAAM;YACL,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,SAAS,CAAC;SACzC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,MAAM,IACL,UAAU,EAAC,SAAS,EACpB,SAAS,EACP,KAAK,CAAC,SAAS;YACb,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,4BAA4B;YAChD,CAAC,CAAC,2BAA2B,kBAEnB,KAAK,CAAC,OAAO,mBACZ,KAAK,CAAC,OAAO,KAAK,KAAK,KAClC,KAAK,CAAC,OAAO,EACjB,QAAQ,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK,EACjC,OAAO,EAAE,WAAW,EACpB,WAAW,EAAE,eAAe,EAC5B,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO;QAEN,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAClC,oBAAC,OAAO,CAAC,YAAY,IACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAA,KAAK,CAAC,WAAW,mCAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAClE,SAAS;YACP,uEAAuE;YACvE,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,EAErC,GAAG,EAAE,IAAI,GACT,CACH;QACA,KAAK,CAAC,KAAK,IAAI,CACd,8BAAM,SAAS,EAAC,iCAAiC,IAAE,KAAK,CAAC,KAAK,CAAQ,CACvE,CACM,CACV,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAA4B,CAAI;IACnE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAC/B,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,WAAW;IAC5C;;;OAGG;IACH,YAAoB,QAAuC,EAAE;;QAC3D,KAAK,EAAE,CAAC;QADU,UAAK,GAAL,KAAK,CAAoC;QAE3D,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,MAAA,KAAK,CAAC,OAAO,mCAAI,IAAI,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAS,IAAI,CAAC,MAAA,KAAK,CAAC,OAAO,mCAAI,KAAK,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,OAAQ,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO,CAAC,KAAc;QACxB,IAAI,IAAI,CAAC,OAAO,IAAI,KAAK,KAAK,IAAI,CAAC,QAAQ,EAAE;YAC3C,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,MAAM,EAAE,CAAC;SACf;IACH,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAS,CAAC;IACxB,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO,CAAC,KAAc;QACxB,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC1B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;aACvB;YACD,IAAI,CAAC,MAAM,EAAE,CAAC;SACf;IACH,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO,CAAC,KAAiB;QAC3B,IAAI,KAAK,KAAK,IAAI,CAAC,QAAQ,EAAE;YAC3B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,MAAM,EAAE,CAAC;SACf;IACH,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAS,CAAC;IACxB,CAAC;IAED,MAAM;QACJ,OAAO,CACL,oBAAC,sBAAsB,OACjB,IAAI,CAAC,KAAK,EACd,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,OAAO,EAAE,IAAI,CAAC,OAAO,GACrB,CACH,CAAC;IACJ,CAAC;CAKF;AAqCD;;;;;GAKG;AACH,MAAM,UAAU,6BAA6B,CAC3C,KAA2C;IAE3C,OAAO,CACL,oBAAC,SAAS,IACR,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,cAAc,EACrC,YAAY,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAC7B,CAAC,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;YACjD,IAAI,CAAC,IAAI,KAAK,cAAc,IAG7B,GAAG,EAAE,CACJ,KAAK,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CACjD,oBAAC,sBAAsB,OAAK,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAI,CAChE,CAAC,CAAC,CAAC,IAAI,CAEA,CACb,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAAC,CAAS;IACpD,CAAC,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IACtC,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IACnD;;;OAGG;IACH,YAAoB,KAA2C;QAC7D,KAAK,EAAE,CAAC;QADU,UAAK,GAAL,KAAK,CAAsC;QAE7D,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;QACrC,4BAA4B,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAC9C,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YAC5C,IAAI,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE;gBAC1B,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;aAC/C;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IACS,oBAAoB,CAC5B,QAAyB,EACzB,EAAU,EACV,IAAoC;QAEpC,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;SACjC;aAAM;YACL,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;SACpC;QACD,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE;YAChC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;SACnC;aAAM;YACL,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;SAChC;QACD,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE;YAChC,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE;gBAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;aAC5B;SACF;aAAM;YACL,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE;gBAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;aAC3B;SACF;IACH,CAAC;IACD,MAAM;QACJ,OAAO,oBAAC,6BAA6B,OAAK,IAAI,CAAC,KAAK,GAAI,CAAC;IAC3D,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,YAAa,SAAQ,MAAM;IAG/B;;OAEG;IACH;QACE,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QANxD,UAAK,GAAW,CAAC,CAAC;QAOhB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,WAAW,CAAC,KAAa;QACvB,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,KAAK,IAAI,CAAC;SACtC;IACH,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,MAAc;QACpB,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,WAAW,EAClB,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACX,GAAG,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,OAAO,GAAG,WAAW,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,OAAO,GAAG,YAAY,GAAG,CAAC,IAAI,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,KAAa,EAAE,MAAc;QACvC,IAAI,CAAC,MAAsB,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAQ,IAAI,CAAC,MAAsB,CAAC,OAAO,CAAC,MAAM,CAAC;IACrD,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,KAAa;QACpB,OAAQ,IAAI,CAAC,MAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,kBAAmB,SAAQ,aAAa;IAC5C;;OAEG;IACH,YAAY,QAAuC,EAAE;QACnD,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtE,KAAK,CAAC;YACJ,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,CAAC;YACD,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC;SACnC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAAC;QAE9C,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,EAAE,CAAC;IAClC,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,KAAa,EAAE,MAAc;QACxC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;;;;;;OAOG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,OAAO;SACR;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACrB,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,IAAI;QACF,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,SAAS;QACP,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IAED;;;OAGG;IACH,WAAW;QACT,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAO,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAES,WAAW;QACnB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;CAGF;AAED;;GAEG;AACH,IAAU,OAAO,CA0EhB;AA1ED,WAAU,OAAO;IACf,SAAgB,gBAAgB,CAC9B,OAA6C;;QAE7C,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAEvC,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAErD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC7C,qDAAqD;QACrD,IAAI,OAAO,CAAC;QACZ,IAAI,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE;YACnC,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YACvC,IAAI,OAAO,EAAE;gBACX,SAAS,IAAI,iBAAiB,CAAC;aAChC;SACF;QACD,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE;YACjC,SAAS,IAAI,gBAAgB,CAAC;SAC/B;QACD,MAAM,aAAa,GACjB,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU;YACjC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC;YAC3B,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QAEpB,IAAI,OAAO,GACT,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,aAAa,IAAI,KAAK,IAAI,SAAS,CAAC;QACpE,6BAA6B;QAC7B,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;QACjE,IAAI,OAAO,EAAE;YACX,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxE,OAAO,GAAG,GAAG,OAAO,KAAK,EAAE,GAAG,CAAC;SAChC;QACD,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,KAAK,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAE7C,OAAO;YACL,SAAS;YACT,OAAO,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,EAAE;YACvC,IAAI;YACJ,SAAS;YACT,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO;YACnC,OAAO;YACP,OAAO;YACP,KAAK,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,KAAK;YAC7B,OAAO;SACR,CAAC;IACJ,CAAC;IAnDe,wBAAgB,mBAmD/B,CAAA;IAED;;OAEG;IACU,oBAAY,GAAG,IAAI,gBAAgB,CAAiB;QAC/D,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE;KACjB,CAAC,CAAC;IAEH;;OAEG;IACH,MAAa,MAAO,SAAQ,MAAM;QAChC;;WAEG;QACH;YACE,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QACtC,CAAC;KACF;IARY,cAAM,SAQlB,CAAA;AACH,CAAC,EA1ES,OAAO,KAAP,OAAO,QA0EhB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/ui-components",
3
- "version": "4.1.0-beta.0",
3
+ "version": "4.1.0-beta.1",
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.13.3",
45
45
  "@jupyter/web-components": "^0.13.3",
46
- "@jupyterlab/coreutils": "^6.1.0-beta.0",
47
- "@jupyterlab/observables": "^5.1.0-beta.0",
48
- "@jupyterlab/rendermime-interfaces": "^3.9.0-beta.0",
49
- "@jupyterlab/translation": "^4.1.0-beta.0",
46
+ "@jupyterlab/coreutils": "^6.1.0-beta.1",
47
+ "@jupyterlab/observables": "^5.1.0-beta.1",
48
+ "@jupyterlab/rendermime-interfaces": "^3.9.0-beta.1",
49
+ "@jupyterlab/translation": "^4.1.0-beta.1",
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.0-beta.0",
67
+ "@jupyterlab/testing": "^4.1.0-beta.1",
68
68
  "@types/jest": "^29.2.0",
69
69
  "@types/react": "^18.0.26",
70
70
  "jest": "^29.2.0",
@@ -259,7 +259,7 @@ export class Toolbar<T extends Widget = Widget> extends Widget {
259
259
  * The item can be removed from the toolbar by setting its parent to `null`.
260
260
  */
261
261
  insertAfter(at: string, name: string, widget: T): boolean {
262
- return this._insertRelative(at, 1, name, widget);
262
+ return this.insertRelative(at, 1, name, widget);
263
263
  }
264
264
 
265
265
  /**
@@ -279,10 +279,13 @@ export class Toolbar<T extends Widget = Widget> extends Widget {
279
279
  * The item can be removed from the toolbar by setting its parent to `null`.
280
280
  */
281
281
  insertBefore(at: string, name: string, widget: T): boolean {
282
- return this._insertRelative(at, 0, name, widget);
282
+ return this.insertRelative(at, 0, name, widget);
283
283
  }
284
284
 
285
- private _insertRelative(
285
+ /**
286
+ * Insert an item relatively to an other item.
287
+ */
288
+ protected insertRelative(
286
289
  at: string,
287
290
  offset: number,
288
291
  name: string,
@@ -371,8 +374,8 @@ export class ReactiveToolbar extends Toolbar<Widget> {
371
374
  super();
372
375
  this.insertItem(0, TOOLBAR_OPENER_NAME, this.popupOpener);
373
376
  this.popupOpener.hide();
374
- this._resizer = new Throttler(async () => {
375
- await this._onResize();
377
+ this._resizer = new Throttler(async (callTwice = false) => {
378
+ await this._onResize(callTwice);
376
379
  }, 300);
377
380
  }
378
381
 
@@ -415,6 +418,25 @@ export class ReactiveToolbar extends Toolbar<Widget> {
415
418
  return super.insertAfter(at, name, widget);
416
419
  }
417
420
 
421
+ /**
422
+ * Insert an item relatively to an other item.
423
+ */
424
+ protected insertRelative(
425
+ at: string,
426
+ offset: number,
427
+ name: string,
428
+ widget: Widget
429
+ ): boolean {
430
+ const targetPosition = this._widgetPositions.get(at);
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
+ return this.insertItem(position, name, widget);
438
+ }
439
+
418
440
  /**
419
441
  * Insert an item into the toolbar at the specified index.
420
442
  *
@@ -444,12 +466,24 @@ export class ReactiveToolbar extends Toolbar<Widget> {
444
466
  }
445
467
 
446
468
  // Save the widgets position when a new widget is inserted.
447
- if (this._widgetPositions.get(name) === undefined) {
448
- this._saveWidgetPosition();
469
+ if (
470
+ name !== TOOLBAR_OPENER_NAME &&
471
+ this._widgetPositions.get(name) === undefined
472
+ ) {
473
+ this._widgetPositions.set(name, index);
449
474
  }
450
475
  return status;
451
476
  }
452
477
 
478
+ /**
479
+ * A message handler invoked on an `'after-show'` message.
480
+ *
481
+ * Invokes resizing to ensure correct display of items.
482
+ */
483
+ onAfterShow(msg: Message): void {
484
+ void this._resizer.invoke(true);
485
+ }
486
+
453
487
  /**
454
488
  * A message handler invoked on a `'before-hide'` message.
455
489
  *
@@ -474,7 +508,19 @@ export class ReactiveToolbar extends Toolbar<Widget> {
474
508
  }
475
509
  }
476
510
 
477
- private _onResize() {
511
+ /**
512
+ * Move the toolbar items between the reactive toolbar and the popup toolbar,
513
+ * depending on the width of the toolbar and the width of each item.
514
+ *
515
+ * @param callTwice - whether to call the function twice.
516
+ *
517
+ * **NOTES**
518
+ * The `callTwice` parameter is useful when the toolbar is displayed the first time,
519
+ * because the size of the items is unknown before their first rendering. The first
520
+ * call will usually add all the items in the main toolbar, and the second call will
521
+ * reorganize the items between the main toolbar and the popup toolbar.
522
+ */
523
+ private async _onResize(callTwice = false) {
478
524
  if (!(this.parent && this.parent.isAttached)) {
479
525
  return;
480
526
  }
@@ -501,41 +547,45 @@ export class ReactiveToolbar extends Toolbar<Widget> {
501
547
  if (opener.widgetCount() > 0) {
502
548
  const widgetsToAdd = [];
503
549
  let index = 0;
504
- let widget = opener.widgetAt(index);
505
550
  const widgetCount = opener.widgetCount();
506
551
 
507
- width += this._getWidgetWidth(widget);
508
-
509
- if (widgetCount === 1 && width - openerWidth <= toolbarWidth) {
510
- width -= openerWidth;
511
- }
512
-
513
- while (width < toolbarWidth && index < widgetCount) {
514
- widgetsToAdd.push(widget);
515
- index++;
516
- widget = opener.widgetAt(index);
552
+ while (index < widgetCount) {
553
+ let widget = opener.widgetAt(index);
517
554
  if (widget) {
518
555
  width += this._getWidgetWidth(widget);
556
+ if (widgetCount - widgetsToAdd.length === 1) {
557
+ width -= openerWidth;
558
+ }
519
559
  } else {
520
560
  break;
521
561
  }
562
+ if (width < toolbarWidth) {
563
+ widgetsToAdd.push(widget);
564
+ } else {
565
+ break;
566
+ }
567
+ index++;
522
568
  }
523
-
524
569
  while (widgetsToAdd.length > 0) {
525
570
  // Insert the widget in the right position in the toolbar.
526
571
  const widget = widgetsToAdd.shift()!;
527
572
  const name = Private.nameProperty.get(widget);
528
- const index = this._widgetPositions.get(name) ?? 0;
529
- this.insertItem(index, name, widget);
573
+ if (this._widgetPositions.has(name)) {
574
+ this.insertItem(this._widgetPositions.get(name)!, name, widget);
575
+ } else {
576
+ this.addItem(name, widget);
577
+ }
530
578
  }
531
579
  }
532
-
533
580
  if (opener.widgetCount() > 0) {
534
581
  opener.updatePopup();
535
582
  opener.show();
536
583
  } else {
537
584
  opener.hide();
538
585
  }
586
+ if (callTwice) {
587
+ void this._onResize();
588
+ }
539
589
  })
540
590
  .catch(msg => {
541
591
  console.error('Error while computing the ReactiveToolbar', msg);
@@ -563,8 +613,10 @@ export class ReactiveToolbar extends Toolbar<Widget> {
563
613
  if (this._zoomChanged) {
564
614
  widgetWidth = await this._saveWidgetWidth(widget);
565
615
  } else {
616
+ // The widget widths can be 0px if it has been added to the toolbar but
617
+ // not rendered, this is why we must use '||' instead of '??'.
566
618
  widgetWidth =
567
- this._getWidgetWidth(widget) ?? (await this._saveWidgetWidth(widget));
619
+ this._getWidgetWidth(widget) || (await this._saveWidgetWidth(widget));
568
620
  }
569
621
  width += widgetWidth;
570
622
  if (
@@ -605,13 +657,6 @@ export class ReactiveToolbar extends Toolbar<Widget> {
605
657
  return this._widgetWidths![widgetName];
606
658
  }
607
659
 
608
- private _saveWidgetPosition(): void {
609
- this._widgetPositions.clear();
610
- (this.layout as ToolbarLayout).widgets.forEach((widget, index) => {
611
- this._widgetPositions.set(Private.nameProperty.get(widget), index);
612
- });
613
- }
614
-
615
660
  protected readonly popupOpener: ToolbarPopupOpener = new ToolbarPopupOpener();
616
661
  private readonly _widgetWidths: { [key: string]: number } = {};
617
662
  private readonly _resizer: Throttler;
@@ -910,7 +955,7 @@ export namespace CommandToolbarButtonComponent {
910
955
  /**
911
956
  * Overrides command label
912
957
  */
913
- label?: string;
958
+ label?: string | CommandRegistry.CommandFunc<string>;
914
959
  /**
915
960
  * Overrides command caption
916
961
  */
@@ -1209,9 +1254,13 @@ namespace Private {
1209
1254
  if (!commands.isVisible(id, args)) {
1210
1255
  className += ' lm-mod-hidden';
1211
1256
  }
1257
+ const labelOverride =
1258
+ typeof options.label === 'function'
1259
+ ? options.label(args ?? {})
1260
+ : options.label;
1212
1261
 
1213
1262
  let tooltip =
1214
- commands.caption(id, args) || options.label || label || iconLabel;
1263
+ commands.caption(id, args) || labelOverride || label || iconLabel;
1215
1264
  // Shows hot keys in tooltips
1216
1265
  const binding = commands.keyBindings.find(b => b.command === id);
1217
1266
  if (binding) {
@@ -1231,7 +1280,7 @@ namespace Private {
1231
1280
  tooltip: options.caption ?? tooltip,
1232
1281
  onClick,
1233
1282
  enabled,
1234
- label: options.label ?? label,
1283
+ label: labelOverride ?? label,
1235
1284
  pressed
1236
1285
  };
1237
1286
  }
package/style/styling.css CHANGED
@@ -46,6 +46,11 @@ input.jp-mod-styled:focus {
46
46
  box-shadow: inset 0 0 4px var(--md-blue-300);
47
47
  }
48
48
 
49
+ input[type='checkbox'].jp-mod-styled:focus-visible {
50
+ outline: var(--jp-border-width) solid var(--jp-input-active-border-color);
51
+ outline-offset: 1px;
52
+ }
53
+
49
54
  .jp-select-wrapper {
50
55
  display: flex;
51
56
  position: relative;