@umbraco-cms/backoffice 14.0.0-c26a40c4 → 14.0.0-ce7724db

package/dist-cms/packages/core/extension-registry/models/index.d.ts

@@ -20,7 +20,7 @@ import type { ManifestSectionView } from './section-view.model.js';
 import type { ManifestStore, ManifestTreeStore, ManifestItemStore } from './store.model.js';
 import type { ManifestTheme } from './theme.model.js';
 import type { ManifestTinyMcePlugin } from './tinymce-plugin.model.js';
-import type { ManifestTranslations } from './translations.model.js';
+import type { ManifestLocalization } from './localization.model.js';
 import type { ManifestTree } from './tree.model.js';
 import type { ManifestTreeItem } from './tree-item.model.js';
 import type { ManifestUserProfileApp } from './user-profile-app.model.js';
@@ -51,7 +51,7 @@ export * from './section.model.js';
 export * from './store.model.js';
 export * from './theme.model.js';
 export * from './tinymce-plugin.model.js';
-export * from './translations.model.js';
+export * from './localization.model.js';
 export * from './tree-item.model.js';
 export * from './tree.model.js';
 export * from './user-profile-app.model.js';
@@ -59,4 +59,4 @@ export * from './workspace-action.model.js';
 export * from './workspace-view-collection.model.js';
 export * from './workspace-editor-view.model.js';
 export * from './workspace.model.js';
-export type ManifestTypes = ManifestBundle<ManifestTypes> | ManifestCondition | ManifestCollectionView | ManifestDashboard | ManifestDashboardCollection | ManifestEntityAction | ManifestEntityBulkAction | ManifestEntryPoint | ManifestExternalLoginProvider | ManifestGlobalContext | ManifestHeaderApp | ManifestHeaderAppButtonKind | ManifestHealthCheck | ManifestItemStore | ManifestMenu | ManifestMenuItem | ManifestMenuItemTreeKind | ManifestModal | ManifestPackageView | ManifestPropertyAction | ManifestPropertyEditorSchema | ManifestPropertyEditorUi | ManifestRepository | ManifestSection | ManifestSectionSidebarApp | ManifestSectionSidebarAppMenuKind | ManifestSectionView | ManifestStore | ManifestTheme | ManifestTinyMcePlugin | ManifestTranslations | ManifestTree | ManifestTreeItem | ManifestTreeStore | ManifestUserProfileApp | ManifestWorkspace | ManifestWorkspaceAction | ManifestWorkspaceEditorView | ManifestWorkspaceViewCollection | ManifestBase;
+export type ManifestTypes = ManifestBundle<ManifestTypes> | ManifestCondition | ManifestCollectionView | ManifestDashboard | ManifestDashboardCollection | ManifestEntityAction | ManifestEntityBulkAction | ManifestEntryPoint | ManifestExternalLoginProvider | ManifestGlobalContext | ManifestHeaderApp | ManifestHeaderAppButtonKind | ManifestHealthCheck | ManifestItemStore | ManifestMenu | ManifestMenuItem | ManifestMenuItemTreeKind | ManifestModal | ManifestPackageView | ManifestPropertyAction | ManifestPropertyEditorSchema | ManifestPropertyEditorUi | ManifestRepository | ManifestSection | ManifestSectionSidebarApp | ManifestSectionSidebarAppMenuKind | ManifestSectionView | ManifestStore | ManifestTheme | ManifestTinyMcePlugin | ManifestLocalization | ManifestTree | ManifestTreeItem | ManifestTreeStore | ManifestUserProfileApp | ManifestWorkspace | ManifestWorkspaceAction | ManifestWorkspaceEditorView | ManifestWorkspaceViewCollection | ManifestBase;

package/dist-cms/packages/core/extension-registry/models/index.js

@@ -20,7 +20,7 @@ export * from './section.model.js';
 export * from './store.model.js';
 export * from './theme.model.js';
 export * from './tinymce-plugin.model.js';
-export * from './translations.model.js';
+export * from './localization.model.js';
 export * from './tree-item.model.js';
 export * from './tree.model.js';
 export * from './user-profile-app.model.js';

package/dist-cms/packages/core/extension-registry/models/{translations.model.d.ts → localization.model.d.ts}

@@ -1,11 +1,10 @@
 import type { ManifestWithLoaderIncludingDefaultExport } from '../../../../libs/extension-api/index.js';
-export type UmbTranslationEntry = string | ((...args: any[]) => string);
-export type UmbTranslationsDictionary = Record<string, Record<string, UmbTranslationEntry>>;
-export interface ManifestTranslations extends ManifestWithLoaderIncludingDefaultExport<UmbTranslationsDictionary> {
-    type: 'translations';
-    meta: MetaTranslations;
+import type { UmbLocalizationDictionary } from '../../../../libs/localization-api/index.js';
+export interface ManifestLocalization extends ManifestWithLoaderIncludingDefaultExport<UmbLocalizationDictionary> {
+    type: 'localization';
+    meta: MetaLocalization;
 }
-export interface MetaTranslations {
+export interface MetaLocalization {
     /**
      * @summary The culture of the translations.
      * @description
@@ -18,7 +17,7 @@ export interface MetaTranslations {
      */
     culture: string;
     /**
-     * @summary The direction of the translations (left-to-right or right-to-left).
+     * @summary The direction of the localizations (left-to-right or right-to-left).
      * @description
      * The value is used to describe the direction of the translations according to the extension system
      * and it will be set as the `dir` attribute on the `<html>` element. It defaults to `ltr`.
@@ -28,7 +27,7 @@ export interface MetaTranslations {
      */
     direction?: 'ltr' | 'rtl';
     /**
-     * The translations.
+     * The localizations.
      * @example
      * {
      *   "general": {
@@ -37,5 +36,5 @@ export interface MetaTranslations {
      *   }
      * }
      */
-    translations?: UmbTranslationsDictionary;
+    localizations?: UmbLocalizationDictionary;
 }

package/dist-cms/packages/core/extension-registry/models/property-editor.model.d.ts

@@ -1,5 +1,5 @@
 import type { UmbPropertyEditorExtensionElement } from '../interfaces/index.js';
-import { type UmbDataTypeConfig } from '../../property-editor/index.js';
+import type { UmbPropertyEditorConfig } from '../../property-editor/index.js';
 import type { ManifestElement, ManifestBase } from '../../../../libs/extension-api/index.js';
 export interface ManifestPropertyEditorUi extends ManifestElement<UmbPropertyEditorExtensionElement> {
     type: 'propertyEditorUi';
@@ -7,9 +7,28 @@ export interface ManifestPropertyEditorUi extends ManifestElement<UmbPropertyEdi
 }
 export interface MetaPropertyEditorUi {
     label: string;
-    propertyEditorSchemaAlias: string;
     icon: string;
+    /**
+     * The group that this property editor UI belongs to, which will be used to group the property editor UIs in the property editor picker.
+     * If not specified, the property editor UI will be grouped under "Common".
+     * @default "Common"
+     * @examples [
+     *  "Common",
+     * 	"Content",
+     * 	"Media"
+     * ]
+     */
     group: string;
+    /**
+     * The alias of the property editor schema that this property editor UI is for.
+     * If not specified, the property editor UI can only be used to configure other property editors.
+     * @examples [
+     * 	"Umbraco.TextBox",
+     * 	"Umbraco.TextArea",
+     * 	"Umbraco.Label",
+     * ]
+     */
+    propertyEditorSchemaAlias?: string;
     settings?: PropertyEditorSettings;
     supportsReadOnly?: boolean;
 }
@@ -30,7 +49,7 @@ export interface PropertyEditorConfigProperty {
     description?: string;
     alias: string;
     propertyEditorUiAlias: string;
-    config?: UmbDataTypeConfig;
+    config?: UmbPropertyEditorConfig;
 }
 export interface PropertyEditorConfigDefaultData {
     alias: string;

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

@@ -1 +1,2 @@
 import './localize.element.js';
+export * from './registry/localization.registry.js';

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

@@ -1 +1,2 @@
 import './localize.element.js';
+export * from './registry/localization.registry.js';

package/dist-cms/packages/core/localization/localize.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { css, customElement, html, property, state } from '../../../external/lit/index.js';
+import { css, customElement, html, property, state, unsafeHTML } from '../../../external/lit/index.js';
 import { UmbLitElement } from '../../../shared/lit-element/index.js';
 /**
  * This element allows you to localize a string with optional interpolation values.
@@ -32,7 +32,7 @@ export let UmbLocalizeElement = class UmbLocalizeElement extends UmbLitElement {
     }
     render() {
         return this.text
-            ? html `${this.text}`
+            ? html `${unsafeHTML(this.text)}`
             : this.debug
                 ? html `<span style="color:red">${this.key}</span>`
                 : html `<slot></slot>`;

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

@@ -1,7 +1,7 @@
-const translationManifests = [
+const localizationManifests = [
     {
-        type: 'translations',
-        alias: 'Umb.Translations.En_US',
+        type: 'localization',
+        alias: 'Umb.Localization.En_US',
         weight: -100,
         name: 'English (US)',
         meta: {
@@ -10,8 +10,8 @@ const translationManifests = [
         loader: () => import('../../../assets/lang/en-us.js'),
     },
     {
-        type: 'translations',
-        alias: 'Umb.Translations.Da_DK',
+        type: 'localization',
+        alias: 'Umb.Localization.Da_DK',
         weight: -100,
         name: 'Dansk (Danmark)',
         meta: {
@@ -20,4 +20,4 @@ const translationManifests = [
         loader: () => import('../../../assets/lang/da-dk.js'),
     },
 ];
-export const manifests = [...translationManifests];
+export const manifests = [...localizationManifests];

package/dist-cms/packages/core/localization/registry/localization.registry.d.ts

@@ -0,0 +1,17 @@
+import { LocalizationSet } from '../../../../libs/localization-api/index.js';
+import { UmbBackofficeExtensionRegistry } from '../../extension-registry/index.js';
+export declare class UmbLocalizationRegistry {
+    #private;
+    /**
+     * Get the current registered translations.
+     */
+    get localizations(): Map<string, LocalizationSet>;
+    get isDefaultLoaded(): import("rxjs/internal/Observable").Observable<boolean>;
+    constructor(extensionRegistry: UmbBackofficeExtensionRegistry);
+    /**
+     * Load a language from the extension registry.
+     * @param locale The locale to load.
+     */
+    loadLanguage(locale: string): void;
+}
+export declare const umbLocalizationRegistry: UmbLocalizationRegistry;

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

@@ -0,0 +1,79 @@
+import { registerLocalization, localizations, } from '../../../../libs/localization-api/index.js';
+import { hasDefaultExport, loadExtension } from '../../../../libs/extension-api/index.js';
+import { umbExtensionsRegistry } from '../../extension-registry/index.js';
+import { BehaviorSubject, Subject, combineLatest, map, distinctUntilChanged, filter, startWith, } from '../../../../external/rxjs/index.js';
+export class UmbLocalizationRegistry {
+    /**
+     * Get the current registered translations.
+     */
+    get localizations() {
+        return localizations;
+    }
+    get isDefaultLoaded() {
+        return this.#isDefaultLoaded.asObservable();
+    }
+    #currentLanguage = new Subject();
+    #isDefaultLoaded = new BehaviorSubject(false);
+    constructor(extensionRegistry) {
+        const currentLanguage$ = this.#currentLanguage.pipe(startWith(document.documentElement.lang || 'en-us'), map((x) => x.toLowerCase()), distinctUntilChanged());
+        const currentExtensions$ = extensionRegistry.extensionsOfType('localization').pipe(filter((x) => x.length > 0), distinctUntilChanged((prev, curr) => prev.length === curr.length && prev.every((x) => curr.includes(x))));
+        combineLatest([currentLanguage$, currentExtensions$]).subscribe(async ([userCulture, extensions]) => {
+            const locale = new Intl.Locale(userCulture);
+            const translations = await Promise.all(extensions
+                .filter((x) => x.meta.culture.toLowerCase() === locale.baseName.toLowerCase() ||
+                x.meta.culture.toLowerCase() === locale.language.toLowerCase())
+                .map(async (extension) => {
+                const innerDictionary = {};
+                // If extension contains a dictionary, add it to the inner dictionary.
+                if (extension.meta.localizations) {
+                    for (const [dictionaryName, dictionary] of Object.entries(extension.meta.localizations)) {
+                        this.#addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
+                    }
+                }
+                // If extension contains a js file, load it and add the default dictionary to the inner dictionary.
+                const loadedExtension = await loadExtension(extension);
+                if (loadedExtension && hasDefaultExport(loadedExtension)) {
+                    for (const [dictionaryName, dictionary] of Object.entries(loadedExtension.default)) {
+                        this.#addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
+                    }
+                }
+                // Notify subscribers that the inner dictionary has changed.
+                return {
+                    $code: extension.meta.culture.toLowerCase(),
+                    $dir: extension.meta.direction ?? 'ltr',
+                    ...innerDictionary,
+                };
+            }));
+            if (translations.length) {
+                registerLocalization(...translations);
+                // Set the document language
+                const newLang = locale.baseName.toLowerCase();
+                if (document.documentElement.lang.toLowerCase() !== newLang) {
+                    document.documentElement.lang = newLang;
+                }
+                // Set the document direction to the direction of the primary language
+                const newDir = translations[0].$dir ?? 'ltr';
+                if (document.documentElement.dir !== newDir) {
+                    document.documentElement.dir = newDir;
+                }
+            }
+            if (!this.#isDefaultLoaded.value) {
+                this.#isDefaultLoaded.next(true);
+                this.#isDefaultLoaded.complete();
+            }
+        });
+    }
+    /**
+     * Load a language from the extension registry.
+     * @param locale The locale to load.
+     */
+    loadLanguage(locale) {
+        this.#currentLanguage.next(locale);
+    }
+    #addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary) {
+        for (const [key, value] of Object.entries(dictionary)) {
+            innerDictionary[`${dictionaryName}_${key}`] = value;
+        }
+    }
+}
+export const umbLocalizationRegistry = new UmbLocalizationRegistry(umbExtensionsRegistry);

package/dist-cms/packages/core/macro/macro.service.d.ts

@@ -23,4 +23,4 @@ export declare class UmbMacroService {
     generateMvcSyntax(args: MacroSyntaxData): string;
     collectValueData(macro: any, macroParams: any, renderingEngine: any): MacroSyntaxData;
 }
-export declare const UMB_MACRO_SERVICE_CONTEXT_TOKEN: UmbContextToken<UmbMacroService>;
+export declare const UMB_MACRO_SERVICE_CONTEXT_TOKEN: UmbContextToken<UmbMacroService, UmbMacroService>;

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

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { html, ifDefined, customElement, property } from '../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../shared/style/index.js";
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 export let UmbMenuItemElement = class UmbMenuItemElement extends UmbLitElement {
     render() {
@@ -14,7 +14,7 @@ export let UmbMenuItemElement = class UmbMenuItemElement extends UmbLitElement {
 			icon-name=${this.manifest.meta.icon}
 			entity-type=${ifDefined(this.manifest.meta.entityType)}></umb-menu-item-base>`;
     }
-    static { this.styles = [UUITextStyles]; }
+    static { this.styles = [UmbTextStyles]; }
 };
 __decorate([
     property({ type: Object, attribute: false })

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

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { html, customElement, property, state, ifDefined } from '../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../shared/style/index.js";
 import { UMB_SECTION_CONTEXT_TOKEN } from '../../section/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 export let UmbMenuItemBaseElement = class UmbMenuItemBaseElement extends UmbLitElement {
@@ -50,7 +50,7 @@ export let UmbMenuItemBaseElement = class UmbMenuItemBaseElement extends UmbLitE
 			.label=${this.label}>
 		</umb-entity-actions-bundle>`;
     }
-    static { this.styles = [UUITextStyles]; }
+    static { this.styles = [UmbTextStyles]; }
 };
 __decorate([
     property({ type: String, attribute: 'entity-type' })

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

@@ -6,4 +6,4 @@ export declare class UmbMenuContext {
     readonly alias: import("rxjs").Observable<string | undefined>;
     setManifest(manifest: ManifestMenu | undefined): void;
 }
-export declare const UMB_MENU_CONTEXT_TOKEN: UmbContextToken<UmbMenuContext>;
+export declare const UMB_MENU_CONTEXT_TOKEN: UmbContextToken<UmbMenuContext, UmbMenuContext>;

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

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UUITextStyles } from '../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../shared/style/index.js";
 import { html, customElement, property } from '../../../external/lit/index.js';
 import { UmbLitElement } from '../../../shared/lit-element/index.js';
 import './menu-item/menu-item.element.js';
@@ -19,7 +19,7 @@ export let UmbMenuElement = class UmbMenuElement extends UmbLitElement {
 			.filter=${(items) => items.meta.menus.includes(this.manifest.alias)}
 			default-element="umb-menu-item"></umb-extension-slot>`;
     }
-    static { this.styles = [UUITextStyles]; }
+    static { this.styles = [UmbTextStyles]; }
 };
 __decorate([
     property({ attribute: false })

package/dist-cms/packages/core/modal/common/code-editor/code-editor-modal.element.js

@@ -6,7 +6,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { css, html, ifDefined, customElement, query } from '../../../../../external/lit/index.js';
 import { loadCodeEditor } from '../../../../templating/code-editor/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { UmbBooleanState } from '../../../../../libs/observable-api/index.js';
 export let UmbCodeEditorModalElement = class UmbCodeEditorModalElement extends UmbModalBaseElement {
@@ -68,7 +67,6 @@ export let UmbCodeEditorModalElement = class UmbCodeEditorModalElement extends U
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
         css `
 			#editor-box {
 				padding: var(--uui-box-default-padding, var(--uui-size-space-5, 18px));

package/dist-cms/packages/core/modal/common/confirm/confirm-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { html, customElement, property } from '../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../shared/style/index.js";
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
 export let UmbConfirmModalElement = class UmbConfirmModalElement extends UmbLitElement {
     _handleConfirm() {
@@ -30,7 +30,7 @@ export let UmbConfirmModalElement = class UmbConfirmModalElement extends UmbLitE
 			</uui-dialog-layout>
 		`;
     }
-    static { this.styles = [UUITextStyles]; }
+    static { this.styles = [UmbTextStyles]; }
 };
 __decorate([
     property({ attribute: false })

package/dist-cms/packages/core/modal/common/embedded-media/embedded-media-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, unsafeHTML, when, customElement, state } from '../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../shared/style/index.js";
 import { OEmbedStatus, } from '../../index.js';
 import { umbracoPath } from '../../../../../shared/utils/index.js';
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
@@ -192,7 +192,7 @@ export let UmbEmbeddedMediaModalElement = class UmbEmbeddedMediaModalElement ext
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			h3 {
 				margin-left: var(--uui-size-space-5);

package/dist-cms/packages/core/modal/common/folder/folder-modal.element.d.ts

@@ -1,13 +1,13 @@
 import { UmbFolderModalData, UmbFolderModalResult, UmbModalContext } from '../../index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
-import { FolderReponseModel } from '../../../../../external/backend-api/index.js';
+import { FolderResponseModel } from '../../../../../external/backend-api/index.js';
 export declare class UmbFolderModalElement extends UmbLitElement {
     #private;
     modalContext?: UmbModalContext<UmbFolderModalData, UmbFolderModalResult>;
     private _data?;
     get data(): UmbFolderModalData | undefined;
     set data(value: UmbFolderModalData | undefined);
-    _folder?: FolderReponseModel;
+    _folder?: FolderResponseModel;
     _headline?: string;
     _isNew: boolean;
     private _formElement?;

package/dist-cms/packages/core/modal/common/folder/folder-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, customElement, property, query, state } from '../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../shared/style/index.js";
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
 import { createExtensionClass } from '../../../../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../../../extension-registry/index.js';
@@ -141,7 +141,7 @@ export let UmbFolderModalElement = class UmbFolderModalElement extends UmbLitEle
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			#name {
 				width: 100%;

package/dist-cms/packages/core/modal/common/icon-picker/icon-picker-modal.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import icons from '../../../../../shared/icon-registry/icons/icons.json' assert { type: 'json' };
 import { css, html, styleMap, customElement, state } from '../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../shared/style/index.js";
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 // TODO: Make use of UmbPickerLayoutBase
 // TODO: to prevent element extension we need to move the Picker logic into a separate class we can reuse across all pickers
@@ -115,7 +115,7 @@ export let UmbIconPickerModalElement = class UmbIconPickerModalElement extends U
         })}`;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			:host {
 				position: relative;

package/dist-cms/packages/core/modal/common/link-picker/link-picker-modal.element.js

@@ -5,7 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, nothing, customElement, query, state } from '../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { buildUdi, getKeyFromUdi } from '../../../../../shared/utils/index.js';
 export let UmbLinkPickerModalElement = class UmbLinkPickerModalElement extends UmbModalBaseElement {
@@ -143,7 +142,6 @@ export let UmbLinkPickerModalElement = class UmbLinkPickerModalElement extends U
 				selectable></umb-tree>`;
     }
     static { this.styles = [
-        UUITextStyles,
         css `
 			hr {
 				border: none;

package/dist-cms/packages/core/modal/common/property-settings/property-settings-modal.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UUITextStyles, } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from '../../../../../shared/style/index.js';
 import { css, html, nothing, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { generateAlias } from '../../../../../shared/utils/index.js';
@@ -134,7 +134,6 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
         this._customValidationOptions.forEach((option) => {
             option.selected = option.value === regEx;
         });
-        console.log(this._customValidationOptions);
         this._returnData.validation.regEx = regEx ?? null;
         this.requestUpdate('_returnData');
         this.requestUpdate('_customValidationOptions');
@@ -287,7 +286,7 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
             : nothing} `;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			:host {
 				color: var(--uui-color-text);

package/dist-cms/packages/core/modal/common/section-picker/section-picker-modal.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../shared/style/index.js";
 import { css, html, customElement, state } from '../../../../../external/lit/index.js';
 import { UmbSelectionManagerBase } from '../../../../../shared/utils/index.js';
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
@@ -51,7 +51,7 @@ export let UmbSectionPickerModalElement = class UmbSectionPickerModalElement ext
 			</umb-body-layout>
 		`;
     }
-    static { this.styles = [UUITextStyles, css ``]; }
+    static { this.styles = [UmbTextStyles, css ``]; }
 };
 __decorate([
     state()

package/dist-cms/packages/core/modal/common/template/template-modal.element.js

@@ -5,7 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, ifDefined, customElement, query, state } from '../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
 import { TemplateResource } from '../../../../../external/backend-api/index.js';
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
@@ -92,7 +91,6 @@ export let UmbTemplateModalElement = class UmbTemplateModalElement extends UmbMo
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
         css `
 			uui-box {
 				position: relative;

package/dist-cms/packages/core/modal/common/tree-picker/tree-picker-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, customElement, state } from '../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../shared/style/index.js";
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 export let UmbTreePickerModalElement = class UmbTreePickerModalElement extends UmbModalBaseElement {
     constructor() {
@@ -48,7 +48,7 @@ export let UmbTreePickerModalElement = class UmbTreePickerModalElement extends U
 			</umb-body-layout>
 		`;
     }
-    static { this.styles = [UUITextStyles, css ``]; }
+    static { this.styles = [UmbTextStyles, css ``]; }
 };
 __decorate([
     state()

package/dist-cms/packages/core/modal/modal-context.d.ts

@@ -48,5 +48,5 @@ export declare class UmbModalContextClass<ModalData extends object = object, Mod
     onSubmit(): Promise<ModalResult>;
     destroy(): void;
 }
-export declare const UMB_MODAL_CONTEXT_TOKEN: UmbContextToken<UmbModalContext<object, any>>;
+export declare const UMB_MODAL_CONTEXT_TOKEN: UmbContextToken<UmbModalContext<object, any>, UmbModalContext<object, any>>;
 export {};

package/dist-cms/packages/core/modal/modal-manager.context.d.ts

@@ -34,4 +34,4 @@ export declare class UmbModalManagerContext {
      */
     close(key: string): void;
 }
-export declare const UMB_MODAL_MANAGER_CONTEXT_TOKEN: UmbContextToken<UmbModalManagerContext>;
+export declare const UMB_MODAL_MANAGER_CONTEXT_TOKEN: UmbContextToken<UmbModalManagerContext, UmbModalManagerContext>;

package/dist-cms/packages/core/modal/modal-route-registration.d.ts

@@ -28,8 +28,8 @@ export declare class UmbModalRouteRegistration<UmbModalTokenData extends object
     get modalContext(): UmbModalContext<UmbModalTokenData, UmbModalTokenResult> | undefined;
     observeRouteBuilder(callback: (urlBuilder: UmbModalRouteBuilder) => void): this;
     _internal_setRouteBuilder(urlBuilder: UmbModalRouteBuilder): void;
-    onSetup(callback: (routingInfo: Params) => UmbModalTokenData | false): this;
+    onSetup(callback: (routingInfo: Params) => Promise<UmbModalTokenData | false> | UmbModalTokenData | false): this;
     onSubmit(callback: (data: UmbModalTokenResult) => void): this;
     onReject(callback: () => void): this;
-    routeSetup(router: IRouterSlot, modalContext: UmbModalManagerContext, params: Params): UmbModalContext<UmbModalTokenData, UmbModalTokenResult> | null | undefined;
+    routeSetup(router: IRouterSlot, modalContext: UmbModalManagerContext, params: Params): Promise<UmbModalContext<UmbModalTokenData, UmbModalTokenResult> | null | undefined>;
 }

package/dist-cms/packages/core/modal/modal-route-registration.js

@@ -81,11 +81,11 @@ export class UmbModalRouteRegistration {
         this.#onRejectCallback?.();
         this.#modalContext = undefined;
     };
-    routeSetup(router, modalContext, params) {
+    async routeSetup(router, modalContext, params) {
         // If already open, don't do anything:
         if (this.active)
             return;
-        const modalData = this.#onSetupCallback ? this.#onSetupCallback(params) : undefined;
+        const modalData = this.#onSetupCallback ? await this.#onSetupCallback(params) : undefined;
         if (modalData !== false) {
             this.#modalContext = modalContext.open(this.#modalAlias, modalData, this.modalConfig, router);
             this.#modalContext.onSubmit().then(this.#onSubmit, this.#onReject);

package/dist-cms/packages/core/modal/token/folder-modal.token.d.ts

@@ -1,11 +1,11 @@
 import { UmbModalToken } from '../index.js';
-import { FolderReponseModel } from '../../../../external/backend-api/index.js';
+import { FolderResponseModel } from '../../../../external/backend-api/index.js';
 export interface UmbFolderModalData {
     repositoryAlias: string;
     unique?: string;
     parentUnique?: string | null;
 }
 export interface UmbFolderModalResult {
-    folder: FolderReponseModel;
+    folder: FolderResponseModel;
 }
 export declare const UMB_FOLDER_MODAL: UmbModalToken<UmbFolderModalData, UmbFolderModalResult>;