@sapui5/sap.ui.richtexteditor 1.109.0 → 1.111.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.richtexteditor",
-  "version": "1.109.0",
+  "version": "1.111.0",
   "description": "SAPUI5 Library sap.ui.richtexteditor",
   "homepage": "https://sap.github.io/ui5-tooling/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 2009-2022 SAP SE. All rights reserved.</copyright>
-	<version>1.109.0</version>
+ * (c) Copyright 2009-2023 SAP SE. All rights reserved.</copyright>
+	<version>1.111.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 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 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.109.0
+		 * @version 1.111.0
 		 */
 		var RTESplitButton = SplitButton.extend("sap.ui.richtexteditor.RTESplitButton", {
 			metadata: {

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 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 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.richtexteditor.RichTextEditor.
@@ -185,6 +185,7 @@ sap.ui.define([
 				/**
 				 * Height of RichTextEditor control in CSS units.
 				 * <b>Note:</b> If the height property results in a value smaller than 200px, the minimum height of 200px will be applied.
+				 * <b>Note:</b> If the "autoresize" TinyMCE plugin is used, the height property is not taken into account.
 				 */
 				height: { type: "sap.ui.core.CSSSize", group: "Dimension", defaultValue: null },
 
@@ -293,7 +294,7 @@ sap.ui.define([
 				 * @deprecated Since version 1.97.0
 				 * This property became obsolete after the deprecation of TinyMCE v3.
 				 */
-				useLegacyTheme: { type: "boolean", group: "Appearance", defaultValue: true },
+				useLegacyTheme: { type: "boolean", group: "Appearance", defaultValue: true, deprecated: true },
 
 				/**
 				 * An array of button configurations. These configurations contain the names of buttons as array in the property "buttons" and the name of the group in "name", they can also contain the "row" where the buttons should be placed, a "priority" and whether the buttons are "visible". See method addButtonGroup() for more details on the structure of the objects in this array.
@@ -336,7 +337,8 @@ sap.ui.define([
 				readyRecurring: {},
 
 				/**
-				 * This event is fired right before the TinyMCE instance is created and can be used to change the settings object that will be given to TinyMCE. The parameter "configuration" is the javascript oject that will be given to TinyMCE upon first instantiation. The configuration parameter contains a map that can be changed in the case of TinyMCE.
+				 * This event is fired right before the TinyMCE instance is created and can be used to change the settings object that will be given to TinyMCE. The parameter "configuration" is the javascript object that will be given to TinyMCE upon first instantiation. The configuration parameter contains a map that can be changed in the case of TinyMCE.
+				 * <b>Note:</b> In order to add plugins to the <code>RichTextEditor</code> control, you have to use the <code>addPlugin</code> method. Adding plugins through the settings object may lead to synchronizing issues between TinyMCE and <code>RichTextEditor</code> control.
 				 */
 				beforeEditorInit: {}
 			},
@@ -860,7 +862,7 @@ sap.ui.define([
 	 * RichTextEditor.
 	 *
 	 * @param {object|string} [mPlugin] The plugin ID/name or an object with property "name", containing the ID/name of the plugin
-	 * @returns {object} Control instance (for method chaining)
+	 * @returns {sap.ui.richtexteditor.RichTextEditor} Control instance (for method chaining)
 	 * @public
 	 */
 	RichTextEditor.prototype.addPlugin = function (mPlugin) {
@@ -885,7 +887,7 @@ sap.ui.define([
 	 * Removes the plugin with the given name/ID from the list of plugins to load
 	 *
 	 * @param {string} [sPluginName] The name/ID of the plugin to remove
-	 * @returns {object} Control instance (for method chaining)
+	 * @returns {sap.ui.richtexteditor.RichTextEditor} Control instance (for method chaining)
 	 * @public
 	 */
 	RichTextEditor.prototype.removePlugin = function(sPluginName) {
@@ -913,7 +915,7 @@ sap.ui.define([
 	 * @param {int}        [vGroup.row=0] (optional) Row number in which the button should be
 	 * @param {int}        [vGroup.priority=10] (optional) The priority of the button group. Lower priorities are added first.
 	 * @param {int}        [vGroup.customToolbarPriority] (optional) The priority of the button group in the custom toolbar. Each default group in the custom toolbar has a predefined <code>customToolbarPriority</code>. Lower priorities are added in first.
-	 * @returns {object} Control instance (for method chaining)
+	 * @returns {sap.ui.richtexteditor.RichTextEditor} Control instance (for method chaining)
 	 * @public
 	 */
 	RichTextEditor.prototype.addButtonGroup = function (vGroup) {
@@ -1009,7 +1011,7 @@ sap.ui.define([
 	 * Removes a button group from the editor.
 	 *
 	 * @param {string} [sGroupName] The name of the group to be removed.
-	 * @returns {object} Control instance (for method chaining)
+	 * @returns {sap.ui.richtexteditor.RichTextEditor} Control instance (for method chaining)
 	 * @public
 	 */
 	RichTextEditor.prototype.removeButtonGroup = function(sGroupName) {
@@ -1033,7 +1035,7 @@ sap.ui.define([
 	 * Sets the button groups to the editor.
 	 *
 	 * @param {array} [aGroups] Array of names or objects containing the group information
-	 * @returns {object} Control instance (for method chaining)
+	 * @returns {sap.ui.richtexteditor.RichTextEditor} Control instance (for method chaining)
 	 * @public
 	 */
 	RichTextEditor.prototype.setButtonGroups = function (aGroups) {
@@ -1086,7 +1088,7 @@ sap.ui.define([
 	 * Sets the plugins to the editor.
 	 *
 	 * @param {array} [aPlugins] Array of names or objects containing the plugin information
-	 * @returns {object} Control instance (for method chaining)
+	 * @returns {sap.ui.richtexteditor.RichTextEditor} Control instance (for method chaining)
 	 * @public
 	 */
 	RichTextEditor.prototype.setPlugins = function (aPlugins) {
@@ -1246,7 +1248,7 @@ sap.ui.define([
 	 * All plugins and button groups should be set after this has been invoked
 	 *
 	 * @param {string} [sEditorType] Which editor type to be used (currently only TinyMCE 4, 5 and 6)
-	 * @returns {object} Control instance (for method chaining)
+	 * @returns {sap.ui.richtexteditor.RichTextEditor} Control instance (for method chaining)
 	 * @public
 	 */
 	RichTextEditor.prototype.setEditorType = function(sEditorType) {
@@ -1257,8 +1259,6 @@ sap.ui.define([
 
 			this._setupToolbar();
 
-			this.setEditorLocation(EDITOR_LOCATION_MAPPING[this.getEditorType()]);
-
 			if (!oEditorMapping[sEditorType]) {
 				Log.error('TinyMCE3 is removed now due to security concerns, please do NOT use it anymore. The framework automatically will load TinyMCE4 since v1.60');
 			}
@@ -1522,9 +1522,11 @@ sap.ui.define([
 	 */
 	RichTextEditor.prototype.onBeforeRenderingTinyMCE = function() {
 		if (this._shouldLoadTinyMCE()) {
+			// fallback to tinymce 4 for now since the editorLocation property used to do so
+			var sEditorLocation = EDITOR_LOCATION_MAPPING[this.getEditorType()] || EDITOR_LOCATION_MAPPING[RichTextEditor.EDITORTYPE_TINYMCE4];
 			// Load TinyMCE component
 			this._tinyMCEStatus = EditorStatus.Loading;
-			this._pTinyMCELoaded = RichTextEditor.loadTinyMCE(this.getEditorLocation()).then(function() {
+			this._pTinyMCELoaded = RichTextEditor.loadTinyMCE(sEditorLocation).then(function() {
 				this._tinyMCEStatus = EditorStatus.Loaded;
 			}.bind(this));
 		} else {
@@ -1917,7 +1919,7 @@ sap.ui.define([
 		/*eslint-disable camelcase */
 		var oConfig = {
 			// The following line only covers the editor content, not the UI in general
-			height: "100%",
+			height: "calc(100% - var(--_sap_ui_richtexteditor__toolbar_height))",
 			directionality: this._getTextDirection(),
 			selector: "[id='" + this._textAreaId + "']",
 			theme: bIsTinyMCE5Or6 ? "silver" : "modern",

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 SAP SE. All rights reserved.
  */
 // Provides default renderer for control sap.ui.richtexteditor.RichTextEditor
 sap.ui.define(['sap/ui/core/Core'],
@@ -28,6 +28,8 @@ sap.ui.define(['sap/ui/core/Core'],
 		var oToolbarWrapper = oRichTextEditor.getAggregation("_toolbarWrapper");
 		var bCustomToolbar = oToolbarWrapper && oRichTextEditor._bCustomToolbarRequirementsFullfiled;
 		var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.richtexteditor");
+		var aPlugins = oRichTextEditor.getPlugins();
+		var bAutoresize = false;
 
 		rm.openStart("div", oRichTextEditor);
 		rm.class("sapUiRTE");
@@ -42,7 +44,15 @@ sap.ui.define(['sap/ui/core/Core'],
 		}
 
 		rm.style("width", oRichTextEditor.getWidth());
-		rm.style("height", oRichTextEditor.getHeight() || "200px");
+
+		bAutoresize = aPlugins.some(function(oPlugin) {
+			return oPlugin.name === "autoresize";
+		});
+
+		if (oRichTextEditor.getHeight() && !bAutoresize) {
+			rm.style("height", oRichTextEditor.getHeight());
+		}
+
 		if (oRichTextEditor.getTooltip_AsString()) { // ensure not to render null
 			rm.attr("title", oRichTextEditor.getTooltip_AsString());
 		}

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.richtexteditor.ToolbarWrapper.

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 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 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 SAP SE. All rights reserved.
  */
 
 /**
@@ -34,7 +34,7 @@ sap.ui.define([
 				"sap.ui.richtexteditor.RTESplitButton"
 			],
 			elements: [],
-			version: "1.109.0"
+			version: "1.111.0"
 		});
 
 		/**

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

@@ -3,6 +3,19 @@
 	min-height: 200px;
 }
 
+.sapUiRTE.sapUiRTEWithCustomToolbar {
+	--_sap_ui_richtexteditor__toolbar_height: 2.75rem;
+}
+
+.sapUiRTE:not(.sapUiRTEWithCustomToolbar) {
+	--_sap_ui_richtexteditor__toolbar_height: 0rem;
+}
+
+.sapUiSizeCompact.sapUiRTE.sapUiRTEWithCustomToolbar,
+.sapUiSizeCompact .sapUiRTE.sapUiRTEWithCustomToolbar {
+	--_sap_ui_richtexteditor__toolbar_height: 2rem;
+}
+
 /* This fixes the focus of the split buttons in Edge */
 html[data-sap-ui-browser^="ed"] {
 	.sapUiRTE.sapUiRTEWithCustomToolbar .sapUiRTECustomToolbar .sapMBtnBase.sapMSBText .sapMBtnFocusDiv {
@@ -17,6 +30,8 @@ html[data-sap-ui-browser^="ed"] {
 	.tox-editor-header {
 		padding: 0;
 	}
+
+	min-height: ~"calc(200px - var(--_sap_ui_richtexteditor__toolbar_height))";
 }
 
 .sapUiRTEWithCustomToolbar .sapUiRteEditorContainer {

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

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

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

@@ -4,6 +4,10 @@
 /* ==================================================== */
 
 /*RichTextEditor with Custom toolbar*/
+.sapUiRTE.sapUiRTEWithCustomToolbar {
+	--_sap_ui_richtexteditor__toolbar_height: 3rem;
+}
+
 .sapUiRTE.sapUiRTEWithCustomToolbar .sapUiRTECustomToolbar {
 
 	.sapMBarChild ~ .sapMBarChild {

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 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 2009-2022 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2023 SAP SE. All rights reserved.
  */
 
 @import "../base/library.source.less";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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