npm - @umbraco-cms/backoffice - Versions diffs - 14.0.0-bd6f74b3 → 14.0.0-c074e160 - Mend

@umbraco-cms/backoffice 14.0.0-bd6f74b3 → 14.0.0-c074e160

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 (1147) hide show

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

@@ -1,10 +1,10 @@
 import type { ManifestWithLoaderIncludingDefaultExport } from '../../../../libs/extension-api/index.js';
-import type { UmbTranslationsDictionary } from '../../../../libs/localization-api/index.js';
-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
@@ -17,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`.
@@ -27,7 +27,7 @@ export interface MetaTranslations {
      */
     direction?: 'ltr' | 'rtl';
     /**
-     * The translations.
+     * The localizations.
      * @example
      * {
      *   "general": {
@@ -36,5 +36,5 @@ export interface MetaTranslations {
      *   }
      * }
      */
-    translations?: UmbTranslationsDictionary;
+    localizations?: UmbLocalizationDictionary;
 }

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

@@ -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';
@@ -49,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/index.d.ts CHANGED Viewed

@@ -22,4 +22,5 @@ export * from './store/index.js';
 export * from './tree/index.js';
 export * from './variant/index.js';
 export * from './workspace/index.js';
+export * from './culture/index.js';
 export declare const onInit: UmbEntryPointOnInit;

package/dist-cms/packages/core/index.js CHANGED Viewed

@@ -8,6 +8,7 @@ import { manifests as workspaceManifests } from './workspace/manifests.js';
 import { manifests as modalManifests } from './modal/common/manifests.js';
 import { manifests as themeManifests } from './themes/manifests.js';
 import { manifests as conditionManifests } from './extension-registry/conditions/manifests.js';
+import { manifests as cultureManifests } from './culture/manifests.js';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from './notification/index.js';
 import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from './modal/index.js';
 import { UmbContextProviderController } from '../../libs/context-api/index.js';
@@ -35,6 +36,7 @@ export * from './store/index.js';
 export * from './tree/index.js';
 export * from './variant/index.js';
 export * from './workspace/index.js';
+export * from './culture/index.js';
 const manifests = [
     ...conditionManifests,
     ...debugManifests,
@@ -45,6 +47,7 @@ const manifests = [
     ...workspaceManifests,
     ...modalManifests,
     ...themeManifests,
+    ...cultureManifests,
 ];
 export const onInit = (host, extensionRegistry) => {
     new UmbMultiExtensionsClassInitializer(host, ['globalContext', 'store', 'treeStore', 'itemStore']);

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

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

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

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

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

@@ -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/{translation.registry.d.ts → localization.registry.d.ts} RENAMED Viewed

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

package/dist-cms/packages/core/localization/registry/{translation.registry.js → localization.registry.js} RENAMED Viewed

@@ -1,18 +1,23 @@
-import { registerTranslation, translations, } from '../../../../libs/localization-api/index.js';
+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 { Subject, combineLatest, map, distinctUntilChanged } from '../../../../external/rxjs/index.js';
-export class UmbTranslationRegistry {
+import { BehaviorSubject, Subject, combineLatest, map, distinctUntilChanged, filter, startWith, } from '../../../../external/rxjs/index.js';
+export class UmbLocalizationRegistry {
     /**
      * Get the current registered translations.
      */
-    get translations() {
-        return translations;
+    get localizations() {
+        return localizations;
+    }
+    get isDefaultLoaded() {
+        return this.#isDefaultLoaded.asObservable();
     }
     #currentLanguage = new Subject();
-    #currentLanguageUnique = this.#currentLanguage.pipe(map((x) => x.toLowerCase()), distinctUntilChanged());
+    #isDefaultLoaded = new BehaviorSubject(false);
     constructor(extensionRegistry) {
-        combineLatest([this.#currentLanguageUnique, extensionRegistry.extensionsOfType('translations')]).subscribe(async ([userCulture, extensions]) => {
+        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() ||
@@ -20,8 +25,8 @@ export class UmbTranslationRegistry {
                 .map(async (extension) => {
                 const innerDictionary = {};
                 // If extension contains a dictionary, add it to the inner dictionary.
-                if (extension.meta.translations) {
-                    for (const [dictionaryName, dictionary] of Object.entries(extension.meta.translations)) {
+                if (extension.meta.localizations) {
+                    for (const [dictionaryName, dictionary] of Object.entries(extension.meta.localizations)) {
                         this.#addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
                     }
                 }
@@ -40,11 +45,21 @@ export class UmbTranslationRegistry {
                 };
             }));
             if (translations.length) {
-                registerTranslation(...translations);
+                registerLocalization(...translations);
                 // Set the document language
-                document.documentElement.lang = locale.baseName.toLowerCase();
+                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
-                document.documentElement.dir = translations[0].$dir ?? 'ltr';
+                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();
             }
         });
     }
@@ -61,4 +76,4 @@ export class UmbTranslationRegistry {
         }
     }
 }
-export const umbTranslationRegistry = new UmbTranslationRegistry(umbExtensionsRegistry);
+export const umbLocalizationRegistry = new UmbLocalizationRegistry(umbExtensionsRegistry);

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ export declare class UmbPropertySettingsModalElement extends UmbModalBaseElement
     #private;
     private _customValidationOptions;
     private _aliasLocked;
+    protected _ownerDocumentType?: UmbPropertySettingsModalResult;
     protected _returnData: UmbPropertySettingsModalResult;
     connectedCallback(): void;
     protected firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;

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

@@ -4,10 +4,11 @@ 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';
+import { UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN } from '../../../../documents/document-types/index.js';
 // TODO: Could base take a token to get its types?.
 // TODO: Missing a workspace context... unless this should not be a workspace any way.
 export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalElement extends UmbModalBaseElement {
@@ -42,7 +43,14 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
     }
     connectedCallback() {
         super.connectedCallback();
-        this._returnData = JSON.parse(JSON.stringify(this.data));
+        // TODO: This is actually not good enough, we need to be able to get to the DOCUMENT_WORKSPACE_CONTEXT, so we can have a look at the draft/runtime version of the document. Otherwise 'Vary by culture' is first updated when saved.
+        this.consumeContext(UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN, (instance) => {
+            this.observe(instance.byId(this.data?.documentTypeId), (documentType) => {
+                this._ownerDocumentType = documentType;
+                this.requestUpdate('_ownerDocumentType');
+            }, '_observeDocumentType');
+        });
+        this._returnData = JSON.parse(JSON.stringify(this.data?.propertyData ?? {}));
         this._returnData.validation ??= {};
         const regEx = this._returnData.validation.regEx ?? null;
         const newlySelected = this._customValidationOptions.find((option) => {
@@ -93,7 +101,7 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
             this._returnData.alias = alias;
         }
         else {
-            this._returnData.alias = this.data?.alias;
+            this._returnData.alias = this.data?.propertyData?.alias;
         }
         this.requestUpdate('_returnData');
     }
@@ -134,7 +142,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');
@@ -156,6 +163,10 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
         this._returnData.validation.regExMessage = event.target.value.toString();
         this.requestUpdate('_returnData');
     }
+    #onVaryByCultureChange(event) {
+        this._returnData.variesByCulture = event.target.checked;
+        this.requestUpdate('_returnData');
+    }
     // TODO: This would conceptually be a Property Editor Workspace, should be changed at one point in the future.
     // For now this is hacky made available by giving the element an fixed alias.
     // This would allow for workspace views and workspace actions.
@@ -205,6 +216,7 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
 									${this.#renderCustomValidation()}
 								</div>
 								<hr />
+								${this.#renderVariationControls()}
 								<div class="container">
 									<b style="margin-bottom: var(--uui-size-space-3)">Appearance</b>
 									<div id="appearances">${this.#renderAlignLeftIcon()} ${this.#renderAlignTopIcon()}</div>
@@ -253,13 +265,13 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
 				<uui-toggle
 					@change=${this.#onMandatoryChange}
 					id="mandatory"
-					value=${this._returnData.validation?.mandatory}
+					.checked=${this._returnData.validation?.mandatory ?? false}
 					slot="editor"></uui-toggle>
 			</div>
 			${this._returnData.validation?.mandatory
             ? html `<uui-input
 						name="mandatory-message"
-						value=${this._returnData.validation?.mandatoryMessage}
+						value=${this._returnData.validation?.mandatoryMessage ?? ''}
 						@change=${this.#onMandatoryMessageChange}
 						style="margin-top: var(--uui-size-space-1)"
 						id="mandatory-message"
@@ -286,8 +298,25 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
 				  `
             : nothing} `;
     }
+    #renderVariationControls() {
+        return this._ownerDocumentType?.variesByCulture || this._ownerDocumentType?.variesBySegment ?
+            html `
+			<div class="container">
+				<b>Variation</b>
+				${this._ownerDocumentType?.variesByCulture ? this.#renderVaryByCulture() : ''}
+			</div>
+			<hr />`
+            : '';
+    }
+    #renderVaryByCulture() {
+        return html `<uui-toggle
+				@change=${this.#onVaryByCultureChange}
+				.checked=${this._returnData.variesByCulture ?? false}
+				label="Vary by culture"></uui-toggle>
+			`;
+    }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			:host {
 				color: var(--uui-color-text);
@@ -424,6 +453,9 @@ __decorate([
 __decorate([
     state()
 ], UmbPropertySettingsModalElement.prototype, "_aliasLocked", void 0);
+__decorate([
+    state()
+], UmbPropertySettingsModalElement.prototype, "_ownerDocumentType", void 0);
 __decorate([
     state()
 ], UmbPropertySettingsModalElement.prototype, "_returnData", void 0);

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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);