openproject-primer_view_components 0.96.0 → 0.97.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.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +14 -0
  3. data/app/assets/javascripts/primer_view_components.js +5 -5
  4. data/app/assets/javascripts/primer_view_components.js.map +1 -1
  5. data/app/assets/styles/primer_view_components.css +1 -1
  6. data/app/assets/styles/primer_view_components.css.map +1 -1
  7. data/app/components/primer/alpha/action_list/item.rb +2 -1
  8. data/app/components/primer/alpha/action_list.css +1 -1
  9. data/app/components/primer/alpha/action_list.css.json +9 -22
  10. data/app/components/primer/alpha/action_list.css.map +1 -1
  11. data/app/components/primer/alpha/action_list.html.erb +1 -5
  12. data/app/components/primer/alpha/action_list.pcss +43 -81
  13. data/app/components/primer/alpha/action_list.rb +9 -7
  14. data/app/components/primer/alpha/action_menu/action_menu_element.js +84 -234
  15. data/app/components/primer/alpha/action_menu/action_menu_element.ts +92 -273
  16. data/app/components/primer/alpha/action_menu/action_menu_focus_zone_stack.js +1 -1
  17. data/app/components/primer/alpha/action_menu/action_menu_focus_zone_stack.ts +1 -1
  18. data/app/components/primer/alpha/action_menu/menu_loader.d.ts +21 -0
  19. data/app/components/primer/alpha/action_menu/menu_loader.js +221 -0
  20. data/app/components/primer/alpha/action_menu/menu_loader.ts +269 -0
  21. data/lib/primer/view_components/version.rb +1 -1
  22. data/previews/primer/alpha/action_list_preview.rb +46 -1
  23. data/previews/primer/alpha/action_menu_preview/sub_menus.html.erb +1 -1
  24. data/previews/primer/alpha/action_menu_preview.rb +5 -2
  25. data/static/arguments.json +2 -2
  26. data/static/classes.json +3 -3
  27. data/static/classnames.cjs +1 -1
  28. data/static/classnames.js +1 -1
  29. data/static/info_arch.json +21 -2
  30. data/static/previews.json +13 -0
  31. metadata +4 -1
@@ -15,7 +15,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
15
15
  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
16
16
  return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
17
17
  };
18
- var _ActionMenuElement_instances, _a, _ActionMenuElement_abortController, _ActionMenuElement_originalLabel, _ActionMenuElement_inputName, _ActionMenuElement_invokerBeingClicked, _ActionMenuElement_intersectionObserver, _ActionMenuElement_focusZoneStack, _ActionMenuElement_request, _ActionMenuElement_ownedLoaders, _ActionMenuElement_emptyLoaders, _ActionMenuElement_scrollUpdater, _ActionMenuElement_bindHostListeners, _ActionMenuElement_setupSubMenuLoading, _ActionMenuElement_observeInvokerPosition, _ActionMenuElement_updateLevels, _ActionMenuElement_deferred_get, _ActionMenuElement_preload_get, _ActionMenuElement_body_get, _ActionMenuElement_sync, _ActionMenuElement_invalidate, _ActionMenuElement_load, _ActionMenuElement_keepInputs, _ActionMenuElement_dropKeptInputs, _ActionMenuElement_listen, _ActionMenuElement_noLoadPending, _ActionMenuElement_updateReady, _ActionMenuElement_onBodyMutation, _ActionMenuElement_adopt, _ActionMenuElement_keepOpenWhileLoading, _ActionMenuElement_pruneFocusZones, _ActionMenuElement_softDisableItems, _ActionMenuElement_potentiallyDisallowActivation, _ActionMenuElement_isAnchorActivationViaSpace, _ActionMenuElement_isClipboardActivationViaKeyboard, _ActionMenuElement_isActivation, _ActionMenuElement_handleItemKeyboardEvent, _ActionMenuElement_handleBeforeToggleEvent, _ActionMenuElement_handleToggleEvent, _ActionMenuElement_toggledMenu, _ActionMenuElement_handleInvokerActivated, _ActionMenuElement_handleDialogItemActivated, _ActionMenuElement_handleItemActivated, _ActionMenuElement_handleIncludeFragmentReplaced, _ActionMenuElement_handleFocusOut, _ActionMenuElement_show, _ActionMenuElement_hide, _ActionMenuElement_isOpen, _ActionMenuElement_setDynamicLabel, _ActionMenuElement_updateInput, _ActionMenuElement_firstItem_get, _ActionMenuElement_subMenuForItem, _ActionMenuElement_itemForSubMenu;
18
+ var _ActionMenuElement_instances, _a, _ActionMenuElement_abortController, _ActionMenuElement_originalLabel, _ActionMenuElement_inputName, _ActionMenuElement_invokerBeingClicked, _ActionMenuElement_intersectionObserver, _ActionMenuElement_focusZoneStack, _ActionMenuElement_loader, _ActionMenuElement_scrollUpdater, _ActionMenuElement_bindHostListeners, _ActionMenuElement_setupSubMenuLoading, _ActionMenuElement_observeInvokerPosition, _ActionMenuElement_updateLevels, _ActionMenuElement_keepOpenWhileLoading, _ActionMenuElement_pruneFocusZones, _ActionMenuElement_softDisableItems, _ActionMenuElement_potentiallyDisallowActivation, _ActionMenuElement_isAnchorActivationViaSpace, _ActionMenuElement_isClipboardActivationViaKeyboard, _ActionMenuElement_isActivation, _ActionMenuElement_handleItemKeyboardEvent, _ActionMenuElement_handleBeforeToggleEvent, _ActionMenuElement_handleToggleEvent, _ActionMenuElement_focusLostTo, _ActionMenuElement_toggledMenu, _ActionMenuElement_handleInvokerActivated, _ActionMenuElement_handleDialogItemActivated, _ActionMenuElement_handleItemActivated, _ActionMenuElement_handleIncludeFragmentReplaced, _ActionMenuElement_focusLoadedMenu, _ActionMenuElement_restoreTabStop, _ActionMenuElement_handleFocusOut, _ActionMenuElement_show, _ActionMenuElement_hide, _ActionMenuElement_isOpen, _ActionMenuElement_setDynamicLabel, _ActionMenuElement_updateInput, _ActionMenuElement_firstItem_get, _ActionMenuElement_subMenuForItem, _ActionMenuElement_itemForSubMenu;
19
19
  var ActionMenuElement_1;
20
20
  import { controller, target } from '@github/catalyst';
21
21
  import '@oddbird/popover-polyfill';
@@ -23,6 +23,7 @@ import AnchoredPositionElement from '../../anchored_position';
23
23
  import { observeMutationsUntilConditionMet } from '../../utils';
24
24
  import { ActionMenuFocusZoneStack } from './action_menu_focus_zone_stack';
25
25
  import { ClipboardCopyElement } from '@github/clipboard-copy-element';
26
+ import { MenuLoader } from './menu_loader';
26
27
  let ActionMenuElement = ActionMenuElement_1 = _a = class ActionMenuElement extends HTMLElement {
27
28
  constructor() {
28
29
  super();
@@ -33,26 +34,8 @@ let ActionMenuElement = ActionMenuElement_1 = _a = class ActionMenuElement exten
33
34
  _ActionMenuElement_invokerBeingClicked.set(this, false);
34
35
  _ActionMenuElement_intersectionObserver.set(this, void 0);
35
36
  _ActionMenuElement_focusZoneStack.set(this, void 0);
36
- // The current request of a deferred primary menu: the loader it was made
37
- // with and the src it was made for. Never updated; a new request replaces it.
38
- // The src is recorded because the loader's attribute is configuration a
39
- // morph may rewrite while the request is in flight; the record is what was
40
- // requested, so a rewritten loader cannot pass an old response off as new.
41
- _ActionMenuElement_request.set(this, null
42
- // Every primary loader this element created or adopted, so completions of
43
- // superseded ones can be told apart from sub-menu fragments.
44
- );
45
- // Every primary loader this element created or adopted, so completions of
46
- // superseded ones can be told apart from sub-menu fragments.
47
- _ActionMenuElement_ownedLoaders.set(this, new WeakSet()
48
- // Loaders whose response had no menu items, with the body they left
49
- // empty. That body staying empty is not a reason to load again before the
50
- // next open; a body other code puts in its place is.
51
- );
52
- // Loaders whose response had no menu items, with the body they left
53
- // empty. That body staying empty is not a reason to load again before the
54
- // next open; a body other code puts in its place is.
55
- _ActionMenuElement_emptyLoaders.set(this, new WeakMap());
37
+ // Loads a deferred primary menu's items; see MenuLoader
38
+ _ActionMenuElement_loader.set(this, void 0);
56
39
  _ActionMenuElement_scrollUpdater.set(this, () => {
57
40
  if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isOpen).call(this)) {
58
41
  this.overlay?.update();
@@ -61,8 +44,24 @@ let ActionMenuElement = ActionMenuElement_1 = _a = class ActionMenuElement exten
61
44
  // Never disconnected: it observes the element's own subtree, so it keeps
62
45
  // working while the element is detached. A local, not a field: the
63
46
  // registration keeps it alive as long as the element is.
47
+ __classPrivateFieldSet(this, _ActionMenuElement_loader, new MenuLoader({
48
+ element: this,
49
+ body: () => this.overlayBody,
50
+ template: () => this.loaderTemplate,
51
+ itemSelector: ActionMenuElement_1.menuItemSelectors.join(','),
52
+ isOpen: () => __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isOpen).call(this),
53
+ onLoadStart: (fragment, keepOpen) => {
54
+ // The response decides the form field name
55
+ __classPrivateFieldSet(this, _ActionMenuElement_inputName, '', "f");
56
+ if (keepOpen)
57
+ __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_keepOpenWhileLoading).call(this, fragment);
58
+ },
59
+ onLoaded: () => __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_handleIncludeFragmentReplaced).call(this),
60
+ }), "f");
64
61
  const observer = new MutationObserver(records => {
65
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_onBodyMutation).call(this, records);
62
+ // A replaced overlay may have taken open sub-menus with it
63
+ __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_pruneFocusZones).call(this);
64
+ __classPrivateFieldGet(this, _ActionMenuElement_loader, "f").mutated(records);
66
65
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateLevels).call(this);
67
66
  });
68
67
  observer.observe(this, { childList: true, subtree: true });
@@ -148,13 +147,20 @@ let ActionMenuElement = ActionMenuElement_1 = _a = class ActionMenuElement exten
148
147
  }
149
148
  connectedCallback() {
150
149
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_bindHostListeners).call(this);
151
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_setDynamicLabel).call(this);
152
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateInput).call(this);
150
+ // Kept inputs stand for the selection until a response replaces them;
151
+ // the body holds no items to sync from meanwhile
152
+ if (!__classPrivateFieldGet(this, _ActionMenuElement_loader, "f").keepingInputs) {
153
+ __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_setDynamicLabel).call(this);
154
+ __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateInput).call(this);
155
+ }
153
156
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_softDisableItems).call(this);
154
157
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_setupSubMenuLoading).call(this);
155
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_sync).call(this);
158
+ __classPrivateFieldGet(this, _ActionMenuElement_loader, "f").sync();
156
159
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_observeInvokerPosition).call(this);
157
- if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_noLoadPending).call(this)) {
160
+ if (__classPrivateFieldGet(this, _ActionMenuElement_loader, "f").deferred) {
161
+ __classPrivateFieldGet(this, _ActionMenuElement_loader, "f").updateReady();
162
+ }
163
+ else if (!this.includeFragment?.isConnected) {
158
164
  this.setAttribute('data-ready', 'true');
159
165
  }
160
166
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateLevels).call(this);
@@ -167,13 +173,12 @@ let ActionMenuElement = ActionMenuElement_1 = _a = class ActionMenuElement exten
167
173
  }
168
174
  attributeChangedCallback(name) {
169
175
  if (name === 'src')
170
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_sync).call(this);
176
+ __classPrivateFieldGet(this, _ActionMenuElement_loader, "f").sync();
171
177
  }
172
178
  // Forgets the current request so the menu loads again at the current src:
173
179
  // at once when open or preloaded, otherwise when it next opens.
174
180
  refresh() {
175
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_invalidate).call(this);
176
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_sync).call(this);
181
+ __classPrivateFieldGet(this, _ActionMenuElement_loader, "f").refresh();
177
182
  }
178
183
  handleEvent(event) {
179
184
  const targetIsInvoker = this.invokerElement?.contains(event.target);
@@ -241,34 +246,8 @@ let ActionMenuElement = ActionMenuElement_1 = _a = class ActionMenuElement exten
241
246
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_handleItemActivated).call(this, item);
242
247
  return;
243
248
  }
244
- if (event.type === 'include-fragment-replace') {
245
- const loader = event.target;
246
- if (loader !== __classPrivateFieldGet(this, _ActionMenuElement_request, "f")?.loader)
247
- return;
248
- // Other code removed the current loader before it completed, eg. by
249
- // emptying the body, or rewrote its src, eg. by a morph: its response is
250
- // not the one requested and must not render or mark the menu ready
251
- const body = __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_body_get);
252
- if (!body || loader.parentElement !== body || (loader.getAttribute('src') ?? '').trim() !== __classPrivateFieldGet(this, _ActionMenuElement_request, "f").src) {
253
- event.preventDefault();
254
- return;
255
- }
256
- // A response without menu items is discarded, so the body stays empty
257
- // and the menu loads again when it next opens
258
- const fragment = event instanceof CustomEvent ? event.detail?.fragment : null;
259
- if (!(fragment instanceof DocumentFragment))
260
- return;
261
- if (!fragment.querySelector(ActionMenuElement_1.menuItemSelectors.join(','))) {
262
- fragment.replaceChildren();
263
- __classPrivateFieldGet(this, _ActionMenuElement_emptyLoaders, "f").set(loader, body);
264
- }
265
- return;
266
- }
267
249
  if (event.type === 'include-fragment-replaced') {
268
- // A superseded primary loader that completed late
269
- const loader = event.target;
270
- if (__classPrivateFieldGet(this, _ActionMenuElement_ownedLoaders, "f").has(loader) && loader !== __classPrivateFieldGet(this, _ActionMenuElement_request, "f")?.loader)
271
- return;
250
+ // A static menu's deferred sub-menu
272
251
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_handleIncludeFragmentReplaced).call(this);
273
252
  return;
274
253
  }
@@ -353,9 +332,7 @@ _ActionMenuElement_inputName = new WeakMap();
353
332
  _ActionMenuElement_invokerBeingClicked = new WeakMap();
354
333
  _ActionMenuElement_intersectionObserver = new WeakMap();
355
334
  _ActionMenuElement_focusZoneStack = new WeakMap();
356
- _ActionMenuElement_request = new WeakMap();
357
- _ActionMenuElement_ownedLoaders = new WeakMap();
358
- _ActionMenuElement_emptyLoaders = new WeakMap();
335
+ _ActionMenuElement_loader = new WeakMap();
359
336
  _ActionMenuElement_scrollUpdater = new WeakMap();
360
337
  _ActionMenuElement_instances = new WeakSet();
361
338
  _ActionMenuElement_bindHostListeners = function _ActionMenuElement_bindHostListeners() {
@@ -369,7 +346,7 @@ _ActionMenuElement_bindHostListeners = function _ActionMenuElement_bindHostListe
369
346
  this.addEventListener('toggle', this, { signal, capture: true });
370
347
  };
371
348
  _ActionMenuElement_setupSubMenuLoading = function _ActionMenuElement_setupSubMenuLoading() {
372
- if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_deferred_get) || !this.includeFragment)
349
+ if (__classPrivateFieldGet(this, _ActionMenuElement_loader, "f").deferred || !this.includeFragment)
373
350
  return;
374
351
  this.includeFragment.addEventListener('include-fragment-replaced', this, {
375
352
  signal: __classPrivateFieldGet(this, _ActionMenuElement_abortController, "f").signal,
@@ -383,156 +360,6 @@ _ActionMenuElement_updateLevels = function _ActionMenuElement_updateLevels() {
383
360
  menu.setAttribute('data-level', String(index + 1));
384
361
  }
385
362
  };
386
- _ActionMenuElement_deferred_get = function _ActionMenuElement_deferred_get() {
387
- return Boolean(this.loaderTemplate);
388
- };
389
- _ActionMenuElement_preload_get = function _ActionMenuElement_preload_get() {
390
- return this.loaderTemplate?.content.firstElementChild?.getAttribute('loading') === 'eager';
391
- };
392
- _ActionMenuElement_body_get = function _ActionMenuElement_body_get() {
393
- return this.overlayBody ?? null;
394
- };
395
- _ActionMenuElement_sync = function _ActionMenuElement_sync(opening = false) {
396
- const src = (this.getAttribute('src') ?? '').trim();
397
- if (!__classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_deferred_get) || !src)
398
- return;
399
- if (!(opening || __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isOpen).call(this) || __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_preload_get))) {
400
- // A pending or failed loader for another src must not render meanwhile;
401
- // a completed one is kept, so setting its src again does not reload
402
- if (__classPrivateFieldGet(this, _ActionMenuElement_request, "f") && src !== __classPrivateFieldGet(this, _ActionMenuElement_request, "f").src && __classPrivateFieldGet(this, _ActionMenuElement_request, "f").loader.parentElement === __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_body_get)) {
403
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_invalidate).call(this);
404
- }
405
- return;
406
- }
407
- const loader = __classPrivateFieldGet(this, _ActionMenuElement_request, "f")?.loader;
408
- if (!__classPrivateFieldGet(this, _ActionMenuElement_request, "f") || src !== __classPrivateFieldGet(this, _ActionMenuElement_request, "f").src || !__classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_body_get)?.firstElementChild) {
409
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_load).call(this, src, opening);
410
- }
411
- else if (loader?.isConnected) {
412
- // A retry fetches the loader's own src, which a morph may have rewritten
413
- if ((loader.getAttribute('src') ?? '').trim() === __classPrivateFieldGet(this, _ActionMenuElement_request, "f").src) {
414
- loader.classList.remove('is-error');
415
- loader.refetch();
416
- }
417
- else {
418
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_load).call(this, src, opening);
419
- }
420
- }
421
- };
422
- _ActionMenuElement_invalidate = function _ActionMenuElement_invalidate() {
423
- __classPrivateFieldGet(this, _ActionMenuElement_request, "f")?.loader.remove();
424
- __classPrivateFieldSet(this, _ActionMenuElement_request, null, "f");
425
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateReady).call(this);
426
- };
427
- _ActionMenuElement_load = function _ActionMenuElement_load(src, opening = false) {
428
- const body = __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_body_get);
429
- const template = this.loaderTemplate?.content.firstElementChild;
430
- if (!body || !template)
431
- return;
432
- // Imported, not cloned, so the loader is upgraded before it connects
433
- const loader = this.ownerDocument.importNode(template, true);
434
- loader.setAttribute('src', src);
435
- loader.setAttribute('loading', 'eager');
436
- __classPrivateFieldSet(this, _ActionMenuElement_request, { loader, src }, "f");
437
- __classPrivateFieldGet(this, _ActionMenuElement_ownedLoaders, "f").add(loader);
438
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_listen).call(this, loader);
439
- // The response decides the form field name
440
- __classPrivateFieldSet(this, _ActionMenuElement_inputName, '', "f");
441
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_keepInputs).call(this, body);
442
- body.prepend(loader);
443
- if (opening || __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isOpen).call(this)) {
444
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_keepOpenWhileLoading).call(this, loader);
445
- // A focus handler may have started a newer load meanwhile
446
- if (__classPrivateFieldGet(this, _ActionMenuElement_request, "f")?.loader !== loader)
447
- return;
448
- }
449
- for (const child of Array.from(body.childNodes)) {
450
- if (child !== loader)
451
- child.remove();
452
- }
453
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateReady).call(this);
454
- };
455
- _ActionMenuElement_keepInputs = function _ActionMenuElement_keepInputs(body) {
456
- const inputs = body.querySelector('[data-list-inputs]');
457
- if (!inputs)
458
- return;
459
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_dropKeptInputs).call(this);
460
- this.append(inputs);
461
- };
462
- _ActionMenuElement_dropKeptInputs = function _ActionMenuElement_dropKeptInputs() {
463
- for (const inputs of this.querySelectorAll(':scope > [data-list-inputs]'))
464
- inputs.remove();
465
- };
466
- _ActionMenuElement_listen = function _ActionMenuElement_listen(fragment) {
467
- fragment.addEventListener('include-fragment-replace', this);
468
- fragment.addEventListener('include-fragment-replaced', this);
469
- };
470
- _ActionMenuElement_noLoadPending = function _ActionMenuElement_noLoadPending() {
471
- if (!__classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_deferred_get) && this.includeFragment?.isConnected)
472
- return false;
473
- const loader = __classPrivateFieldGet(this, _ActionMenuElement_request, "f")?.loader;
474
- return !loader || loader.parentElement !== __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_body_get);
475
- };
476
- _ActionMenuElement_updateReady = function _ActionMenuElement_updateReady() {
477
- if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_noLoadPending).call(this)) {
478
- this.setAttribute('data-ready', 'true');
479
- }
480
- else {
481
- this.removeAttribute('data-ready');
482
- }
483
- };
484
- _ActionMenuElement_onBodyMutation = function _ActionMenuElement_onBodyMutation(records) {
485
- // A replaced overlay may have taken open sub-menus with it
486
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_pruneFocusZones).call(this);
487
- if (!__classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_deferred_get))
488
- return;
489
- const body = __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_body_get);
490
- if (!body)
491
- return;
492
- if (records.some(record => record.addedNodes.length > 0)) {
493
- const fragments = Array.from(body.querySelectorAll(':scope > include-fragment')).filter(fragment => !__classPrivateFieldGet(this, _ActionMenuElement_ownedLoaders, "f").has(fragment));
494
- const fragment = fragments.at(-1);
495
- if (fragment)
496
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_adopt).call(this, fragment);
497
- }
498
- // An empty body was emptied or replaced by other code, unless it is the
499
- // one the current loader left empty; loading again there would loop on a
500
- // preloaded menu, so that one waits for the next open
501
- const loader = __classPrivateFieldGet(this, _ActionMenuElement_request, "f")?.loader;
502
- if (!body.firstElementChild && !(loader && __classPrivateFieldGet(this, _ActionMenuElement_emptyLoaders, "f").get(loader) === body))
503
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_sync).call(this);
504
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateReady).call(this);
505
- };
506
- _ActionMenuElement_adopt = function _ActionMenuElement_adopt(fragment) {
507
- const body = __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_body_get);
508
- if (!body)
509
- return;
510
- const src = (fragment.getAttribute('src') ?? '').trim();
511
- __classPrivateFieldSet(this, _ActionMenuElement_request, { loader: fragment, src }, "f");
512
- __classPrivateFieldGet(this, _ActionMenuElement_ownedLoaders, "f").add(fragment);
513
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_listen).call(this, fragment);
514
- // The response decides the form field name
515
- __classPrivateFieldSet(this, _ActionMenuElement_inputName, '', "f");
516
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_keepInputs).call(this, body);
517
- if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isOpen).call(this)) {
518
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_keepOpenWhileLoading).call(this, fragment);
519
- // A focus handler may have started a newer load meanwhile
520
- if (__classPrivateFieldGet(this, _ActionMenuElement_request, "f")?.loader !== fragment)
521
- return;
522
- }
523
- for (const child of Array.from(body.childNodes)) {
524
- if (child !== fragment)
525
- child.remove();
526
- }
527
- if (src && src !== this.getAttribute('src')) {
528
- this.setAttribute('src', src);
529
- }
530
- else if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isOpen).call(this) || __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_preload_get)) {
531
- // An unchanged src does not run the rule, and a lazy loader inserted
532
- // before its attributes never starts on its own
533
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_sync).call(this);
534
- }
535
- };
536
363
  _ActionMenuElement_keepOpenWhileLoading = function _ActionMenuElement_keepOpenWhileLoading(fragment) {
537
364
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_pruneFocusZones).call(this);
538
365
  __classPrivateFieldGet(this, _ActionMenuElement_focusZoneStack, "f").popAbove(this.overlay);
@@ -593,6 +420,8 @@ _ActionMenuElement_isActivation = function _ActionMenuElement_isActivation(event
593
420
  _ActionMenuElement_handleItemKeyboardEvent = function _ActionMenuElement_handleItemKeyboardEvent(event, item) {
594
421
  switch (event.key) {
595
422
  case 'ArrowRight': {
423
+ if (item.getAttribute('aria-disabled'))
424
+ break;
596
425
  const subMenu = __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_subMenuForItem).call(this, item);
597
426
  subMenu?.showPopover();
598
427
  break;
@@ -610,7 +439,7 @@ _ActionMenuElement_handleBeforeToggleEvent = function _ActionMenuElement_handleB
610
439
  if (event.newState === 'open') {
611
440
  // A closed lazy menu catches up, and a failed load retries, as it opens
612
441
  if (event.target === this.overlay)
613
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_sync).call(this, true);
442
+ __classPrivateFieldGet(this, _ActionMenuElement_loader, "f").sync(true);
614
443
  return;
615
444
  }
616
445
  if (event.newState !== 'closed')
@@ -641,18 +470,22 @@ _ActionMenuElement_handleToggleEvent = function _ActionMenuElement_handleToggleE
641
470
  __classPrivateFieldGet(this, _ActionMenuElement_focusZoneStack, "f").push(menu, { trapFocus: !isPrimaryMenu });
642
471
  // Picks up a src set by a beforetoggle listener that ran after ours
643
472
  if (isPrimaryMenu)
644
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_sync).call(this, true);
473
+ __classPrivateFieldGet(this, _ActionMenuElement_loader, "f").sync(true);
645
474
  window.requestAnimationFrame(() => {
646
475
  const firstItem = menu.querySelector(ActionMenuElement_1.menuItemSelectors.join(','));
647
476
  firstItem?.focus();
648
477
  });
649
478
  }
650
- else if (menu === this.overlay && !document.querySelector(':popover-open')) {
479
+ else if (menu === this.overlay && !document.querySelector(':popover-open') && __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_focusLostTo).call(this, menu)) {
651
480
  // A light-dismissed menu (e.g. a click outside it) leaves focus on the body;
652
481
  // hand it back to the invoker so the menu stays reachable from the keyboard.
653
482
  this.invokerElement?.focus();
654
483
  }
655
484
  };
485
+ _ActionMenuElement_focusLostTo = function _ActionMenuElement_focusLostTo(menu) {
486
+ const active = document.activeElement;
487
+ return !active || active === document.body || menu.contains(active);
488
+ };
656
489
  _ActionMenuElement_toggledMenu = function _ActionMenuElement_toggledMenu(event) {
657
490
  return event.target instanceof AnchoredPositionElement ? event.target : null;
658
491
  };
@@ -745,31 +578,48 @@ _ActionMenuElement_handleItemActivated = function _ActionMenuElement_handleItemA
745
578
  }));
746
579
  };
747
580
  _ActionMenuElement_handleIncludeFragmentReplaced = function _ActionMenuElement_handleIncludeFragmentReplaced() {
748
- // Content can finish loading while the menu is detached
749
- if (this.isConnected) {
750
- const firstItem = __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_firstItem_get);
751
- if (firstItem) {
752
- firstItem.focus();
753
- }
754
- else if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isOpen).call(this)) {
755
- // Nothing to focus in an empty response: close and return to the
756
- // button.
757
- this.overlay.hidePopover();
758
- this.invokerElement?.focus();
759
- }
760
- this.overlay?.update();
761
- }
762
- if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_deferred_get))
763
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_dropKeptInputs).call(this);
581
+ // Selection first: focusing afterwards can run a consumer handler that
582
+ // starts another load
764
583
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_setDynamicLabel).call(this);
765
584
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateInput).call(this);
766
585
  __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_softDisableItems).call(this);
767
- // Ready unless the focus moves above started another load
768
- if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_deferred_get)) {
769
- __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_updateReady).call(this);
770
- }
771
- else {
586
+ // Focus moves in a microtask: after the list's focus zone has processed
587
+ // the new items (its observer would otherwise drop the focused item's
588
+ // tab stop), and before the focusout frame would close the menu
589
+ const activeOnLoad = document.activeElement;
590
+ queueMicrotask(() => __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_focusLoadedMenu).call(this, activeOnLoad));
591
+ // A deferred menu's loader decides readiness
592
+ if (!__classPrivateFieldGet(this, _ActionMenuElement_loader, "f").deferred)
772
593
  this.setAttribute('data-ready', 'true');
594
+ };
595
+ _ActionMenuElement_focusLoadedMenu = function _ActionMenuElement_focusLoadedMenu(activeOnLoad) {
596
+ // Content can finish loading while the menu is detached
597
+ if (!this.isConnected)
598
+ return;
599
+ // A consumer's completion listener, or a load it started, moved focus
600
+ // meanwhile: keep it there
601
+ const active = document.activeElement;
602
+ if (active !== activeOnLoad) {
603
+ __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_restoreTabStop).call(this, active);
604
+ return;
605
+ }
606
+ const firstItem = __classPrivateFieldGet(this, _ActionMenuElement_instances, "a", _ActionMenuElement_firstItem_get);
607
+ if (firstItem) {
608
+ firstItem.focus();
609
+ }
610
+ else if (__classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isOpen).call(this)) {
611
+ // Nothing to focus in an empty response: close and return to the
612
+ // button.
613
+ this.overlay.hidePopover();
614
+ this.invokerElement?.focus();
615
+ }
616
+ this.overlay?.update();
617
+ };
618
+ _ActionMenuElement_restoreTabStop = function _ActionMenuElement_restoreTabStop(element) {
619
+ if (element instanceof HTMLElement &&
620
+ this.overlay?.contains(element) &&
621
+ element.matches(ActionMenuElement_1.validSelectors.join(','))) {
622
+ element.setAttribute('tabindex', '0');
773
623
  }
774
624
  };
775
625
  _ActionMenuElement_handleFocusOut = function _ActionMenuElement_handleFocusOut() {