@umbraco-cms/backoffice 14.0.0-335b4f13 → 14.0.0-84ca069c

package/dist-cms/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.js

@@ -0,0 +1,167 @@
+import { UmbMacroService } from '../../../../macro/index.js';
+import { UmbTinyMcePluginBase } from '../../../../extension-registry/index.js';
+import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '../../../../modal/index.js';
+// TODO => This is a quick transplant of the existing macro plugin - needs to be finished, and need to
+// determine how to replicate the existing macro service
+export default class UmbTinyMceMacroPickerPlugin extends UmbTinyMcePluginBase {
+    #macroService = new UmbMacroService();
+    #modalContext;
+    constructor(args) {
+        super(args);
+        this.host.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (modalContext) => {
+            this.#modalContext = modalContext;
+        });
+        /** Adds custom rules for the macro plugin and custom serialization */
+        this.editor.on('preInit', () => {
+            //this is requires so that we tell the serializer that a 'div' is actually allowed in the root, 
+            // otherwise the cleanup will strip it out
+            this.editor.serializer.addRules('div');
+            /** This checks if the div is a macro container, if so, checks if its wrapped in a p tag and then unwraps it (removes p tag) */
+            this.editor.serializer.addNodeFilter('div', (nodes) => {
+                for (let i = 0; i < nodes.length; i++) {
+                    if (nodes[i].attr('class') === 'umb-macro-holder' &&
+                        nodes[i].parent?.name.toLowerCase() === 'p') {
+                        nodes[i].parent?.unwrap();
+                    }
+                }
+            });
+        });
+        /** when the contents load we need to find any macros declared and load in their content */
+        this.editor.on('SetContent', () => {
+            //get all macro divs and load their content
+            this.editor.dom.select('.umb-macro-holder.mceNonEditable').forEach((macroElement) => {
+                this.#loadMacroContent(macroElement, null);
+            });
+        });
+        /** Adds the button instance */
+        this.editor.ui.registry.addButton('umbmacro', {
+            icon: 'preferences',
+            tooltip: 'Insert macro',
+            /** The insert macro button click event handler */
+            onAction: () => {
+                let dialogData = {
+                    //flag for use in rte so we only show macros flagged for the editor
+                    richTextEditor: true,
+                };
+                //when we click we could have a macro already selected and in that case we'll want to edit the current parameters
+                //so we'll need to extract them and submit them to the dialog.
+                const activeMacroElement = this.#getRealMacroElem();
+                if (activeMacroElement) {
+                    //we have a macro selected so we'll need to parse it's alias and parameters
+                    const comment = Array.from(activeMacroElement.childNodes).find((x) => x.nodeType === 8);
+                    if (!comment) {
+                        throw 'Cannot parse the current macro, the syntax in the editor is invalid';
+                    }
+                    const syntax = comment.textContent?.trim();
+                    const parsed = this.#macroService?.parseMacroSyntax(syntax);
+                    dialogData = {
+                        richTextEditor: false,
+                        macroData: parsed,
+                        activeMacroElement, //pass the active element along so we can retrieve it later
+                    };
+                }
+                this.#showMacroPicker(dialogData);
+            },
+        });
+    }
+    /** loads in the macro content async from the server */
+    #loadMacroContent(macroDiv, macroData) {
+        //if we don't have the macroData, then we'll need to parse it from the macro div
+        if (!macroData && macroDiv) {
+            const comment = Array.from(macroDiv.childNodes).find((x) => x.nodeType === 8);
+            if (!comment) {
+                throw ('Cannot parse the current macro, the syntax in the editor is invalid');
+            }
+            const syntax = comment.textContent?.trim();
+            const parsed = this.#macroService?.parseMacroSyntax(syntax);
+            macroData = parsed;
+        }
+        //show the throbber
+        macroDiv?.classList.add('loading');
+        // Add the contenteditable="false" attribute
+        // As just the CSS class of .mceNonEditable is not working by itself?!
+        macroDiv?.setAttribute('contenteditable', 'false');
+        // TODO => macro data service?
+        // const contentId = $routeParams.id;
+        // //need to wrap in safe apply since this might be occuring outside of angular
+        // angularHelper.safeApply($rootScope, function () {
+        // 	tryExecuteAndNotify(this, macroResource
+        // 		.getMacroResultAsHtmlForEditor(macroData.macroAlias, contentId, macroData.macroParamsDictionary))
+        // 		.then(function (htmlResult) {
+        // 			$macroDiv.removeClass('loading');
+        // 			htmlResult = htmlResult.trim();
+        // 			if (htmlResult !== '') {
+        // 				const wasDirty = editor.isDirty();
+        //              const $ins = macroDiv?.querySelector('ins');
+        // 				$ins.html(htmlResult);
+        // 				if (!wasDirty) {
+        // 					editor.undoManager.clear();
+        // 				}
+        // 			}
+        // 		});
+        // });
+    }
+    #insertInEditor(macroObject, activeMacroElement) {
+        //Important note: the TinyMce plugin "noneditable" is used here so that the macro cannot be edited,
+        // for this to work the mceNonEditable class needs to come last and we also need to use the attribute contenteditable = false
+        // (even though all the docs and examples say that is not necessary)
+        //put the macro syntax in comments, we will parse this out on the server side to be used
+        //for persisting.
+        const macroSyntaxComment = `<!-- ${macroObject.syntax} -->`;
+        //create an id class for this element so we can re-select it after inserting
+        const uniqueId = 'umb-macro-' + this.editor.dom.uniqueId();
+        let macroDiv = this.editor.dom.create('div', {
+            class: `umb-macro-holder ${macroObject.macroAlias} ${uniqueId} mceNonEditable`,
+            contenteditable: 'false',
+        }, `${macroSyntaxComment}<ins>Macro alias: <strong>${macroObject.macroAlias}</strong></ins>`);
+        //if there's an activeMacroElement then replace it, otherwise set the contents of the selected node
+        if (activeMacroElement) {
+            activeMacroElement.replaceWith(macroDiv); //directly replaces the html node
+        }
+        else {
+            this.editor.selection.setNode(macroDiv);
+        }
+        macroDiv = this.editor.dom.select('div.umb-macro-holder.' + uniqueId)[0];
+        this.editor.setDirty(true);
+        //async load the macro content
+        this.#loadMacroContent(macroDiv, macroObject);
+    }
+    /**
+     * Because the macro got wrapped in a P tag because of the way 'enter' works in older versions of Umbraco, this
+     * method will return the macro element if not wrapped in a p, or the p if the macro
+     * element is the only one inside of it even if we are deep inside an element inside the macro
+     */
+    #getRealMacroElem() {
+        // Ask the editor for the currently selected element
+        const element = this.editor?.selection.getNode();
+        if (!element) {
+            return null;
+        }
+        const e = element.closest('.umb-macro-holder');
+        if (!e || e === null)
+            return null;
+        if (e.parentNode?.nodeName === 'P') {
+            //now check if we're the only element
+            if (element.parentNode?.childNodes.length === 1) {
+                return e.parentNode;
+            }
+        }
+        return e;
+    }
+    // TODO => depends on macro picker, which doesn't exist, just showing a generic modal for now
+    async #showMacroPicker(dialogData) {
+        const modalHandler = this.#modalContext?.open(UMB_CONFIRM_MODAL, {
+            headline: 'Macro picker',
+            content: 'Yet to be implemented',
+        });
+        if (!modalHandler)
+            return;
+        const result = await modalHandler.onSubmit();
+        if (!result)
+            return;
+        // TODO => object here should be the response from the modal
+        this.#insertInEditor({}, dialogData.activeMacroElement);
+        this.editor.dispatch('Change');
+    }
+}
+//# sourceMappingURL=tiny-mce-macropicker.plugin.js.map

package/dist-cms/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tiny-mce-macropicker.plugin.js","sourceRoot":"","sources":["../../../../../../../src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts"],"names":[],"mappings":"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"}

package/dist-cms/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.d.ts

@@ -0,0 +1,5 @@
+import { TinyMcePluginArguments, UmbTinyMcePluginBase } from '../../../../extension-registry/index.js';
+export default class UmbTinyMceMediaPickerPlugin extends UmbTinyMcePluginBase {
+    #private;
+    constructor(args: TinyMcePluginArguments);
+}

package/dist-cms/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.js

@@ -0,0 +1,141 @@
+import { UmbTinyMcePluginBase } from '../../../../extension-registry/index.js';
+import { UmbMediaHelper } from '../../../../../../shared/utils/index.js';
+import { UMB_MEDIA_TREE_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN, } from '../../../../modal/index.js';
+export default class UmbTinyMceMediaPickerPlugin extends UmbTinyMcePluginBase {
+    #mediaHelper;
+    #currentUser;
+    #modalContext;
+    #auth;
+    constructor(args) {
+        super(args);
+        this.#mediaHelper = new UmbMediaHelper();
+        this.host.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (modalContext) => {
+            this.#modalContext = modalContext;
+        });
+        // TODO => this breaks tests. disabling for now
+        // will ignore user media start nodes
+        // this.host.consumeContext(UMB_AUTH, (instance) => {
+        // 	this.#auth = instance;
+        // 	this.#observeCurrentUser();
+        // });
+        this.editor.ui.registry.addButton('umbmediapicker', {
+            icon: 'image',
+            tooltip: 'Media Picker',
+            //stateSelector: 'img[data-udi]', TODO => Investigate where stateselector has gone, or if it is still needed
+            onAction: () => this.#onAction(),
+        });
+    }
+    async #observeCurrentUser() {
+        if (!this.#auth)
+            return;
+        this.host.observe(this.#auth.currentUser, (currentUser) => this.#currentUser = currentUser);
+    }
+    async #onAction() {
+        const selectedElm = this.editor.selection.getNode();
+        let currentTarget = {};
+        if (selectedElm.nodeName === 'IMG') {
+            const img = selectedElm;
+            const hasUdi = img.hasAttribute('data-udi');
+            const hasDataTmpImg = img.hasAttribute('data-tmpimg');
+            currentTarget = {
+                altText: img.alt,
+                url: img.src,
+                caption: img.dataset.caption,
+            };
+            if (hasUdi) {
+                currentTarget['udi'] = img.dataset.udi;
+            }
+            else {
+                currentTarget['id'] = img.getAttribute('rel') ?? undefined;
+            }
+            if (hasDataTmpImg) {
+                currentTarget['tmpimg'] = img.dataset.tmpimg;
+            }
+        }
+        this.#showMediaPicker(currentTarget);
+    }
+    async #showMediaPicker(currentTarget) {
+        let startNodeId;
+        let startNodeIsVirtual;
+        if (!this.configuration?.getByAlias('startNodeId')) {
+            if (this.configuration?.getValueByAlias('ignoreUserStartNodes') === true) {
+                startNodeId = -1;
+                startNodeIsVirtual = true;
+            }
+            else {
+                startNodeId = this.#currentUser?.mediaStartNodeIds?.length !== 1 ? -1 : this.#currentUser?.mediaStartNodeIds[0];
+                startNodeIsVirtual = this.#currentUser?.mediaStartNodeIds?.length !== 1;
+            }
+        }
+        // TODO => startNodeId and startNodeIsVirtual do not exist on ContentTreeItemResponseModel
+        const modalHandler = this.#modalContext?.open(UMB_MEDIA_TREE_PICKER_MODAL, {
+            selection: currentTarget.udi ? [...currentTarget.udi] : [],
+            multiple: false,
+            //startNodeId,
+            //startNodeIsVirtual,
+        });
+        if (!modalHandler)
+            return;
+        const { selection } = await modalHandler.onSubmit();
+        if (!selection.length)
+            return;
+        this.#insertInEditor(selection[0]);
+        this.editor.dispatch('Change');
+    }
+    // TODO => mediaPicker returns a UDI, so need to fetch it. Wait for backend CLI before implementing
+    async #insertInEditor(img) {
+        if (!img)
+            return;
+        // We need to create a NEW DOM <img> element to insert
+        // setting an attribute of ID to __mcenew, so we can gather a reference to the node, to be able to update its size accordingly to the size of the image.
+        const data = {
+            alt: img.altText || '',
+            src: img.url ? img.url : 'nothing.jpg',
+            id: '__mcenew',
+            'data-udi': img.udi,
+            'data-caption': img.caption,
+        };
+        const newImage = this.editor.dom.createHTML('img', data);
+        const parentElement = this.editor.selection.getNode().parentElement;
+        if (img.caption && parentElement) {
+            const figCaption = this.editor.dom.createHTML('figcaption', {}, img.caption);
+            const combined = newImage + figCaption;
+            if (parentElement.nodeName !== 'FIGURE') {
+                const fragment = this.editor.dom.createHTML('figure', {}, combined);
+                this.editor.selection.setContent(fragment);
+            }
+            else {
+                parentElement.innerHTML = combined;
+            }
+        }
+        else {
+            //if caption is removed, remove the figure element
+            if (parentElement?.nodeName === 'FIGURE' && parentElement.parentElement) {
+                parentElement.parentElement.innerHTML = newImage;
+            }
+            else {
+                this.editor.selection.setContent(newImage);
+            }
+        }
+        // Using settimeout to wait for a DoM-render, so we can find the new element by ID.
+        setTimeout(() => {
+            const imgElm = this.editor.dom.get('__mcenew');
+            if (!imgElm)
+                return;
+            this.editor.dom.setAttrib(imgElm, 'id', null);
+            // When image is loaded we are ready to call sizeImageInEditor.
+            const onImageLoaded = () => {
+                this.#mediaHelper?.sizeImageInEditor(this.editor, imgElm, img.url);
+                this.editor.dispatch('Change');
+            };
+            // Check if image already is loaded.
+            if (imgElm.complete === true) {
+                onImageLoaded();
+            }
+            else {
+                imgElm.onload = onImageLoaded;
+            }
+        });
+    }
+}
+//# sourceMappingURL=tiny-mce-mediapicker.plugin.js.map

package/dist-cms/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tiny-mce-mediapicker.plugin.js","sourceRoot":"","sources":["../../../../../../../src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAC1G,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EACN,2BAA2B,EAE3B,+BAA+B,GAC/B,MAAM,+BAA+B,CAAC;AAoBvC,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,oBAAoB;IAC5E,YAAY,CAAiB;IAC7B,YAAY,CAAmB;IAC/B,aAAa,CAA0B;IACvC,KAAK,CAAwB;IAE7B,YAAY,IAA4B;QACvC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,CAAC,YAAY,GAAG,IAAI,cAAc,EAAE,CAAC;QAEzC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,+BAA+B,EAAE,CAAC,YAAY,EAAE,EAAE;YAC1E,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,+CAA+C;QAC/C,qCAAqC;QACrC,qDAAqD;QACrD,0BAA0B;QAC1B,+BAA+B;QAC/B,MAAM;QAEN,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EAAE;YACnD,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,cAAc;YACvB,4GAA4G;YAC5G,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE;SAChC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO;QAExB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,SAAS;QACd,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACpD,IAAI,aAAa,GAA0B,EAAE,CAAC;QAE9C,IAAI,WAAW,CAAC,QAAQ,KAAK,KAAK,EAAE;YACnC,MAAM,GAAG,GAAG,WAA+B,CAAC;YAC5C,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAC5C,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAEtD,aAAa,GAAG;gBACf,OAAO,EAAE,GAAG,CAAC,GAAG;gBAChB,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO;aAC5B,CAAC;YAEF,IAAI,MAAM,EAAE;gBACX,aAAa,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;aACvC;iBAAM;gBACN,aAAa,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC;aAC3D;YAED,IAAI,aAAa,EAAE;gBAClB,aAAa,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;aAC7C;SACD;QAED,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,aAAoC;QAC1D,IAAI,WAAW,CAAC;QAChB,IAAI,kBAAkB,CAAC;QAEvB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE;YACnD,IAAI,IAAI,CAAC,aAAa,EAAE,eAAe,CAAU,sBAAsB,CAAC,KAAK,IAAI,EAAE;gBAClF,WAAW,GAAG,CAAC,CAAC,CAAC;gBACjB,kBAAkB,GAAG,IAAI,CAAC;aAC1B;iBAAM;gBACN,WAAW,GAAG,IAAI,CAAC,YAAY,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAChH,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC,CAAC;aACxE;SACD;QAED,0FAA0F;QAC1F,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,2BAA2B,EAAE;YAC1E,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;YAC1D,QAAQ,EAAE,KAAK;YACf,cAAc;YACd,qBAAqB;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY;YAAE,OAAO;QAE1B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAC;QACpD,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO;QAE9B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,mGAAmG;IACnG,KAAK,CAAC,eAAe,CAAC,GAAQ;QAC7B,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,sDAAsD;QACtD,wJAAwJ;QACxJ,MAAM,IAAI,GAA0B;YACnC,GAAG,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE;YACtB,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa;YACtC,EAAE,EAAE,UAAU;YACd,UAAU,EAAE,GAAG,CAAC,GAAG;YACnB,cAAc,EAAE,GAAG,CAAC,OAAO;SAC3B,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,IAAqC,CAAC,CAAC;QAC1F,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC;QAEpE,IAAI,GAAG,CAAC,OAAO,IAAI,aAAa,EAAE;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YAC7E,MAAM,QAAQ,GAAG,QAAQ,GAAG,UAAU,CAAC;YAEvC,IAAI,aAAa,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;gBACpE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aAC3C;iBAAM;gBACN,aAAa,CAAC,SAAS,GAAG,QAAQ,CAAC;aACnC;SACD;aAAM;YACN,kDAAkD;YAClD,IAAI,aAAa,EAAE,QAAQ,KAAK,QAAQ,IAAI,aAAa,CAAC,aAAa,EAAE;gBACxE,aAAa,CAAC,aAAa,CAAC,SAAS,GAAG,QAAQ,CAAC;aACjD;iBAAM;gBACN,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aAC3C;SACD;QAED,mFAAmF;QACnF,UAAU,CAAC,GAAG,EAAE;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAqB,CAAC;YACnE,IAAI,CAAC,MAAM;gBAAE,OAAO;YAEpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAE9C,+DAA+D;YAC/D,MAAM,aAAa,GAAG,GAAG,EAAE;gBAC1B,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;gBACnE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChC,CAAC,CAAC;YAEF,oCAAoC;YACpC,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE;gBAC7B,aAAa,EAAE,CAAC;aAChB;iBAAM;gBACN,MAAM,CAAC,MAAM,GAAG,aAAa,CAAC;aAC9B;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;CACD"}

package/dist-cms/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.d.ts

@@ -5,8 +5,9 @@ import { UmbDataTypePropertyCollection } from '../../../components/index.js';
  * @element umb-property-editor-ui-tiny-mce
  */
 export declare class UmbPropertyEditorUITinyMceElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
+    #private;
     value: string;
-    config: UmbDataTypePropertyCollection;
+    set config(config: UmbDataTypePropertyCollection);
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }

package/dist-cms/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.js

@@ -4,10 +4,9 @@ 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 { html, customElement, property } from '../../../../../external/lit/index.js';
 import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { html, customElement, property } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
-import { UmbDataTypePropertyCollection } from '../../../components/index.js';
 /**
  * @element umb-property-editor-ui-tiny-mce
  */
@@ -15,19 +14,29 @@ export let UmbPropertyEditorUITinyMceElement = class UmbPropertyEditorUITinyMceE
     constructor() {
         super(...arguments);
         this.value = '';
-        this.config = new UmbDataTypePropertyCollection();
+    }
+    #configuration;
+    set config(config) {
+        this.#configuration = config;
+    }
+    #onChange(event) {
+        this.value = event.target.value;
+        this.dispatchEvent(new CustomEvent('property-value-change'));
     }
     render() {
-        return html `<div>umb-property-editor-ui-tiny-mce</div>`;
+        return html `<umb-input-tiny-mce
+			@change=${this.#onChange}
+			.configuration=${this.#configuration}
+			.value=${this.value}></umb-input-tiny-mce>`;
     }
     static { this.styles = [UUITextStyles]; }
 };
 __decorate([
-    property()
+    property({ type: String })
 ], UmbPropertyEditorUITinyMceElement.prototype, "value", void 0);
 __decorate([
-    property({ type: Array, attribute: false })
-], UmbPropertyEditorUITinyMceElement.prototype, "config", void 0);
+    property({ attribute: false })
+], UmbPropertyEditorUITinyMceElement.prototype, "config", null);
 UmbPropertyEditorUITinyMceElement = __decorate([
     customElement('umb-property-editor-ui-tiny-mce')
 ], UmbPropertyEditorUITinyMceElement);

package/dist-cms/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.js.map

@@ -1 +1 @@
-{"version":3,"file":"property-editor-ui-tiny-mce.element.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAEnF;;GAEG;AAEI,WAAM,iCAAiC,GAAvC,MAAM,iCAAkC,SAAQ,aAAa;IAA7D;;QAEN,UAAK,GAAG,EAAE,CAAC;QAGJ,WAAM,GAAG,IAAI,6BAA6B,EAAE,CAAC;IAOrD,CAAC;IALA,MAAM;QACL,OAAO,IAAI,CAAA,4CAA4C,CAAC;IACzD,CAAC;aAEM,WAAM,GAAG,CAAC,aAAa,CAAC,AAAlB,CAAmB;;AAThC;IADC,QAAQ,EAAE;gEACA;AAGJ;IADN,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;iEACQ;AALxC,iCAAiC;IAD7C,aAAa,CAAC,iCAAiC,CAAC;GACpC,iCAAiC,CAY7C;AAED,eAAe,iCAAiC,CAAC"}
+{"version":3,"file":"property-editor-ui-tiny-mce.element.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAErF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE;;GAEG;AAEI,WAAM,iCAAiC,GAAvC,MAAM,iCAAkC,SAAQ,aAAa;IAA7D;;QAKN,UAAK,GAAG,EAAE,CAAC;IAoBZ,CAAC;IAvBA,cAAc,CAAiC;IAM/C,IAAW,MAAM,CAAC,MAAqC;QACtD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,KAAiB;QAC1B,IAAI,CAAC,KAAK,GAAI,KAAK,CAAC,MAA2B,CAAC,KAAK,CAAC;QACtD,IAAI,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM;QACL,OAAO,IAAI,CAAA;aACA,IAAI,CAAC,SAAS;oBACP,IAAI,CAAC,cAAc;YAC3B,IAAI,CAAC,KAAK,wBAAwB,CAAC;IAC9C,CAAC;aAEM,WAAM,GAAG,CAAC,aAAa,CAAC,AAAlB,CAAmB;;AAnBhC;IADC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;gEAChB;AAGX;IADC,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;+DAG9B;AAVW,iCAAiC;IAD7C,aAAa,CAAC,iCAAiC,CAAC;GACpC,iCAAiC,CAyB7C;AAED,eAAe,iCAAiC,CAAC"}

package/dist-cms/packages/core/property-editors/uis/toggle/manifests.js

@@ -5,7 +5,7 @@ export const manifest = {
     loader: () => import('./property-editor-ui-toggle.element.js'),
     meta: {
         label: 'Toggle',
-        propertyEditorAlias: 'Umbraco.TrueFalse',
+        propertyEditorSchemaAlias: 'Umbraco.TrueFalse',
         icon: 'umb:checkbox',
         group: 'common',
         settings: {

package/dist-cms/packages/core/property-editors/uis/toggle/manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/toggle/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,6BAA6B;IACpC,IAAI,EAAE,2BAA2B;IACjC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,wCAAwC,CAAC;IAC9D,IAAI,EAAE;QACL,KAAK,EAAE,QAAQ;QACf,mBAAmB,EAAE,mBAAmB;QACxC,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE;YACT,UAAU,EAAE;gBACX;oBACC,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,eAAe;oBACtB,WAAW,EACV,0HAA0H;oBAC3H,qBAAqB,EAAE,6BAA6B;iBACpD;gBACD;oBACC,KAAK,EAAE,YAAY;oBACnB,KAAK,EAAE,oBAAoB;oBAC3B,WAAW,EAAE,oCAAoC;oBACjD,qBAAqB,EAAE,6BAA6B;iBACpD;gBACD;oBACC,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,UAAU;oBACjB,WAAW,EAAE,0BAA0B;oBACvC,qBAAqB,EAAE,8BAA8B;iBACrD;gBACD;oBACC,KAAK,EAAE,UAAU;oBACjB,KAAK,EAAE,WAAW;oBAClB,WAAW,EAAE,2BAA2B;oBACxC,qBAAqB,EAAE,8BAA8B;iBACrD;aACD;SACD;KACD;CACD,CAAC"}
+{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/toggle/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,6BAA6B;IACpC,IAAI,EAAE,2BAA2B;IACjC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,wCAAwC,CAAC;IAC9D,IAAI,EAAE;QACL,KAAK,EAAE,QAAQ;QACf,yBAAyB,EAAE,mBAAmB;QAC9C,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE;YACT,UAAU,EAAE;gBACX;oBACC,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,eAAe;oBACtB,WAAW,EACV,0HAA0H;oBAC3H,qBAAqB,EAAE,6BAA6B;iBACpD;gBACD;oBACC,KAAK,EAAE,YAAY;oBACnB,KAAK,EAAE,oBAAoB;oBAC3B,WAAW,EAAE,oCAAoC;oBACjD,qBAAqB,EAAE,6BAA6B;iBACpD;gBACD;oBACC,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,UAAU;oBACjB,WAAW,EAAE,0BAA0B;oBACvC,qBAAqB,EAAE,8BAA8B;iBACrD;gBACD;oBACC,KAAK,EAAE,UAAU;oBACjB,KAAK,EAAE,WAAW;oBAClB,WAAW,EAAE,2BAA2B;oBACxC,qBAAqB,EAAE,8BAA8B;iBACrD;aACD;SACD;KACD;CACD,CAAC"}

package/dist-cms/packages/core/property-editors/uis/tree-picker/config/start-node/manifests.js

@@ -7,7 +7,7 @@ export const manifest = {
         label: 'Tree Picker Start Node',
         icon: 'umb:page-add',
         group: 'pickers',
-        propertyEditorAlias: '',
+        propertyEditorSchemaAlias: '',
     },
 };
 //# sourceMappingURL=manifests.js.map

package/dist-cms/packages/core/property-editors/uis/tree-picker/config/start-node/manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../../../src/packages/core/property-editors/uis/tree-picker/config/start-node/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,2CAA2C;IAClD,IAAI,EAAE,2CAA2C;IACjD,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,wDAAwD,CAAC;IAC9E,IAAI,EAAE;QACL,KAAK,EAAE,wBAAwB;QAC/B,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,SAAS;QAChB,mBAAmB,EAAE,EAAE;KACvB;CACD,CAAC"}
+{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../../../src/packages/core/property-editors/uis/tree-picker/config/start-node/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,2CAA2C;IAClD,IAAI,EAAE,2CAA2C;IACjD,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,wDAAwD,CAAC;IAC9E,IAAI,EAAE;QACL,KAAK,EAAE,wBAAwB;QAC/B,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,SAAS;QAChB,yBAAyB,EAAE,EAAE;KAC7B;CACD,CAAC"}

package/dist-cms/packages/core/property-editors/uis/tree-picker/manifests.js

@@ -8,7 +8,7 @@ const manifest = {
         label: 'Tree Picker',
         icon: 'umb:page-add',
         group: 'pickers',
-        propertyEditorAlias: 'Umbraco.MultiNodeTreePicker',
+        propertyEditorSchemaAlias: 'Umbraco.MultiNodeTreePicker',
         settings: {
             properties: [
                 {

package/dist-cms/packages/core/property-editors/uis/tree-picker/manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/tree-picker/manifests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAGzE,MAAM,QAAQ,GAA6B;IAC1C,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,iCAAiC;IACxC,IAAI,EAAE,gCAAgC;IACtC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,6CAA6C,CAAC;IACnE,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,SAAS;QAChB,mBAAmB,EAAE,6BAA6B;QAClD,QAAQ,EAAE;YACT,UAAU,EAAE;gBACX;oBACC,KAAK,EAAE,WAAW;oBAClB,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,EAAE;oBACf,qBAAqB,EAAE,2CAA2C;iBAClE;gBACD;oBACC,KAAK,EAAE,QAAQ;oBACf,KAAK,EAAE,qBAAqB;oBAC5B,WAAW,EAAE,EAAE;oBACf,qBAAqB,EAAE,iCAAiC;iBACxD;gBACD;oBACC,KAAK,EAAE,gBAAgB;oBACvB,KAAK,EAAE,kBAAkB;oBACzB,WAAW,EAAE,4BAA4B;oBACzC,qBAAqB,EAAE,6BAA6B;iBACpD;aACD;SACD;KACD;CACD,CAAC;AAEF,MAAM,MAAM,GAAoC,CAAC,SAAS,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC"}
+{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/tree-picker/manifests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAGzE,MAAM,QAAQ,GAA6B;IAC1C,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,iCAAiC;IACxC,IAAI,EAAE,gCAAgC;IACtC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,6CAA6C,CAAC;IACnE,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,SAAS;QAChB,yBAAyB,EAAE,6BAA6B;QACxD,QAAQ,EAAE;YACT,UAAU,EAAE;gBACX;oBACC,KAAK,EAAE,WAAW;oBAClB,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,EAAE;oBACf,qBAAqB,EAAE,2CAA2C;iBAClE;gBACD;oBACC,KAAK,EAAE,QAAQ;oBACf,KAAK,EAAE,qBAAqB;oBAC5B,WAAW,EAAE,EAAE;oBACf,qBAAqB,EAAE,iCAAiC;iBACxD;gBACD;oBACC,KAAK,EAAE,gBAAgB;oBACvB,KAAK,EAAE,kBAAkB;oBACzB,WAAW,EAAE,4BAA4B;oBACzC,qBAAqB,EAAE,6BAA6B;iBACpD;aACD;SACD;KACD;CACD,CAAC;AAEF,MAAM,MAAM,GAAoC,CAAC,SAAS,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC"}

package/dist-cms/packages/core/property-editors/uis/upload-field/manifests.js

@@ -5,7 +5,7 @@ export const manifest = {
     loader: () => import('./property-editor-ui-upload-field.element.js'),
     meta: {
         label: 'Upload Field',
-        propertyEditorAlias: 'Umbraco.UploadField',
+        propertyEditorSchemaAlias: 'Umbraco.UploadField',
         icon: 'umb:download-alt',
         group: 'common',
     },

package/dist-cms/packages/core/property-editors/uis/upload-field/manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/upload-field/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,kCAAkC;IACzC,IAAI,EAAE,iCAAiC;IACvC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,8CAA8C,CAAC;IACpE,IAAI,EAAE;QACL,KAAK,EAAE,cAAc;QACrB,mBAAmB,EAAE,qBAAqB;QAC1C,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,QAAQ;KACf;CACD,CAAC"}
+{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/upload-field/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,kCAAkC;IACzC,IAAI,EAAE,iCAAiC;IACvC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,8CAA8C,CAAC;IACpE,IAAI,EAAE;QACL,KAAK,EAAE,cAAc;QACrB,yBAAyB,EAAE,qBAAqB;QAChD,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,QAAQ;KACf;CACD,CAAC"}

package/dist-cms/packages/core/property-editors/uis/user-picker/manifests.js

@@ -5,7 +5,7 @@ export const manifest = {
     loader: () => import('./property-editor-ui-user-picker.element.js'),
     meta: {
         label: 'User Picker',
-        propertyEditorAlias: 'Umbraco.UserPicker',
+        propertyEditorSchemaAlias: 'Umbraco.UserPicker',
         icon: 'umb:user',
         group: 'people',
     },

package/dist-cms/packages/core/property-editors/uis/user-picker/manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/user-picker/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,iCAAiC;IACxC,IAAI,EAAE,gCAAgC;IACtC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,6CAA6C,CAAC;IACnE,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,mBAAmB,EAAE,oBAAoB;QACzC,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,QAAQ;KACf;CACD,CAAC"}
+{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/user-picker/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,iCAAiC;IACxC,IAAI,EAAE,gCAAgC;IACtC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,6CAA6C,CAAC;IACnE,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,yBAAyB,EAAE,oBAAoB;QAC/C,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,QAAQ;KACf;CACD,CAAC"}

package/dist-cms/packages/core/property-editors/uis/value-type/manifests.js

@@ -7,7 +7,7 @@ export const manifest = {
         label: 'Value Type',
         icon: 'umb:autofill',
         group: 'common',
-        propertyEditorAlias: 'Umbraco.JSON',
+        propertyEditorSchemaAlias: 'Umbraco.JSON',
     },
 };
 //# sourceMappingURL=manifests.js.map

package/dist-cms/packages/core/property-editors/uis/value-type/manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/value-type/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,gCAAgC;IACvC,IAAI,EAAE,+BAA+B;IACrC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,4CAA4C,CAAC;IAClE,IAAI,EAAE;QACL,KAAK,EAAE,YAAY;QACnB,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,QAAQ;QACf,mBAAmB,EAAE,cAAc;KACnC;CACD,CAAC"}
+{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/core/property-editors/uis/value-type/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,gCAAgC;IACvC,IAAI,EAAE,+BAA+B;IACrC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,4CAA4C,CAAC;IAClE,IAAI,EAAE;QACL,KAAK,EAAE,YAAY;QACnB,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,QAAQ;QACf,yBAAyB,EAAE,cAAc;KACzC;CACD,CAAC"}

package/dist-cms/packages/documents/documents/property-editors/Umbraco.ContentPicker.d.ts

@@ -1,2 +1,2 @@
-import type { ManifestPropertyEditorModel } from '../../../core/extension-registry/index.js';
-export declare const manifest: ManifestPropertyEditorModel;
+import type { ManifestPropertyEditorSchema } from '../../../core/extension-registry/index.js';
+export declare const manifest: ManifestPropertyEditorSchema;

package/dist-cms/packages/documents/documents/property-editors/Umbraco.ContentPicker.js

@@ -1,5 +1,5 @@
 export const manifest = {
-    type: 'propertyEditorModel',
+    type: 'propertyEditorSchema',
     name: 'Content Picker',
     alias: 'Umbraco.ContentPicker',
     meta: {

package/dist-cms/packages/documents/documents/property-editors/Umbraco.ContentPicker.js.map

@@ -1 +1 @@
-{"version":3,"file":"Umbraco.ContentPicker.js","sourceRoot":"","sources":["../../../../../src/packages/documents/documents/property-editors/Umbraco.ContentPicker.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAAgC;IACpD,IAAI,EAAE,qBAAqB;IAC3B,IAAI,EAAE,gBAAgB;IACtB,KAAK,EAAE,uBAAuB;IAC9B,IAAI,EAAE;QACL,4BAA4B,EAAE,oCAAoC;QAClE,QAAQ,EAAE;YACT,UAAU,EAAE;gBACX;oBACC,KAAK,EAAE,aAAa;oBACpB,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,EAAE;oBACf,qBAAqB,EAAE,iCAAiC;iBACxD;aACD;SACD;KACD;CACD,CAAC"}
+{"version":3,"file":"Umbraco.ContentPicker.js","sourceRoot":"","sources":["../../../../../src/packages/documents/documents/property-editors/Umbraco.ContentPicker.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAAiC;IACrD,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE,gBAAgB;IACtB,KAAK,EAAE,uBAAuB;IAC9B,IAAI,EAAE;QACL,4BAA4B,EAAE,oCAAoC;QAClE,QAAQ,EAAE;YACT,UAAU,EAAE;gBACX;oBACC,KAAK,EAAE,aAAa;oBACpB,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,EAAE;oBACf,qBAAqB,EAAE,iCAAiC;iBACxD;aACD;SACD;KACD;CACD,CAAC"}

package/dist-cms/packages/documents/documents/property-editors/document-picker/manifests.js

@@ -5,7 +5,7 @@ export const manifest = {
     loader: () => import('./property-editor-ui-document-picker.element.js'),
     meta: {
         label: 'Document Picker',
-        propertyEditorAlias: 'Umbraco.ContentPicker',
+        propertyEditorSchemaAlias: 'Umbraco.ContentPicker',
         icon: 'umb:document',
         group: 'common',
         settings: {

package/dist-cms/packages/documents/documents/property-editors/document-picker/manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/documents/documents/property-editors/document-picker/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,qCAAqC;IAC5C,IAAI,EAAE,oCAAoC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,iDAAiD,CAAC;IACvE,IAAI,EAAE;QACL,KAAK,EAAE,iBAAiB;QACxB,mBAAmB,EAAE,uBAAuB;QAC5C,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE;YACT,UAAU,EAAE;gBACX;oBACC,KAAK,EAAE,gBAAgB;oBACvB,KAAK,EAAE,kBAAkB;oBACzB,WAAW,EAAE,4BAA4B;oBACzC,qBAAqB,EAAE,6BAA6B;iBACpD;gBACD;oBACC,KAAK,EAAE,iBAAiB;oBACxB,KAAK,EAAE,qBAAqB;oBAC5B,WAAW,EAAE,uCAAuC;oBACpD,qBAAqB,EAAE,kCAAkC;iBACzD;gBACD;oBACC,KAAK,EAAE,sBAAsB;oBAC7B,KAAK,EAAE,yBAAyB;oBAChC,WAAW,EAAE,4FAA4F;oBACzG,qBAAqB,EAAE,6BAA6B;iBACpD;aACD;SACD;KACD;CACD,CAAC"}
+{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../../src/packages/documents/documents/property-editors/document-picker/manifests.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAA6B;IACjD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,qCAAqC;IAC5C,IAAI,EAAE,oCAAoC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,iDAAiD,CAAC;IACvE,IAAI,EAAE;QACL,KAAK,EAAE,iBAAiB;QACxB,yBAAyB,EAAE,uBAAuB;QAClD,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE;YACT,UAAU,EAAE;gBACX;oBACC,KAAK,EAAE,gBAAgB;oBACvB,KAAK,EAAE,kBAAkB;oBACzB,WAAW,EAAE,4BAA4B;oBACzC,qBAAqB,EAAE,6BAA6B;iBACpD;gBACD;oBACC,KAAK,EAAE,iBAAiB;oBACxB,KAAK,EAAE,qBAAqB;oBAC5B,WAAW,EAAE,uCAAuC;oBACpD,qBAAqB,EAAE,kCAAkC;iBACzD;gBACD;oBACC,KAAK,EAAE,sBAAsB;oBAC7B,KAAK,EAAE,yBAAyB;oBAChC,WAAW,EAAE,4FAA4F;oBACzG,qBAAqB,EAAE,6BAA6B;iBACpD;aACD;SACD;KACD;CACD,CAAC"}

package/dist-cms/packages/media/media/repository/media.repository.js

@@ -6,40 +6,28 @@ import { UmbContextConsumerController } from '../../../../libs/context-api/index
 import { UMB_NOTIFICATION_CONTEXT_TOKEN } from '../../../core/notification/index.js';
 export class UmbMediaRepository {
     #host;
+    #init;
     #treeSource;
     #treeStore;
     #detailDataSource;
     #store;
     #notificationContext;
-    #initResolver;
-    #initialized = false;
     constructor(host) {
         this.#host = host;
         // TODO: figure out how spin up get the correct data source
         this.#treeSource = new UmbMediaTreeServerDataSource(this.#host);
         this.#detailDataSource = new UmbMediaDetailServerDataSource(this.#host);
-        new UmbContextConsumerController(this.#host, UMB_MEDIA_TREE_STORE_CONTEXT_TOKEN, (instance) => {
-            this.#treeStore = instance;
-            this.#checkIfInitialized();
-        });
-        new UmbContextConsumerController(this.#host, UMB_MEDIA_STORE_CONTEXT_TOKEN, (instance) => {
-            this.#store = instance;
-            this.#checkIfInitialized();
-        });
-        new UmbContextConsumerController(this.#host, UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
-            this.#notificationContext = instance;
-            this.#checkIfInitialized();
-        });
-    }
-    // TODO: make a generic way to wait for initialization
-    #init = new Promise((resolve) => {
-        this.#initialized ? resolve() : (this.#initResolver = resolve);
-    });
-    #checkIfInitialized() {
-        if (this.#treeStore && this.#store && this.#notificationContext) {
-            this.#initialized = true;
-            this.#initResolver?.();
-        }
+        this.#init = Promise.all([
+            new UmbContextConsumerController(this.#host, UMB_MEDIA_TREE_STORE_CONTEXT_TOKEN, (instance) => {
+                this.#treeStore = instance;
+            }).asPromise(),
+            new UmbContextConsumerController(this.#host, UMB_MEDIA_STORE_CONTEXT_TOKEN, (instance) => {
+                this.#store = instance;
+            }).asPromise(),
+            new UmbContextConsumerController(this.#host, UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
+                this.#notificationContext = instance;
+            }).asPromise(),
+        ]);
     }
     // TREE:
     async requestTreeRoot() {