@umbraco-cms/backoffice 14.0.0--preview004-5857d7ce → 14.0.0--preview004-ada18684

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

@@ -17,7 +17,7 @@ export let UmbCodeEditorModalElement = class UmbCodeEditorModalElement extends U
         this.#loadCodeEditor();
     }
     #handleConfirm() {
-        this.modalContext?.submit({ content: this.data?.content ?? '' });
+        this.modalContext?.submit({ content: this._codeEditor?.editor?.monacoEditor?.getValue() ?? '' });
     }
     #handleCancel() {
         this.modalContext?.reject();
@@ -31,19 +31,10 @@ export let UmbCodeEditorModalElement = class UmbCodeEditorModalElement extends U
             console.error(error);
         }
     }
-    // TODO => debounce?
-    #onCodeEditorInput(e) {
-        e.preventDefault();
-        if (!this.data) {
-            return;
-        }
-        this.data.content = this._codeEditor?.code ?? '';
-    }
     #renderCodeEditor() {
         return html `<umb-code-editor
 			language=${ifDefined(this.data?.language)}
-			.code=${this.data?.content ?? ''}
-			@input=${this.#onCodeEditorInput}></umb-code-editor>`;
+			.code=${this.data?.content ?? ''}></umb-code-editor>`;
     }
     #renderLoading() {
         return html `<div id="loader-container">

package/dist-cms/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-linkpicker.plugin.js

@@ -42,27 +42,25 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
             data.text = ' ';
         }
         if (!this.#anchorElement) {
-            this.#openLinkPicker();
+            this.#openLinkPicker({ name: this.editor.selection.getContent() });
             return;
         }
         //if we already have a link selected, we want to pass that data over to the dialog
         const currentTarget = {
-            name: this.#anchorElement.title,
-            url: this.#anchorElement.getAttribute('href') ?? '',
+            name: this.#anchorElement.title || this.#anchorElement.textContent,
             target: this.#anchorElement.target,
+            queryString: `${this.#anchorElement.search}${this.#anchorElement.hash}`,
         };
-        // drop the lead char from the anchor text, if it has a value
-        const anchorVal = this.#anchorElement.dataset.anchor;
-        if (anchorVal) {
-            currentTarget.queryString = anchorVal.substring(1);
+        if (this.#anchorElement.href.includes('localLink:')) {
+            const href = this.#anchorElement.getAttribute('href');
+            currentTarget.udi = href.split('localLink:')[1].slice(0, -1);
         }
-        if (currentTarget.url?.includes('localLink:')) {
-            currentTarget.udi =
-                currentTarget.url?.substring(currentTarget.url.indexOf(':') + 1, currentTarget.url.lastIndexOf('}')) ?? '';
+        else if (this.#anchorElement.host.length) {
+            currentTarget.url = this.#anchorElement.protocol ? this.#anchorElement.protocol + '//' : undefined;
+            currentTarget.url += this.#anchorElement.host + this.#anchorElement.pathname;
         }
         this.#openLinkPicker(currentTarget);
     }
-    // TODO => get anchors to provide to link picker?
     async #openLinkPicker(currentTarget) {
         const modalHandler = this.#modalContext?.open(UMB_LINK_PICKER_MODAL, {
             config: {
@@ -73,7 +71,7 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
         });
         if (!modalHandler)
             return;
-        const linkPickerData = await modalHandler.onSubmit();
+        const linkPickerData = await modalHandler.onSubmit().catch(() => undefined);
         if (!linkPickerData)
             return;
         this.#linkPickerData = linkPickerData;
@@ -82,12 +80,17 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
     //Create a json obj used to create the attributes for the tag
     // TODO => where has rel gone?
     #createElemAttributes() {
-        const a = Object.assign({}, this.#linkPickerData?.link, { 'data-anchor': null });
+        // Attribute 'name' because of linkPickerData. It should be 'title' .
+        const { name, ...linkPickerData } = this.#linkPickerData.link;
+        const a = Object.assign({}, linkPickerData);
         // always need to map back to href for tinymce to render correctly
         // do this first as checking querystring below may modify the href property
         if (this.#linkPickerData?.link.url) {
             a.href = this.#linkPickerData.link.url;
         }
+        if (this.#linkPickerData?.link.name) {
+            a.title = name;
+        }
         if (this.#linkPickerData?.link.queryString?.startsWith('#')) {
             a['data-anchor'] = this.#linkPickerData?.link.queryString;
             a.href += this.#linkPickerData?.link.queryString;
@@ -136,7 +139,7 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
                 this.#linkPickerData.link.queryString = urlParts[1] + urlParts[2];
             }
         }
-        if (!this.#linkPickerData?.link.url && !this.#linkPickerData?.link.queryString) {
+        if (!this.#linkPickerData?.link.url && !this.#linkPickerData?.link.queryString && !this.#linkPickerData?.link.udi) {
             this.editor.execCommand('unlink');
             return;
         }

package/dist-cms/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.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 { UmbTextStyles } from "../../../../../shared/style/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';
 /**