@openui5/sap.ui.integration 1.96.2 → 1.98.0

package/src/sap/ui/integration/designtime/editor/CardEditor.js

@@ -1,17 +1,25 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
 	"sap/ui/integration/editor/Editor",
 	"sap/ui/core/Core",
-	"sap/ui/integration/widgets/Card"
+	"sap/ui/integration/widgets/Card",
+	"sap/ui/integration/editor/Merger",
+	"sap/ui/model/json/JSONModel",
+	"sap/base/util/merge",
+	"sap/ui/model/resource/ResourceModel"
 ], function (
 	Editor,
 	Core,
-	Card
+	Card,
+	Merger,
+	JSONModel,
+	merge,
+	ResourceModel
 ) {
 	"use strict";
 
@@ -28,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
 	 * @since 1.83
@@ -123,6 +131,47 @@ sap.ui.define([
 		}
 	};
 
+	CardEditor.prototype.createManifest = function (vIdOrSettings, bSuppress) {
+		this._isManifestReady = false;
+		if (this._oEditorManifest) {
+			this._oEditorManifest.destroy();
+		}
+		this.destroyAggregation("_extension");
+		var iCurrentModeIndex = Merger.layers[this.getMode()];
+
+		this._oEditorManifest = this._oEditorCard._oCardManifest;
+		this._registerManifestModulePath();
+		this._oInitialManifestModel = new JSONModel(this._oEditorManifest._oInitialJson);
+		this.setProperty("json", this._oEditorManifest._oInitialJson, bSuppress);
+		var oManifestJson = this._oEditorManifest._oManifest.getRawJson();
+		var _beforeCurrentLayer = merge({}, oManifestJson);
+		this._beforeManifestModel = new JSONModel(_beforeCurrentLayer);
+		if (iCurrentModeIndex < Merger.layers["translation"] && this._currentLayerManifestChanges) {
+			//merge if not translation
+			oManifestJson = Merger.mergeDelta(oManifestJson, [this._currentLayerManifestChanges]);
+		}
+		//create a manifest model after the changes are merged
+		this._manifestModel = new JSONModel(oManifestJson);
+		this._isManifestReady = true;
+		this.fireManifestReady();
+		//add a context model
+		this._createContextModel();
+		if (this._oEditorManifest.getResourceBundle()) {
+			var oResourceBundle = this._oEditorManifest.getResourceBundle();
+			var oResourceModel = new ResourceModel({
+				bundle: oResourceBundle
+			});
+			this.setModel(oResourceModel, "i18n");
+			this._oResourceBundle = oResourceBundle;
+		} else {
+			this._loadDefaultTranslations();
+		}
+
+		return this._loadExtension().then(function() {
+			this._initInternal();
+		}.bind(this));
+	};
+
 	/**
 	 * Initializes the additional content
 	 */

package/src/sap/ui/integration/designtime/editor/CardPreview.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.editor.CardPreview
 	 * @author SAP SE
 	 * @since 1.83.0
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @private
 	 * @experimental since 1.83.0
 	 * @ui5-restricted
@@ -62,21 +62,25 @@ sap.ui.define([
 				oRm.addClass("sapUiIntegrationDTPreviewDark");
 			}
 			if (oControl.getSettings().preview.position && (oControl.getSettings().preview.position === "top" || oControl.getSettings().preview.position === "bottom")) {
-				oRm.addClass("sapUiIntegrationDTPreviewMarginForAlignTopAndBottom");
+				var sLanguge = Core.getConfiguration().getLanguage().replaceAll('_', '-');
+				// for the languages "ar-SA"(Arabic) and "he-IL"(Hebrew) which write from right to left, use spec style
+				if (sLanguge.startsWith("ar") || sLanguge.startsWith("he")) {
+					oRm.addClass("sapUiIntegrationDTPreviewMarginForAlignTopAndBottomSpec");
+				} else {
+					oRm.addClass("sapUiIntegrationDTPreviewMarginForAlignTopAndBottom");
+				}
 			}
-			oRm.writeClasses();
 			oRm.openEnd();
 			oRm.openStart("div");
 			oRm.addClass("before");
-			oRm.writeAttribute("tabindex", "0");
+			oRm.writeAttribute("tabindex", "-1");
 			oRm.writeAttributeEscaped("id", oControl.getId() + "-before");
 			oRm.addStyle("z-index", oControl.getParent()._iZIndex + 1);
-			oRm.writeStyles();
 			oRm.openEnd();
 			oRm.close("div");
 			oRm.renderControl(oControl._getCardPreview());
 			oRm.openStart("div");
-			oRm.writeAttribute("tabindex", "0");
+			oRm.writeAttribute("tabindex", "-1");
 			oRm.writeAttributeEscaped("id", oControl.getId() + "-after");
 			oRm.openEnd();
 			oRm.close("div");
@@ -126,9 +130,9 @@ sap.ui.define([
 	};
 
 	CardPreview.prototype.onAfterRendering = function () {
-		var oPreview = this._getCardPreview(),
+		var oPreview = this.getAggregation("cardPreview"),
 		    sModes = this._getModes();
-		if (sModes.indexOf("Live") > -1 && oPreview.getDomRef().getElementsByClassName("sapVizFrame")) {
+		if (sModes.indexOf("Live") > -1 && oPreview && oPreview.getDomRef() && oPreview.getDomRef().getElementsByClassName("sapVizFrame")) {
 			window.setTimeout(function() {
 				try {
 					var vizFrameId = oPreview.getDomRef().getElementsByClassName("sapVizFrame")[0].id;
@@ -160,7 +164,15 @@ sap.ui.define([
 		if (oPreview) {
 			this.setAggregation("cardPreview", oPreview);
 			if (!this.getSettings().preview || this.getSettings().preview.scaled !== false) {
-				oPreview.addStyleClass("sapUiIntegrationDTPreviewScale");
+				oPreview.removeStyleClass("sapUiIntegrationDTPreviewScale");
+				oPreview.removeStyleClass("sapUiIntegrationDTPreviewScaleSpec");
+				var sLanguge = Core.getConfiguration().getLanguage().replaceAll('_', '-');
+				// for the languages "ar-SA"(Arabic) and "he-IL"(Hebrew) which write from right to left, use spec style
+				if (sLanguge.startsWith("ar") || sLanguge.startsWith("he")) {
+					oPreview.addStyleClass("sapUiIntegrationDTPreviewScaleSpec");
+				} else {
+					oPreview.addStyleClass("sapUiIntegrationDTPreviewScale");
+				}
 			} else {
 				oPreview.addStyleClass("sapUiIntegrationDTPreviewNoScale");
 			}
@@ -364,12 +376,20 @@ sap.ui.define([
 		if (!this._oModeToggleButton) {
 			this._oModeToggleButton = new ToggleButton();
 			this._oModeToggleButton.setTooltip();
-			this._oModeToggleButton.addStyleClass("sapUiIntegrationDTPreviewButton");
 			this._oModeToggleButton.attachPress(function () {
 				this._toggleCurrentMode();
 				this.update();
 			}.bind(this));
 		}
+		this._oModeToggleButton.removeStyleClass("sapUiIntegrationDTPreviewButton");
+		this._oModeToggleButton.removeStyleClass("sapUiIntegrationDTPreviewButtonSpec");
+		var sLanguge = Core.getConfiguration().getLanguage().replaceAll('_', '-');
+		// for the languages "ar-SA"(Arabic) and "he-IL"(Hebrew) which write from right to left, use spec style
+		if (sLanguge.startsWith("ar") || sLanguge.startsWith("he")) {
+			this._oModeToggleButton.addStyleClass("sapUiIntegrationDTPreviewButtonSpec");
+		} else {
+			this._oModeToggleButton.addStyleClass("sapUiIntegrationDTPreviewButton");
+		}
 		var tb = this._oModeToggleButton,
 			currentMode = this._getCurrentMode();
 		if (currentMode === "None") {

package/src/sap/ui/integration/designtime/editor/css/CardPreview.css

@@ -15,6 +15,10 @@
 	margin-left: calc(50% - 135px);
 }
 
+.sapUiIntegrationDTPreviewMarginForAlignTopAndBottomSpec {
+	margin-right: calc(50% - 135px);
+}
+
 .sapUiIntegrationDTPreview>.before {
 	position: absolute;
 	min-width: calc(190px + 5rem);
@@ -45,7 +49,20 @@
 	position: absolute
 }
 
+.sapUiIntegrationDTPreview .sapFCard.sapUiIntegrationDTPreviewScaleSpec {
+	transform: scale3d(0.4, 0.4, 1);
+	transform-origin: 100% 0;
+	width: 500px !important;
+	height: 600px !important;
+	position: absolute
+}
+
 .sapUiIntegrationDTPreview .sapUiIntegrationDTPreviewButton {
 	position: absolute !important;
-	margin: calc(260px + 0.3rem) 0 0 calc(95px - 1rem) !important;
+	margin: calc(260px + 0.3rem) 0 0 calc(95px - 0.5rem) !important;
+}
+
+.sapUiIntegrationDTPreview .sapUiIntegrationDTPreviewButtonSpec {
+	position: absolute !important;
+	margin: calc(260px + 0.3rem) calc(95px - 0.5rem) 0 0 !important
 }