@openui5/sap.ui.core 1.106.0 → 1.107.1

package/src/sap/ui/core/FocusHandler.js

@@ -6,18 +6,23 @@
 
 // Provides class sap.ui.core.FocusHandler
 sap.ui.define([
+	"../base/EventProvider",
 	"../base/Object",
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/dom/_ready"
 ],
-	function(BaseObject, Log, jQuery, _ready) {
+	function(EventProvider, BaseObject, Log, jQuery, _ready) {
 	"use strict";
 
 		// Element, Core module references, lazily probed when needed
 		var Element;
 		var Core;
 
+		var oFocusInfoEventProvider = new EventProvider();
+		var FOCUS_INFO_EVENT = "focusInfo";
+		var oEventData = {};
+
 		/**
 		 * Constructs an instance of an sap.ui.core.FocusHandler.
 		 * Keeps track of the focused element.
@@ -154,6 +159,36 @@ sap.ui.define([
 			}
 		};
 
+		/**
+		 * Adds the given function as an extender of the focus info. The given function will be called within the
+		 * <code>restoreFocus</code> function before the focus info is forwarded to the corresponding control.
+		 *
+		 * @see sap.ui.core.FocusHandler#restoreFocus
+		 * @param {function} fnFunction The function that will be called to extend the focus info
+		 * @param {object} oListener An object which is set as "this" context when callin the "fnFunction"
+		 * @return {sap.ui.core.FocusHandler} The object itself to allow function chaining
+		 * @private
+		 */
+		FocusHandler.prototype.addFocusInfoExtender = function(fnFunction, oListener) {
+			oFocusInfoEventProvider.attachEvent(FOCUS_INFO_EVENT, oEventData, fnFunction, oListener);
+			return this;
+		};
+
+		/**
+		 * Removes the given function from being an extender of the focus info.
+		 *
+		 * @param {function} fnFunction The function that will be removed
+		 * @param {object} oListener An object which is set as "this" context when callin the "fnFunction". Only when
+		 *  the same "oListener" is given as the one that is used to call <code>addFocusInfoExtender</code>, the function
+		 *  can be removed correctly.
+		 * @return {sap.ui.core.FocusHandler} The object itself to allow function chaining
+		 * @private
+		 */
+		FocusHandler.prototype.removeFocusInfoExtender = function(fnFunction, oListener) {
+			oFocusInfoEventProvider.detachEvent(FOCUS_INFO_EVENT, fnFunction, oListener);
+			return this;
+		};
+
 		/**
 		 * Restores the focus to the last known focused control or to the given focusInfo, if possible.
 		 *
@@ -182,7 +217,20 @@ sap.ui.define([
 				this.oLastFocusedControlInfo = oInfo;
 				// Do not store dom patch info in the last focused control info
 				delete this.oLastFocusedControlInfo.patching;
-				oControl.applyFocusInfo(oInfo.info);
+
+				// expose focus info into the oEventData which is forwarded to the focus info extender
+				oEventData.info = oInfo.info;
+				oFocusInfoEventProvider.fireEvent(FOCUS_INFO_EVENT, {
+					domRef: oControl.getDomRef()
+				});
+
+				oControl.applyFocusInfo(oEventData.info);
+
+				// oEventData is given to the event handler as event data, thus we can't assign it with a new empty
+				// object. We need to clear it by deleting all of its own properties
+				Object.keys(oEventData).forEach(function(sKey) {
+					delete oEventData[sKey];
+				});
 			} else {
 				Log.debug("Apply focus info of control " + oInfo.id + " not possible", null, "sap.ui.core.FocusHandler");
 			}

package/src/sap/ui/core/Fragment.js

@@ -60,7 +60,7 @@ function(
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @public
 	 * @alias sap.ui.core.Fragment
 	 */

package/src/sap/ui/core/HTML.js

@@ -44,11 +44,10 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.HTML
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var HTML = Control.extend("sap.ui.core.HTML", /** @lends sap.ui.core.HTML.prototype */ {
 		metadata : {

package/src/sap/ui/core/History.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/ui/util/Storage"],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @alias sap.ui.core.History
 	 * @protected
 	 */

package/src/sap/ui/core/Icon.js

@@ -73,12 +73,11 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @public
 	 * @since 1.11.1
 	 * @alias sap.ui.core.Icon
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var Icon = Control.extend("sap.ui.core.Icon", /** @lends sap.ui.core.Icon.prototype */ {
 		metadata : {

package/src/sap/ui/core/IndicationColorSupport.js

@@ -16,7 +16,7 @@ sap.ui.define(['./library'],
 		 * Helper functionality for indication color support.
 		 *
 		 * @author SAP SE
-		 * @version 1.106.0
+		 * @version 1.107.1
 		 * @public
 		 * @namespace sap.ui.core.IndicationColorSupport
 		 * @since 1.66

package/src/sap/ui/core/IntervalTrigger.js

@@ -23,7 +23,7 @@ sap.ui.define(['../base/Object', './EventBus', "sap/base/assert"],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.106.0
+		 * @version 1.107.1
 		 * @public
 		 * @since 1.11.0
 		 * @alias sap.ui.core.IntervalTrigger

package/src/sap/ui/core/InvisibleMessage.js

@@ -32,12 +32,11 @@ function (coreLibrary, ManagedObject, Log) {
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @hideconstructor
 	 * @public
 	 * @since 1.78
 	 * @alias sap.ui.core.InvisibleMessage
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 
 	var InvisibleMessage = ManagedObject.extend("sap.ui.core.InvisibleMessage", /** @lends sap.ui.core.InvisibleMessage.prototype */ {

package/src/sap/ui/core/InvisibleRenderer.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 * Provides the default renderer for the controls that have set their <code>visible</code> property to <code>false</code>.
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @alias module:sap/ui/core/InvisibleRenderer
 	 * @since 1.66.0
 	 * @protected

package/src/sap/ui/core/InvisibleText.js

@@ -6,11 +6,12 @@
 
 // Provides control sap.ui.core.InvisibleText.
 sap.ui.define([
-	"./Control",
 	"sap/base/Log",
 	"sap/base/security/encodeXML",
+	"./Configuration",
+	"./Control",
 	"./library" // ensure loading of CSS
-], function(Control, Log, encodeXML) {
+], function(Log, encodeXML, Configuration, Control) {
 	"use strict";
 
 
@@ -29,12 +30,11 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @public
 	 * @since 1.27.0
 	 * @alias sap.ui.core.InvisibleText
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var InvisibleText = Control.extend("sap.ui.core.InvisibleText", /** @lends sap.ui.core.InvisibleText.prototype */ {
 		metadata : {
@@ -180,7 +180,7 @@ sap.ui.define([
 	InvisibleText.getStaticId = function(sLibrary, sTextKey) {
 		var sTextId = "", sKey, oBundle, oText;
 
-		if ( sap.ui.getCore().getConfiguration().getAccessibility() && sTextKey ) {
+		if ( Configuration.getAccessibility() && sTextKey ) {
 			// Note: identify by lib and text key, not by text to avoid conflicts after a language change
 			sKey = sLibrary + "|" + sTextKey;
 			sTextId = mTextIds[sKey];

package/src/sap/ui/core/Item.js

@@ -24,11 +24,10 @@ sap.ui.define(['./Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.Item
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var Item = Element.extend("sap.ui.core.Item", /** @lends sap.ui.core.Item.prototype */ { metadata : {
 

package/src/sap/ui/core/LabelEnablement.js

@@ -136,7 +136,7 @@ sap.ui.define(['../base/ManagedObject', "sap/base/assert"],
 	 * @see sap.ui.core.LabelEnablement#enrich
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @protected
 	 * @alias sap.ui.core.LabelEnablement
 	 * @namespace

package/src/sap/ui/core/LayoutData.js

@@ -23,11 +23,10 @@ sap.ui.define(['./Element', "sap/ui/thirdparty/jquery", './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.LayoutData
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var LayoutData = Element.extend("sap.ui.core.LayoutData", /** @lends sap.ui.core.LayoutData.prototype */ { metadata : {
 

package/src/sap/ui/core/ListItem.js

@@ -23,11 +23,10 @@ sap.ui.define(['./Item', './library'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.ListItem
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var ListItem = Item.extend("sap.ui.core.ListItem", /** @lends sap.ui.core.ListItem.prototype */ { metadata : {
 

package/src/sap/ui/core/LocalBusyIndicator.js

@@ -32,14 +32,13 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @public
 	 * @since 1.11.0
 	 * @deprecated Since version 1.14.2.
 	 * The LocalBusyIndicator Control is not needed anymore by the new implementation of the LBI. Hence, it is not used anymore.
 	 * @alias sap.ui.core.LocalBusyIndicator
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var LocalBusyIndicator = Control.extend("sap.ui.core.LocalBusyIndicator", /** @lends sap.ui.core.LocalBusyIndicator.prototype */ {
 		metadata : {

package/src/sap/ui/core/Locale.js

@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/base/assert', './CalendarType'],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.106.0
+		 * @version 1.107.1
 		 * @public
 		 * @alias sap.ui.core.Locale
 		 */

package/src/sap/ui/core/LocaleData.js

@@ -5,8 +5,8 @@
  */
 
 //Provides the locale object sap.ui.core.LocaleData
-sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', './Locale', 'sap/base/assert', 'sap/base/util/LoaderExtensions'],
-	function(extend, BaseObject, CalendarType, Locale, assert, LoaderExtensions) {
+sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', './Locale', 'sap/base/assert', 'sap/base/util/LoaderExtensions', "sap/ui/core/Configuration"],
+	function(extend, BaseObject, CalendarType, Locale, assert, LoaderExtensions, Configuration) {
 	"use strict";
 
 	/**
@@ -18,7 +18,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @public
 	 * @alias sap.ui.core.LocaleData
 	 */
@@ -157,7 +157,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		},
 
 		/**
-		 * Get stand alone month names in width "narrow", "abbreviated" or "wide".
+		 * Get standalone month names in width "narrow", "abbreviated" or "wide".
 		 *
 		 * @param {string} sWidth the required width for the month names
 		 * @param {sap.ui.core.CalendarType} [sCalendarType] the type of calendar. If it's not set, it falls back to the calendar type either set in configuration or calculated from locale.
@@ -183,7 +183,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		},
 
 		/**
-		 * Get stand alone day names in width "narrow", "abbreviated" or "wide".
+		 * Get standalone day names in width "narrow", "abbreviated" or "wide".
 		 *
 		 * @param {string} sWidth the required width for the day names
 		 * @param {sap.ui.core.CalendarType} [sCalendarType] the type of calendar. If it's not set, it falls back to the calendar type either set in configuration or calculated from locale.
@@ -209,7 +209,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		},
 
 		/**
-		 * Get stand alone quarter names in width "narrow", "abbreviated" or "wide".
+		 * Get standalone quarter names in width "narrow", "abbreviated" or "wide".
 		 *
 		 * @param {string} sWidth the required width for the quarter names
 		 * @param {sap.ui.core.CalendarType} [sCalendarType] the type of calendar. If it's not set, it falls back to the calendar type either set in configuration or calculated from locale.
@@ -746,7 +746,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 							}
 						}
 					}
-					// if neither symbol or group matched, add it to the missing tokens and add distance
+					// if neither symbol nor group matched, add it to the missing tokens and add distance
 					aMissingTokens.push(oToken);
 					iDistance += 50 - i;
 				}
@@ -1590,6 +1590,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		 *
 		 * Call:
 		 * <code>getUnitFromMapping("my")</code> would result in <code>"my-custom-unit"</code>
+		 * @param {string} sMapping mapping identifier
 		 * @return {string} unit from the mapping
 		 * @public
 		 * @since 1.54
@@ -2074,11 +2075,12 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 	 * from the configuration, in case sCalendarType is undefined.
 	 *
 	 * @param {sap.ui.core.CalendarType} sCalendarType the type defined in {@link sap.ui.core.CalendarType}.
+	 * @returns {string} calendar name
 	 * @private
 	 */
 	function getCLDRCalendarName(sCalendarType) {
 		if (!sCalendarType) {
-			sCalendarType = sap.ui.getCore().getConfiguration().getCalendarType();
+			sCalendarType = Configuration.getCalendarType();
 		}
 		return "ca-" + sCalendarType.toLowerCase();
 	}
@@ -2214,7 +2216,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 	var CustomLocaleData = LocaleData.extend("sap.ui.core.CustomLocaleData", {
 		constructor: function(oLocale) {
 			LocaleData.apply(this, arguments);
-			this.mCustomData = sap.ui.getCore().getConfiguration().getFormatSettings().getCustomLocaleData();
+			this.mCustomData = Configuration.getFormatSettings().getCustomLocaleData();
 		},
 
 		/**

package/src/sap/ui/core/Manifest.js

@@ -16,7 +16,8 @@ sap.ui.define([
 	'sap/base/util/uid',
 	'sap/base/util/merge',
 	'sap/base/util/isPlainObject',
-	'sap/base/util/LoaderExtensions'
+	'sap/base/util/LoaderExtensions',
+	'sap/ui/core/Configuration'
 ],
 	function(
 		BaseObject,
@@ -29,7 +30,8 @@ sap.ui.define([
 		uid,
 		merge,
 		isPlainObject,
-		LoaderExtensions
+		LoaderExtensions,
+		Configuration
 	) {
 	"use strict";
 
@@ -137,7 +139,7 @@ sap.ui.define([
 	 * @class The Manifest class.
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @alias sap.ui.core.Manifest
 	 * @since 1.33.0
 	 */
@@ -377,7 +379,7 @@ sap.ui.define([
 			var sMinUI5Version = this.getEntry("/sap.ui5/dependencies/minUI5Version");
 			if (sMinUI5Version &&
 				Log.isLoggable(Log.Level.WARNING) &&
-				sap.ui.getCore().getConfiguration().getDebug()) {
+				Configuration.getDebug()) {
 				VersionInfo.load().then(function(oVersionInfo) {
 					var oMinVersion = getVersionWithoutSuffix(sMinUI5Version);
 					var oVersion = getVersionWithoutSuffix(oVersionInfo && oVersionInfo.version);
@@ -852,7 +854,7 @@ sap.ui.define([
 		var oManifestUrl = new URI(sManifestUrl);
 		["sap-language", "sap-client"].forEach(function(sName) {
 			if (!oManifestUrl.hasQuery(sName)) {
-				var sValue = sap.ui.getCore().getConfiguration().getSAPParam(sName);
+				var sValue = Configuration.getSAPParam(sName);
 				if (sValue) {
 					oManifestUrl.addQuery(sName, sValue);
 				}
@@ -874,7 +876,7 @@ sap.ui.define([
 			dataType: "json",
 			async: typeof bAsync !== "undefined" ? bAsync : false,
 			headers: {
-				"Accept-Language": sap.ui.getCore().getConfiguration().getLanguageTag()
+				"Accept-Language": Configuration.getLanguageTag()
 			},
 			failOnError: typeof bFailOnError !== "undefined" ? bFailOnError : true
 		});

package/src/sap/ui/core/Message.js

@@ -5,8 +5,8 @@
  */
 
 // Provides control sap.ui.core.Message.
-sap.ui.define(['./Element', './library', "sap/base/Log"],
-	function(Element, library, Log) {
+sap.ui.define(['./Element', './library', "sap/base/Log", "sap/ui/core/Configuration"],
+	function(Element, library, Log, Configuration) {
 	"use strict";
 
 	// shortcut
@@ -26,11 +26,10 @@ sap.ui.define(['./Element', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.Message
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var Message = Element.extend("sap.ui.core.Message", /** @lends sap.ui.core.Message.prototype */ { metadata : {
 
@@ -72,10 +71,9 @@ sap.ui.define(['./Element', './library', "sap/base/Log"],
 	 * @param {string} [sSize="16x16"] Only the values "16x16" or "32x32" are allowed. Otherwise the default value is used.
 	 * @return {sap.ui.core.URI} URI of the default icon.
 	 * @public
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Message.prototype.getDefaultIcon = function(sSize) {
-		var sModulePath = sap.ui.require.toUrl("sap/ui/core/themes/" + sap.ui.getCore().getConfiguration().getTheme());
+		var sModulePath = sap.ui.require.toUrl("sap/ui/core/themes/" + Configuration.getTheme());
 
 		var sImagesPath = sModulePath + "/img/message/";
 		if (sSize && sSize == "32x32") {

package/src/sap/ui/core/Popup.js

@@ -9,13 +9,15 @@
 // Provides helper class sap.ui.core.Popup
 sap.ui.define([
 	'sap/ui/Device',
+	'sap/ui/base/Event',
 	'sap/ui/base/ManagedObject',
 	'sap/ui/base/Object',
 	'sap/ui/base/ObjectPool',
 	'./Control',
+	'./Element',
+	'./FocusHandler',
 	'./IntervalTrigger',
 	'./RenderManager',
-	'./Element',
 	'./ResizeHandler',
 	'./library',
 	"sap/base/assert",
@@ -29,18 +31,21 @@ sap.ui.define([
 	"sap/ui/events/F6Navigation",
 	"sap/ui/events/isMouseEventDelayed",
 	"sap/ui/base/EventProvider",
+	"sap/ui/core/Configuration",
 	"sap/ui/dom/jquery/control", // jQuery Plugin "control"
 	"sap/ui/dom/jquery/Focusable", // jQuery Plugin "firstFocusableDomRef"
 	"sap/ui/dom/jquery/rect" // jQuery Plugin "rect"
 ], function(
 	Device,
+	Event,
 	ManagedObject,
 	BaseObject,
 	ObjectPool,
 	Control,
+	Element,
+	FocusHandler,
 	IntervalTrigger,
 	RenderManager,
-	Element,
 	ResizeHandler,
 	library,
 	assert,
@@ -53,7 +58,8 @@ sap.ui.define([
 	jQuery,
 	F6Navigation,
 	isMouseEventDelayed,
-	EventProvider
+	EventProvider,
+	Configuration
 	//control
 	//Focusable
 	//rect
@@ -266,6 +272,7 @@ sap.ui.define([
 			this._mEvents["sap.ui.core.Popup.onFocusEvent-" + this._popupUID] = this.onFocusEvent;
 			this._mEvents["sap.ui.core.Popup.increaseZIndex-" + this._popupUID] = this._increaseMyZIndex;
 			this._mEvents["sap.ui.core.Popup.contains-" + this._popupUID] = this._containsEventBusWrapper;
+			this._mEvents["sap.ui.core.Popup.extendFocusInfo-" + this._popupUID] = this._extendFocusInfoEventBusWrapper;
 
 			if (oContent) {
 				this.setContent(oContent);
@@ -1752,7 +1759,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Popup.prototype._applyPosition = function(oPosition) {
-		var bRtl = sap.ui.getCore().getConfiguration().getRTL();
+		var bRtl = Configuration.getRTL();
 		var $Ref = this._$();
 
 		if ($Ref.length) {
@@ -2731,6 +2738,46 @@ sap.ui.define([
 		}
 	}
 
+	Popup.prototype._extendFocusInfo = function(oEvent, oEventData) {
+		var bExtended = false,
+			sEventPrefix = "sap.ui.core.Popup.extendFocusInfo-",
+			oData;
+
+		if (oEvent instanceof Event) {
+			// the call is from event provider
+			oData = {
+				info: oEventData.info,
+				element: oEvent.getParameter("domRef")
+			};
+		} else {
+			// the call is from the event bus
+			oData = oEvent;
+		}
+
+		var oContent = this.getContent();
+		var oContentDom = (oContent instanceof Element) ? oContent.getDomRef() : oContent;
+
+		if (oContentDom && oContentDom.contains(oData.element)) {
+			oData.info.preventScroll = true;
+			bExtended = true;
+		} else {
+			var aChildPopups = this.getChildPopups();
+			bExtended = aChildPopups.some(function(sChildID) {
+				var sEventId = sEventPrefix + sChildID;
+				sap.ui.getCore().getEventBus().publish("sap.ui", sEventId, oData);
+
+				return oData.extended;
+			});
+		}
+
+		return bExtended;
+	};
+
+	// Wrapper of _contains method for the event bus
+	Popup.prototype._extendFocusInfoEventBusWrapper = function(sChannel, sEvent, oData) {
+		oData.contains = this._extendFocusInfo(oData);
+	};
+
 	/**
 	 * @private
 	 */
@@ -2767,6 +2814,11 @@ sap.ui.define([
 			"visibility": "visible"
 		}).show();
 
+		if (!this.isInPopup(this._oLastPosition.of)) {
+			this._bFocusExtenderAdded = true;
+			FocusHandler.addFocusInfoExtender(this._extendFocusInfo, this);
+		}
+
 		if (Popup.blStack.length === 1) {
 			_fireBlockLayerStateChange({
 				visible: true,
@@ -2786,10 +2838,14 @@ sap.ui.define([
 		disconnectBlockLayerAndWithin(oWithinDOMRef);
 
 		if ($BlockRef.length) {
+			if (this._bFocusExtenderAdded) {
+				this._bFocusExtenderAdded = false;
+				FocusHandler.removeFocusInfoExtender(this._extendFocusInfo, this);
+			}
+
 			// if there are more z-indices this means there are more dialogs stacked
 			// up. So redisplay the block layer (with new z-index) under the new
 			// current dialog which should be displayed.
-
 			if (Popup.blStack.length > 1) {
 				Popup.blStack = Popup.blStack.filter(function(oPopupInfo) {
 					return oPopupInfo.popup !== that;
@@ -2809,6 +2865,7 @@ sap.ui.define([
 				oBlockLayerDomRef.style.visibility = "hidden";
 				oBlockLayerDomRef.style.display = "none";
 
+
 				_fireBlockLayerStateChange({
 					visible: false,
 					zIndex: oLastPopupInfo.zIndex

package/src/sap/ui/core/RenderManager.js

@@ -20,7 +20,8 @@ sap.ui.define([
 	"sap/base/util/extend",
 	"./InvisibleRenderer",
 	"./Patcher",
-	"./FocusHandler"
+	"./FocusHandler",
+	"sap/ui/core/Configuration"
 ], function(
 	LabelEnablement,
 	BaseObject,
@@ -36,7 +37,8 @@ sap.ui.define([
 	extend,
 	InvisibleRenderer,
 	Patcher,
-	FocusHandler
+	FocusHandler,
+	Configuration
 ) {
 
 	"use strict";
@@ -184,7 +186,7 @@ sap.ui.define([
 	 *
 	 * @extends Object
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.1
 	 * @alias sap.ui.core.RenderManager
 	 * @public
 	 */
@@ -1621,7 +1623,7 @@ sap.ui.define([
 	 * @deprecated Since 1.92. Instead, use the {@link sap.ui.core.Core#getConfiguration} API.
 	 */
 	RenderManager.prototype.getConfiguration = function() {
-		return sap.ui.getCore().getConfiguration();
+		return Configuration;
 	};
 
 	/**
@@ -1756,7 +1758,7 @@ sap.ui.define([
 	 * @deprecated Since 1.92. Instead use {@link sap.ui.core.RenderManager#accessibilityState} of the {@link sap.ui.core.RenderManager Semantic Rendering API}.
 	 */
 	RenderManager.prototype.writeAccessibilityState = function(oElement, mProps) {
-		if (!sap.ui.getCore().getConfiguration().getAccessibility()) {
+		if (!Configuration.getAccessibility()) {
 			return this;
 		}