diff --git a/src/Umbraco.Web.UI.Client/examples/custom-validation-workspace-context/README.md b/src/Umbraco.Web.UI.Client/examples/custom-validation-workspace-context/README.md index ffdd2afb3e..e9396ad626 100644 --- a/src/Umbraco.Web.UI.Client/examples/custom-validation-workspace-context/README.md +++ b/src/Umbraco.Web.UI.Client/examples/custom-validation-workspace-context/README.md @@ -2,4 +2,4 @@ This example demonstrates how you can append extra validation messages to the Validation Context based on the value of a Property of a property Editor that this Customization is not interested in overriding/replacing. -See this having an effect on the All RTEs page, where too long words are invalid. \ No newline at end of file +See this having an effect on the "Rich Text Editor" page, where too long words are invalid. diff --git a/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-anchor.extension.ts b/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-anchor.extension.ts index 0638768517..12c5a2b0ec 100644 --- a/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-anchor.extension.ts +++ b/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-anchor.extension.ts @@ -33,19 +33,12 @@ export const Anchor = Node.create({ addOptions() { return { - HTMLAttributes: { - id: 'id', - }, + HTMLAttributes: { id: '' }, }; }, parseHTML() { - return [ - { - tag: 'a[id]', - getAttrs: (element) => (element.innerHTML === '' ? {} : false), - }, - ]; + return [{ tag: 'a[id]', getAttrs: (element) => (element.innerHTML === '' ? {} : false) }]; }, renderHTML({ HTMLAttributes }) { diff --git a/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-figcaption.extension.ts b/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-figcaption.extension.ts index 23b188b7bf..ea2f2ab83e 100644 --- a/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-figcaption.extension.ts +++ b/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-figcaption.extension.ts @@ -27,11 +27,7 @@ export const Figcaption = Node.create({ draggable: false, parseHTML() { - return [ - { - tag: 'figcaption', - }, - ]; + return [{ tag: this.name }]; }, renderHTML({ HTMLAttributes }) { diff --git a/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-figure.extension.ts b/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-figure.extension.ts index 0cae9f7b47..49a89606df 100644 --- a/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-figure.extension.ts +++ b/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-figure.extension.ts @@ -35,7 +35,7 @@ export const Figure = Node.create({ parseHTML() { return [ { - tag: 'figure', + tag: this.name, getAttrs: (dom) => { const figcaption = dom.querySelector('figcaption'); return { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts index d9f0c7ae5a..5581e92cd8 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts @@ -1746,7 +1746,7 @@ export const data: Array = [ defaultTemplate: { id: 'all-rtes-document-type-id' }, id: 'all-rtes-document-type-id', alias: 'allRtesDocumentType', - name: 'All RTEs document type', + name: 'Rich Text Editor document type', description: null, icon: 'icon-document', allowedAsRoot: true, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts index ca181f29ab..96c562bdb7 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts @@ -77,9 +77,9 @@ export const data: Array = [

Some value for the RTE with an external link and an internal link foo foo

-
Macro alias: TestMacro
+
Macro alias: TestMacro

The following tests the embed plugin:

-
+

End of test content

`, }, @@ -939,7 +939,7 @@ export const data: Array = [ publishDate: '2023-02-06T15:32:24.957009', culture: 'en-US', segment: null, - name: 'All RTEs', + name: 'Rich Text Editor', createDate: '2023-02-06T15:32:05.350038', updateDate: '2023-02-06T15:32:24.957009', }, @@ -947,7 +947,7 @@ export const data: Array = [ values: [ { alias: 'tiptap', - editorAlias: 'Umb.PropertyEditorUi.Tiptap', + editorAlias: 'Umbraco.RichText', culture: null, segment: null, value: { @@ -957,7 +957,25 @@ export const data: Array = [ settingsData: [], expose: [], }, - markup: `

Here is a link for all HTML tags.

Some value for the RTE with an external link and an internal link.

This is a plain old span tag. Hello world.

Version

Date

15.3

2025-03-20

16.0

2025-06-12

17.0

2025-11-27

Installer illustration

End of test content

`, + markup: ` +

Here is a link for all HTML tags.

+ +

Some value for the RTE with an external link and an internal link foo foo

+ +

The following tests the embed plugin:

+

+ +

Some value for the RTE with an external link and an internal link.

+ +
This is a plain old span tag. Hello world.
+ +

Version

Date

15.3

2025-03-20

16.0

2025-06-12

17.0

2025-11-27

+ +

Installer illustration

+ +
Macro alias: TestMacro
+ +

End of test content

`, }, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/rte-embed.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/rte-embed.handlers.ts index 671bb2af10..7f20c63c29 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/rte-embed.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/rte-embed.handlers.ts @@ -11,7 +11,7 @@ export const handlers = [ const height = heightParam ? parseInt(heightParam) : 240; const response: OEmbedResponseModel = { - markup: ``, + markup: ``, }; return res(ctx.status(200), ctx.json(response)); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/context/block-rte-entries.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/context/block-rte-entries.context.ts index 1473e9fdad..1342f5c1c9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/context/block-rte-entries.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/context/block-rte-entries.context.ts @@ -147,7 +147,7 @@ export class UmbBlockRteEntriesContext extends UmbBlockEntriesContext< await Promise.all( layoutEntries.map(async (layoutEntry) => { this._insertBlockFromPropertyValue(layoutEntry, value, originData); - // TODO: Missing some way to insert a Block HTML Element into the RTE at the current cursor point. (hopefully the responsibilit can be avoided here, but there is some connection missing at this point) [NL] + // TODO: Missing some way to insert a Block HTML Element into the RTE at the current cursor point. (hopefully the responsibility can be avoided here, but there is some connection missing at this point) [NL] }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/font-size.tiptap-toolbar-api.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/font-size.tiptap-toolbar-api.ts index 6088077159..d2ce175dee 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/font-size.tiptap-toolbar-api.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/font-size.tiptap-toolbar-api.ts @@ -2,7 +2,7 @@ import { UmbTiptapToolbarElementApiBase } from '../base.js'; import type { MetaTiptapToolbarMenuItem } from '../types.js'; import type { Editor } from '@umbraco-cms/backoffice/external/tiptap'; -export default class UmbTiptapToolbarFontFamilyExtensionApi extends UmbTiptapToolbarElementApiBase { +export default class UmbTiptapToolbarFontSizeExtensionApi extends UmbTiptapToolbarElementApiBase { override isActive(editor?: Editor, item?: MetaTiptapToolbarMenuItem) { const styles = editor?.getAttributes('span')?.style; return styles?.includes(`font-size: ${item?.data};`) === true;