@umbraco-cms/backoffice 17.7.0 → 17.8.0-rc

package/dist-cms/packages/tiptap/components/toolbar/{tiptap-toolbar-button-action.element.js → button/tiptap-toolbar-button-action.element.js}

@@ -5,11 +5,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbTiptapToolbarButtonElement } from './tiptap-toolbar-button.element.js';
-import { customElement, html, when } from '../../../../external/lit/index.js';
+import { customElement, html, when } from '../../../../../external/lit/index.js';
 let UmbTiptapToolbarButtonActionElement = class UmbTiptapToolbarButtonActionElement extends UmbTiptapToolbarButtonElement {
-    // Note: This element does not use the inherited `isActive` @state in its template,
-    // but relies on it being set by the base class `#onEditorUpdate` to trigger Lit re-renders
-    // so that `api.isDisabled(editor)` is re-evaluated.
     render() {
         const label = this.localize.string(this.manifest?.meta.label);
         return html `
@@ -18,7 +15,7 @@ let UmbTiptapToolbarButtonActionElement = class UmbTiptapToolbarButtonActionElem
 				look="default"
 				label=${label}
 				title=${label}
-				?disabled=${this.api?.isDisabled(this.editor)}
+				?disabled=${this.isDisabled}
 				@click=${() => this.api?.execute(this.editor)}>
 				${when(this.manifest?.meta.icon, (icon) => html `<umb-icon name=${icon}></umb-icon>`, () => html `<span>${label}</span>`)}
 			</uui-button>

package/dist-cms/packages/tiptap/components/toolbar/{tiptap-toolbar-button-disabled.element.js → button/tiptap-toolbar-button-disabled.element.js}

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbTiptapToolbarButtonElement } from './tiptap-toolbar-button.element.js';
-import { customElement, html, when } from '../../../../external/lit/index.js';
+import { customElement, html, when } from '../../../../../external/lit/index.js';
 /** @deprecated No longer used internally. Please use `UmbTiptapToolbarButtonActionElement` (`umb-tiptap-toolbar-button-action`) instead. This will be removed in Umbraco 19. [LK] */
 let UmbTiptapToolbarButtonDisabledElement = class UmbTiptapToolbarButtonDisabledElement extends UmbTiptapToolbarButtonElement {
     render() {

package/dist-cms/packages/tiptap/components/toolbar/{tiptap-toolbar-button.element.d.ts → button/tiptap-toolbar-button.element.d.ts}

@@ -1,13 +1,14 @@
-import type { Editor } from '../../externals.js';
-import type { ManifestTiptapToolbarExtension, ManifestTiptapToolbarExtensionButtonKind } from '../../extensions/tiptap-toolbar.extension.js';
-import type { UmbTiptapToolbarElementApi } from '../../extensions/types.js';
-import { UmbLitElement } from '../../../core/lit-element/index.js';
+import type { Editor } from '../../../externals.js';
+import type { ManifestTiptapToolbarExtension, ManifestTiptapToolbarExtensionButtonKind } from '../../../extensions/tiptap-toolbar.extension.js';
+import type { UmbTiptapToolbarElementApi } from '../../../extensions/types.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
 export declare class UmbTiptapToolbarButtonElement<ManifestType extends ManifestTiptapToolbarExtension = ManifestTiptapToolbarExtensionButtonKind> extends UmbLitElement {
     #private;
     api?: UmbTiptapToolbarElementApi;
     editor?: Editor;
     manifest?: ManifestType;
     protected isActive: boolean;
+    protected isDisabled: boolean;
     connectedCallback(): void;
     disconnectedCallback(): void;
     render(): import("lit-html").TemplateResult<1>;

package/dist-cms/packages/tiptap/components/toolbar/{tiptap-toolbar-button.element.js → button/tiptap-toolbar-button.element.js}

@@ -4,15 +4,17 @@ 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 { customElement, html, state, when } from '../../../../external/lit/index.js';
-import { UmbLitElement } from '../../../core/lit-element/index.js';
+import { customElement, html, state, when } from '../../../../../external/lit/index.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
 let UmbTiptapToolbarButtonElement = class UmbTiptapToolbarButtonElement extends UmbLitElement {
     constructor() {
         super(...arguments);
         this.isActive = false;
+        this.isDisabled = false;
         this.#onEditorUpdate = () => {
             if (this.api && this.editor && this.manifest) {
                 this.isActive = this.api.isActive(this.editor);
+                this.isDisabled = this.api.isDisabled(this.editor);
             }
         };
     }
@@ -20,6 +22,7 @@ let UmbTiptapToolbarButtonElement = class UmbTiptapToolbarButtonElement extends
         super.connectedCallback();
         if (this.editor) {
             this.editor.on('transaction', this.#onEditorUpdate);
+            this.#onEditorUpdate();
         }
     }
     disconnectedCallback() {
@@ -37,7 +40,7 @@ let UmbTiptapToolbarButtonElement = class UmbTiptapToolbarButtonElement extends
 				look=${this.isActive ? 'outline' : 'default'}
 				label=${label}
 				title=${label}
-				?disabled=${this.api?.isDisabled(this.editor)}
+				?disabled=${this.isDisabled}
 				@click=${() => this.api?.execute(this.editor)}>
 				${when(this.manifest?.meta.icon, (icon) => html `<umb-icon name=${icon}></umb-icon>`, () => html `<span>${label}</span>`)}
 			</uui-button>
@@ -47,6 +50,9 @@ let UmbTiptapToolbarButtonElement = class UmbTiptapToolbarButtonElement extends
 __decorate([
     state()
 ], UmbTiptapToolbarButtonElement.prototype, "isActive", void 0);
+__decorate([
+    state()
+], UmbTiptapToolbarButtonElement.prototype, "isDisabled", void 0);
 UmbTiptapToolbarButtonElement = __decorate([
     customElement('umb-tiptap-toolbar-button')
 ], UmbTiptapToolbarButtonElement);

package/dist-cms/packages/tiptap/components/toolbar/{tiptap-toolbar-color-picker-button.element.d.ts → color-picker/tiptap-toolbar-color-picker-button.element.d.ts}

@@ -1,5 +1,5 @@
-import type { ManifestTiptapToolbarExtensionColorPickerButtonKind } from '../../extensions/tiptap-toolbar.extension.js';
-import { UmbTiptapToolbarButtonElement } from './tiptap-toolbar-button.element.js';
+import type { ManifestTiptapToolbarExtensionColorPickerButtonKind } from '../../../extensions/tiptap-toolbar.extension.js';
+import { UmbTiptapToolbarButtonElement } from '../button/tiptap-toolbar-button.element.js';
 export declare class UmbTiptapToolbarColorPickerButtonElement extends UmbTiptapToolbarButtonElement<ManifestTiptapToolbarExtensionColorPickerButtonKind> {
     #private;
     private _selectedColor?;

package/dist-cms/packages/tiptap/components/toolbar/{tiptap-toolbar-color-picker-button.element.js → color-picker/tiptap-toolbar-color-picker-button.element.js}

@@ -4,8 +4,8 @@ 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 { UmbTiptapToolbarButtonElement } from './tiptap-toolbar-button.element.js';
-import { css, customElement, html, state, when } from '../../../../external/lit/index.js';
+import { UmbTiptapToolbarButtonElement } from '../button/tiptap-toolbar-button.element.js';
+import { css, customElement, html, state, when } from '../../../../../external/lit/index.js';
 let UmbTiptapToolbarColorPickerButtonElement = class UmbTiptapToolbarColorPickerButtonElement extends UmbTiptapToolbarButtonElement {
     #onChange(event) {
         this._selectedColor = event.target.value;
@@ -13,7 +13,7 @@ let UmbTiptapToolbarColorPickerButtonElement = class UmbTiptapToolbarColorPicker
     }
     render() {
         const label = this.localize.string(this.manifest?.meta.label);
-        const disabled = this.api?.isDisabled(this.editor);
+        const disabled = this.isDisabled;
         return html `
 			<uui-button-group>
 				<uui-button

package/dist-cms/packages/tiptap/components/toolbar/{tiptap-toolbar-menu.element.d.ts → menu/tiptap-toolbar-menu.element.d.ts}

@@ -1,10 +1,11 @@
-import type { Editor } from '../../externals.js';
-import type { ManifestTiptapToolbarExtensionMenuKind, UmbTiptapToolbarElementApi } from '../../extensions/index.js';
-import { UmbLitElement } from '../../../core/lit-element/index.js';
-import '../cascading-menu-popover/cascading-menu-popover.element.js';
+import type { Editor } from '../../../externals.js';
+import type { ManifestTiptapToolbarExtensionMenuKind, UmbTiptapToolbarElementApi } from '../../../extensions/index.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import '../../cascading-menu-popover/cascading-menu-popover.element.js';
 export declare class UmbTiptapToolbarMenuElement extends UmbLitElement {
     #private;
     protected isActive: boolean;
+    protected isDisabled: boolean;
     api?: UmbTiptapToolbarElementApi;
     editor?: Editor;
     set manifest(value: ManifestTiptapToolbarExtensionMenuKind | undefined);

package/dist-cms/packages/tiptap/components/toolbar/{tiptap-toolbar-menu.element.js → menu/tiptap-toolbar-menu.element.js}

@@ -4,17 +4,19 @@ 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, state, when } from '../../../../external/lit/index.js';
-import { UmbLitElement } from '../../../core/lit-element/index.js';
-import '../cascading-menu-popover/cascading-menu-popover.element.js';
+import { css, customElement, html, state, when } from '../../../../../external/lit/index.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import '../../cascading-menu-popover/cascading-menu-popover.element.js';
 let UmbTiptapToolbarMenuElement = class UmbTiptapToolbarMenuElement extends UmbLitElement {
     constructor() {
         super(...arguments);
         this.#menu = [];
         this.isActive = false;
+        this.isDisabled = false;
         this.#onEditorUpdate = () => {
             if (this.api && this.editor && this.manifest) {
                 this.isActive = this.api.isActive(this.editor) || this.#isMenuActive(this.#menu) || false;
+                this.isDisabled = this.api.isDisabled(this.editor);
             }
         };
     }
@@ -31,6 +33,7 @@ let UmbTiptapToolbarMenuElement = class UmbTiptapToolbarMenuElement extends UmbL
         super.connectedCallback();
         if (this.editor) {
             this.editor.on('transaction', this.#onEditorUpdate);
+            this.#onEditorUpdate();
         }
     }
     disconnectedCallback() {
@@ -93,7 +96,7 @@ let UmbTiptapToolbarMenuElement = class UmbTiptapToolbarMenuElement extends UmbL
     #onEditorUpdate;
     render() {
         const label = this.localize.string(this.manifest?.meta.label);
-        const disabled = this.api?.isDisabled(this.editor);
+        const disabled = this.isDisabled;
         return html `
 			${when(this.manifest?.meta.look === 'icon', () => html `
 					<uui-button
@@ -152,6 +155,9 @@ let UmbTiptapToolbarMenuElement = class UmbTiptapToolbarMenuElement extends UmbL
 __decorate([
     state()
 ], UmbTiptapToolbarMenuElement.prototype, "isActive", void 0);
+__decorate([
+    state()
+], UmbTiptapToolbarMenuElement.prototype, "isDisabled", void 0);
 UmbTiptapToolbarMenuElement = __decorate([
     customElement('umb-tiptap-toolbar-menu')
 ], UmbTiptapToolbarMenuElement);

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

@@ -1,11 +1,13 @@
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
 export default class UmbTiptapToolbarClearFormattingExtensionApi extends UmbTiptapToolbarElementApiBase {
     execute(editor) {
+        if (!editor)
+            return;
         const unsetAttrs = ({ commands }) => {
             commands.unsetClassName?.();
             commands.unsetStyles?.();
             return true;
         };
-        editor?.chain().focus()?.clearNodes().unsetAllMarks().command(unsetAttrs).run();
+        editor.chain().focus().clearNodes().unsetAllMarks().command(unsetAttrs).run();
     }
 }

package/dist-cms/packages/tiptap/extensions/extension-apis.bundle.d.ts

@@ -88,10 +88,10 @@ export { UmbTiptapAnchorModalElement } from './anchor/modals/anchor-modal.elemen
 export { UmbCharacterMapModalElement } from './character-map/modals/character-map-modal.element.js';
 export { UmbTiptapTablePropertiesModalElement } from './table/modals/table-properties-modal.element.js';
 export { UmbTiptapTableToolbarMenuElement } from './table/components/table-toolbar-menu.element.js';
-export { UmbTiptapToolbarButtonActionElement } from '../components/toolbar/tiptap-toolbar-button-action.element.js';
-export { UmbTiptapToolbarButtonElement } from '../components/toolbar/tiptap-toolbar-button.element.js';
-export { UmbTiptapToolbarColorPickerButtonElement } from '../components/toolbar/tiptap-toolbar-color-picker-button.element.js';
-export { UmbTiptapToolbarMenuElement } from '../components/toolbar/tiptap-toolbar-menu.element.js';
+export { UmbTiptapToolbarButtonActionElement } from '../components/toolbar/button/tiptap-toolbar-button-action.element.js';
+export { UmbTiptapToolbarButtonElement } from '../components/toolbar/button/tiptap-toolbar-button.element.js';
+export { UmbTiptapToolbarColorPickerButtonElement } from '../components/toolbar/color-picker/tiptap-toolbar-color-picker-button.element.js';
+export { UmbTiptapToolbarMenuElement } from '../components/toolbar/menu/tiptap-toolbar-menu.element.js';
 export { default as UmbTableCellMergeAction } from './table/actions/table-cell-merge.action.js';
 export { default as UmbTableCellMergeSplitAction } from './table/actions/table-cell-merge-split.action.js';
 export { default as UmbTableCellSplitAction } from './table/actions/table-cell-split.action.js';

package/dist-cms/packages/tiptap/extensions/extension-apis.bundle.js

@@ -93,10 +93,10 @@ export { UmbCharacterMapModalElement } from './character-map/modals/character-ma
 export { UmbTiptapTablePropertiesModalElement } from './table/modals/table-properties-modal.element.js';
 // Toolbar UI elements (referenced from kind manifests)
 export { UmbTiptapTableToolbarMenuElement } from './table/components/table-toolbar-menu.element.js';
-export { UmbTiptapToolbarButtonActionElement } from '../components/toolbar/tiptap-toolbar-button-action.element.js';
-export { UmbTiptapToolbarButtonElement } from '../components/toolbar/tiptap-toolbar-button.element.js';
-export { UmbTiptapToolbarColorPickerButtonElement } from '../components/toolbar/tiptap-toolbar-color-picker-button.element.js';
-export { UmbTiptapToolbarMenuElement } from '../components/toolbar/tiptap-toolbar-menu.element.js';
+export { UmbTiptapToolbarButtonActionElement } from '../components/toolbar/button/tiptap-toolbar-button-action.element.js';
+export { UmbTiptapToolbarButtonElement } from '../components/toolbar/button/tiptap-toolbar-button.element.js';
+export { UmbTiptapToolbarColorPickerButtonElement } from '../components/toolbar/color-picker/tiptap-toolbar-color-picker-button.element.js';
+export { UmbTiptapToolbarMenuElement } from '../components/toolbar/menu/tiptap-toolbar-menu.element.js';
 // Table menu-item action APIs
 export { default as UmbTableCellMergeAction } from './table/actions/table-cell-merge.action.js';
 export { default as UmbTableCellMergeSplitAction } from './table/actions/table-cell-merge-split.action.js';

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

@@ -1,4 +1,5 @@
 import { Extension } from '../../externals.js';
+import { hasClassNames, splitClassNames } from '../../utils/class-names.function.js';
 export const HtmlClassAttribute = Extension.create({
     name: 'htmlClassAttribute',
     addOptions() {
@@ -26,25 +27,19 @@ export const HtmlClassAttribute = Extension.create({
                 if (!className)
                     return false;
                 const types = type ? [type] : this.options.types;
-                const toggleClasses = className.split(/\s+/).filter((c) => c);
+                const toggleClasses = splitClassNames(className);
                 if (toggleClasses.length === 0) {
                     return true;
                 }
+                // One decision for the whole command: deciding per type would let one type lose the classes while
+                // another gains them, so the toggle would never settle on or off across a selection spanning both.
+                const removeToggleClasses = types.some((t) => hasClassNames(editor.getAttributes(t)?.class, className));
                 return types
                     .map((t) => {
-                    const existingClass = editor.getAttributes(t)?.class ?? '';
-                    const classes = existingClass.split(/\s+/).filter((c) => c);
-                    const hasAllToggleClasses = toggleClasses.every((c) => classes.includes(c));
-                    let newClasses;
-                    if (hasAllToggleClasses) {
-                        // All toggle classes present: remove them
-                        newClasses = classes.filter((c) => !toggleClasses.includes(c));
-                    }
-                    else {
-                        // Not all toggle classes present: add missing ones
-                        const toAdd = toggleClasses.filter((c) => !classes.includes(c));
-                        newClasses = [...classes, ...toAdd];
-                    }
+                    const classes = splitClassNames(editor.getAttributes(t)?.class);
+                    const newClasses = removeToggleClasses
+                        ? classes.filter((c) => !toggleClasses.includes(c))
+                        : [...classes, ...toggleClasses.filter((c) => !classes.includes(c))];
                     if (newClasses.length === 0) {
                         // No classes left, remove the attribute entirely
                         return commands.resetAttributes(t, 'class');

package/dist-cms/packages/tiptap/extensions/link/link-attributes.function.d.ts

@@ -0,0 +1,24 @@
+import type { UmbLinkPickerLink, UmbLinkPickerLinkType } from '../../../multi-url-picker/index.js';
+/**
+ * The attributes of an anchor carrying the `umbLink` mark.
+ */
+export type UmbLinkAttributes = {
+    href?: string | null;
+    title?: string | null;
+    target?: string | null;
+    type?: UmbLinkPickerLinkType | null;
+    'data-anchor'?: string | null;
+    'data-culture'?: string | null;
+};
+/**
+ * Determines whether an href addresses an entity in this Umbraco installation rather than an arbitrary URL.
+ * @param {string | null | undefined} href - The href to test
+ * @returns {boolean} True when the href is a local link
+ */
+export declare function isLocalLinkHref(href: string | null | undefined): boolean;
+/**
+ * Maps the attributes of an anchor onto the link model the link picker edits.
+ * @param {UmbLinkAttributes} attrs - The attributes of the anchor, or an empty object when there is no anchor yet
+ * @returns {UmbLinkPickerLink} The link model for the picker
+ */
+export declare function linkFromAttributes(attrs: UmbLinkAttributes): UmbLinkPickerLink;

package/dist-cms/packages/tiptap/extensions/link/link-attributes.function.js

@@ -0,0 +1,45 @@
+// The stored form of a local link, as recognised by the server when it resolves one to a URL: the leading
+// slash is optional and the braces may be URL-encoded. Anchored, so a URL that merely contains the token
+// somewhere in its path or query string is not taken for a local link.
+const LOCAL_LINK_HREF_PATTERN = /^\/?(?:\{|%7B)localLink:(?<id>[^}%]+)(?:\}|%7D)/i;
+/**
+ * Determines whether an href addresses an entity in this Umbraco installation rather than an arbitrary URL.
+ * @param {string | null | undefined} href - The href to test
+ * @returns {boolean} True when the href is a local link
+ */
+export function isLocalLinkHref(href) {
+    return !!href && LOCAL_LINK_HREF_PATTERN.test(href);
+}
+/**
+ * Maps the attributes of an anchor onto the link model the link picker edits.
+ * @param {UmbLinkAttributes} attrs - The attributes of the anchor, or an empty object when there is no anchor yet
+ * @returns {UmbLinkPickerLink} The link model for the picker
+ */
+export function linkFromAttributes(attrs) {
+    const queryString = attrs['data-anchor'];
+    const url = attrs.href?.substring(0, attrs.href.length - (queryString?.length ?? 0));
+    const unique = (url && LOCAL_LINK_HREF_PATTERN.exec(url)?.groups?.id) || null;
+    return {
+        name: attrs.title,
+        queryString,
+        target: attrs.target,
+        type: linkType(attrs, unique),
+        unique,
+        url,
+        culture: attrs['data-culture'],
+    };
+}
+/**
+ * Only a local link carries its entity type on the anchor, so for anything else the type is derived from
+ * whether there is an anchor at all: an existing one was entered manually, and no anchor means nothing has
+ * been picked yet.
+ * @param {UmbLinkAttributes} attrs - The attributes of the anchor
+ * @param {string | null} unique - The unique identifier of the linked entity, when the anchor is a local link
+ * @returns {UmbLinkPickerLinkType | undefined} The link type, or undefined when it can not be determined
+ */
+function linkType(attrs, unique) {
+    if (unique) {
+        return attrs.type ?? undefined;
+    }
+    return attrs.href ? 'external' : undefined;
+}

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

@@ -3,14 +3,14 @@ declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         umbLink: {
             ensureUmbLink: (attributes: {
-                type: string;
+                type?: string | null;
                 href: string;
                 'data-anchor'?: string | null;
                 target?: string | null;
                 title?: string | null;
             }) => ReturnType;
             setUmbLink: (attributes: {
-                type: string;
+                type?: string | null;
                 href: string;
                 'data-anchor'?: string | null;
                 target?: string | null;

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

@@ -1,6 +1,9 @@
 import { Link } from '../../externals.js';
+import { isLocalLinkHref } from './link-attributes.function.js';
 export const UmbLink = Link.extend({
     name: 'umbLink',
+    // Excluded from "Clear formatting" (`unsetAllMarks()`) so links survive it; use `unsetUmbLink()` to remove a link explicitly.
+    clearable: false,
     addAttributes() {
         return {
             ...this.parent?.(),
@@ -8,7 +11,14 @@ export const UmbLink = Link.extend({
             'data-culture': { default: null },
             target: { default: null },
             title: { default: null },
-            type: { default: 'external' },
+            // `type` carries the entity type of a local link, which the server needs to resolve it to a URL and
+            // strips from the rendered markup afterwards. On any other href nothing strips it and it reaches the
+            // front end, where `<a type>` is invalid unless it holds a MIME type (#23648) — so only serialize it
+            // onto a local link.
+            type: {
+                default: null,
+                renderHTML: (attributes) => attributes.type && isLocalLinkHref(attributes.href) ? { type: attributes.type } : {},
+            },
         };
     },
     // TODO: [LK] Review why `addOptions()` is not typed correctly here.

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

@@ -1,11 +1,12 @@
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
 import { UmbLink } from './link.tiptap-extension.js';
+import { linkFromAttributes } from './link-attributes.function.js';
 import { UMB_LINK_PICKER_MODAL } from '../../../multi-url-picker/index.js';
 import { umbOpenModal } from '../../../core/modal/index.js';
 export default class UmbTiptapToolbarLinkExtensionApi extends UmbTiptapToolbarElementApiBase {
     async execute(editor) {
         const attrs = editor?.getAttributes(UmbLink.name) ?? {};
-        const link = this.#getLinkData(attrs);
+        const link = linkFromAttributes(attrs);
         const data = { config: {}, index: null, isNew: link?.url === undefined };
         const value = { link };
         const overlaySize = this.configuration?.getValueByAlias('overlaySize') ?? 'small';
@@ -20,21 +21,6 @@ export default class UmbTiptapToolbarLinkExtensionApi extends UmbTiptapToolbarEl
             editor?.chain().focus().extendMarkRange(UmbLink.name).unsetLink().run();
         }
     }
-    #getLinkData(attrs) {
-        const queryString = attrs['data-anchor'];
-        const culture = attrs['data-culture'];
-        const url = attrs.href?.substring(0, attrs.href.length - (queryString?.length ?? 0));
-        const unique = url?.includes('localLink:') ? url.substring(url.indexOf(':') + 1, url.indexOf('}')) : null;
-        return {
-            name: attrs.title,
-            queryString,
-            target: attrs.target,
-            type: attrs.type,
-            unique,
-            url,
-            culture,
-        };
-    }
     #parseLinkData(link) {
         const { name, target, type, unique, culture } = link;
         let { queryString, url } = link;
@@ -64,7 +50,8 @@ export default class UmbTiptapToolbarLinkExtensionApi extends UmbTiptapToolbarEl
         if (!url)
             return null;
         return {
-            type: type ?? 'external',
+            // Only a local link carries its entity type on the anchor; see the `type` attribute on `UmbLink`.
+            type: unique ? type : null,
             href: url,
             'data-anchor': anchor,
             target,

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

@@ -1,4 +1,5 @@
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
+import { hasClassNames } from '../../utils/class-names.function.js';
 export default class UmbTiptapToolbarStyleMenuApi extends UmbTiptapToolbarElementApiBase {
     #headingCommand(level) {
         return {
@@ -15,7 +16,7 @@ export default class UmbTiptapToolbarStyleMenuApi extends UmbTiptapToolbarElemen
         h5: this.#headingCommand(5),
         h6: this.#headingCommand(6),
         p: { type: 'paragraph', command: (chain) => chain.setParagraph() },
-        a: { type: 'umbLink', command: (chain) => chain.ensureUmbLink({ type: 'external', href: '#' }) },
+        a: { type: 'umbLink', command: (chain) => chain.ensureUmbLink({ href: '#' }) },
         blockquote: { type: 'blockquote', command: (chain) => chain.toggleBlockquote() },
         code: { type: 'code', command: (chain) => chain.toggleCode() },
         codeBlock: { type: 'codeBlock', command: (chain) => chain.toggleCodeBlock() },
@@ -31,13 +32,61 @@ export default class UmbTiptapToolbarStyleMenuApi extends UmbTiptapToolbarElemen
     isActive(editor, item) {
         if (!editor || !item?.data)
             return false;
-        const { tag, id, class: className } = item.data;
-        const ext = tag ? this.#commands[tag] : null;
-        const attrs = editor?.getAttributes(ext?.type ?? 'paragraph');
-        const tagMatch = !tag ? true : ext ? (ext.isActive?.(editor) ?? editor?.isActive(ext.type) ?? false) : false;
+        const { tag } = item.data;
+        if (tag)
+            return this.#isTagActive(editor, tag, item.data);
+        return this.#hasAttributesAroundSelection(editor, item.data);
+    }
+    #isTagActive(editor, tag, data) {
+        const ext = this.#commands[tag];
+        if (!ext)
+            return false;
+        const tagMatch = ext.isActive?.(editor) ?? editor.isActive(ext.type) ?? false;
+        return tagMatch && this.#hasAttributes(editor.getAttributes(ext.type), data);
+    }
+    #hasAttributesAroundSelection(editor, data) {
+        // Mirrors the range `editor.getAttributes(type)` reads, so the item is active exactly when toggling it
+        // would remove something, never the reverse.
+        return (this.#hasNodeWithAttributes(editor, data) ||
+            this.#hasAncestorNodeWithAttributes(editor, data) ||
+            this.#hasMarkWithAttributes(editor, data));
+    }
+    #hasAncestorNodeWithAttributes(editor, data) {
+        const { $from } = editor.state.selection;
+        for (let depth = $from.depth; depth > 0; depth--) {
+            if (this.#hasAttributes($from.node(depth).attrs, data))
+                return true;
+        }
+        return false;
+    }
+    #hasNodeWithAttributes(editor, data) {
+        return this.#someNodeAroundSelection(editor, (node) => this.#hasAttributes(node.attrs, data));
+    }
+    #hasMarkWithAttributes(editor, data) {
+        const { state } = editor;
+        const { empty } = state.selection;
+        if (empty) {
+            const marks = [...(state.storedMarks ?? []), ...state.selection.$head.marks()];
+            return marks.some((mark) => this.#hasAttributes(mark.attrs, data));
+        }
+        return this.#someNodeAroundSelection(editor, (node) => node.marks.some((mark) => this.#hasAttributes(mark.attrs, data)));
+    }
+    #someNodeAroundSelection(editor, predicate) {
+        const { from, to } = editor.state.selection;
+        let matched = false;
+        editor.state.doc.nodesBetween(from, to, (node) => {
+            if (matched)
+                return false;
+            matched = predicate(node);
+            return !matched;
+        });
+        return matched;
+    }
+    #hasAttributes(attrs, data) {
+        const { id, class: className } = data;
         const idMatch = !id ? true : attrs.id === id;
-        const classMatch = !className ? true : attrs.class?.includes(className) === true;
-        return tagMatch && idMatch && classMatch;
+        const classMatch = !className ? true : hasClassNames(attrs.class, className);
+        return idMatch && classMatch;
     }
     execute(editor, item) {
         if (!editor || !item?.data)

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

@@ -1,4 +1,4 @@
-import { UmbTiptapToolbarMenuElement } from '../../../components/toolbar/tiptap-toolbar-menu.element.js';
+import { UmbTiptapToolbarMenuElement } from '../../../components/toolbar/menu/tiptap-toolbar-menu.element.js';
 import type { PropertyValues } from '../../../../../external/lit/index.js';
 import './table-insert.element.js';
 export declare class UmbTiptapTableToolbarMenuElement extends UmbTiptapToolbarMenuElement {

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

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UmbTiptapToolbarMenuElement } from '../../../components/toolbar/tiptap-toolbar-menu.element.js';
+import { UmbTiptapToolbarMenuElement } from '../../../components/toolbar/menu/tiptap-toolbar-menu.element.js';
 import { customElement, html, ifDefined, when } from '../../../../../external/lit/index.js';
 import './table-insert.element.js';
 let UmbTiptapTableToolbarMenuElement = class UmbTiptapTableToolbarMenuElement extends UmbTiptapToolbarMenuElement {

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction-ltr.tiptap-toolbar-api.d.ts

@@ -1,6 +1,6 @@
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
 import type { Editor } from '../../externals.js';
 export default class UmbTiptapToolbarTextDirectionLtrExtensionApi extends UmbTiptapToolbarElementApiBase {
-    isActive: (editor?: Editor) => boolean;
+    isActive(editor?: Editor): boolean;
     execute(editor?: Editor): void;
 }

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction-ltr.tiptap-toolbar-api.js

@@ -1,8 +1,7 @@
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
 export default class UmbTiptapToolbarTextDirectionLtrExtensionApi extends UmbTiptapToolbarElementApiBase {
-    constructor() {
-        super(...arguments);
-        this.isActive = (editor) => editor?.isActive({ textDirection: 'ltr' }) === true || editor?.isActive({ textDirection: 'auto' }) === true;
+    isActive(editor) {
+        return editor?.isActive({ dir: 'ltr' }) === true || editor?.isActive({ dir: 'auto' }) === true;
     }
     execute(editor) {
         if (!this.isActive(editor)) {

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction-rtl.tiptap-toolbar-api.d.ts

@@ -1,6 +1,6 @@
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
 import type { Editor } from '../../externals.js';
 export default class UmbTiptapToolbarTextDirectionRtlExtensionApi extends UmbTiptapToolbarElementApiBase {
-    isActive: (editor?: Editor) => boolean;
+    isActive(editor?: Editor): boolean;
     execute(editor?: Editor): void;
 }

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction-rtl.tiptap-toolbar-api.js

@@ -1,8 +1,7 @@
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
 export default class UmbTiptapToolbarTextDirectionRtlExtensionApi extends UmbTiptapToolbarElementApiBase {
-    constructor() {
-        super(...arguments);
-        this.isActive = (editor) => editor?.isActive({ textDirection: 'rtl' }) === true;
+    isActive(editor) {
+        return editor?.isActive({ dir: 'rtl' }) === true;
     }
     execute(editor) {
         if (!this.isActive(editor)) {

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction.tiptap-api.d.ts

@@ -1,5 +1,4 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
-/** @deprecated No longer required, (since it comes default with Tiptap). This will be removed in Umbraco 19. [LK] */
 export default class UmbTiptapTextDirectionExtensionApi extends UmbTiptapExtensionApiBase {
-    getTiptapExtensions: () => never[];
+    getTiptapExtensions: () => import("@tiptap/core").Extension<import("./text-direction.tiptap-extension.js").UmbTiptapTextDirectionOptions, any>[];
 }

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

@@ -1,10 +1,12 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
-/** @deprecated No longer required, (since it comes default with Tiptap). This will be removed in Umbraco 19. [LK] */
+import { TextDirection } from './text-direction.tiptap-extension.js';
 export default class UmbTiptapTextDirectionExtensionApi extends UmbTiptapExtensionApiBase {
     constructor() {
         super(...arguments);
-        // NOTE: `TextDirection` is now bundled with Tiptap since v3.11.0. [LK]
-        // https://github.com/ueberdosis/tiptap/pull/7207
-        this.getTiptapExtensions = () => [];
+        this.getTiptapExtensions = () => [
+            TextDirection.configure({
+                types: ['heading', 'paragraph', 'blockquote', 'orderedList', 'bulletList'],
+            }),
+        ];
     }
 }