@umbraco-cms/backoffice 18.1.1 → 18.2.0-rc

package/dist-cms/packages/tiptap/extensions/block/block.tiptap-api.js

@@ -59,7 +59,13 @@ export default class UmbTiptapBlockElementApi extends UmbTiptapExtensionApiBase
         if (!editor)
             return;
         // Find existing blocks in the editor
-        const existingBlocks = Array.from(editor.view.dom.querySelectorAll('umb-rte-block, umb-rte-block-inline')).map((x) => x.getAttribute(UMB_BLOCK_RTE_DATA_CONTENT_KEY));
+        const existingBlocks = [];
+        editor.state.doc.descendants((node) => {
+            const contentKey = node.attrs[UMB_BLOCK_RTE_DATA_CONTENT_KEY];
+            if (contentKey)
+                existingBlocks.push(contentKey);
+            return true;
+        });
         // ADD blocks that are in contents but NOT in editor
         const newBlocks = contents.filter((x) => !existingBlocks.includes(x.key));
         newBlocks.forEach((block) => {

package/dist-cms/packages/tiptap/extensions/bubble-menu/bubble-menu.tiptap-extension.d.ts

@@ -27,5 +27,10 @@ export type UmbTiptapBubbleMenuPluginProps = {
 export type UmbBubbleMenuOptions = UmbTiptapBubbleMenuPluginProps;
 /** @deprecated No longer used internally. This will be removed in Umbraco 19. [LK] */
 export declare const UmbBubbleMenu: Extension<UmbTiptapBubbleMenuPluginProps, any>;
-/** @deprecated No longer used internally. This will be removed in Umbraco 19. [LK] */
+/**
+ * @param {Editor} editor - The Tiptap editor instance
+ * @param {UmbTiptapBubbleMenuPluginProps} props - The bubble menu plugin options
+ * @returns {Plugin} The ProseMirror plugin
+ * @deprecated No longer used internally. This will be removed in Umbraco 19. [LK]
+ */
 export declare const UmbBubbleMenuPlugin: (editor: Editor, props: UmbTiptapBubbleMenuPluginProps) => Plugin<any>;

package/dist-cms/packages/tiptap/extensions/bubble-menu/bubble-menu.tiptap-extension.js

@@ -67,7 +67,12 @@ class UmbBubbleMenuPluginView {
         this.#popover.remove();
     }
 }
-/** @deprecated No longer used internally. This will be removed in Umbraco 19. [LK] */
+/**
+ * @param {Editor} editor - The Tiptap editor instance
+ * @param {UmbTiptapBubbleMenuPluginProps} props - The bubble menu plugin options
+ * @returns {Plugin} The ProseMirror plugin
+ * @deprecated No longer used internally. This will be removed in Umbraco 19. [LK]
+ */
 export const UmbBubbleMenuPlugin = (editor, props) => {
     return new Plugin({
         view(editorView) {

package/dist-cms/packages/tiptap/extensions/embedded-media/embedded-media.tiptap-extension.js

@@ -25,8 +25,15 @@ export const umbEmbeddedMedia = Node.create({
     },
     renderHTML({ HTMLAttributes }) {
         const { markup, ...attrs } = HTMLAttributes;
-        const embed = document.createRange().createContextualFragment(markup);
-        return [this.options.inline ? 'span' : 'div', mergeAttributes({ class: 'umb-embed-holder' }, attrs), embed];
+        const dom = document.createElement(this.options.inline ? 'span' : 'div');
+        for (const [name, value] of Object.entries(mergeAttributes({ class: 'umb-embed-holder' }, attrs))) {
+            if (value != null)
+                dom.setAttribute(name, value);
+        }
+        if (markup) {
+            dom.append(document.createRange().createContextualFragment(markup));
+        }
+        return dom;
     },
     addCommands() {
         return {

package/dist-cms/packages/tiptap/extensions/html-attr-class/html-attr-class.tiptap-api.js

@@ -11,6 +11,7 @@ export default class UmbTiptapHtmlAttributeClassExtensionApi extends UmbTiptapEx
                     'bulletList',
                     'codeBlock',
                     'div',
+                    'divContainer',
                     'figcaption',
                     'figure',
                     'heading',

package/dist-cms/packages/tiptap/extensions/html-attr-dataset/html-attr-dataset.tiptap-api.js

@@ -11,6 +11,7 @@ export default class UmbTiptapHtmlAttributeDatasetExtensionApi extends UmbTiptap
                     'bulletList',
                     'codeBlock',
                     'div',
+                    'divContainer',
                     'figcaption',
                     'figure',
                     'heading',

package/dist-cms/packages/tiptap/extensions/html-attr-dataset/html-attr-dataset.tiptap-extension.js

@@ -18,7 +18,18 @@ export const HtmlDatasetAttributes = Extension.create({
                 types: this.options.types,
                 attributes: {
                     dataset: {
-                        parseHTML: (element) => element.dataset,
+                        parseHTML: (element) => {
+                            const dataset = { ...element.dataset };
+                            // Umbraco stamps `data-router-slot="disabled"` onto the live anchor only, to stop the
+                            // backoffice's SPA router intercepting clicks (see `link.tiptap-extension.ts`). Dropping
+                            // it here keeps it out of the document, so it is never serialized back into the stored
+                            // markup and existing content self-heals on re-save. Any other element or value is
+                            // authored content and round-trips untouched. (#22654) [LK]
+                            if (element instanceof HTMLAnchorElement && dataset.routerSlot === 'disabled') {
+                                delete dataset.routerSlot;
+                            }
+                            return dataset;
+                        },
                         renderHTML: (attributes) => {
                             const keys = attributes.dataset ? Object.keys(attributes.dataset) : [];
                             if (!keys.length)

package/dist-cms/packages/tiptap/extensions/html-attr-id/html-attr-id.tiptap-api.js

@@ -11,6 +11,7 @@ export default class UmbTiptapHtmlAttributeIdExtensionApi extends UmbTiptapExten
                     'bulletList',
                     'codeBlock',
                     'div',
+                    'divContainer',
                     'figcaption',
                     'figure',
                     'heading',

package/dist-cms/packages/tiptap/extensions/html-attr-style/html-attr-style.tiptap-api.js

@@ -11,6 +11,7 @@ export default class UmbTiptapHtmlAttributeStyleExtensionApi extends UmbTiptapEx
                     'bulletList',
                     'codeBlock',
                     'div',
+                    'divContainer',
                     'figcaption',
                     'figure',
                     'heading',

package/dist-cms/packages/tiptap/extensions/html-tag-div/html-tag-div-container.tiptap-extension.d.ts

@@ -0,0 +1,18 @@
+import { Node } from '../../externals.js';
+export interface UmbTiptapHtmlTagDivContainerOptions {
+    /**
+     * HTML attributes to add to the element.
+     * @default {}
+     * @example { class: 'foo' }
+     */
+    HTMLAttributes: Record<string, any>;
+}
+/**
+ * A `<div>` node that contains block-level content (e.g. paragraphs, lists, headings).
+ *
+ * Registered alongside the inline-only `div` node (`html-tag-div.tiptap-extension.ts`) at a higher
+ * parse priority: a `<div>` with at least one block-level child element is claimed by this node, so
+ * its nested block content is preserved instead of being lifted out of the div (#22654). A `<div>`
+ * with no block-level children falls through to the inline `div` node.
+ */
+export declare const DivContainer: Node<UmbTiptapHtmlTagDivContainerOptions, any>;

package/dist-cms/packages/tiptap/extensions/html-tag-div/html-tag-div-container.tiptap-extension.js

@@ -0,0 +1,76 @@
+import { Node, mergeAttributes } from '../../externals.js';
+const BLOCK_TAGS = new Set([
+    'div',
+    'p',
+    'ul',
+    'ol',
+    'table',
+    'blockquote',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'hr',
+    'figure',
+    'pre',
+    'section',
+    'article',
+    'aside',
+    'header',
+    'footer',
+    'nav',
+    'main',
+    'address',
+    'dl',
+    'form',
+    'fieldset',
+    'umb-rte-block',
+]);
+/**
+ * Whether `element` has at least one direct child element that is block-level.
+ *
+ * Only checks direct children, so tags that can only ever appear nested inside another
+ * `BLOCK_TAGS` entry (e.g. `li` inside `ul`/`ol`, `tr`/`td`/`th`/`thead`/`tbody`/`tfoot` inside
+ * `table`, `dt`/`dd` inside `dl`, `figcaption` inside `figure`) are omitted from `BLOCK_TAGS`
+ * since their container is what would actually surface as the direct child.
+ *
+ * `umb-rte-block` is included since it belongs to the `block` node group (`block.tiptap-extension.ts`);
+ * its inline counterpart `umb-rte-block-inline` belongs to the `inline` group, so a `<div>` wrapping
+ * only that is correctly left to the inline `div` node.
+ * @param {HTMLElement} element The element whose direct children are checked.
+ * @returns {boolean} Returns true if at least one direct child element is block-level.
+ */
+function hasBlockLevelChild(element) {
+    return Array.from(element.children).some((child) => BLOCK_TAGS.has(child.tagName.toLowerCase()));
+}
+/**
+ * A `<div>` node that contains block-level content (e.g. paragraphs, lists, headings).
+ *
+ * Registered alongside the inline-only `div` node (`html-tag-div.tiptap-extension.ts`) at a higher
+ * parse priority: a `<div>` with at least one block-level child element is claimed by this node, so
+ * its nested block content is preserved instead of being lifted out of the div (#22654). A `<div>`
+ * with no block-level children falls through to the inline `div` node.
+ */
+export const DivContainer = Node.create({
+    name: 'divContainer',
+    priority: 60,
+    group: 'block',
+    content: 'block+',
+    defining: true,
+    addOptions() {
+        return { HTMLAttributes: {} };
+    },
+    parseHTML() {
+        return [
+            {
+                tag: 'div',
+                getAttrs: (element) => (hasBlockLevelChild(element) ? {} : false),
+            },
+        ];
+    },
+    renderHTML({ HTMLAttributes }) {
+        return ['div', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0];
+    },
+});

package/dist-cms/packages/tiptap/extensions/html-tag-div/html-tag-div.tiptap-api.js

@@ -1,8 +1,9 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
 import { Div } from './html-tag-div.tiptap-extension.js';
+import { DivContainer } from './html-tag-div-container.tiptap-extension.js';
 export default class UmbTiptapHtmlTagDivExtensionApi extends UmbTiptapExtensionApiBase {
     constructor() {
         super(...arguments);
-        this.getTiptapExtensions = () => [Div];
+        this.getTiptapExtensions = () => [Div, DivContainer];
     }
 }

package/dist-cms/packages/tiptap/extensions/html-tag-div/index.d.ts

@@ -1 +1,2 @@
 export * from './html-tag-div.tiptap-extension.js';
+export * from './html-tag-div-container.tiptap-extension.js';

package/dist-cms/packages/tiptap/extensions/html-tag-div/index.js

@@ -1 +1,2 @@
 export * from './html-tag-div.tiptap-extension.js';
+export * from './html-tag-div-container.tiptap-extension.js';

package/dist-cms/packages/tiptap/extensions/link/link.tiptap-extension.js

@@ -1,6 +1,4 @@
 import { Link } from '../../externals.js';
-// TODO: [LK] Look to use a NodeView to render the link, so that we remove the `data-router-slot` attribute from the HTML value.
-// https://tiptap.dev/docs/editor/extensions/custom-extensions/node-views/javascript
 export const UmbLink = Link.extend({
     name: 'umbLink',
     addAttributes() {
@@ -20,9 +18,26 @@ export const UmbLink = Link.extend({
     addOptions() {
         return {
             ...this.parent?.(),
-            HTMLAttributes: {
-                'data-router-slot': 'disabled',
-            },
+            // Empty (not omitted): the parent Link extension's own addOptions() defaults `HTMLAttributes` to
+            // `{ target: '_blank', rel: 'noopener noreferrer nofollow', class: null }`, which addAttributes()
+            // then uses as the schema-level default for each link's own `rel`/`target`/`class` attrs. Overriding
+            // with `{}` here keeps those attributes unset by default, same as before `data-router-slot` moved
+            // to the MarkView below.
+            HTMLAttributes: {},
+        };
+    },
+    // Renders the live anchor by hand so `data-router-slot="disabled"` (needed to stop the backoffice's
+    // SPA router intercepting clicks on RTE-authored links) stays a live-DOM-only concern and never leaks
+    // into the serialized/stored HTML via `renderHTML` (#22654).
+    addMarkView() {
+        return ({ HTMLAttributes }) => {
+            const dom = document.createElement('a');
+            Object.entries(HTMLAttributes).forEach(([key, value]) => {
+                if (value != null)
+                    dom.setAttribute(key, value);
+            });
+            dom.dataset.routerSlot = 'disabled';
+            return { dom };
         };
     },
     addCommands() {

package/dist-cms/packages/tiptap/extensions/link/link.tiptap-toolbar-api.js

@@ -82,7 +82,8 @@ export default class UmbTiptapToolbarLinkExtensionApi extends UmbTiptapToolbarEl
     }
     /**
      * If the URL is prefixed "www.", then prepend "http://" protocol scheme.
-     * @param url
+     * @param {string | null | undefined} url - The URL to check
+     * @returns {string | null} The URL with the protocol scheme prepended, if applicable
      */
     #ensureHttpProtocol(url) {
         if (!url)
@@ -94,7 +95,8 @@ export default class UmbTiptapToolbarLinkExtensionApi extends UmbTiptapToolbarEl
     }
     /**
      * If the URL is an email address, then prepend "mailto:" protocol scheme.
-     * @param url
+     * @param {string | null | undefined} url - The URL to check
+     * @returns {string | null} The URL with the "mailto:" scheme prepended, if applicable
      */
     #transformURLToMailto(url) {
         if (!url)
@@ -106,7 +108,8 @@ export default class UmbTiptapToolbarLinkExtensionApi extends UmbTiptapToolbarEl
     }
     /**
      * If the URL contains an anchor, then return the anchor.
-     * @param queryString
+     * @param {string | null} queryString - The query string to check
+     * @returns {string | null} The anchor, if present
      */
     #getAnchorFromQueryString(queryString) {
         if (!queryString)
@@ -115,7 +118,8 @@ export default class UmbTiptapToolbarLinkExtensionApi extends UmbTiptapToolbarEl
     }
     /**
      * If the query string does not start with "?" or "#", then prepend it.
-     * @param queryString
+     * @param {string | null | undefined} queryString - The query string to normalize
+     * @returns {string | null} The normalized query string
      */
     #queryStringFromUrl(queryString) {
         if (!queryString)

package/dist-cms/packages/tiptap/extensions/table/components/table-toolbar-menu.element.d.ts

@@ -1,6 +1,8 @@
 import { UmbTiptapToolbarMenuElement } from '../../../components/toolbar/tiptap-toolbar-menu.element.js';
+import type { PropertyValues } from '../../../../../external/lit/index.js';
 import './table-insert.element.js';
 export declare class UmbTiptapTableToolbarMenuElement extends UmbTiptapToolbarMenuElement {
+    protected updated(changedProperties: PropertyValues): void;
     render(): import("lit-html").TemplateResult<1>;
 }
 export { UmbTiptapTableToolbarMenuElement as element };

package/dist-cms/packages/tiptap/extensions/table/components/table-toolbar-menu.element.js

@@ -8,6 +8,15 @@ import { UmbTiptapToolbarMenuElement } from '../../../components/toolbar/tiptap-
 import { customElement, html, ifDefined, when } from '../../../../../external/lit/index.js';
 import './table-insert.element.js';
 let UmbTiptapTableToolbarMenuElement = class UmbTiptapTableToolbarMenuElement extends UmbTiptapToolbarMenuElement {
+    updated(changedProperties) {
+        super.updated(changedProperties);
+        if (changedProperties.has('isActive') && !this.isActive) {
+            const popover = this.shadowRoot?.getElementById('popover-menu');
+            if (popover?.matches(':popover-open')) {
+                popover.hidePopover();
+            }
+        }
+    }
     render() {
         const label = this.localize.string(this.manifest?.meta.label);
         return html `

package/dist-cms/packages/tiptap/extensions/text-indent/text-indent.tiptap-api.js

@@ -5,7 +5,7 @@ export default class UmbTiptapTextIndentExtensionApi extends UmbTiptapExtensionA
         super(...arguments);
         this.getTiptapExtensions = () => [
             TextIndent.configure({
-                types: ['div', 'heading', 'paragraph', 'blockquote', 'listItem', 'orderedList', 'bulletList'],
+                types: ['div', 'divContainer', 'heading', 'paragraph', 'blockquote', 'listItem', 'orderedList', 'bulletList'],
             }),
         ];
     }

package/dist-cms/packages/tiptap/extensions/types.d.ts

@@ -29,7 +29,7 @@ export interface UmbTiptapExtensionArgs {
     /**
      * The data type configuration for the property editor that the editor is used for.
      * You can populate this manually if you are using the editor outside of a property editor with the {@link UmbPropertyEditorConfigCollection} object.
-     * @remark This is only available when the editor is used in a property editor or populated manually.
+     * @remarks This is only available when the editor is used in a property editor or populated manually.
      */
     configuration?: UmbPropertyEditorConfigCollection;
 }

package/dist-cms/packages/tiptap/package.json

@@ -6,15 +6,15 @@
         "build": "vite build"
     },
     "dependencies": {
-        "@tiptap/core": "3.22.3",
-        "@tiptap/extension-image": "3.22.3",
-        "@tiptap/extension-subscript": "3.22.3",
-        "@tiptap/extension-superscript": "3.22.3",
-        "@tiptap/extension-table": "3.22.3",
-        "@tiptap/extension-text-align": "3.22.3",
-        "@tiptap/extension-text-style": "3.22.3",
-        "@tiptap/starter-kit": "3.22.3",
-        "@tiptap/extensions": "3.22.3",
-        "@tiptap/pm": "3.22.3"
+        "@tiptap/core": "3.29.2",
+        "@tiptap/extension-image": "3.29.2",
+        "@tiptap/extension-subscript": "3.29.2",
+        "@tiptap/extension-superscript": "3.29.2",
+        "@tiptap/extension-table": "3.29.2",
+        "@tiptap/extension-text-align": "3.29.2",
+        "@tiptap/extension-text-style": "3.29.2",
+        "@tiptap/starter-kit": "3.29.2",
+        "@tiptap/extensions": "3.29.2",
+        "@tiptap/pm": "3.29.2"
     }
 }

package/dist-cms/packages/tiptap/property-editors/extensions-configuration/property-editor-ui-tiptap-extensions-configuration.element.d.ts

@@ -10,7 +10,7 @@ export declare class UmbPropertyEditorUiTiptapExtensionsConfigurationElement ext
     private _groups;
     constructor();
     protected firstUpdated(_changedProperties: PropertyValueMap<unknown>): Promise<void>;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static readonly styles: import("lit").CSSResult[];
 }
 export { UmbPropertyEditorUiTiptapExtensionsConfigurationElement as element };

package/dist-cms/packages/tiptap/property-editors/statusbar-configuration/property-editor-ui-tiptap-statusbar-configuration.element.js

@@ -9,6 +9,7 @@ import { customElement, css, html, property, when, repeat, nothing, state } from
 import { debounce } from '../../../core/utils/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
 import { UMB_PROPERTY_CONTEXT } from '../../../core/property/index.js';
+const UMB_TIPTAP_STATUSBAR_ITEM_DRAG_TYPE = 'text/umb-tiptap-statusbar-item';
 let UmbPropertyEditorUiTiptapStatusbarConfigurationElement = class UmbPropertyEditorUiTiptapStatusbarConfigurationElement extends UmbLitElement {
     #context;
     #currentDragItem;
@@ -64,26 +65,36 @@ let UmbPropertyEditorUiTiptapStatusbarConfigurationElement = class UmbPropertyEd
         const lastItem = this.#value?.[lastArea].length ?? 0;
         this.#context.insertStatusbarItem(item.alias, [lastArea, lastItem]);
     }
+    #isOwnDragItem(event) {
+        return event.dataTransfer?.types.includes(UMB_TIPTAP_STATUSBAR_ITEM_DRAG_TYPE) === true;
+    }
     #onDragStart(event, alias, fromPos) {
         event.dataTransfer.effectAllowed = 'move';
+        event.dataTransfer.setData(UMB_TIPTAP_STATUSBAR_ITEM_DRAG_TYPE, alias);
         this.#currentDragItem = { alias, fromPos };
     }
     #onDragOver(event) {
+        if (!this.#isOwnDragItem(event))
+            return;
         event.preventDefault();
         event.dataTransfer.dropEffect = 'move';
     }
     #onDragEnd(event) {
         event.preventDefault();
-        if (event.dataTransfer?.dropEffect === 'none') {
-            const { fromPos } = this.#currentDragItem ?? {};
-            if (!fromPos)
-                return;
+        const { fromPos } = this.#currentDragItem ?? {};
+        this.#currentDragItem = undefined;
+        if (event.dataTransfer?.dropEffect === 'none' && fromPos) {
             this.#context.removeStatusbarItem(fromPos);
         }
     }
     #onDrop(event, toPos) {
+        // An area can also receive a drag of the toolbar designer, which sits alongside this one. Acting on one of
+        // those would re-insert the item of the preceding drag. (#23524)
+        if (!this.#isOwnDragItem(event))
+            return;
         event.preventDefault();
         const { alias, fromPos } = this.#currentDragItem ?? {};
+        this.#currentDragItem = undefined;
         // Remove item if no destination position is provided
         if (fromPos && !toPos) {
             this.#context.removeStatusbarItem(fromPos);
@@ -169,7 +180,7 @@ let UmbPropertyEditorUiTiptapStatusbarConfigurationElement = class UmbPropertyEd
 				class="area"
 				dropzone="move"
 				@dragover=${this.#onDragOver}
-				@drop=${(e) => this.#onDrop(e, [areaIndex, area.data.length - 1])}>
+				@drop=${(e) => this.#onDrop(e, [areaIndex, area.data.length])}>
 				<div class="items">
 					${when(area?.data.length === 0, () => html `<em><umb-localize key="tiptap_toolbar_emptyGroup">Empty</umb-localize></em>`, () => html `${area.data.map((alias, idx) => this.#renderItem(alias, areaIndex, idx))}`)}
 				</div>

package/dist-cms/packages/tiptap/property-editors/statusbar-configuration/tiptap-statusbar-configuration.context.js

@@ -33,7 +33,7 @@ export class UmbTiptapStatusbarConfigurationContext extends UmbContextBase {
             }));
             this.#extensions.setValue(_extensions);
             this.#lookup = new Map(_extensions.map((ext) => [ext.alias, ext]));
-        });
+        }, null);
         this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, async (dataset) => {
             this.observe(await dataset?.propertyValueByAlias('extensions'), (extensions) => {
                 if (extensions) {
@@ -123,8 +123,17 @@ export class UmbTiptapStatusbarConfigurationContext extends UmbContextBase {
             value = [[], value[0]];
         }
         this.#extensionsInUse.clear();
-        value.forEach((area) => area.forEach((alias) => this.#extensionsInUse.add(alias)));
-        const statusbar = value.map((area) => ({ unique: UmbId.new(), data: area }));
+        // An extension can only be used once, so any repeat occurrence is dropped rather than carried along. (#23524)
+        const statusbar = value.map((area) => {
+            const aliases = [];
+            for (const alias of area) {
+                if (this.#extensionsInUse.has(alias))
+                    continue;
+                this.#extensionsInUse.add(alias);
+                aliases.push(alias);
+            }
+            return { unique: UmbId.new(), data: aliases };
+        });
         this.#statusbar.setValue(statusbar);
     }
 }

package/dist-cms/packages/tiptap/property-editors/tiptap-rte/property-editor-ui-tiptap.element.d.ts

@@ -1,11 +1,15 @@
 import { UmbPropertyEditorUiRteElementBase } from '../../../rte/index.js';
 import type { PropertyValueMap } from '../../../../external/lit/index.js';
+import type { UmbPropertyEditorConfigCollection } from '../../../core/property-editor/index.js';
 import '../../components/input-tiptap/input-tiptap.element.js';
 /**
  * @element umb-property-editor-ui-tiptap
  */
 export declare class UmbPropertyEditorUiTiptapElement extends UmbPropertyEditorUiRteElementBase {
     #private;
+    private _interactionMemories;
+    set config(config: UmbPropertyEditorConfigCollection | undefined);
+    constructor();
     protected firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult;

package/dist-cms/packages/tiptap/property-editors/tiptap-rte/property-editor-ui-tiptap.element.js

@@ -4,13 +4,40 @@ 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, styleMap } from '../../../../external/lit/index.js';
+import { css, customElement, html, state, styleMap } from '../../../../external/lit/index.js';
 import { UmbPropertyEditorUiRteElementBase } from '../../../rte/index.js';
+import { UmbPropertyEditorUiInteractionMemoryManager } from '../../../core/property-editor/index.js';
 import '../../components/input-tiptap/input-tiptap.element.js';
 /**
  * @element umb-property-editor-ui-tiptap
  */
 let UmbPropertyEditorUiTiptapElement = class UmbPropertyEditorUiTiptapElement extends UmbPropertyEditorUiRteElementBase {
+    #interactionMemoryManager;
+    set config(config) {
+        // Unconditionally, and before the base's own guard: without a config hash there is no key to
+        // persist the memories under.
+        this.#interactionMemoryManager.setPropertyEditorConfig(config);
+        super.config = config;
+    }
+    constructor() {
+        super();
+        this.#interactionMemoryManager = new UmbPropertyEditorUiInteractionMemoryManager(this, {
+            memoryUniquePrefix: 'UmbRte',
+        });
+        this._interactionMemories = [];
+        this.observe(this.#interactionMemoryManager.memoriesForPropertyEditor, (memories) => {
+            this._interactionMemories = memories ?? [];
+        }, null);
+    }
+    async #onInteractionMemoriesChange(event) {
+        const memories = event.target.interactionMemories;
+        if (memories && memories.length > 0) {
+            await this.#interactionMemoryManager.saveMemoriesForPropertyEditor(memories);
+        }
+        else {
+            await this.#interactionMemoryManager.deleteMemoriesForPropertyEditor();
+        }
+    }
     firstUpdated(_changedProperties) {
         super.firstUpdated(_changedProperties);
         this.addFormControlElement(this.shadowRoot.querySelector('umb-input-tiptap'));
@@ -59,7 +86,9 @@ let UmbPropertyEditorUiTiptapElement = class UmbPropertyEditorUiTiptapElement ex
 				.value=${this._markup}
 				?readonly=${this.readonly}
 				?required=${this.mandatory}
-				@change=${this.#onChange}></umb-input-tiptap>
+				.interactionMemories=${this._interactionMemories}
+				@change=${this.#onChange}
+				@interaction-memories-change=${this.#onInteractionMemoriesChange}></umb-input-tiptap>
 		`;
     }
     static { this.styles = css `
@@ -68,6 +97,9 @@ let UmbPropertyEditorUiTiptapElement = class UmbPropertyEditorUiTiptapElement ex
 		}
 	`; }
 };
+__decorate([
+    state()
+], UmbPropertyEditorUiTiptapElement.prototype, "_interactionMemories", void 0);
 UmbPropertyEditorUiTiptapElement = __decorate([
     customElement('umb-property-editor-ui-tiptap')
 ], UmbPropertyEditorUiTiptapElement);

package/dist-cms/packages/tiptap/property-editors/tiptap-rte/value-summary/value-summary.element.d.ts

@@ -2,7 +2,7 @@ import { nothing } from '../../../../../external/lit/index.js';
 import { UmbValueSummaryElementBase } from '../../../../core/value-summary/index.js';
 import type { UmbPropertyEditorRteValueType } from '../../../../rte/index.js';
 export declare class UmbTiptapPropertyEditorValueSummaryElement extends UmbValueSummaryElementBase<UmbPropertyEditorRteValueType | undefined> {
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
 }
 export { UmbTiptapPropertyEditorValueSummaryElement as element };
 declare global {

package/dist-cms/packages/tiptap/property-editors/toolbar-configuration/property-editor-ui-tiptap-toolbar-configuration.element.js

@@ -10,6 +10,7 @@ import { debounce } from '../../../core/utils/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
 import { UMB_PROPERTY_CONTEXT } from '../../../core/property/index.js';
 import './tiptap-toolbar-group-configuration.element.js';
+const UMB_TIPTAP_TOOLBAR_ITEM_DRAG_TYPE = 'text/umb-tiptap-toolbar-item';
 let UmbPropertyEditorUiTiptapToolbarConfigurationElement = class UmbPropertyEditorUiTiptapToolbarConfigurationElement extends UmbLitElement {
     #context;
     #currentDragItem;
@@ -72,26 +73,36 @@ let UmbPropertyEditorUiTiptapToolbarConfigurationElement = class UmbPropertyEdit
         const lastItem = this.#value?.[lastRow][lastGroup].length ?? 0;
         this.#context.insertToolbarItem(item.alias, [lastRow, lastGroup, lastItem]);
     }
+    #isOwnDragItem(event) {
+        return event.dataTransfer?.types.includes(UMB_TIPTAP_TOOLBAR_ITEM_DRAG_TYPE) === true;
+    }
     #onDragStart(event, alias, fromPos) {
         event.dataTransfer.effectAllowed = 'move';
+        event.dataTransfer.setData(UMB_TIPTAP_TOOLBAR_ITEM_DRAG_TYPE, alias);
         this.#currentDragItem = { alias, fromPos };
     }
     #onDragOver(event) {
+        if (!this.#isOwnDragItem(event))
+            return;
         event.preventDefault();
         event.dataTransfer.dropEffect = 'move';
     }
     #onDragEnd(event) {
         event.preventDefault();
-        if (event.dataTransfer?.dropEffect === 'none') {
-            const { fromPos } = this.#currentDragItem ?? {};
-            if (!fromPos)
-                return;
+        const { fromPos } = this.#currentDragItem ?? {};
+        this.#currentDragItem = undefined;
+        if (event.dataTransfer?.dropEffect === 'none' && fromPos) {
             this.#context.removeToolbarItem(fromPos);
         }
     }
     #onDrop(event, toPos) {
+        // A group also receives the drops of the sorter that reorders the items within it, as those bubble out of the
+        // group element. Acting on one of those would re-insert the item of the preceding drag. (#23524)
+        if (!this.#isOwnDragItem(event))
+            return;
         event.preventDefault();
         const { alias, fromPos } = this.#currentDragItem ?? {};
+        this.#currentDragItem = undefined;
         // Remove item if no destination position is provided
         if (fromPos && !toPos) {
             this.#context.removeToolbarItem(fromPos);
@@ -217,7 +228,7 @@ let UmbPropertyEditorUiTiptapToolbarConfigurationElement = class UmbPropertyEdit
 				class="group"
 				dropzone="move"
 				@dragover=${this.#onDragOver}
-				@drop=${(e) => this.#onDrop(e, [rowIndex, groupIndex, group.data.length - 1])}>
+				@drop=${(e) => this.#onDrop(e, [rowIndex, groupIndex, group.data.length])}>
 				<umb-tiptap-toolbar-group-configuration
 					.items=${items}
 					.rowIndex=${rowIndex}