@openui5/sap.ui.rta 1.105.1 → 1.107.0

package/src/sap/ui/rta/toolbar/BaseRenderer.js

@@ -16,16 +16,18 @@ function(
 
 	var BaseRenderer = Renderer.extend.call(HBoxRenderer, "sap.ui.rta.toolbar.BaseRenderer");
 
+	BaseRenderer.apiVersion = 1; // @todo-semantic-rendering out of order .class() and .style() calls before openStart
+
 	BaseRenderer.render = function (oRM, oControl) {
-		oRM.addClass("sapUiRtaToolbar");
-		oRM.addClass("color_" + oControl.getColor());
+		oRM.class("sapUiRtaToolbar");
+		oRM.class("color_" + oControl.getColor());
 
 		// setting type if exists
-		oControl.type && oRM.addClass("type_" + oControl.type);
+		oControl.type && oRM.class("type_" + oControl.type);
 
 		// setting z-index if exists
 		var iZIndex = oControl.getZIndex();
-		iZIndex && oRM.addStyle("z-index", iZIndex);
+		iZIndex && oRM.style("z-index", iZIndex);
 
 		HBoxRenderer.render(oRM, oControl);
 	};

package/src/sap/ui/rta/toolbar/Fiori.js

@@ -32,7 +32,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/FioriLike.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/OverflowToolbarButton.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Personalization.js

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Standalone.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/contextBased/SaveAsContextBasedAdaptation.js

@@ -0,0 +1,125 @@
+/*!
+ * OpenUI5
+ * (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/base/ManagedObject",
+	"sap/ui/core/Fragment",
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/write/api/ContextSharingAPI",
+	"sap/ui/rta/Utils",
+	"sap/ui/model/Binding"
+], function (
+	ManagedObject,
+	Fragment,
+	Layer,
+	ContextSharingAPI,
+	Utils,
+	Binding
+) {
+	"use strict";
+
+	/**
+	 * Controller for the <code>sap.ui.rta.toolbar.contextBased.SaveAsContextBasedAdaptation</code> controls.
+	 * Contains implementation of context-based-adaptation functionality.
+	 *
+	 * @class
+	 *
+	 * @author SAP SE
+	 * @version 1.107.0
+	 *
+	 * @constructor
+	 * @private
+	 * @since 1.106
+	 * @alias sap.ui.rta.toolbar.contextBased.SaveAsContextBasedAdaptation
+	 */
+	var SaveAsContextBasedAdaptation = ManagedObject.extend("sap.ui.rta.toolbar.contextBased.SaveAsContextBasedAdaptation", {
+		metadata: {
+			properties: {
+				toolbar: {
+					type: "any" // "sap.ui.rta.toolbar.Base"
+				}
+			}
+		},
+		constructor: function () {
+			ManagedObject.prototype.constructor.apply(this, arguments);
+			this.oTextResources = this.getToolbar().getTextResources();
+		}
+	});
+
+	SaveAsContextBasedAdaptation.prototype.openAddAdaptationDialog = function (sLayer) {
+		if (!this._oAddAdaptationDialogPromise) {
+			this._oAddAdaptationDialogPromise = Fragment.load({
+				name: "sap.ui.rta.toolbar.contextBased.SaveAsContextBasedAdaptationDialog",
+				id: this.getToolbar().getId() + "_fragment--sapUiRta_addAdaptationDialog",
+				controller: {
+					onAdaptationTitleChange: _onAdaptationTitleChange.bind(this),
+					onSaveAsContextBasedAdaptation: _onSaveAsContextBasedAdaptation.bind(this),
+					onCancelContextBasedAdaptationDialog: _onCancelContextBasedAdaptationDialog.bind(this)
+				}
+			}).then(function (oDialog) {
+				this._oAddAdaptationDialog = oDialog;
+				oDialog.addStyleClass(Utils.getRtaStyleClassName());
+				this.getToolbar().addDependent(this._oAddAdaptationDialog);
+				createContextSharingComponent.call(this, sLayer);
+			}.bind(this));
+		} else {
+			this.getToolbar().getControl("addAdaptationDialog--saveContextBasedAdaptation-title-input").setValue("");
+		}
+		return this._oAddAdaptationDialogPromise.then(function () {
+			return this._oAddAdaptationDialog.open();
+		}.bind(this));
+	};
+
+	function _onAdaptationTitleChange(oEvent) {
+		this.sAdaptationTitle = oEvent.getParameter("value");
+		_enableSaveAsButton.call(this);
+	}
+
+	function _onCancelContextBasedAdaptationDialog() {
+		_clearContexts.call(this);
+		this._oAddAdaptationDialog.close();
+	}
+
+	function _onSaveAsContextBasedAdaptation() {
+		var oContextBasedAdaptation = {};
+		oContextBasedAdaptation.title = getAdaptationTitle.call(this);
+		oContextBasedAdaptation.contexts = this._oContextComponentInstance.getSelectedContexts();
+		this.getToolbar().fireEvent("saveAsContextBasedAdaptation", oContextBasedAdaptation);
+	}
+
+	function createContextSharingComponent(sLayer) {
+		var mPropertyBag = { layer: sLayer || Layer.CUSTOMER };
+		return ContextSharingAPI.createComponent(mPropertyBag).then(function (oContextSharingComponent) {
+			this._oContextComponent = oContextSharingComponent;
+			this._oContextComponentInstance = oContextSharingComponent.getComponentInstance();
+			this._oContextComponentInstance.resetSelectedContexts();
+			this._oAddAdaptationDialog.addContent(this._oContextComponent);
+			var oSelectedContextsModel = this._oContextComponentInstance.getSelectedContextsModel();
+			this.oSelectedContextsBinding = new Binding(oSelectedContextsModel, "/", oSelectedContextsModel.getContext("/"));
+			this.oSelectedContextsBinding.attachChange(_enableSaveAsButton.bind(this));
+		}.bind(this));
+	}
+
+	function getAdaptationTitle() {
+		return this.sAdaptationTitle || "";
+	}
+
+	function _enableSaveAsButton() {
+		var bEnable = getAdaptationTitle.call(this).length > 0 && this._oContextComponentInstance.getSelectedContexts().role.length > 0;
+		this.getToolbar().getControl("addAdaptationDialog--saveContextBasedAdaptation-saveButton").setEnabled(bEnable);
+	}
+
+	function _clearContexts() {
+		if (this._oContextComponentInstance) {
+			if (this._oContextComponent.isDestroyed()) {
+				return createContextSharingComponent.call(this);
+			}
+			this._oContextComponentInstance.resetSelectedContexts();
+			this._oAddAdaptationDialog.addContent(this._oContextComponent);
+		}
+	}
+	return SaveAsContextBasedAdaptation;
+});

package/src/sap/ui/rta/toolbar/contextBased/SaveAsContextBasedAdaptationDialog.fragment.xml

@@ -0,0 +1,79 @@
+<core:FragmentDefinition
+	xmlns:form="sap.ui.layout.form"
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core">
+	<Dialog id="selectContextsDialog"
+		resizable="true"
+		draggable="true"
+		title="{i18n>SAC_DIALOG_HEADER}">
+		<Panel id="saveContextBasedAdaptation-information-panel">
+			<Toolbar id="toolbar">
+				<Label id="label"
+					text="Information"
+					design="Bold">
+				</Label>
+			</Toolbar>
+			<form:Form id="saveContextBasedAdaptation-form"
+				editable="true">
+				<form:layout>
+					<form:ResponsiveGridLayout labelSpanXL="3"
+						labelSpanL="3"
+						labelSpanM="3"
+						labelSpanS="12"
+						adjustLabelSpan="false"
+						emptySpanXL="4"
+						emptySpanL="4"
+						emptySpanM="4"
+						emptySpanS="0"
+						columnsXL="1"
+						columnsL="1"
+						columnsM="1"
+						singleContainerFullSize="false"/>
+				</form:layout>
+				<form:FormContainer>
+					<form:formElements>
+						<form:FormElement >
+							<form:label>
+								<Label id="saveContextBasedAdaptation-title-label"
+									text="{i18n>APP_DIALOG_TITLE_TEXT}"
+									textAlign="Left"
+									required="true">
+								</Label>
+							</form:label>
+							<Input id="saveContextBasedAdaptation-title-input"
+								value="{/title}"
+								valueLiveUpdate="true"
+								liveChange=".onAdaptationTitleChange"
+								placeholder="{i18n>SAVE_AS_DIALOG_PLACEHOLDER_TITLE_TEXT}">
+							</Input>
+						</form:FormElement>
+						<form:FormElement >
+							<form:label>
+								<Label id="saveContextBasedAdaptation-rank-label"
+									text="{i18n>CLM_HEADER_PRIORITY}"
+									textAlign="Left"
+									required="true">
+								</Label>
+							</form:label>
+							<Select id="saveContextBasedAdaptation-rank-select"
+								selectedKey="{/selected}">
+							</Select>
+						</form:FormElement>
+					</form:formElements>
+				</form:FormContainer>
+			</form:Form>
+		</Panel>
+		<beginButton>
+			<Button id="saveContextBasedAdaptation-saveButton"
+				type="Emphasized"
+				text="{i18n>APP_VARIANT_DIALOG_SAVE}"
+				press=".onSaveAsContextBasedAdaptation"/>
+		</beginButton>
+		<endButton>
+			<Button id="saveContextBasedAdaptation-cancelButton"
+				type="Emphasized"
+				text="{i18n>SAVE_AS_APP_VARIANT_DIALOG_CANCEL}"
+				press=".onCancelContextBasedAdaptationDialog"/>
+		</endButton>
+	</Dialog>
+</core:FragmentDefinition>

package/src/sap/ui/rta/toolbar/translation/Translation.js

@@ -11,12 +11,10 @@ sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Fragment",
 	"sap/ui/rta/Utils",
-	"sap/ui/fl/Utils",
 	"sap/ui/model/json/JSONModel",
 	"sap/m/MessageBox",
 	"sap/m/MessageToast",
 	"sap/ui/fl/write/api/TranslationAPI",
-	"sap/ui/fl/write/api/VersionsAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/core/util/File"
 ], function(
@@ -24,12 +22,10 @@ sap.ui.define([
 	ManagedObject,
 	Fragment,
 	Utils,
-	FlUtils,
 	JSONModel,
 	MessageBox,
 	MessageToast,
 	TranslationAPI,
-	VersionsAPI,
 	Layer,
 	FileUtil
 ) {
@@ -53,7 +49,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/versioning/Versioning.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/util/BindingsExtractor.js

@@ -7,12 +7,16 @@
 sap.ui.define([
 	"sap/ui/dt/ElementUtil",
 	"sap/ui/dt/OverlayRegistry",
-	"sap/base/util/isPlainObject"
+	"sap/base/util/isPlainObject",
+	"sap/base/util/restricted/_uniqWith",
+	"sap/base/util/deepEqual"
 ],
 function(
 	ElementUtil,
 	OverlayRegistry,
-	isPlainObject
+	isPlainObject,
+	_uniqWith,
+	deepEqual
 ) {
 	"use strict";
 
@@ -35,7 +39,12 @@ function(
 		};
 		var sAggregationName = oElement.sParentAggregationName;
 		var oParent = oElement.getParent();
-		var aBindings = BindingsExtractor.getBindings(oElement, oModel, undefined, undefined, oRelevantContainerElement);
+		var aBindings = BindingsExtractor.getBindings({
+			element: oElement,
+			model: oModel,
+			relevantContainerElement: oRelevantContainerElement,
+			parent: oParent
+		});
 
 		if (oParent) {
 			var oDefaultAggregation = oParent.getMetadata().getAggregation();
@@ -52,7 +61,13 @@ function(
 					if (oTemplateDefaultAggregation) {
 						var sTemplateDefaultAggregationName = oTemplateDefaultAggregation.name;
 						var oTemplateElement = ElementUtil.getAggregation(oTemplate, sTemplateDefaultAggregationName)[iPositionOfInvisibleElement];
-						aBindings = aBindings.concat(BindingsExtractor.getBindings(oTemplateElement, null, true, undefined, oRelevantContainerElement));
+						aBindings = aBindings.concat(BindingsExtractor.getBindings({
+							model: oModel,
+							element: oTemplateElement,
+							template: true,
+							relevantContainerElement: oRelevantContainerElement,
+							parent: oParent
+						}));
 					}
 				}
 			}
@@ -93,58 +108,85 @@ function(
 
 	/**
 	 * Gets bindings for the whole hierarchy of children for a specified Element
-	 * and filters out bindings which are not relevant (based on the parent model)
+	 * and filters out bindings which are not relevant (based on the given model)
 	 *
-	 * @param {sap.ui.core.Control} oElement - Starting point of the search
-	 * @param {sap.ui.model.Model} oParentDefaultModel - Model for filtering irrelevant binding paths
-	 * @param {boolean} [vTemplate] - Whether we should consider provided element as a template
-	 * @param {string} [sAggregationName] - if aggregation name is given then only for this aggregation bindings are returned, if not then all aggregations are considered
-	 * @param {sap.ui.core.Control} [oRelevantContainerElement] - if this element is given then only bindings from element related to the relevant container are considered
+	 * @param {object} mPropertyBag - PropertyBag
+	 * @param {sap.ui.core.Control} mPropertyBag.element - Starting point of the search
+	 * @param {sap.ui.model.Model} [mPropertyBag.model] - Model for filtering irrelevant binding paths
+	 * @param {boolean} [mPropertyBag.template] - Whether we should consider provided element as a template or part of a template
+	 * @param {string} [mPropertyBag.aggregationName] - if aggregation name is given then only for this aggregation bindings are returned, if not then all aggregations are considered
+	 * @param {sap.ui.core.Control} [mPropertyBag.relevantContainerElement] - if this element is given then only bindings from element related to the relevant container are considered
+	 * @param {sap.ui.core.Control} [mPropertyBag.parent] - parent of the element being evaluated; if the element is a template, the parent is the control hosting the template
 	 * @returns {Array} - returns array with all relevant bindings for all properties of the element
 	 *
 	 * @private
 	 */
-	BindingsExtractor.getBindings = function(oElement, oParentDefaultModel, vTemplate, sAggregationName, oRelevantContainerElement) {
+	BindingsExtractor.getBindings = function(mPropertyBag) {
+		var oElement = mPropertyBag.element;
+		var oModel = mPropertyBag.model;
+		var oParent = mPropertyBag.parent;
+		var sAggregationName = mPropertyBag.aggregationName;
+		var oRelevantContainerElement = mPropertyBag.relevantContainerElement;
 		var aBindings = [];
 		if (isElementRelatedToRelevantContainer(oElement, oRelevantContainerElement)) {
 			aBindings = (
-				vTemplate
-					? getBindingsFromTemplateProperties(oElement)
-					: BindingsExtractor.getBindingsFromProperties(oElement, oParentDefaultModel)
+				mPropertyBag.template
+					? getBindingsFromTemplateProperties(oElement, oParent, oModel)
+					: BindingsExtractor.getBindingsFromProperties(oElement, oModel)
 			);
 		}
 		var aAggregationNames = sAggregationName ? [sAggregationName] : Object.keys(oElement.getMetadata().getAllAggregations());
 
 		aAggregationNames.forEach(function (sAggregationNameInLoop) {
-			aBindings = aBindings.concat(getBindingsForAggregation(oElement, oParentDefaultModel, vTemplate, sAggregationNameInLoop, oRelevantContainerElement));
+			aBindings = aBindings.concat(getBindingsForAggregation(oElement, oModel, mPropertyBag.template, sAggregationNameInLoop, oRelevantContainerElement));
 		});
 
-		return aBindings;
+		// Remove duplicates
+		return _uniqWith(aBindings, deepEqual);
 	};
 
-	function getBindingsForAggregation(oElement, oParentDefaultModel, vTemplate, sAggregationName, oRelevantContainerElement) {
+	function getBindingsForAggregation(oElement, oModel, bTemplate, sAggregationName, oRelevantContainerElement) {
 		var aBindings = [];
+		var aElements = [];
 		var oTemplate;
-		var bTemplate;
-		// Getting children of the current aggregation and iterating through all of them
+		var bIsInTemplate = bTemplate;
+		var oElementModel = oElement.getModel();
+
 		var oBinding = oElement.getBindingInfo(sAggregationName);
-		if (vTemplate !== false) {
-			oTemplate = oBinding && oBinding.template;
-			bTemplate = !!vTemplate;
+		oTemplate = oBinding && oBinding.template;
+
+		// If a template is found for a different model, we don't look inside the template
+		// e.g. a Select control whose entries are defined in an own JSON model
+		if (oTemplate && oElementModel && oElementModel !== oModel) {
+			return [];
 		}
-		var aElements = oTemplate ? [oTemplate] : ElementUtil.getAggregation(oElement, sAggregationName);
 
+		// If a template is bound to the current element on the given model,
+		// we continue the evaluation on the template (as it has no direct parent)
+		if (oTemplate) {
+			bIsInTemplate = true;
+			aElements = [oTemplate];
+		} else {
+			aElements = ElementUtil.getAggregation(oElement, sAggregationName);
+		}
+
+		// Getting children of the current aggregation and iterating through all of them
 		aElements.forEach(function (oChildElement) {
 			if (oChildElement.getMetadata) {
 				if (isElementRelatedToRelevantContainer(oElement, oRelevantContainerElement)) {
 					// Fetching bindings from Element and all children of Element
-					aBindings = aBindings.concat(oTemplate || bTemplate
-						? getBindingsFromTemplateProperties(oChildElement, oRelevantContainerElement)
-						: BindingsExtractor.getBindingsFromProperties(oChildElement, oParentDefaultModel));
+					aBindings = aBindings.concat(bIsInTemplate
+						? getBindingsFromTemplateProperties(oChildElement, oElement, oModel)
+						: BindingsExtractor.getBindingsFromProperties(oChildElement, oModel));
 				}
-				// For children, templates should not be evaluated (because the delegate also does not consider them)
 				aBindings = aBindings.concat(
-					BindingsExtractor.getBindings(oChildElement, oParentDefaultModel, false, undefined, oRelevantContainerElement)
+					BindingsExtractor.getBindings({
+						element: oChildElement,
+						model: oModel,
+						template: bIsInTemplate,
+						relevantContainerElement: oRelevantContainerElement,
+						parent: oElement
+					})
 				);
 			}
 		});
@@ -153,7 +195,7 @@ function(
 	}
 
 	/**
-	 * Fetches all bindings for a specified binding model
+	 * Fetches all bindings for a specified binding model, filtering out the irrelevant ones
 	 *
 	 * @param {sap.ui.model.PropertyBinding} oBinding - Binding model to get paths from
 	 * @param {sap.ui.model.odata.XX.ODataModel} oParentDefaultModel - Data model (XX = '', v2, v4...)
@@ -162,13 +204,13 @@ function(
 	 *
 	 * @private
 	 */
-	BindingsExtractor.flattenBindings = function(oBinding, oParentDefaultModel) {
+	BindingsExtractor.filterAndFlattenBindings = function(oBinding, oParentDefaultModel) {
 		var aBindings = [];
 		var sModelName = oBinding.getMetadata().getName();
 
 		if (sModelName === "sap.ui.model.CompositeBinding") {
 			oBinding.getBindings().forEach(function (oBinding) {
-				aBindings = aBindings.concat(BindingsExtractor.flattenBindings(oBinding, oParentDefaultModel));
+				aBindings = aBindings.concat(BindingsExtractor.filterAndFlattenBindings(oBinding, oParentDefaultModel));
 			});
 		} else if (
 			(
@@ -215,13 +257,13 @@ function(
 	 * Retrieving all bindings from all available properties for a specified element
 	 *
 	 * @param {sap.ui.core.Control} oElement - element to get bindings from
-	 * @param {sap.ui.model.Model} oParentDefaultModel - parent model to filter irrelevant bindings
+	 * @param {sap.ui.model.Model} oModel - model to filter irrelevant bindings
 	 *
 	 * @return {Array} - returns found bindings
 	 *
 	 * @private
 	 */
-	BindingsExtractor.getBindingsFromProperties = function(oElement, oParentDefaultModel) {
+	BindingsExtractor.getBindingsFromProperties = function(oElement, oModel) {
 		var aPropertiesKeys = Object.keys(oElement.getMetadata().getAllProperties());
 
 		return aPropertiesKeys
@@ -229,32 +271,46 @@ function(
 			.filter(oElement.getBinding.bind(oElement))
 			.reduce(function (aBindings, sPropertyName) {
 				return aBindings.concat(
-					BindingsExtractor.flattenBindings(
+					BindingsExtractor.filterAndFlattenBindings(
 						oElement.getBinding(sPropertyName),
-						oParentDefaultModel
+						oModel
 					)
 				);
 			}, []);
 	};
 
 	/**
-	 * Retrieving all bindings from all available properties for a specified element of template
+	 * Retrieving all bindings from all available properties for a template
+	 *
+	 * @param {sap.ui.core.Control} oTemplate - template being evaluated
+	 * @param {sap.ui.core.Control} oTemplateParent - template "parent"; control to which it is bound
+	 * @param {sap.ui.model.Modell} oModel - relevant model, usually the parent default model
 	 *
-	 * @param {sap.ui.core.Control} oElement - element to get bindings from
 	 * @return {Array} - returns found bindings
 	 * @private
 	 */
-	function getBindingsFromTemplateProperties(oElement) {
-		var aPropertiesKeys = Object.keys(oElement.getMetadata().getAllProperties());
+	function getBindingsFromTemplateProperties(oTemplate, oTemplateParent, oModel) {
+		var aPropertiesKeys = Object.keys(oTemplate.getMetadata().getAllProperties());
+		var bIsSameModel;
 
 		return aPropertiesKeys
 			.filter(function (sPropertyName) {
-				return sPropertyName in oElement.mBindingInfos;
+				var mBindingInfo = oTemplate.mBindingInfos[sPropertyName];
+				var sModelName = mBindingInfo && mBindingInfo.parts[0] && mBindingInfo.parts[0].model;
+				bIsSameModel = oModel === oTemplateParent.getModel(sModelName);
+				if (!sModelName) {
+					var oParentDefaultModel = oTemplateParent.getDefaultModel ? oTemplateParent.getDefaultModel() : null;
+					var oTemplateDefaultModel = oTemplate.getDefaultModel ? oTemplate.getDefaultModel() : null;
+					bIsSameModel = oParentDefaultModel === oTemplateDefaultModel;
+				} else {
+					bIsSameModel = oModel === oTemplateParent.getModel(sModelName);
+				}
+				return mBindingInfo && bIsSameModel;
 			})
 			.reduce(function (aBindings, sPropertyName) {
 				return aBindings.concat(
 					flattenBindingsFromTemplate(
-						oElement.mBindingInfos[sPropertyName]
+						oTemplate.mBindingInfos[sPropertyName]
 					)
 				);
 			}, []);

package/src/sap/ui/rta/util/PluginManager.js

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.86

package/src/sap/ui/rta/util/PopupManager.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @constructor
 	 * @private
 	 * @since 1.48

package/src/sap/ui/rta/util/ReloadManager.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @namespace sap.ui.rta.util.ReloadManager
 	 * @alias sap.ui.rta.util.ReloadManager
 	 * @since 1.104
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/util/ServiceEventBus.js

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

package/src/sap/ui/rta/util/StylesLoader.js

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/thirdparty/jquery"
-], function(jQuery) {
+	"sap/ui/thirdparty/jquery", "sap/ui/core/Configuration"
+], function(jQuery, Configuration) {
 	"use strict";
 
 	var module = {};
@@ -20,7 +20,7 @@ sap.ui.define([
 		return jQuery.get(sap.ui.require.toUrl(('sap.ui.rta.assets.' + sFileName).replace(/\./g, "/")) + '.css')
 				.then(function (sData) {
 					// TODO: check if it's possible to use UI5 standard mechanism for styles adjustments
-					if (sap.ui.getCore().getConfiguration().getRTL()) {
+					if (Configuration.getRTL()) {
 						return sData.replace(/right/g, 'left');
 					}
 					return sData;