@openui5/sap.ui.core 1.110.0 → 1.111.1

package/src/sap/ui/core/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.110.0</version>
+  <version>1.111.1</version>
 
   <documentation>The SAPUI5 Core Runtime.
 
@@ -203,7 +203,7 @@
             <copyright>OpenJS Foundation and other contributors</copyright>
             <pattern>sap/ui/thirdparty/jquery-compat.js</pattern>
         </lib>
-        <lib name="jquery_mobile" displayName="jQuery Mobile" npmName="n/a" version="1.3.1" hash="ce7f0d13341afe624e75cf797f43192f" homepage="http://jquerymobile.com" id="73554900106100002438">
+        <lib name="jquery_mobile" displayName="jQuery Mobile" npmName="n/a" version="1.3.1" hash="9455e32c6b83390085754590a3d71707" homepage="http://jquerymobile.com" id="73554900106100002438">
             <license url="http://jQuery.org/license" type="MIT" />
             <copyright>2010, 2013 jQuery Foundation, Inc. and other contributors</copyright>
             <pattern>sap/ui/thirdparty/jquery-mobile-custom.js</pattern>

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * Provides methods to show or hide a waiting animation covering the whole
 	 * page and blocking user interaction.
 	 * @namespace
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @public
 	 * @alias sap.ui.core.BusyIndicator
 	 */

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

@@ -225,7 +225,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @alias sap.ui.core.Component
 	 * @since 1.9.2
 	 */
@@ -1722,68 +1722,76 @@ sap.ui.define([
 						bIsDataSourceUri = true;
 					}
 
-					if (oDataSource.type === 'OData' && oDataSource.settings && typeof oDataSource.settings.maxAge === "number") {
+					if (oDataSource.type === 'OData' && oDataSource.settings) {
 						oModelConfig.settings = oModelConfig.settings || {};
-						oModelConfig.settings.headers = oModelConfig.settings.headers || {};
-						oModelConfig.settings.headers["Cache-Control"] = "max-age=" + oDataSource.settings.maxAge;
-					}
 
-					// read out OData annotations and create ODataModel settings for it
-					if (oDataSource.type === 'OData' && oDataSource.settings && oDataSource.settings.annotations) {
-						var aAnnotations = oDataSource.settings.annotations;
+						if (typeof oDataSource.settings.maxAge === "number") {
+							oModelConfig.settings.headers = oModelConfig.settings.headers || {};
+							oModelConfig.settings.headers["Cache-Control"] = "max-age=" + oDataSource.settings.maxAge;
+						}
 
-						for (var i = 0; i < aAnnotations.length; i++) {
-							var sAnnotation = aAnnotations[i];
-							var oAnnotation = mConfig.dataSources[sAnnotation];
+						// The ODataModel's "ignoreAnnotationsFromMetadata" parameter only accepts <true> (see ODataModel constructor documentation)
+						if (oDataSource.settings.ignoreAnnotationsFromMetadata === true) {
+							oModelConfig.settings.ignoreAnnotationsFromMetadata = oDataSource.settings.ignoreAnnotationsFromMetadata;
+						}
 
-							// dataSource entry should be defined!
-							if (!oAnnotation) {
-								Log.error("Component Manifest: ODataAnnotation \"" + sAnnotation + "\" for dataSource \"" + oModelConfig.dataSource + "\" could not be found in manifest", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
-								continue;
-							}
+						// read out OData annotations and create ODataModel settings for it
+						if (oDataSource.settings.annotations) {
+							var aAnnotations = oDataSource.settings.annotations;
 
-							// type should be ODataAnnotation!
-							if (oAnnotation.type !== 'ODataAnnotation') {
-								Log.error("Component Manifest: dataSource \"" + sAnnotation + "\" was expected to have type \"ODataAnnotation\" but was \"" + oAnnotation.type + "\"", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
-								continue;
-							}
+							for (var i = 0; i < aAnnotations.length; i++) {
+								var sAnnotation = aAnnotations[i];
+								var oAnnotation = mConfig.dataSources[sAnnotation];
 
-							// uri is required!
-							if (!oAnnotation.uri) {
-								Log.error("Component Manifest: Missing \"uri\" for ODataAnnotation \"" + sAnnotation + "\"", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
-								continue;
-							}
+								// dataSource entry should be defined!
+								if (!oAnnotation) {
+									Log.error("Component Manifest: ODataAnnotation \"" + sAnnotation + "\" for dataSource \"" + oModelConfig.dataSource + "\" could not be found in manifest", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
+									continue;
+								}
 
-							var oAnnotationUri = new URI(oAnnotation.uri);
+								// type should be ODataAnnotation!
+								if (oAnnotation.type !== 'ODataAnnotation') {
+									Log.error("Component Manifest: dataSource \"" + sAnnotation + "\" was expected to have type \"ODataAnnotation\" but was \"" + oAnnotation.type + "\"", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
+									continue;
+								}
 
-							if (bIsV2Model || bIsV4Model) {
-								/* eslint-disable no-loop-func */
-								["sap-language", "sap-client"].forEach(function(sName) {
-									if (!oAnnotationUri.hasQuery(sName) && oConfig.getSAPParam(sName)) {
-										oAnnotationUri.setQuery(sName, oConfig.getSAPParam(sName));
-									}
-								});
-								/* eslint-enable no-loop-func */
-
-								var sCacheTokenForAnnotation = mCacheTokens.dataSources && mCacheTokens.dataSources[oAnnotation.uri];
-								if (sCacheTokenForAnnotation) {
-									Component._applyCacheToken(oAnnotationUri, {
-										cacheToken: sCacheTokenForAnnotation,
-										componentName: sLogComponentName,
-										dataSource: sAnnotation
+								// uri is required!
+								if (!oAnnotation.uri) {
+									Log.error("Component Manifest: Missing \"uri\" for ODataAnnotation \"" + sAnnotation + "\"", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
+									continue;
+								}
+
+								var oAnnotationUri = new URI(oAnnotation.uri);
+
+								if (bIsV2Model || bIsV4Model) {
+									/* eslint-disable no-loop-func */
+									["sap-language", "sap-client"].forEach(function(sName) {
+										if (!oAnnotationUri.hasQuery(sName) && oConfig.getSAPParam(sName)) {
+											oAnnotationUri.setQuery(sName, oConfig.getSAPParam(sName));
+										}
 									});
+									/* eslint-enable no-loop-func */
+
+									var sCacheTokenForAnnotation = mCacheTokens.dataSources && mCacheTokens.dataSources[oAnnotation.uri];
+									if (sCacheTokenForAnnotation) {
+										Component._applyCacheToken(oAnnotationUri, {
+											cacheToken: sCacheTokenForAnnotation,
+											componentName: sLogComponentName,
+											dataSource: sAnnotation
+										});
+									}
 								}
-							}
 
-							// resolve relative to component, ui5:// URLs are already resolved upfront
-							var oAnnotationSourceManifest = mConfig.origin.dataSources[aAnnotations[i]] || oManifest;
-							var sAnnotationUri = oAnnotationSourceManifest.resolveUri(oAnnotationUri.toString());
+								// resolve relative to component, ui5:// URLs are already resolved upfront
+								var oAnnotationSourceManifest = mConfig.origin.dataSources[aAnnotations[i]] || oManifest;
+								var sAnnotationUri = oAnnotationSourceManifest.resolveUri(oAnnotationUri.toString());
 
-							// add uri to annotationURI array in settings (this parameter applies for ODataModel v1 & v2)
-							oModelConfig.settings = oModelConfig.settings || {};
-							oModelConfig.settings.annotationURI = oModelConfig.settings.annotationURI || [];
-							oModelConfig.settings.annotationURI.push(sAnnotationUri);
+								// add uri to annotationURI array in settings (this parameter applies for ODataModel v1 & v2)
+								oModelConfig.settings.annotationURI = oModelConfig.settings.annotationURI || [];
+								oModelConfig.settings.annotationURI.push(sAnnotationUri);
+							}
 						}
+
 					}
 
 				} else {

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

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * See also {@link module:sap/ui/core/ComponentSupport}.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.ComponentContainer

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @public
 	 * @class
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.9.2
 	 * @alias sap.ui.core.ComponentMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

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

@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @public
 	 * @since 1.58.0
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @namespace
 	 * @alias module:sap/ui/core/ComponentSupport
 	 */

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	// Singleton instance for configuration
 	var oConfiguration;
 	var M_SETTINGS;
-	var VERSION = "1.110.0";
+	var VERSION = "1.111.1";
 
 	// Helper Functions
 	function detectLanguage() {
@@ -270,6 +270,7 @@ sap.ui.define([
 		"xx-waitForTheme"       : { type : "string",  defaultValue : ""}, // rendering|init
 		"xx-hyphenation" : { type : "string",  defaultValue : ""}, // (empty string)|native|thirdparty|disable
 		"xx-flexBundleRequestForced" : { type : "boolean",  defaultValue : false },
+		"xx-skipAutomaticFlLibLoading" : { type : "boolean",  defaultValue: false },
 		"xx-cssVariables"       : { type : "string",   defaultValue : "false" }, // false|true|additional (additional just includes the css_variables.css in addition)
 		"xx-debugModuleLoading"	: { type : "boolean",  defaultValue: false },
 		"statistics"            : { type : "boolean",  defaultValue : false },
@@ -568,8 +569,10 @@ sap.ui.define([
 			}
 
 			// in case the flexibilityServices configuration was set to a non-empty, non-default value, sap.ui.fl becomes mandatory
+			// if not overruled by xx-skipAutomaticFlLibLoading
 			if (config.flexibilityServices
 					&& config.flexibilityServices !== M_SETTINGS.flexibilityServices.defaultValue
+					&& !config['xx-skipAutomaticFlLibLoading']
 					&& config.modules.indexOf("sap.ui.fl.library") == -1) {
 				config.modules.push("sap.ui.fl.library");
 			}

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

@@ -79,7 +79,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @alias sap.ui.core.Control
 	 */
 	var Control = Element.extend("sap.ui.core.Control", /** @lends sap.ui.core.Control.prototype */ {
@@ -333,6 +333,12 @@ sap.ui.define([
 			return;
 		}
 
+		// Mark the control that it is in a dirty state and requires rendering.
+		// This flag will be used by the RenderManager to determine whether the rendering
+		// is necessary for the child controls while they are getting rendered with their parents.
+		// This will be cleared by the RenderManager when the control is rendered completely.
+		this._bNeedsRendering = true;
+
 		if ( this.bOutput && (oUIArea = this.getUIArea()) ) {
 			// if this control has been rendered before (bOutput)
 			// and if it is contained in a UIArea (!!oUIArea)
@@ -391,6 +397,7 @@ sap.ui.define([
 	 * @protected
 	 */
 	Control.prototype.rerender = function() {
+		this._bNeedsRendering = true;
 		UIArea.rerenderControl(this);
 	};
 
@@ -517,8 +524,8 @@ sap.ui.define([
 	 *
 	 * Use {@link #detachBrowserEvent} to remove the event handler(s) again.
 	 *
-	 * @param {string} [sEventType] A string containing one or more JavaScript event types, such as "click" or "blur".
-	 * @param {function} [fnHandler] A function to execute each time the event is triggered.
+	 * @param {string} sEventType A string containing one or more JavaScript event types, such as "click" or "blur".
+	 * @param {function} fnHandler A function to execute each time the event is triggered.
 	 * @param {object} [oListener] The object, that wants to be notified, when the event occurs
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 * @public
@@ -558,8 +565,8 @@ sap.ui.define([
 	 * Note: listeners are only removed, if the same combination of event type, callback function
 	 * and context object is given as in the call to <code>attachBrowserEvent</code>.
 	 *
-	 * @param {string} [sEventType] A string containing one or more JavaScript event types, such as "click" or "blur".
-	 * @param {function} [fnHandler] The function that is to be no longer executed.
+	 * @param {string} sEventType A string containing one or more JavaScript event types, such as "click" or "blur".
+	 * @param {function} fnHandler The function that is to be no longer executed.
 	 * @param {object} [oListener] The context object that was given in the call to <code>attachBrowserEvent</code>.
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 * @public
@@ -970,7 +977,8 @@ sap.ui.define([
 
 		if (bBlocked) {
 			this.addDelegate(oRenderingDelegate, false, this);
-		} else {
+		} else if (!this.getBusy()) {
+			// only remove delegate if control is not still in "busy" state
 			this.removeDelegate(oRenderingDelegate);
 		}
 
@@ -1040,7 +1048,11 @@ sap.ui.define([
 			Interaction.notifyShowBusyIndicator(this);
 			this.addDelegate(oRenderingDelegate, false, this);
 		} else {
-			this.removeDelegate(oRenderingDelegate);
+			// only remove the delegate if the control is not still in "blocked" state
+			if (!this.getProperty("blocked")) {
+				this.removeDelegate(oRenderingDelegate);
+			}
+
 			//If there is a pending delayed call we clear it
 			if (this._busyIndicatorDelayedCallId) {
 				clearTimeout(this._busyIndicatorDelayedCallId);

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

@@ -170,7 +170,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @final
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @alias sap.ui.core.Core
 	 * @public
 	 * @hideconstructor
@@ -1647,6 +1647,7 @@ sap.ui.define([
 	 * @param {string} [sLibraryName='sap.ui.core'] Name of the library to retrieve the bundle for
 	 * @param {string} [sLocale] Locale to retrieve the resource bundle for
 	 * @param {boolean} [bAsync=false] Whether the resource bundle is loaded asynchronously
+	 * @ui5-omissible-params sLocale
 	 * @returns {module:sap/base/i18n/ResourceBundle|undefined|Promise<module:sap/base/i18n/ResourceBundle|undefined>} The best matching resource bundle for the given
 	 *   parameters or <code>undefined</code>; in asynchronous case a Promise on that bundle is returned
 	 * @public

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * in the documentation.
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.CustomData

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class Static class for enabling declarative UI support.
 	 *
 	 * @author Peter Muessig, Tino Butz
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 1.7.0
 	 * @public
 	 * @alias sap.ui.core.DeclarativeSupport

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

@@ -18,7 +18,8 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/events/F6Navigation",
 	"./RenderManager",
-	"sap/ui/core/Configuration"
+	"./Configuration",
+	"./EnabledPropagator"
 ],
 	function(
 		DataType,
@@ -33,7 +34,8 @@ sap.ui.define([
 		jQuery,
 		F6Navigation,
 		RenderManager,
-		Configuration
+		Configuration,
+		EnabledPropagator
 	) {
 	"use strict";
 
@@ -128,7 +130,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @public
 	 * @alias sap.ui.core.Element
 	 */
@@ -199,6 +201,7 @@ sap.ui.define([
 
 		constructor : function(sId, mSettings) {
 			ManagedObject.apply(this, arguments);
+			this._iRenderingDelegateCount = 0;
 		},
 
 		renderer : null // Element has no renderer
@@ -509,6 +512,29 @@ sap.ui.define([
 		}
 	};
 
+	/*
+	 * Intercept any changes for properties named "enabled".
+	 *
+	 * If such a change is detected, inform all descendants that use the `EnabledPropagator`
+	 * so that they can recalculate their own, derived enabled state.
+	 * This is required in the context of rendering V4 to make the state of controls/elements
+	 * self-contained again when they're using the `EnabledPropagator` mixin.
+	 */
+	Element.prototype.setProperty = function(sPropertyName, vValue, bSuppressInvalidate) {
+		if (sPropertyName != "enabled" || bSuppressInvalidate) {
+			return ManagedObject.prototype.setProperty.apply(this, arguments);
+		}
+
+		var bOldEnabled = this.mProperties.enabled;
+		ManagedObject.prototype.setProperty.apply(this, arguments);
+		if (bOldEnabled != this.mProperties.enabled) {
+			// the EnabledPropagator knows better which descendants to update
+			EnabledPropagator.updateDescendants(this);
+		}
+
+		return this;
+	};
+
 	Element.prototype.insertDependent = function(oElement, iIndex) {
 		this.insertAggregation("dependents", oElement, iIndex, true);
 		return this; // explicitly return 'this' to fix controls that override insertAggregation wrongly
@@ -654,6 +680,39 @@ sap.ui.define([
 	 */
 	Element._interceptEvent = undefined;
 
+	/**
+	 * Updates the count of rendering-related delegates and if the given threshold is reached,
+	 * informs the RenderManager` to enable/disable rendering V4 for the element.
+	 *
+	 * @param {sap.ui.core.Element} oElement The element instance
+	 * @param {object} oDelegate The delegate instance
+	 * @param {iThresholdCount} iThresholdCount Whether the delegate has been added=1 or removed=0.
+	 *    At the same time serves as threshold when to inform the `RenderManager`.
+	 * @private
+	 */
+	function updateRenderingDelegate(oElement, oDelegate, iThresholdCount) {
+		if (oDelegate.canSkipRendering || !(oDelegate.onAfterRendering || oDelegate.onBeforeRendering)) {
+			return;
+		}
+
+		oElement._iRenderingDelegateCount += (iThresholdCount || -1);
+
+		if (oElement.bOutput === true && oElement._iRenderingDelegateCount == iThresholdCount) {
+			RenderManager.canSkipRendering(oElement, 1 /* update skip-the-rendering DOM marker, only if the apiVersion is 4 */);
+		}
+	}
+
+	/**
+	 * Returns whether the element has rendering-related delegates that might prevent skipping the rendering.
+	 *
+	 * @returns {boolean}
+	 * @private
+	 * @ui5-restricted sap.ui.core.RenderManager
+	 */
+	Element.prototype.hasRenderingDelegate = function() {
+		return Boolean(this._iRenderingDelegateCount);
+	};
+
 	/**
 	 * Adds a delegate that listens to the events of this element.
 	 *
@@ -692,6 +751,8 @@ sap.ui.define([
 		}
 
 		(bCallBefore ? this.aBeforeDelegates : this.aDelegates).push({oDelegate:oDelegate, bClone: !!bClone, vThis: ((oThis === this) ? true : oThis)}); // special case: if this element is the given context, set a flag, so this also works after cloning (it should be the cloned element then, not the given one)
+		updateRenderingDelegate(this, oDelegate, 1);
+
 		return this;
 	};
 
@@ -710,12 +771,14 @@ sap.ui.define([
 		for (i = 0; i < this.aDelegates.length; i++) {
 			if (this.aDelegates[i].oDelegate == oDelegate) {
 				this.aDelegates.splice(i, 1);
+				updateRenderingDelegate(this, oDelegate, 0);
 				i--; // One element removed means the next element now has the index of the current one
 			}
 		}
 		for (i = 0; i < this.aBeforeDelegates.length; i++) {
 			if (this.aBeforeDelegates[i].oDelegate == oDelegate) {
 				this.aBeforeDelegates.splice(i, 1);
+				updateRenderingDelegate(this, oDelegate, 0);
 				i--; // One element removed means the next element now has the index of the current one
 			}
 		}
@@ -752,6 +815,11 @@ sap.ui.define([
 	 * See {@link topic:bdf3e9818cd84d37a18ee5680e97e1c1 Event Handler Methods} for a general explanation of
 	 * event handling in controls.
 	 *
+	 * <b>Note:</b> Setting the special <code>canSkipRendering</code> property to <code>true</code> for the event delegate
+	 * object itself lets the framework know that the <code>onBeforeRendering</code> and <code>onAfterRendering</code>
+	 * event handlers of the delegate are compatible with the contract of {@link sap.ui.core.RenderManager Renderer.apiVersion 4}.
+	 * See example "Adding a rendering delegate...".
+	 *
 	 * @example <caption>Adding a delegate for the keydown and afterRendering event</caption>
 	 * <pre>
 	 * var oDelegate = {
@@ -765,6 +833,22 @@ sap.ui.define([
 	 * oElement.addEventDelegate(oDelegate);
 	 * </pre>
 	 *
+	 * @example <caption>Adding a rendering delegate that is compatible with the rendering optimization</caption>
+	 * <pre>
+	 * var oDelegate = {
+	 *   canSkipRendering: true,
+	 *   onBeforeRendering: function() {
+	 *     // Act when the beforeRendering event is fired on the element
+	 *     // The code here only accesses HTML elements inside the root node of the control
+	 *   },
+	 *   onAfterRendering: function(){
+	 *     // Act when the afterRendering event is fired on the element
+	 *     // The code here only accesses HTML elements inside the root node of the control
+	 *   }
+	 * };
+	 * oElement.addEventDelegate(oDelegate);
+	 * </pre>
+	 *
 	 * @param {object} oDelegate The delegate object which consists of the event handler names and the corresponding event handler functions
 	 * @param {object} [oThis=oDelegate] If given, this object will be the "this" context in the listener methods; default is the delegate object itself
 	 * @returns {this} Returns <code>this</code> to allow method chaining
@@ -1481,6 +1565,17 @@ sap.ui.define([
 	 * {@link sap.ui.core.RenderManager#writeAccessibilityState writeAccessibilityState} methods
 	 * for the parent of the currently rendered control - if the parent implements it.
 	 *
+	 * <b>Note:</b> Setting the special <code>canSkipRendering</code> property of the <code>mAriaProps</code> parameter to <code>true</code> lets the <code>RenderManager</code> know
+	 * that the accessibility enhancement is static and does not interfere with the child control's {@link sap.ui.core.RenderManager Renderer.apiVersion 4} rendering optimization.
+	 *
+	 * @example <caption>Setting an accessibility state that is compatible with the rendering optimization</caption>
+	 * <pre>
+	 * MyControl.prototype.enhanceAccessibilityState = function(oElement, mAriaProps) {
+	 *     mAriaProps.label = "An appropriate label from the parent";
+	 *     mAriaProps.canSkipRendering = true;
+	 * };
+	 * </pre>
+	 *
 	 * @function
 	 * @name sap.ui.core.Element.prototype.enhanceAccessibilityState
 	 * @param {sap.ui.core.Element} oElement

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @since 0.8.6
 	 * @alias sap.ui.core.ElementMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 *
 	 * @param {boolean} [bDefault=true] Value that should be used as default value for the enhancement of the control.
 	 * @param {boolean} [bLegacy=false] Whether the introduced property should use the old name <code>Enabled</code>.
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @public
 	 * @class
 	 * @alias sap.ui.core.EnabledPropagator
@@ -105,6 +105,21 @@ sap.ui.define([
 		this.getMetadata().addPublicMethods("useEnabledPropagator");
 	};
 
+	/**
+	 * Invalidates the descendants of the provided root element that are implementing the EnabledPropagator mixin
+	 *
+	 * @param {sap.ui.core.Element} oRootElement The root element instance
+	 * @private
+	 * @ui5-restricted sap.ui.core
+	 */
+	EnabledPropagator.updateDescendants = function(oRootElement) {
+		oRootElement.isActive() && oRootElement.findElements(true, function(oElement) {
+			if (oElement._bUseEnabledPropagator && oElement.bOutput == true) {
+				oElement.invalidate();
+			}
+		});
+	};
+
 	/**
 	 * Determines whether an ancestor of the provided control implements getEnabled method and that returns false
 	 *

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 * @public
 	 * @since 1.8.0
 	 * @alias sap.ui.core.EventBus

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

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

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @public
 	 * @alias sap.ui.core.HTML

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.110.0
+	 * @version 1.111.1
 	 * @alias sap.ui.core.History
 	 * @protected
 	 */

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

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.1
 	 *
 	 * @public
 	 * @since 1.11.1
@@ -321,9 +321,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Icon.prototype.onkeydown = function(oEvent) {
-
 		if (oEvent.which === KeyCodes.SPACE || oEvent.which === KeyCodes.ENTER) {
-
 			// note: prevent document scrolling
 			oEvent.preventDefault();
 
@@ -350,15 +348,21 @@ sap.ui.define([
 	 * @private
 	 */
 	Icon.prototype.onkeyup = function(oEvent) {
-
 		if (oEvent.which === KeyCodes.SPACE || oEvent.which === KeyCodes.ENTER) {
-
 			this.$().removeClass("sapUiIconActive");
 			this._restoreColors();
-			this.firePress({/* no parameters */});
 		}
 	};
 
+	Icon.prototype.onsapenter = Icon.prototype.onsapspace = function(oEvent) {
+		if (this.hasListeners("press")) {
+			// mark the event for components that needs to know if the event was handled
+			oEvent.setMarked();
+		}
+
+		this.firePress({/* no parameters */});
+	};
+
 	/* =========================================================== */
 	/* Private methods                                             */
 	/* =========================================================== */

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

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