@openui5/sap.ui.integration 1.143.1 → 1.145.0

package/src/sap/ui/integration/designtime/baseEditor/validator/IsNumber.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsNumber
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsPatternMatch.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/integration/designtime/baseEditor/validator/IsSelectedKey.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsSelectedKey
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsStringList.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsStringList
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsUniqueKey.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -13,7 +13,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsUniqueKey
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsUniqueList.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsUniqueList
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/IsValidBinding.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.IsValidBinding
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/MaxLength.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.MaxLength
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/NotABinding.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -15,7 +15,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.NotABinding
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/baseEditor/validator/ValidatorRegistry.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace sap.ui.integration.designtime.baseEditor.validator.ValidatorRegistry
 	 *
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @static
 	 * @since 1.81

package/src/sap/ui/integration/designtime/cardEditor/BASEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/integration/designtime/cardEditor/PropertyEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/integration/designtime/cardEditor/PropertyEditors.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/integration/designtime/cardEditor/config/AppConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @private

package/src/sap/ui/integration/designtime/cardEditor/config/FooterConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @private

package/src/sap/ui/integration/designtime/cardEditor/config/HeaderConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @private

package/src/sap/ui/integration/designtime/cardEditor/config/ListCardConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @private

package/src/sap/ui/integration/designtime/cardEditor/config/ObjectCardConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @private

package/src/sap/ui/integration/designtime/cardEditor/config/TableCardConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @private

package/src/sap/ui/integration/designtime/cardEditor/config/generateActionConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/integration/designtime/cardEditor/config/generateDataConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @function

package/src/sap/ui/integration/designtime/cardEditor/config/generateFooterActionsStripConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/integration/designtime/cardEditor/config/index.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @private

package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_fr.properties

@@ -271,7 +271,7 @@ CARD_EDITOR.DESTINATION.DEFAULT_URL=URL par d\u00E9faut
 
 CARD_EDITOR.FILTERS=Filtres
 
-CARD_EDITOR.FILTER=Filtre
+CARD_EDITOR.FILTER=Filtrer
 
 CARD_EDITOR.FILTER.ITEM=El\u00E9ment
 
@@ -287,7 +287,7 @@ CARD_EDITOR.FILTER.TYPE.SELECT=S\u00E9lectionner
 
 CARD_EDITOR.FILTER.TYPE.DATERANGE=Plage de dates
 
-CARD_EDITOR.FILTER.ITEM_LABEL=Filtre
+CARD_EDITOR.FILTER.ITEM_LABEL=Filtrer
 
 CARD_EDITOR.FILTER.VALUE=Valeur initiale
 

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/complexMapEditor/ComplexMapEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.complexMapEditor.ComplexMapEditor
 	 * @author SAP SE
 	 * @since 1.76
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @private
 	 * @experimental 1.76

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/destinationsEditor/DestinationsEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.destinationsEditor.DestinationsEditor
 	 * @author SAP SE
 	 * @since 1.77
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @private
 	 * @experimental 1.77

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/filtersEditor/FiltersEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.filtersEditor.FiltersEditor
 	 * @author SAP SE
 	 * @since 1.98
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @private
 	 * @experimental 1.97

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/iconEditor/IconEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.iconEditor.IconEditor
 	 * @author SAP SE
 	 * @since 1.81
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @private
 	 * @experimental 1.81

package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/parametersEditor/ParametersEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @alias sap.ui.integration.designtime.cardEditor.propertyEditor.parametersEditor.ParametersEditor
 	 * @author SAP SE
 	 * @since 1.70
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @private
 	 * @experimental 1.70

package/src/sap/ui/integration/designtime/cardEditor/util/CommonPatterns.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(function () {

package/src/sap/ui/integration/designtime/cardEditor/validator/IsPatternMatchList.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.widgets.Card
 	 *
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 * @private
 	 * @constructor
 	 * @since 1.112

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -18,7 +18,8 @@ sap.ui.define([
 	"sap/ui/integration/designtime/editor/CardPreview",
 	"sap/base/util/extend",
 	"sap/ui/integration/util/Utils",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/base/util/deepClone"
 ], function(
 	Element,
 	Library,
@@ -33,7 +34,8 @@ sap.ui.define([
 	CardPreview,
 	extend,
 	Utils,
-	Log
+	Log,
+	deepClone
 ) {
 	"use strict";
 
@@ -51,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.editor.Editor
 	 *
 	 * @author SAP SE
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
 	 * @since 1.83
@@ -104,7 +106,7 @@ sap.ui.define([
 
 	CardEditor.prototype.getSeparatePreview = function() {
 		var sPreviewPosition = this.getPreviewPosition();
-		if (!this.isReady() || sPreviewPosition !== "separate") {
+		if (!this.isFieldReady() || sPreviewPosition !== "separate") {
 			return null;
 		}
 		return this._initPreview();
@@ -120,6 +122,41 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Switch to another editor based on the manifest and item object
+	 *
+	 * @param {*} oManifest the manifest of the editor to switch to
+	 * @param {*} oItemObject the binding object of the pressed tree item
+	 * @param {string} sPath the path of the pressed tree item
+	 */
+	CardEditor.prototype.switchToEditor = function(oManifest, oItemObject, sPath) {
+		// save the current card instance, to avoid creating new instance when switching between child cards
+		this._oChildTreeSettings = this._oChildTreeSettings || {};
+		if (!this._oChildTreeSettings[this._oChildTree._path]) {
+			this._oChildTreeSettings[this._oChildTree._path] = this._oEditorCard;
+		}
+
+		// get settings for the pressed item
+		this.isChild = oItemObject.isChild;
+		var oManifestChanges;
+		if (!this.isChild) {
+			oManifestChanges = this._aMainEditorChanges;
+		} else {
+			oManifestChanges = this._oChildEditorChanges[sPath] || [];
+		}
+		if (this._oChildTreeSettings[sPath]) {
+			this._vIdOrSettings = this._oChildTreeSettings[sPath];
+			this._vIdOrSettings.setManifestChanges(oManifestChanges);
+		} else {
+			this._vIdOrSettings.baseUrl = oItemObject.baseUrl;
+			this._vIdOrSettings.manifest = oManifest;
+			this._vIdOrSettings.manifestChanges = oManifestChanges;
+		}
+
+		// switch to the pressed item card
+		this.setCard(this._vIdOrSettings, true); //suppress rerendering as the editor will be rerendered anyway
+	};
+
 	/**
 	 * Sets the card property as a string, object {manifest:{}, baseUrl:{}} or a reference to a card instance
 	 * @param {any} vCardIdOrSettings
@@ -181,8 +218,8 @@ sap.ui.define([
 	};
 
 	CardEditor.prototype.initDestinations = function (vHost) {
-		this._destinationsModel = new JSONModel({});
-		this.setModel(this._destinationsModel, "destinations");
+		this._oDestinationsModel = new JSONModel({});
+		this.setModel(this._oDestinationsModel, "destinations");
 		var oHostInstance = this.getHostInstance();
 
 		if (vHost && !oHostInstance) {
@@ -235,33 +272,33 @@ sap.ui.define([
 
 	CardEditor.prototype.createManifest = async function (vIdOrSettings, bSuppress) {
 		this._isManifestReady = false;
-		if (this._oEditorManifest) {
-			this._oEditorManifest.destroy();
+		if (this._oManifest) {
+			this._oManifest.destroy();
 		}
 		this.destroyAggregation("_extension");
 		var iCurrentModeIndex = Merger.layers[this.getMode()];
 
-		this._oEditorManifest = this._oEditorCard._oCardManifest;
+		this._oManifest = this._oEditorCard._oCardManifest;
 		this._registerManifestModulePath();
 		// since Manifest.js will translate i18n values in the manifest.json which we don't want to,
 		// so we need to get inital manifest json, merge it with before layer changes by ourself to keep the i18n key
-		var oInitialJson = this._oEditorManifest._oInitialJson;
+		var oInitialJson = this._oManifest._oInitialJson;
 		this._oInitialManifestModel = new JSONModel(oInitialJson);
 		this.setProperty("json", oInitialJson, bSuppress);
 		var oManifestJson;
-		if (this._beforeLayerManifestChanges) {
-			oManifestJson = Merger.mergeDelta(oInitialJson, [this._beforeLayerManifestChanges]);
+		if (this._oBeforeLayerChange) {
+			oManifestJson = Merger.mergeDelta(oInitialJson, [this._oBeforeLayerChange]);
 		} else {
 			oManifestJson = oInitialJson;
 		}
-		var _beforeCurrentLayer = merge({}, oManifestJson);
-		this._beforeManifestModel = new JSONModel(_beforeCurrentLayer);
-		if (iCurrentModeIndex < Merger.layers["translation"] && this._currentLayerManifestChanges) {
+		var oBeforeLayerManifestJson = merge({}, oManifestJson);
+		this._oBeforeLayerManifestModel = new JSONModel(oBeforeLayerManifestJson);
+		if (iCurrentModeIndex < Merger.layers["translation"] && this._oCurrentLayerChange) {
 			//merge if not translation
-			oManifestJson = Merger.mergeDelta(oManifestJson, [this._currentLayerManifestChanges]);
+			oManifestJson = Merger.mergeDelta(oManifestJson, [this._oCurrentLayerChange]);
 		}
 		//create a manifest model after the changes are merged
-		this._manifestModel = new JSONModel(oManifestJson);
+		this._oManifestModel = new JSONModel(oManifestJson);
 		this._isManifestReady = true;
 		this.fireManifestReady();
 		this._initResourceBundlesForMultiTranslation();
@@ -270,8 +307,8 @@ sap.ui.define([
 		}
 		//add a context model
 		this._createContextModel();
-		if (this._oEditorManifest && this._oEditorManifest.getResourceBundle()) {
-			var oResourceBundle = this._oEditorManifest.getResourceBundle();
+		if (this._oManifest && this._oManifest.getResourceBundle()) {
+			var oResourceBundle = this._oManifest.getResourceBundle();
 			var oResourceModel = new ResourceModel({
 				bundle: oResourceBundle
 			});
@@ -291,7 +328,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Initializes the additional content
+	 * Initializes the preview content
 	 */
 	CardEditor.prototype._initPreview = function () {
 		var oSettings = this._oDesigntimeInstance.getSettings() || {};
@@ -300,14 +337,33 @@ sap.ui.define([
 		var oCardPreview = new CardPreview({
 			settings: oSettings,
 			card: this._oEditorCard,
-			parentWidth: this.getWidth(),
+			parentWidth: this._oChildTree && this._editorWidth ? this._editorWidth : this.getWidth(),
 			parentHeight: this.getHeight()
 		});
+		// set preview size type if has child cards
+		if (this._oChildTree && this._previewSize) {
+			oCardPreview._currentSize = this._previewSize;
+		}
 		this.setAggregation("_preview", oCardPreview);
 		oCardPreview.setAssociation("_editor", this);
 		return oCardPreview;
 	};
 
+	/**
+	 * Destory the preview content
+	 */
+	CardEditor.prototype._destoryPreview = function () {
+		var oPreview = this.getAggregation("_preview");
+		if (oPreview) {
+			// save the editor width and preview size type for the next card editor
+			this._editorWidth = oPreview.getParentWidth();
+			this._previewSize = oPreview._currentSize;
+			// do not remove css properties here, as they will be used for the next card editor
+			oPreview.destroy(false);
+			this.setAggregation("_preview", null);
+		}
+	};
+
 	CardEditor.prototype._loadExtension = function () {
 		return new Promise(function (resolve, reject) {
 			var oExtension = this._oEditorCard.getAggregation("_extension");