@sapui5/sap.ui.richtexteditor 1.143.1 → 1.145.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.richtexteditor",
-  "version": "1.143.1",
+  "version": "1.145.0",
   "description": "SAPUI5 Library sap.ui.richtexteditor",
   "homepage": "https://ui5.github.io/cli/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/ui/richtexteditor/.library

@@ -4,8 +4,8 @@
 	<name>sap.ui.richtexteditor</name>
 	<vendor>SAP SE</vendor>
 	<copyright>SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.</copyright>
-	<version>1.143.1</version>
+ * (c) Copyright 2026 SAP SE. All rights reserved.</copyright>
+	<version>1.145.0</version>
 
 	<documentation>A rich text editor (RTE) control. Requires installation of an additional rich text editor library.</documentation>
 

package/src/sap/ui/richtexteditor/RTESplitButton.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 // Provides control sap.ui.richtexteditor.RTESplitButton.
 sap.ui.define([
@@ -24,7 +24,7 @@ sap.ui.define([
 		 * @alias sap.ui.richtexteditor.RTESplitButton
 		 *
 		 * @author SAP SE
-		 * @version 1.143.1
+		 * @version 1.145.0
 		 */
 		var RTESplitButton = SplitButton.extend("sap.ui.richtexteditor.RTESplitButton", {
 			metadata: {

package/src/sap/ui/richtexteditor/RTESplitButtonRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 // Provides default renderer for control sap.ui.richtexteditor.RTESplitButton
 sap.ui.define(['sap/m/SplitButtonRenderer', 'sap/ui/core/Renderer'],

package/src/sap/ui/richtexteditor/RichTextEditor.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.richtexteditor.RichTextEditor.
@@ -88,6 +88,7 @@ sap.ui.define([
 	 *
 	 * <b>Note: The <code>RichTextEditor</code> uses a third-party component and therefore
 	 * some additional restrictions apply for its proper usage and support.
+	 * Use the native third-party API cautiously. Ensure you migrate to newer versions within 12 months of deprecation. Unsupported third-party versions, once deprecated by us, may be removed without notice if critical vulnerabilities or other serious issues are discovered in their code.
 	 * For more information see the Preamble section in {@link topic:d4f3f1598373452bb73f2120930c133c sap.ui.richtexteditor}.
 	 * </b>
 	 *
@@ -203,7 +204,8 @@ sap.ui.define([
 				 * not an enumeration).
 				 *
 				 * <b>Notes:</b>
-				 * <ul><li>TinyMCE version 3 and 4 are no longer supported and cannot be used. If you set the property to TinyMCE, it will load TinyMCE version 7.</li>
+				 * <ul><li>Do not use TinyMCE versions that are no longer supported. We may remove such versions without notice in future releases if critical vulnerabilities or other serious issues are discovered in their code.</li>
+				 * <li>Setting the property to <code>TinyMCE</code> loads the latest TinyMCE available.</li>
 				 * <li>Any attempts to set this property after the first rendering will not
 				 * have any effect.</li>
 				 * <li>The default value of the property will always resolve to the recommended version by UI5. Due to the different support cycles, we will be constantly getting newer TinyMCE versions and update the default value accordingly.</li>
@@ -380,7 +382,7 @@ sap.ui.define([
 				_toolbarWrapper: {type: "sap.ui.richtexteditor.IToolbar", multiple: false, visibility : "hidden", defaultValue: null},
 				/**
 				 * Custom buttons are meant to extend the <code>RichTextEditor</code>'s custom toolbar.
-				 * Though type is set to sap.ui.Control, only sap.m.Button is allowed.
+				 * Though type is set to sap.ui.core.Control, only sap.m.Button is allowed.
 				 * <b>Note:</b> customButtons are available only when the <code>customToolbar</code> is enabled and all the requirements are fulfilled.
 				 *
 				 * @since 1.48
@@ -726,6 +728,8 @@ sap.ui.define([
 	 * Returns the current editor's instance.
 	 * CAUTION: using the native editor introduces a dependency to that editor and breaks the wrapping character of the RichTextEditor control, so it should only be done in justified cases.
 	 *
+	 * <b>Note: Use the native third-party API cautiously. Ensure you migrate to newer versions within 12 months of deprecation. Unsupported third-party versions, once deprecated by us, may be removed without notice if critical vulnerabilities or other serious issues are discovered in their code.</b>
+	 *
 	 * @returns {object} The native editor object (here: The TinyMCE editor instance)
 	 * @public
 	 */
@@ -1283,8 +1287,6 @@ sap.ui.define([
 			this.setProperty("editorType", sEditorType);
 			sEditorType = this.getEditorType();
 
-			this._setupToolbar();
-
 			if (!oEditorMapping[sEditorType]) {
 				this.setProperty("editorType", RichTextEditor.EDITORTYPE_TINYMCE);
 				Log.error('Invalid editorType value set. Fallbacks to latest.');
@@ -1297,6 +1299,7 @@ sap.ui.define([
 				Log.error("TinyMCE version 6 is used as editor type. TinyMCE 6 is deprecated as of version 1.141.0 and will be removed from the code entirely in near future.");
 			}
 
+			this._setupToolbar();
 			this.initTinyMCE();
 		} else {
 			Log.error(
@@ -1633,10 +1636,21 @@ sap.ui.define([
 		switch (this._tinyMCEStatus) {
 			case EditorStatus.Initial:
 			case EditorStatus.Initializing:
+				if (this._pTinyMCEInitialized) {
+					this._pTinyMCEInitialized.then(function() {
+						if (this._tinyMCEStatus === EditorStatus.Ready) {
+							this.setValueTinyMCE(sValue);
+						}
+					}.bind(this));
+				}
+				break;
+
 			case EditorStatus.Loading:
 				// Ignored - value will be set when TinyMCE is ready
 				break;
-
+			case EditorStatus.Loaded:
+				// Ignored - value will be set when TinyMCE is ready
+				break;
 			case EditorStatus.Ready:
 				this._oEditor.setContent(sValue);
 				//Reset the undo manager
@@ -1875,17 +1889,11 @@ sap.ui.define([
 			sPluginsList = sPluginsList.replace(/(,powerpaste|powerpaste,)/gi, "");
 		}
 
-		var bIsTinyMCE6or7 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE6 || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE7;
-
-		// since TinyMCE 6 plugins property format has changed
-		if (bIsTinyMCE6or7) {
-			sPluginsList = this.getPlugins().map(function(oPlugin) {
-				return oPlugin.name;
-			});
-		}
-
+		sPluginsList = this.getPlugins().map(function(oPlugin) {
+			return oPlugin.name;
+		});
 
-		if (bIsTinyMCE6or7 && !this.getEditable()) {
+		if (!this.getEditable()) {
 			sPluginsList = sPluginsList.filter(function(oPlugin) {
 				return oPlugin !== "powerpaste";
 			});
@@ -1989,7 +1997,6 @@ sap.ui.define([
 		var oLocale = new Locale(Localization.getLanguage()),
 			sLanguage = oLocale.getLanguage(),
 			sRegion = oLocale.getRegion(),
-			bIsTinyMCE6or7 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE6 || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE7,
 			sLangStr;
 
 		// Language mapping for old/fallback languages
@@ -1997,7 +2004,7 @@ sap.ui.define([
 
 		// Find default region, if region is not given
 		if (!sRegion) {
-			sRegion = bIsTinyMCE6or7 ? RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS_TINYMCE7[sLanguage] : RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS[sLanguage];
+			sRegion = RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS_TINYMCE7[sLanguage];
 		}
 
 		sLangStr = sRegion ? sLanguage + "_" + sRegion.toUpperCase() : sLanguage;

package/src/sap/ui/richtexteditor/RichTextEditorFontFamily.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.richtexteditor.RichTextEditorFontFamily.
@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @public
 	 * @alias sap.ui.richtexteditor.RichTextEditorFontFamily

package/src/sap/ui/richtexteditor/RichTextEditorRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 // Provides default renderer for control sap.ui.richtexteditor.RichTextEditor
 sap.ui.define(["sap/ui/core/Lib"],
@@ -36,9 +36,15 @@ sap.ui.define(["sap/ui/core/Lib"],
 		if (oRichTextEditor.getRequired()) {
 			rm.class("sapUiRTEReq");
 		}
-		if (oRichTextEditor.getUseLegacyTheme()) {
-			rm.class("sapUiRTELegacyTheme");
-		}
+		/**
+		 * @deprecated As of version 1.97.0
+		 * @private
+		 */
+		(() => {
+			if (oRichTextEditor.getUseLegacyTheme()) {
+				rm.class("sapUiRTELegacyTheme");
+			}
+		})();
 		if (bCustomToolbar) {
 			rm.class("sapUiRTEWithCustomToolbar");
 		}

package/src/sap/ui/richtexteditor/ToolbarWrapper.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.richtexteditor.ToolbarWrapper.
@@ -873,7 +873,7 @@ sap.ui.define([
 			var aDialogContent = oDialog && oDialog.getContent(),
 				oSelection, oSelectedNode, sURL, sDisplayText, sTitle,
 				bTarget, oSelectionNode, bLinkPartSelected, bSelection,
-				sUrlInputPrefixValue;
+				sUrlInputPrefixValue, bImageSelected;
 
 			if (!(aDialogContent instanceof Array) || !aDialogContent.length) {
 				return;
@@ -881,7 +881,15 @@ sap.ui.define([
 
 			oSelection = this.getEditor().getNativeApi().selection;
 			oSelectionNode = oSelection.getNode();
-			oSelectedNode = this._getSelectionAnchor(oSelection);
+
+			bImageSelected = oSelectionNode && oSelectionNode.tagName &&
+				oSelectionNode.tagName.toLowerCase() === "img";
+
+			if (bImageSelected) {
+				oSelectedNode = this._getImageAnchor(oSelectionNode);
+			} else {
+				oSelectedNode = this._getSelectionAnchor(oSelection);
+			}
 
 			if (!oSelectedNode) {
 				oSelectedNode = oSelectionNode.parentElement;
@@ -902,9 +910,17 @@ sap.ui.define([
 				this._bLinkPrefixChecked = oSelectedNode.getAttribute('data-sap-ui-rte-link-prefix') === "true";
 			}
 
-			// if there isn't a selection or a link is partly selected,
-			// the display text should be equal to the text of the selection node
-			if (!bSelection || bLinkPartSelected) {
+			if (bImageSelected) {
+				// For images, check if there's an existing link with title, otherwise use alt text
+				const oImageAnchor = this._getImageAnchor(oSelectionNode);
+				if (oImageAnchor && oImageAnchor.getAttribute('title')) {
+					sDisplayText = oImageAnchor.getAttribute('title');
+				} else {
+					sDisplayText = oSelectionNode.getAttribute('alt') || '';
+				}
+			} else if (!bSelection || bLinkPartSelected) {
+				// if there isn't a selection or a link is partly selected,
+				// the display text should be equal to the text of the selection node
 				sDisplayText = oSelectedNode.text;
 			} else {
 				// prevents displaying the whole anchor element as a display text
@@ -1143,13 +1159,15 @@ sap.ui.define([
 
 		/**
 		 * Helper function for finding selected anchor HTML node
+		 * @param {object} oSelection TinyMCE selection object
+		 * @returns {HTMLAnchorElement|null} The selected anchor element or null
 		 * @private
 		 */
 		ToolbarWrapper.prototype._getSelectionAnchor = function (oSelection) {
 			var oSelectionNode, oAnchor;
 
 			if (!oSelection) {
-				return;
+				return null;
 			}
 
 			oSelectionNode = oSelection.getNode();
@@ -1163,6 +1181,83 @@ sap.ui.define([
 			return oAnchor;
 		};
 
+		/**
+		 * Helper function for finding anchor element that wraps an image
+		 * @param {HTMLImageElement} oImageElement The image element
+		 * @returns {HTMLAnchorElement|null} The wrapping anchor element or null
+		 * @private
+		 */
+		ToolbarWrapper.prototype._getImageAnchor = function (oImageElement) {
+			const oParent = oImageElement && oImageElement.parentElement;
+			return (oParent && oParent.tagName && oParent.tagName.toLowerCase() === "a") ? oParent : null;
+		};
+
+		/**
+		 * Handles creating text links in the editor
+		 * @param {string} sText The text content for the link
+		 * @param {object} oLinkAttrs Link attributes (href, title, target)
+		 * @private
+		 */
+		ToolbarWrapper.prototype._handleTextLink = function (sText, oLinkAttrs) {
+			const oNativeEditor = this.getEditor().getNativeApi();
+
+			if (sText !== this.sSelectionTextValue || sText === "") {
+				oNativeEditor.insertContent(oNativeEditor.dom.createHTML('a', oLinkAttrs, oNativeEditor.dom.encode(sText)));
+			} else {
+				oNativeEditor.execCommand('mceInsertLink', false, oLinkAttrs);
+			}
+		};
+
+		/**
+		 * Handles wrapping an image with a link or updating an existing image link
+		 * @param {HTMLImageElement} oImageElement The image element to link
+		 * @param {object} oLinkAttrs Link attributes (href, title, target)
+		 * @private
+		 */
+		ToolbarWrapper.prototype._handleImageLink = function (oImageElement, oLinkAttrs) {
+			const oNativeEditor = this.getEditor().getNativeApi();
+			const oExistingAnchor = this._getImageAnchor(oImageElement);
+
+			if (!oExistingAnchor) {
+				const oLinkElement = oNativeEditor.dom.create("a", oLinkAttrs);
+				oNativeEditor.dom.insertAfter(oLinkElement, oImageElement);
+				oLinkElement.appendChild(oImageElement);
+				oNativeEditor.selection.select(oLinkElement);
+			} else {
+				this._updateImageLinkAttributes(oExistingAnchor, oLinkAttrs);
+			}
+		};
+
+		/**
+		 * Updates the attributes of an existing image link
+		 * @param {HTMLAnchorElement} oAnchorElement The anchor element to update
+		 * @param {object} oLinkAttrs Link attributes to update
+		 * @private
+		 */
+		ToolbarWrapper.prototype._updateImageLinkAttributes = function (oAnchorElement, oLinkAttrs) {
+			if (oLinkAttrs.href) {
+				oAnchorElement.setAttribute("href", oLinkAttrs.href);
+			}
+			if (oLinkAttrs.title) {
+				oAnchorElement.setAttribute("title", oLinkAttrs.title);
+			}
+			if (oLinkAttrs.target) {
+				oAnchorElement.setAttribute("target", oLinkAttrs.target);
+			}
+		};
+
+		/**
+		 * Removes the link wrapper from an image element
+		 * @param {HTMLImageElement} oImageElement The image element
+		 * @param {HTMLAnchorElement} oAnchorElement The anchor element wrapping the image
+		 * @private
+		 */
+		ToolbarWrapper.prototype._removeImageLink = function (oImageElement, oAnchorElement) {
+			const oNativeEditor = this.getEditor().getNativeApi();
+			oNativeEditor.dom.insertAfter(oImageElement, oAnchorElement);
+			oNativeEditor.dom.remove(oAnchorElement);
+		};
+
 		/**
 		 * Validates and sanitizes a user-provided link field (URL) for safe usage in HTML links.
 		 * - Validates URL syntax and safety
@@ -1227,18 +1322,27 @@ sap.ui.define([
 		* @private
 		*/
 		ToolbarWrapper.prototype.createLink = function (oLinkAttrs, sText) {
-			var oNativeEditor = this.getEditor().getNativeApi();
+			const oNativeEditor = this.getEditor().getNativeApi();
+			const oSelectedNode = oNativeEditor.selection.getNode();
+			const bImageSelected = oSelectedNode && oSelectedNode.tagName &&
+				oSelectedNode.tagName.toLowerCase() === "img";
 
-			// if there is no url provided and no link selected, do not generate an anchor
+			// if there is no url provided
 			if (oLinkAttrs.href === "") {
+				// check if an image is already wrapped in a link and remove it
+				if (bImageSelected) {
+					const oExistingAnchor = this._getImageAnchor(oSelectedNode);
+					if (oExistingAnchor) {
+						this._removeImageLink(oSelectedNode, oExistingAnchor);
+					}
+				}
 				return;
 			}
 
-			// if the user modifies the predefined text value of the current node via the dialog we should perform insertContent
-			if (sText !== this.sSelectionTextValue || sText === "") {
-				oNativeEditor.insertContent(oNativeEditor.dom.createHTML('a', oLinkAttrs, oNativeEditor.dom.encode(sText)));
+			if (bImageSelected) {
+				this._handleImageLink(oSelectedNode, oLinkAttrs);
 			} else {
-				oNativeEditor.execCommand('mceInsertLink', false, oLinkAttrs);
+				this._handleTextLink(sText, oLinkAttrs);
 			}
 		};
 
@@ -1450,15 +1554,11 @@ sap.ui.define([
 						const iRows = Math.min(Math.max(oRowsInput.getValue(), iMinTableCells), iMaxTableCells);
 						const iCols = Math.min(Math.max(oColsInput.getValue(), iMinTableCells), iMaxTableCells);
 
-						if (oRTE.getEditorType() === library.EditorType.TinyMCE6 || oRTE.getEditorType() === library.EditorType.TinyMCE7) {
-							oNativeAPI.execCommand('mceInsertTable', false, { rows: iRows, columns: iCols });
+						oNativeAPI.execCommand('mceInsertTable', false, { rows: iRows, columns: iCols });
 
-							oTableElm = oDomRef.getParents(oNativeAPI.selection.getNode()).find(function (element) {
-								return element.tagName.toLowerCase() === "table";
-							});
-						} else {
-							oTableElm = oNativeAPI.plugins.table.insertTable(iCols, iRows);
-						}
+						oTableElm = oDomRef.getParents(oNativeAPI.selection.getNode()).find(function (element) {
+							return element.tagName.toLowerCase() === "table";
+						});
 
 						oDomRef.setStyle(oTableElm, 'width', oDimensionWidthInput.getValue() + "px");
 						oDomRef.setStyle(oTableElm, 'height', oDimensionHeightInput.getValue() + "px");

package/src/sap/ui/richtexteditor/ToolbarWrapperRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 // Provides default renderer for control sap.ui.richtexteditor.ToolbarWrapper
 sap.ui.define([],

package/src/sap/ui/richtexteditor/library.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 /**
@@ -37,7 +37,7 @@ sap.ui.define([
 				"sap.ui.richtexteditor.RTESplitButton"
 			],
 			elements: [],
-			version: "1.143.1"
+			version: "1.145.0"
 		});
 
 		/**
@@ -52,6 +52,7 @@ sap.ui.define([
 
 		/**
 		 * Determines which editor component should be used for editing the text.
+		 * <b>Note: To ensure stability and to access the latest features, use the most current TinyMCE version supported by your SAPUI5 version by setting the property to <code>TinyMCE</code>. </br> Unsupported TinyMCE versions with critical vulnerabilities or other serious issues may be removed without notice.</b>
 		 *
 		 * @enum {string}
 		 * @public
@@ -67,8 +68,8 @@ sap.ui.define([
 
 			/**
 			 * Uses TinyMCE version 6 as editor
-			 * TinyMCE 6 is no longer supported, therefore using it is on your own risk.
-			 * @deprecated As of version 1.141
+			 * @deprecated As of version 1.141, TinyMCE 6 is no longer supported. Use the {@link sap.ui.richtexteditor.EditorType.TinyMCE} instead.
+			 * @public
 			 */
 			TinyMCE6: "TinyMCE6",
 

package/src/sap/ui/richtexteditor/messagebundle_sl.properties

@@ -21,7 +21,7 @@ UNDERLINE_BUTTON_TOOLTIP=Pod\u010Drtano
 STRIKETHROUGH_BUTTON_TOOLTIP=Pre\u010Drtano
 
 #XTOL: Tooltip for text align menu button
-TEXTALIGN_BUTTON_TOOLTIP=Poravnava teksta
+TEXTALIGN_BUTTON_TOOLTIP=Poravnava besedila
 
 #XTOL: Tooltip for text formatBlock menu button
 FORMAT_BUTTON_TOOLTIP=Oblika

package/src/sap/ui/richtexteditor/themes/base/RichTextEditor.less

@@ -1,14 +1,18 @@
+/* ===================================================== */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
+/* Base theme                                            */
+/* ===================================================== */
+
 .sapUiRTE {
 	display: inline-block;
 	min-height: 200px;
-
 }
 
 .sapUiRTE {
 	--_sap_ui_richtexteditor__wrapper-border: 4px;
 }
 
-/* ====== Custom Toolbar ====== */
+/* Custom Toolbar */
 
 .sapUiRTE.sapUiRTEWithCustomToolbar {
 	--_sap_ui_richtexteditor__toolbar_height: 2.75rem;
@@ -23,7 +27,7 @@
 	--_sap_ui_richtexteditor__toolbar_height: 2rem;
 }
 
-/* ====== Footer Toolbar ====== */
+/* Footer Toolbar */
 
 .sapUiRTE .sapUiRTETextAreaWrapper.sapUiRTEFooter {
 	--_sap_ui_richtexteditor__footer_height: 2.75rem;
@@ -38,15 +42,9 @@
 	--_sap_ui_richtexteditor__footer_height: 2rem;
 }
 
-/* This fixes the focus of the split buttons in Edge */
-html[data-sap-ui-browser^="ed"] {
-	.sapUiRTE.sapUiRTEWithCustomToolbar .sapUiRTECustomToolbar .sapMBtnBase.sapMSBText .sapMBtnFocusDiv {
-		right: 1px;
-	}
-}
-
 .sapUiRTE .sapUiRteEditorContainer {
 	border-radius: 0;
+
 	.tox-editor-container
 	.tox-editor-header {
 		padding: 0;
@@ -62,10 +60,11 @@ html[data-sap-ui-browser^="ed"] {
 }
 
 .sapUiRTEWithCustomToolbar .sapUiRTETextAreaWrapper {
-	border: 1px solid @sapUiFieldBorderColor;
+	border: 1px solid var(--sapField_BorderColor);
 }
 
 .sapUiRTEWithCustomToolbar .sapUiRteEditorContainer {
+
 	.mce-container.mce-panel.mce-first,
 	.mce-container.mce-panel.mce-last {
 		border: none;
@@ -82,16 +81,16 @@ svg.rteFontColorIcon {
 }
 
 svg.rteFontColorIcon path {
-	fill: @sapUiContentIconColor;
+	fill: var(--sapContent_IconColor);
 }
 
 svg.rteFontColorIcon .outline {
 	stroke-width: 1.4px;
-	stroke:@sapUiContentForegroundBorderColor;
+	stroke:var(--sapContent_ForegroundBorderColor);
 }
 
 .sapMBtnActive > svg.rteFontColorIcon path {
-	fill: @sapUiButtonActiveTextColor;
+	fill: var(--sapButton_Active_TextColor);
 }
 
 .sapUiSizeCompact svg.rteFontColorIcon {
@@ -100,10 +99,10 @@ svg.rteFontColorIcon .outline {
 
 .sapUiRTE .sapMSBText .sapMBtnIcon::before {
 	text-shadow:
-		-1px -1px 0 @sapUiContentForegroundBorderColor,
-		1px -1px 0 @sapUiContentForegroundBorderColor,
-		-1px 1px 0 @sapUiContentForegroundBorderColor,
-		1px 1px 0 @sapUiContentForegroundBorderColor;
+		-1px -1px 0 var(--sapContent_ForegroundBorderColor),
+		1px -1px 0 var(--sapContent_ForegroundBorderColor),
+		-1px 1px 0 var(--sapContent_ForegroundBorderColor),
+		1px 1px 0 var(--sapContent_ForegroundBorderColor);
 }
 
 .sapUiRTE .sapUiRTETextAreaWrapper {
@@ -117,4 +116,4 @@ svg.rteFontColorIcon .outline {
 
 .sapUiRTE .sapUiRTEFooter .sapMIBar .sapMBarRight {
 	padding-right: 4px;
-}
+}

package/src/sap/ui/richtexteditor/themes/base/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 @import "../../../../../sap/ui/core/themes/base/base.less";

package/src/sap/ui/richtexteditor/themes/sap_belize/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 /* ============================================================================ */

package/src/sap/ui/richtexteditor/themes/sap_belize_base/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 @import "../../../../../sap/ui/core/themes/base/base.less";

package/src/sap/ui/richtexteditor/themes/sap_belize_hcb/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 /* ============================================================================ */

package/src/sap/ui/richtexteditor/themes/sap_belize_hcw/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 /* ============================================================================ */

package/src/sap/ui/richtexteditor/themes/sap_belize_plus/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 @import "../sap_belize/library.source.less";

package/src/sap/ui/richtexteditor/themes/sap_bluecrystal/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 /* ============================================================================== */

package/src/sap/ui/richtexteditor/themes/sap_bluecrystal_base/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
 @import "../../../../../sap/ui/core/themes/base/base.less";

package/src/sap/ui/richtexteditor/themes/sap_fiori_3/RichTextEditor.less

@@ -1,12 +1,12 @@
-/* ==================================================== */
-/* CSS for control sap.ui.richtexteditor.RichTextEditor */
-/* Fiori 3 theme                                        */
-/* ==================================================== */
+/* ===================================================== */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
+/* Quartz Light theme                                    */
+/* ===================================================== */
 
 .sapUiRTE {
 	--_sap_ui_richtexteditor__wrapper-border: 2px;
 }
 
 .sapUiRTEWithCustomToolbar .sapMTB.sapUiRTECustomToolbar {
-    border-bottom: none;
-}
+	border-bottom: none;
+}

package/src/sap/ui/richtexteditor/themes/sap_fiori_3/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
  @import "../base/library.source.less";

package/src/sap/ui/richtexteditor/themes/sap_fiori_3_dark/RichTextEditor.less

@@ -1,12 +1,12 @@
-/* ==================================================== */
-/* CSS for control sap.ui.richtexteditor.RichTextEditor */
-/* Fiori 3 Dark theme                                   */
-/* ==================================================== */
+/* ===================================================== */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
+/* Quartz Dark theme                                     */
+/* ===================================================== */
 
 .sapUiRTE {
 	--_sap_ui_richtexteditor__wrapper-border: 2px;
 }
 
 .sapUiRTEWithCustomToolbar .sapMTB.sapUiRTECustomToolbar {
-    border-bottom: none;
-}
+	border-bottom: none;
+}

package/src/sap/ui/richtexteditor/themes/sap_fiori_3_dark/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
  @import "../base/library.source.less";

package/src/sap/ui/richtexteditor/themes/sap_fiori_3_hcb/RichTextEditor.less

@@ -1,8 +1,8 @@
-/* ==================================================== */
-/* CSS for control sap.ui.richtexteditor.RichTextEditor */
-/* Quartz High Contrast Black theme                     */
-/* ==================================================== */
+/* ===================================================== */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
+/* Quartz High Contrast Black theme                      */
+/* ===================================================== */
 
 .sapUiRTEWithCustomToolbar .sapMTB.sapUiRTECustomToolbar {
-    border-bottom: none;
-}
+	border-bottom: none;
+}

package/src/sap/ui/richtexteditor/themes/sap_fiori_3_hcb/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
  @import "../base/library.source.less";

package/src/sap/ui/richtexteditor/themes/sap_fiori_3_hcw/RichTextEditor.less

@@ -1,8 +1,8 @@
-/* ==================================================== */
-/* CSS for control sap.ui.richtexteditor.RichTextEditor */
-/* Quartz High Contrast White theme                     */
-/* ==================================================== */
+/* ===================================================== */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
+/* Quartz High Contrast White theme                      */
+/* ===================================================== */
 
 .sapUiRTEWithCustomToolbar .sapMTB.sapUiRTECustomToolbar {
-    border-bottom: none;
-}
+	border-bottom: none;
+}

package/src/sap/ui/richtexteditor/themes/sap_fiori_3_hcw/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
  @import "../base/library.source.less";

package/src/sap/ui/richtexteditor/themes/sap_horizon/RichTextEditor.less

@@ -1,12 +1,12 @@
-/* ==================================================== */
-/* CSS for control sap.ui.richtexteditor.RichTextEditor */
-/* Horizon theme                                        */
-/* ==================================================== */
+/* ===================================================== */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
+/* Morning Horizon theme                                 */
+/* ===================================================== */
 
 .sapUiRTE.sapUiRTEWithCustomToolbar {
 
 	.sapUiRTETextAreaWrapper {
-		border: @sapUiContentFocusWidth solid @sapUiFieldActiveBorderColor;
+		border: var(--sapContent_FocusWidth) solid var(--sapField_Active_BorderColor);
 	}
 
 	.sapUiRTECustomToolbar.sapMTB.sapMTBStandard {
@@ -15,9 +15,9 @@
 
 	.sapMBtn:hover > .sapMBtnHoverable:not(.sapMToggleBtnPressed):not(.sapMBtnActive),
 	.sapMSB .sapMBtn:not(.sapMBtnDisabled):not(:focus):hover .sapMBtnInner.sapMBtnActive {
-		background: @sapUiButtonHoverBackground;
-		border-color: @sapUiButtonHoverBorderColor;
-		box-shadow: @sapContent_Interaction_Shadow;
+		background: var(--sapButton_Hover_Background);
+		border-color: var(--sapButton_Hover_BorderColor);
+		box-shadow: var(--sapContent_Interaction_Shadow);
 	}
 
 	.sapMSB .sapMBtn:hover ~ .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
@@ -27,4 +27,4 @@
 	.sapMBtn:not(.sapMSBArrow) .sapMBtnInner .sapMBtnIcon {
 		top: 0.0625rem;
 	}
-}
+}

package/src/sap/ui/richtexteditor/themes/sap_horizon/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
  @import "../base/library.source.less";

package/src/sap/ui/richtexteditor/themes/sap_horizon_dark/RichTextEditor.less

@@ -1,12 +1,12 @@
 /* ===================================================== */
-/* CSS for control sap.ui.richtexteditor.RichTextEditor  */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
 /* Evening Horizon theme                                 */
 /* ===================================================== */
 
 .sapUiRTE.sapUiRTEWithCustomToolbar {
 
 	.sapUiRTETextAreaWrapper {
-		border: @sapUiContentFocusWidth solid @sapUiFieldActiveBorderColor;
+		border: var(--sapContent_FocusWidth) solid var(--sapField_Active_BorderColor);
 	}
 
 	.sapUiRTECustomToolbar.sapMTB.sapMTBStandard {
@@ -15,9 +15,9 @@
 
 	.sapMBtn:hover > .sapMBtnHoverable:not(.sapMToggleBtnPressed):not(.sapMBtnActive),
 	.sapMSB .sapMBtn:not(.sapMBtnDisabled):not(:focus):hover .sapMBtnInner.sapMBtnActive {
-		background: @sapUiButtonHoverBackground;
-		border-color: @sapUiButtonHoverBorderColor;
-		box-shadow: @sapContent_Interaction_Shadow;
+		background: var(--sapButton_Hover_Background);
+		border-color: var(--sapButton_Hover_BorderColor);
+		box-shadow: var(--sapContent_Interaction_Shadow);
 	}
 
 	.sapMSB .sapMBtn:hover ~ .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
@@ -27,4 +27,4 @@
 	.sapMBtn:not(.sapMSBArrow) .sapMBtnInner .sapMBtnIcon {
 		top: 0.0625rem;
 	}
-}
+}

package/src/sap/ui/richtexteditor/themes/sap_horizon_dark/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
  @import "../base/library.source.less";

package/src/sap/ui/richtexteditor/themes/sap_horizon_hcb/RichTextEditor.less

@@ -1,15 +1,15 @@
 /* ===================================================== */
-/* CSS for control sap.ui.richtexteditor.RichTextEditor  */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
 /* Horizon High Contrast Black theme                     */
 /* ===================================================== */
 
 .sapUiRTE.sapUiRTEWithCustomToolbar {
 
 	.sapUiRTETextAreaWrapper {
-		border: @sapUiContentFocusWidth solid @sapUiFieldActiveBorderColor;
+		border: var(--sapContent_FocusWidth) solid var(--sapField_Active_BorderColor);
 	}
 
 	.sapUiRTECustomToolbar.sapMTB.sapMTBStandard {
 		border-bottom: none;
 	}
-}
+}

package/src/sap/ui/richtexteditor/themes/sap_horizon_hcb/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
  @import "../base/library.source.less";

package/src/sap/ui/richtexteditor/themes/sap_horizon_hcw/RichTextEditor.less

@@ -1,15 +1,15 @@
 /* ===================================================== */
-/* CSS for control sap.ui.richtexteditor.RichTextEditor  */
+/* CSS for control sap.ui.richtexteditor/RichTextEditor  */
 /* Horizon High Contrast White theme                     */
 /* ===================================================== */
 
 .sapUiRTE.sapUiRTEWithCustomToolbar {
 
 	.sapUiRTETextAreaWrapper {
-		border: @sapUiContentFocusWidth solid @sapUiFieldActiveBorderColor;
+		border: var(--sapContent_FocusWidth) solid var(--sapField_Active_BorderColor);
 	}
 
 	.sapUiRTECustomToolbar.sapMTB.sapMTBStandard {
 		border-bottom: none;
 	}
-}
+}

package/src/sap/ui/richtexteditor/themes/sap_horizon_hcw/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2025 SAP SE. All rights reserved.
+ * (c) Copyright 2026 SAP SE. All rights reserved.
  */
 
  @import "../base/library.source.less";