@umbraco-cms/backoffice 18.2.1 → 18.3.0-rc

package/dist-cms/packages/core/icon-registry/icons.js

@@ -1,6 +1,6 @@
 export default [{
         name: "icon-activity",
-        keywords: ["pulse", "action", "motion", "movement", "exercise", "fitness", "healthcare", "heart rate monitor", "vital signs", "vitals", "emergency room", "er", "intensive care", "hospital", "defibrillator", "earthquake", "siesmic", "magnitude", "richter scale", "aftershock", "tremor", "shockwave", "audio", "waveform", "synthesizer", "synthesiser", "music"],
+        keywords: ["pulse", "action", "motion", "movement", "exercise", "fitness", "healthcare", "heart rate monitor", "vital signs", "vitals", "emergency room", "er", "intensive care", "hospital", "defibrillator", "earthquake", "seismic", "magnitude", "richter scale", "aftershock", "tremor", "shockwave", "audio", "waveform", "synthesizer", "synthesiser", "music"],
         groups: ["medical", "account", "social", "science", "multimedia"],
         path: () => import("./icons/icon-activity.js"),
     }, {
@@ -517,7 +517,7 @@ export default [{
         path: () => import("./icons/icon-clubs.js"),
     }, {
         name: "icon-cocktail",
-        keywords: ["cocktail", "alcohol", "beverage", "bar", "drink", "glass"],
+        keywords: ["cocktail", "alcohol", "beverage", "bar", "drink", "glass", "spirit", "party", "celebration", "mixer"],
         groups: ["food-beverage"],
         path: () => import("./icons/icon-cocktail.js"),
     }, {
@@ -640,7 +640,7 @@ export default [{
         path: () => import("./icons/icon-command.js"),
     }, {
         name: "icon-company",
-        keywords: ["city", "cities", "towns", "companies", "sky scrapers", "buildings", "offices", "business", "company", "enterprise", "skyscraper", "organisation", "organization"],
+        keywords: ["city", "cities", "towns", "companies", "sky scrapers", "buildings", "offices"],
         groups: ["building", "account", "buildings"],
         path: () => import("./icons/icon-company.js"),
     }, {
@@ -650,7 +650,7 @@ export default [{
         path: () => import("./icons/icon-compress.js"),
     }, {
         name: "icon-connection",
-        keywords: ["flash", "camera", "lightning", "electricity", "energy"],
+        keywords: ["flash", "camera", "lightning", "electricity", "energy", "power", "quick"],
         groups: ["connectivity", "devices", "photography", "weather"],
         path: () => import("./icons/icon-connection.js"),
     }, {
@@ -757,7 +757,7 @@ export default [{
     }, {
         name: "icon-desktop",
         hidden: true,
-        keywords: ["tv", "screen", "display", "virtual machine", "vm"],
+        keywords: ["tv", "computer", "desktop", "screen", "display", "external display", "screen sharing", "virtual machine", "vm"],
         groups: ["connectivity", "devices"],
         path: () => import("./icons/icon-desktop.js"),
     }, {
@@ -824,7 +824,7 @@ export default [{
         path: () => import("./icons/icon-disk-image.js"),
     }, {
         name: "icon-display",
-        keywords: ["displays", "monitors", "screens", "tvs", "televisions", "computers", "pcs", "tv", "screen", "display", "virtual machine", "vm"],
+        keywords: ["displays", "monitors", "screens", "tvs", "televisions", "computers", "pcs", "tv", "computer", "desktop", "screen", "display", "external display", "screen sharing", "virtual machine", "vm"],
         groups: ["item", "technology", "hardware", "connectivity", "devices"],
         path: () => import("./icons/icon-display.js"),
     }, {
@@ -877,7 +877,7 @@ export default [{
         path: () => import("./icons/icon-download-alt.js"),
     }, {
         name: "icon-download",
-        keywords: ["tv", "screen", "display", "desktop", "download"],
+        keywords: ["tv", "computer", "screen", "display", "desktop", "external display", "screen sharing", "download", "remote", "cast"],
         groups: ["connectivity", "devices"],
         path: () => import("./icons/icon-download.js"),
     }, {
@@ -903,7 +903,7 @@ export default [{
         path: () => import("./icons/icon-edit.js"),
     }, {
         name: "icon-embed",
-        keywords: ["tv", "screen", "display", "desktop", "video", "movie", "film", "running", "start", "boot", "virtual machine", "vm"],
+        keywords: ["tv", "computer", "screen", "display", "desktop", "external display", "screen sharing", "video", "movie", "film", "play", "running", "start", "boot", "virtual machine", "vm"],
         groups: ["connectivity", "devices", "multimedia"],
         path: () => import("./icons/icon-embed.js"),
     }, {
@@ -1011,7 +1011,7 @@ export default [{
         path: () => import("./icons/icon-flag.js"),
     }, {
         name: "icon-flash",
-        keywords: ["flash", "camera", "lightning", "electricity", "energy"],
+        keywords: ["flash", "camera", "lightning", "electricity", "energy", "power", "quick"],
         groups: ["connectivity", "devices", "photography", "weather"],
         path: () => import("./icons/icon-flash.js"),
     }, {
@@ -1143,7 +1143,7 @@ export default [{
         path: () => import("./icons/icon-gps.js"),
     }, {
         name: "icon-graduate",
-        keywords: ["school", "university", "learn", "study", "mortarboard", "education", "ceremony", "academic", "hat", "diploma", "bachlor's", "master's", "doctorate"],
+        keywords: ["school", "university", "learn", "study", "mortarboard", "education", "ceremony", "academic", "hat", "diploma", "bachelor's", "master's", "doctorate"],
         groups: ["buildings"],
         path: () => import("./icons/icon-graduate.js"),
     }, {
@@ -1276,7 +1276,6 @@ export default [{
         path: () => import("./icons/icon-help.js"),
     }, {
         name: "icon-history",
-        keywords: ["time", "redo", "undo", "rewind", "timeline", "version", "time machine", "backup", "rotate", "ccw"],
         groups: ["arrows", "time"],
         path: () => import("./icons/icon-history.js"),
     }, {
@@ -1297,7 +1296,7 @@ export default [{
     }, {
         name: "icon-imac",
         hidden: true,
-        keywords: ["tv", "screen", "display", "virtual machine", "vm"],
+        keywords: ["tv", "computer", "desktop", "screen", "display", "external display", "screen sharing", "virtual machine", "vm"],
         groups: ["connectivity", "devices"],
         path: () => import("./icons/icon-imac.js"),
     }, {
@@ -1341,13 +1340,13 @@ export default [{
     }, {
         name: "icon-ipad",
         hidden: true,
-        keywords: ["tablet", "device"],
+        keywords: ["tablet", "device", "mobile", "screen", "display", "touchscreen", "portable", "responsive"],
         groups: ["devices"],
         path: () => import("./icons/icon-ipad.js"),
     }, {
         name: "icon-iphone",
         hidden: true,
-        keywords: ["mobiles", "telephones", "cellphones", "cell phones", "phone", "cellphone", "device", "screen"],
+        keywords: ["mobiles", "telephones", "cellphones", "cell phones", "phone", "cellphone", "device", "mobile", "screen", "display", "touchscreen", "portable", "responsive"],
         groups: ["item", "household", "phone", "connectivity", "devices"],
         related: ["icon-old-phone", "icon-phone", "icon-phone-ring"],
         path: () => import("./icons/icon-iphone.js"),
@@ -1425,7 +1424,7 @@ export default [{
         path: () => import("./icons/icon-lense.js"),
     }, {
         name: "icon-library",
-        keywords: ["temple", "institution", "government", "bank", "building", "capitol", "finance", "money", "museum", "art gallery", "hall", "institute", "pediment", "portico", "columns", "pillars", "classical", "architecture"],
+        keywords: ["temple", "institution", "government", "bank", "building", "capitol", "finance", "money", "museum", "art gallery", "hall", "institute", "pediment", "portico", "doric", "columns", "pillars", "classical", "architecture", "monument", "site", "history", "historic", "library", "ancient", "structure"],
         groups: ["building", "finance", "navigation", "buildings"],
         related: ["icon-school"],
         path: () => import("./icons/icon-library.js"),
@@ -1618,7 +1617,7 @@ export default [{
         path: () => import("./icons/icon-mindmap.js"),
     }, {
         name: "icon-mobile",
-        keywords: ["phone", "cellphone", "device", "screen"],
+        keywords: ["phone", "cellphone", "device", "mobile", "screen", "display", "touchscreen", "portable", "responsive"],
         groups: ["connectivity", "devices"],
         path: () => import("./icons/icon-mobile.js"),
     }, {
@@ -1648,7 +1647,7 @@ export default [{
         path: () => import("./icons/icon-movie.js"),
     }, {
         name: "icon-multiple-credit-cards",
-        keywords: ["payments", "debit cards", "credit cards", "contactless", "cashless", "loyalty cards", "store cards", "business cards", "money", "finance", "pocket", "credit", "purchase", "payment", "shopping", "retail", "consumer", "cc"],
+        keywords: ["payments", "debit cards", "credit cards", "contactless", "cashless", "loyalty cards", "store cards", "business cards", "wallet", "cards", "banking", "cash", "debit", "transport", "money", "finance", "pocket", "credit", "purchase", "payment", "shopping", "retail", "consumer", "cc"],
         groups: ["item", "money", "card", "account", "finance"],
         related: ["icon-credit-card", "icon-credit-card-alt", "icon-multiple-credit-cards"],
         path: () => import("./icons/icon-multiple-credit-cards.js"),
@@ -1939,7 +1938,7 @@ export default [{
     }, {
         name: "icon-pc",
         hidden: true,
-        keywords: ["computers", "servers", "desktops", "pcs", "tv", "screen", "display", "virtual machine", "vm"],
+        keywords: ["computers", "servers", "desktops", "pcs", "tv", "computer", "desktop", "screen", "display", "external display", "screen sharing", "virtual machine", "vm"],
         groups: ["item", "technology", "hardware", "connectivity", "devices"],
         path: () => import("./icons/icon-pc.js"),
     }, {
@@ -2056,7 +2055,7 @@ export default [{
         path: () => import("./icons/icon-plugin.js"),
     }, {
         name: "icon-podcast",
-        keywords: ["person", "users", "people", "audio", "music", "mic", "talk", "voice", "subscribe", "subscription", "stream"],
+        keywords: ["person", "users", "people"],
         groups: ["user", "special", "multimedia", "social"],
         path: () => import("./icons/icon-podcast.js"),
     }, {
@@ -2141,7 +2140,7 @@ export default [{
         path: () => import("./icons/icon-projector.js"),
     }, {
         name: "icon-pulse",
-        keywords: ["heartbeat", "health", "line charts", "monitors", "line graphs", "pulse", "action", "motion", "movement", "exercise", "fitness", "healthcare", "heart rate monitor", "vital signs", "vitals", "emergency room", "er", "intensive care", "hospital", "defibrillator", "earthquake", "siesmic", "magnitude", "richter scale", "aftershock", "tremor", "shockwave", "audio", "waveform", "synthesizer", "synthesiser", "music"],
+        keywords: ["heartbeat", "health", "line charts", "monitors", "line graphs", "pulse", "action", "motion", "movement", "exercise", "fitness", "healthcare", "heart rate monitor", "vital signs", "vitals", "emergency room", "er", "intensive care", "hospital", "defibrillator", "earthquake", "seismic", "magnitude", "richter scale", "aftershock", "tremor", "shockwave", "audio", "waveform", "synthesizer", "synthesiser", "music"],
         groups: ["data", "medical", "account", "social", "science", "multimedia"],
         path: () => import("./icons/icon-pulse.js"),
     }, {
@@ -2241,7 +2240,7 @@ export default [{
         path: () => import("./icons/icon-remote.js"),
     }, {
         name: "icon-remove",
-        keywords: ["minus", "subtracts", "lines", "deletes", "garbage", "delete", "remove", "bin"],
+        keywords: ["minus", "subtracts", "lines", "deletes"],
         groups: ["maths", "files", "mail"],
         path: () => import("./icons/icon-remove.js"),
     }, {
@@ -2306,7 +2305,7 @@ export default [{
         path: () => import("./icons/icon-ruler.js"),
     }, {
         name: "icon-satellite-dish",
-        keywords: ["broadcasts", "transmits", "receiver", "antenna", "dish aerial", "saucer"],
+        keywords: ["broadcasts", "transmits", "receiver", "antenna", "dish aerial", "saucer", "communication", "broadcast", "signal"],
         groups: ["item", "technology", "hardware", "connectivity", "devices", "multimedia"],
         path: () => import("./icons/icon-satellite-dish.js"),
     }, {
@@ -2352,7 +2351,7 @@ export default [{
         path: () => import("./icons/icon-scull.js"),
     }, {
         name: "icon-search",
-        keywords: ["magnifying glass", "find", "scan", "magnifier", "lens"],
+        keywords: ["magnifying glass", "find", "scan", "magnifier", "lens", "locate", "explore", "discover", "enlarge", "zoom"],
         groups: ["item", "household", "text", "social"],
         path: () => import("./icons/icon-search.js"),
     }, {
@@ -2412,7 +2411,7 @@ export default [{
         path: () => import("./icons/icon-shift.js"),
     }, {
         name: "icon-shipping-box",
-        keywords: ["grid", "grill", "lines", "storage", "shipping", "freight", "supply chain", "docker", "environment", "devops", "code", "coding"],
+        keywords: ["grid", "grill", "lines", "storage", "shipping", "freight", "supply chain", "environment", "devops", "code", "coding"],
         groups: ["shape", "box", "development", "transport", "mail"],
         path: () => import("./icons/icon-shipping-box.js"),
     }, {
@@ -2488,13 +2487,13 @@ export default [{
     }, {
         name: "icon-smiley-inverted",
         hidden: true,
-        keywords: ["emojis", "emoticons", "faces", "people", "person", "user", "happy", "happiness", "emoji", "face", "good", "emotion"],
+        keywords: ["emojis", "emoticons", "faces", "people", "person", "user", "happy", "happiness"],
         groups: ["user", "emoji", "account"],
         related: ["icon-smiley"],
         path: () => import("./icons/icon-smiley-inverted.js"),
     }, {
         name: "icon-smiley",
-        keywords: ["emojis", "emoticons", "faces", "people", "person", "user", "happy", "happiness", "emoji", "face", "good", "emotion"],
+        keywords: ["emojis", "emoticons", "faces", "people", "person", "user", "happy", "happiness"],
         groups: ["user", "emoji", "account"],
         related: ["icon-smiley-inverted"],
         path: () => import("./icons/icon-smiley.js"),
@@ -2529,7 +2528,7 @@ export default [{
         path: () => import("./icons/icon-sound-off.js"),
     }, {
         name: "icon-sound-waves",
-        keywords: ["sounds", "audio", "music", "water", "sea", "sound", "hertz", "wavelength", "vibrate"],
+        keywords: ["sounds", "audio", "music"],
         groups: ["item", "media", "weather", "navigation", "multimedia", "sustainability"],
         path: () => import("./icons/icon-sound-waves.js"),
     }, {
@@ -2627,7 +2626,7 @@ export default [{
     }, {
         name: "icon-stream",
         hidden: true,
-        keywords: ["circle", "wave", "sine", "alternating current", "pulse", "action", "motion", "movement", "exercise", "fitness", "healthcare", "heart rate monitor", "vital signs", "vitals", "emergency room", "er", "intensive care", "hospital", "defibrillator", "earthquake", "siesmic", "magnitude", "richter scale", "aftershock", "tremor", "shockwave", "audio", "waveform", "synthesizer", "synthesiser", "music"],
+        keywords: ["circle", "wave", "sine", "alternating current", "pulse", "action", "motion", "movement", "exercise", "fitness", "healthcare", "heart rate monitor", "vital signs", "vitals", "emergency room", "er", "intensive care", "hospital", "defibrillator", "earthquake", "seismic", "magnitude", "richter scale", "aftershock", "tremor", "shockwave", "audio", "waveform", "synthesizer", "synthesiser", "music"],
         groups: ["misc", "medical", "social", "science", "multimedia"],
         path: () => import("./icons/icon-stream.js"),
     }, {
@@ -2829,20 +2828,20 @@ export default [{
     }, {
         name: "icon-trash-alt-2",
         hidden: true,
-        keywords: ["bin", "rubbish", "garbage", "delete", "remove"],
+        keywords: ["bin", "rubbish"],
         groups: ["item", "household", "files", "mail"],
         related: ["icon-trash", "icon-trash-alt"],
         path: () => import("./icons/icon-trash-alt-2.js"),
     }, {
         name: "icon-trash-alt",
         hidden: true,
-        keywords: ["bin", "rubbish", "garbage", "delete", "remove"],
+        keywords: ["bin", "rubbish"],
         groups: ["item", "household", "files", "mail"],
         related: ["icon-trash", "icon-trash-alt-2"],
         path: () => import("./icons/icon-trash-alt.js"),
     }, {
         name: "icon-trash",
-        keywords: ["bin", "rubbish", "garbage", "delete", "remove"],
+        keywords: ["bin", "rubbish"],
         groups: ["item", "household", "files", "mail"],
         related: ["icon-trash-alt", "icon-trash-alt-2"],
         path: () => import("./icons/icon-trash.js"),
@@ -2858,7 +2857,7 @@ export default [{
         path: () => import("./icons/icon-trending-up-down.js"),
     }, {
         name: "icon-trophy",
-        keywords: ["awards", "cups", "winnings", "rewards", "prize", "sports", "winner", "achievement", "award", "champion", "celebration", "victory"],
+        keywords: ["awards", "cups", "winnings", "rewards", "prize", "sports", "winner", "achievement", "award", "champion", "celebration", "victory", "competition", "tournament", "leaderboard", "ranking", "success", "reward", "cup", "first", "gold"],
         groups: ["item", "award", "sports", "gaming"],
         related: ["icon-medal", "icon-diploma", "icon-diploma-alt"],
         path: () => import("./icons/icon-trophy.js"),
@@ -2876,7 +2875,7 @@ export default [{
         path: () => import("./icons/icon-tv-old.js"),
     }, {
         name: "icon-tv",
-        keywords: ["telly", "tv", "monitor", "display", "screen", "desktop", "video", "movie", "film", "running", "start", "boot", "virtual machine", "vm"],
+        keywords: ["telly", "tv", "monitor", "display", "computer", "screen", "desktop", "external display", "screen sharing", "video", "movie", "film", "play", "running", "start", "boot", "virtual machine", "vm"],
         groups: ["item", "technology", "connectivity", "devices", "multimedia"],
         related: ["icon-tv-old"],
         path: () => import("./icons/icon-tv.js"),
@@ -3316,7 +3315,7 @@ export default [{
         path: () => import("./icons/icon-layout-dislocated.js"),
     }, {
         name: "icon-blend",
-        keywords: ["mode", "overlay", "multiply", "screen", "opacity", "transparency", "alpha", "filters", "lenses", "mixed", "shades", "tints", "hues", "saturation", "brightness", "overlap", "colors", "colours"],
+        keywords: ["mode", "overlay", "multiply", "screen", "opacity", "transparency", "alpha", "filters", "lenses", "mixed", "shades", "tints", "hues", "saturation", "brightness", "overlap", "colors", "colours", "marriage", "rings", "couple", "connection"],
         groups: ["design", "photography", "tools", "development"],
         path: () => import("./icons/icon-blend.js"),
     }, {

package/dist-cms/packages/core/localization/registry/localization.registry.js

@@ -41,6 +41,24 @@ function toCanonicalLocale(locale) {
 function baseLocaleOf(locale) {
     return new Intl.Locale(locale).baseName.toLowerCase();
 }
+/**
+ * Locale-sensitive formatting is delegated to `Intl`, which resolves a language-only tag to the
+ * conventions of that language's default region. Where the dictionary we ship under that tag is
+ * written for a different region, the default is wrong for our users and is corrected here.
+ * Keyed on the full base name, so an explicitly requested region is never overridden.
+ */
+const FORMATTING_LOCALE_OVERRIDES = {
+    // The `en` dictionary is UK English, but `Intl` resolves a bare `en` to US conventions.
+    en: 'en-gb',
+};
+/**
+ * Returns the locale to use for locale-sensitive formatting of the given base name.
+ * @param {string} baseName - the lowercase base name of the requested locale.
+ * @returns {string} the formatting locale, which is the base name itself unless overridden.
+ */
+function toFormattingLocale(baseName) {
+    return FORMATTING_LOCALE_OVERRIDES[baseName] ?? baseName;
+}
 export class UmbLocalizationRegistry {
     // The active language is driven by the consuming host element (<umb-app>, <umb-auth>) via
     // `loadLanguage()` — Razor sets `lang="@DefaultUILanguage"` on those, the element passes
@@ -71,13 +89,19 @@ export class UmbLocalizationRegistry {
                 }
             }
             // If extension contains a js file, load it and add the default dictionary to the inner dictionary.
+            // A failing file (e.g. a 404 on a stale chunk after a deploy) must not take down the other dictionaries.
             if (extension.js) {
-                const loadedExtension = await loadManifestPlainJs(extension.js);
-                if (loadedExtension && hasDefaultExport(loadedExtension)) {
-                    for (const [dictionaryName, dictionary] of Object.entries(loadedExtension.default)) {
-                        addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
+                try {
+                    const loadedExtension = await loadManifestPlainJs(extension.js);
+                    if (loadedExtension && hasDefaultExport(loadedExtension)) {
+                        for (const [dictionaryName, dictionary] of Object.entries(loadedExtension.default)) {
+                            addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
+                        }
                     }
                 }
+                catch (error) {
+                    console.error(`Localization extension "${extension.alias}" failed to load and was skipped:`, error);
+                }
             }
             // Notify subscribers that the inner dictionary has changed.
             return {
@@ -100,7 +124,7 @@ export class UmbLocalizationRegistry {
         // language on its first render. Direction and the actual consumer notification
         // happen below, once the dictionaries are in place.
         tap((currentLanguage) => {
-            umbLocalizationManager.documentLanguage = baseLocaleOf(currentLanguage);
+            umbLocalizationManager.documentLanguage = toFormattingLocale(baseLocaleOf(currentLanguage));
         }), 
         // Switch to the extensions registry to get the current language and the extensions for that language
         // Note: This also cancels the previous subscription if the language changes
@@ -143,13 +167,13 @@ export class UmbLocalizationRegistry {
             umbLocalizationManager.registerManyLocalizations(translations);
             // Set the browser language and direction based on the translations
             this.#setBrowserLanguage(locale, translations);
-        })())), 
-        // Catch any errors that occur while loading the translations
-        // This is important to ensure that the observable does not error out and stop the subscription
+        })()).pipe(
+        // Caught on the inner observable so that an error only drops this load; caught on
+        // the outer pipe it would complete the subscription and stop all later language loads.
         catchError((error) => {
             console.error('Error loading translations:', error);
-            return of([]);
-        }))
+            return of(undefined);
+        }))))
             // Subscribe to the observable to trigger the loading of translations
             .subscribe();
     }
@@ -168,7 +192,7 @@ export class UmbLocalizationRegistry {
         // controller to re-render against the freshly loaded dictionaries. Inlined here because
         // it's the only place this happens — no need for another public method on the manager
         // that we'd just have to retire when the manager and registry get merged.
-        umbLocalizationManager.documentLanguage = newLang;
+        umbLocalizationManager.documentLanguage = toFormattingLocale(newLang);
         umbLocalizationManager.documentDirection = direction;
         umbLocalizationManager.connectedControllers.forEach((ctrl) => ctrl.documentUpdate());
     }

package/dist-cms/packages/core/menu/components/menu-item-layout/menu-item-layout.element.js

@@ -7,7 +7,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { customElement, html, ifDefined, property, state, when } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../lit-element/index.js';
 import { ensureSlash } from '../../../router/index.js';
-import { debounce } from '../../../utils/index.js';
 import { UmbEntityContext } from '../../../entity/index.js';
 /**
  * @element umb-menu-item-layout
@@ -41,14 +40,18 @@ let UmbMenuItemLayoutElement = class UmbMenuItemLayoutElement extends UmbLitElem
          */
         this.hasChildren = false;
         this._isActive = false;
-        this.#debouncedCheckIsActive = debounce(() => this.#checkIsActive(), 100);
+        // history.pushState runs synchronously before any router-slot dispatches this event, so the location
+        // is already final on the first firing — no need to coalesce repeat firings from nested router-slots.
+        this.#onNavigationEnd = () => this.#checkIsActive();
         this.#entityContext.setUnique(null);
     }
     connectedCallback() {
         super.connectedCallback();
-        window.addEventListener('navigationend', this.#debouncedCheckIsActive);
+        window.addEventListener('navigationend', this.#onNavigationEnd);
     }
-    #debouncedCheckIsActive;
+    // history.pushState runs synchronously before any router-slot dispatches this event, so the location
+    // is already final on the first firing — no need to coalesce repeat firings from nested router-slots.
+    #onNavigationEnd;
     #checkIsActive() {
         if (!this.href) {
             this._isActive = false;
@@ -78,7 +81,7 @@ let UmbMenuItemLayoutElement = class UmbMenuItemLayoutElement extends UmbLitElem
     }
     disconnectedCallback() {
         super.disconnectedCallback();
-        window.removeEventListener('navigationend', this.#debouncedCheckIsActive);
+        window.removeEventListener('navigationend', this.#onNavigationEnd);
     }
 };
 __decorate([

package/dist-cms/packages/core/menu/index.d.ts

@@ -1,4 +1,5 @@
 export * from './components/index.js';
+export * from './menu-list-structure-workspace-context-base.js';
 export * from './menu-tree-structure-workspace-context-base.js';
 export * from './menu-structure-workspace-context.context-token.js';
 export * from './menu-variant-structure-workspace-context.context-token.js';
@@ -6,3 +7,4 @@ export * from './menu-variant-tree-structure-workspace-context-base.js';
 export * from './constants.js';
 export type * from './types.js';
 export type { UmbMenuStructureWorkspaceContext } from './menu-structure-workspace-context.interface.js';
+export type { UmbMenuVariantStructureWorkspaceContext } from './menu-variant-structure-workspace-context.interface.js';

package/dist-cms/packages/core/menu/index.js

@@ -1,4 +1,5 @@
 export * from './components/index.js';
+export * from './menu-list-structure-workspace-context-base.js';
 export * from './menu-tree-structure-workspace-context-base.js';
 export * from './menu-structure-workspace-context.context-token.js';
 export * from './menu-variant-structure-workspace-context.context-token.js';

package/dist-cms/packages/core/menu/menu-list-structure-workspace-context-base.d.ts

@@ -0,0 +1,25 @@
+import type { UmbMenuStructureWorkspaceContext } from './menu-structure-workspace-context.interface.js';
+import type { UmbStructureItemModel } from './types.js';
+import { UmbContextBase } from '../../../libs/class-api/index.js';
+import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
+/**
+ * Base class for a menu structure workspace context for an entity that is organized as a flat
+ * list of items directly under a single, fixed root (such as Users or Webhooks), rather than a tree.
+ * @abstract
+ * @class UmbMenuListStructureWorkspaceContextBase
+ * @augments {UmbContextBase}
+ */
+export declare abstract class UmbMenuListStructureWorkspaceContextBase extends UmbContextBase implements UmbMenuStructureWorkspaceContext {
+    #private;
+    readonly structure: import("rxjs").Observable<UmbStructureItemModel[]>;
+    constructor(host: UmbControllerHost);
+    /**
+     * Sets the structure, ordered root first and the current item last, and updates the parent
+     * entity context to the item preceding the current one.
+     * @param {Array<UmbStructureItemModel>} items - The structure items, root first, current item last.
+     * @protected
+     * @memberof UmbMenuListStructureWorkspaceContextBase
+     */
+    protected _setStructure(items: Array<UmbStructureItemModel>): void;
+    destroy(): void;
+}

package/dist-cms/packages/core/menu/menu-list-structure-workspace-context-base.js

@@ -0,0 +1,42 @@
+import { UMB_MENU_STRUCTURE_WORKSPACE_CONTEXT } from './menu-structure-workspace-context.context-token.js';
+import { UmbArrayState } from '../../../libs/observable-api/index.js';
+import { UmbContextBase } from '../../../libs/class-api/index.js';
+import { UmbParentEntityContext } from '../entity/index.js';
+/**
+ * Base class for a menu structure workspace context for an entity that is organized as a flat
+ * list of items directly under a single, fixed root (such as Users or Webhooks), rather than a tree.
+ * @abstract
+ * @class UmbMenuListStructureWorkspaceContextBase
+ * @augments {UmbContextBase}
+ */
+export class UmbMenuListStructureWorkspaceContextBase extends UmbContextBase {
+    #structure;
+    #parentContext;
+    constructor(host) {
+        super(host, UMB_MENU_STRUCTURE_WORKSPACE_CONTEXT);
+        this.#structure = new UmbArrayState([], (x) => x.unique);
+        this.structure = this.#structure.asObservable();
+        this.#parentContext = new UmbParentEntityContext(this);
+        // 'UmbMenuStructureWorkspaceContext' is Obsolete, will be removed in v.18
+        this.provideContext('UmbMenuStructureWorkspaceContext', this);
+    }
+    /**
+     * Sets the structure, ordered root first and the current item last, and updates the parent
+     * entity context to the item preceding the current one.
+     * @param {Array<UmbStructureItemModel>} items - The structure items, root first, current item last.
+     * @protected
+     * @memberof UmbMenuListStructureWorkspaceContextBase
+     */
+    _setStructure(items) {
+        this.#structure.setValue(items);
+        // The parent is the item before the current one, or the current item itself if it's the only
+        // item (e.g. a "new" entity, whose ancestors are just the root).
+        const current = items[items.length - 1];
+        const parent = items.length > 1 ? items[items.length - 2] : current;
+        this.#parentContext.setParent(parent ? { unique: parent.unique, entityType: parent.entityType } : undefined);
+    }
+    destroy() {
+        super.destroy();
+        this.#structure.destroy();
+    }
+}

package/dist-cms/packages/core/menu/menu-structure-workspace-context.context-token.d.ts

@@ -1,3 +1,3 @@
 import type { UmbMenuStructureWorkspaceContext } from './menu-structure-workspace-context.interface.js';
 import { UmbContextToken } from '../../../libs/context-api/index.js';
-export declare const UMB_MENU_STRUCTURE_WORKSPACE_CONTEXT: UmbContextToken<UmbMenuStructureWorkspaceContext, UmbMenuStructureWorkspaceContext>;
+export declare const UMB_MENU_STRUCTURE_WORKSPACE_CONTEXT: UmbContextToken<UmbMenuStructureWorkspaceContext<import("./types.js").UmbStructureItemModel>, UmbMenuStructureWorkspaceContext<import("./types.js").UmbStructureItemModel>>;

package/dist-cms/packages/core/menu/menu-structure-workspace-context.interface.d.ts

@@ -1,16 +1,20 @@
-import type { UmbStructureItemModel } from './types.js';
+import type { UmbStructureItemModel, UmbStructureItemModelBase } from './types.js';
 import type { UmbContext } from '../../../libs/class-api/index.js';
 import type { Observable } from '../../../external/rxjs/index.js';
-export interface UmbMenuStructureWorkspaceContext extends UmbContext {
+/**
+ * Base context for exposing an entity's ancestor/parent structure to menu UI.
+ * @template TStructureItemModel - The shape of each item in the structure.
+ */
+export interface UmbMenuStructureWorkspaceContext<TStructureItemModel extends UmbStructureItemModelBase = UmbStructureItemModel> extends UmbContext {
     /**
      * Observable array of structure items representing the workspace's breadcrumb hierarchy.
      */
-    structure: Observable<UmbStructureItemModel[]>;
+    structure: Observable<Array<TStructureItemModel>>;
     /**
      * Returns the href for a breadcrumb structure item, or `undefined` if the item should not be a link.
      * Used by the workspace breadcrumb element to generate clickable navigation links.
-     * @param structureItem The structure item to generate an href for.
-     * @returns The href string, or `undefined` if the item should not be clickable.
+     * @param {TStructureItemModel} structureItem The structure item to generate an href for.
+     * @returns {string | undefined} The href string, or `undefined` if the item should not be clickable.
      */
-    getItemHref(structureItem: UmbStructureItemModel): string | undefined;
+    getItemHref?(structureItem: TStructureItemModel): string | undefined;
 }

package/dist-cms/packages/core/menu/menu-tree-structure-workspace-context-base.d.ts

@@ -1,11 +1,12 @@
 import type { ManifestWorkspaceContextMenuStructureKind, UmbStructureItemModel } from './types.js';
+import type { UmbMenuStructureWorkspaceContext } from './menu-structure-workspace-context.interface.js';
 import { UmbContextBase } from '../../../libs/class-api/index.js';
 import { UMB_SECTION_CONTEXT } from '../section/index.js';
 import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
 interface UmbMenuTreeStructureWorkspaceContextBaseArgs {
     treeRepositoryAlias: string;
 }
-export declare abstract class UmbMenuTreeStructureWorkspaceContextBase extends UmbContextBase {
+export declare abstract class UmbMenuTreeStructureWorkspaceContextBase extends UmbContextBase implements UmbMenuStructureWorkspaceContext {
     #private;
     manifest?: ManifestWorkspaceContextMenuStructureKind;
     readonly structure: import("rxjs").Observable<UmbStructureItemModel[]>;