@sapui5/sap.ui.richtexteditor 1.98.0 → 1.99.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.richtexteditor",
-  "version": "1.98.0",
+  "version": "1.99.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

@@ -5,7 +5,7 @@
 	<vendor>SAP SE</vendor>
 	<copyright>SAPUI5
  * (c) Copyright 2009-2022 SAP SE. All rights reserved.</copyright>
-	<version>1.98.0</version>
+	<version>1.99.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

@@ -24,7 +24,7 @@ sap.ui.define([
 		 * @alias sap.ui.richtexteditor.RTESplitButton
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 */
 		var RTESplitButton = SplitButton.extend("sap.ui.richtexteditor.RTESplitButton", {
 			metadata: {

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

@@ -199,22 +199,10 @@ sap.ui.define([
 		ToolbarWrapper.prototype.modifyRTEToolbarConfig = function (oConfig) {
 			var oToolbar = this;
 
-			// Sync the default text justification with the text direction set in the config
-			var sTextAlign = oConfig.directionality === "rtl" ? "JustifyRight" : "JustifyLeft";
 			// Remove the native toolbar. From now on the sap.ui.richtexteditor.ToolbarWrapper will be used
 			oConfig.toolbar = false;
 
 			oConfig.setup = function (editor) {
-				editor.on('init', function () {
-					var oEditorCommands = library.EditorCommands;
-
-					// execute the default font styles to ensure right synchronizing of the custom toolbar
-					// prevent tinymce from stealing the focus
-					editor.execCommand("FormatBlock", false, oEditorCommands["FormatBlock"]["Paragraph"].commandValue, {skip_focus: true});
-					editor.execCommand(sTextAlign, false, null, {skip_focus: true});
-					editor.execCommand("FontName", false, oEditorCommands["FontFamily"]["Verdana"].commandValue, {skip_focus: true});
-					editor.execCommand("FontSize", false, "10pt", {skip_focus: true});
-				});
 
 				// Sync sap.ui.richtexteditor.ToolbarWrapper buttons with the editor
 				editor.on('NodeChange', function () {
@@ -1441,6 +1429,7 @@ sap.ui.define([
 						oEditorHelper.createSelect({
 							id: this._getId("FontFamily"),
 							ariaLabelledBy: oInvisibleTextFontFamily,
+							selectedItemId: this._getId("FontFamilyVerdana"),
 							items: this._createFontStyleSelectItems(),
 							change: function (oEvent) {
 								var oItem;
@@ -1459,6 +1448,7 @@ sap.ui.define([
 						oEditorHelper.createSelect({
 							id: this._getId("FontSize"),
 							ariaLabelledBy: oInvisibleTextFontSize,
+							selectedItemId: this._getId("FontSize2"),
 							items: this._createFontSizeSelectItems(),
 							change: function (oEvent) {
 								var oItem;
@@ -1483,6 +1473,8 @@ sap.ui.define([
 					break;
 				case "text-align":
 					bVisibleGroupTextAlign = oRTE ? oRTE.getShowGroupTextAlign() : false;
+					var bTextAlignLRight = oRTE._getTextDirection() === "rtl";
+					var iDefaultItemIndex = bTextAlignLRight ? 2 : 0;
 					var aMenuItems = this._createMenuButtonItems("TextAlign");
 					aContent.push(
 						oEditorHelper.createMenuButton(
@@ -1496,9 +1488,10 @@ sap.ui.define([
 									oEditor = oRTE.getNativeApi();
 									oSelectedItemIcon = oSelectedItem.getIcon();
 									if (oSelectedItemIcon === this.getParent().getIcon()) {
+										var sTextAlign = bTextAlignLRight ? "JustifyRight" : "JustifyLeft";
 										// Text Align commands in TinyMCE have a toggle behavior when you set a
 										// certain command twice the default command (text-align-left) will be applied
-										oEditor.execCommand('JustifyLeft');
+										oEditor.execCommand(sTextAlign);
 									} else {
 										oEditor.execCommand('Justify' + oToolbar._findTextAlignCommandByIcon(oSelectedItemIcon));
 									}
@@ -1506,7 +1499,7 @@ sap.ui.define([
 									Log.warning("Cannot execute native command: " + 'Justify');
 								}
 							},
-							aMenuItems[0].getIcon(),
+							aMenuItems[iDefaultItemIndex].getIcon(),
 							this._oResourceBundle.getText(oCommands["TextAlign"].bundleKey)
 						).setVisible(bVisibleGroupTextAlign)
 					);

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

@@ -37,7 +37,7 @@ sap.ui.define(["sap/ui/thirdparty/jquery", 'sap/ui/core/Core', 'sap/ui/core/libr
 				"sap.ui.richtexteditor.RTESplitButton"
 			],
 			elements: [],
-			version: "1.98.0"
+			version: "1.99.0"
 		});
 
 		/**