@openui5/sap.m 1.134.0 → 1.136.0

package/src/sap/m/IllustrationPool.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -8,9 +8,11 @@ sap.ui.define([
 	"./library",
 	"sap/ui/core/EventBus",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/StaticArea"
+	"sap/ui/core/StaticArea",
+	"sap/ui/core/Configuration",
+	"sap/ui/core/Theming"
 ],
-	function(Log, mLibrary, EventBus, jQuery, StaticArea) {
+	function(Log, mLibrary, EventBus, jQuery, StaticArea, Configuration, Theming) {
 		"use strict";
 
 		/**
@@ -21,7 +23,6 @@ sap.ui.define([
 			SAP_ILLUSTRATION_SET_NAME = 'sapIllus',
 			SAP_ILLUSTRATION_SET_PATH = sap.ui.require.toUrl("sap/m/themes/base/illustrations/"),
 			SAP_ILLUSTRATION_SET_SYMBOLS = Object.keys(mLibrary.IllustratedMessageType);
-
 		/*
 		 * A map of registered sets
 		 * key: set name
@@ -36,13 +37,6 @@ sap.ui.define([
 
 		var oSetRegistry = Object.create(null);
 
-		oSetRegistry[SAP_ILLUSTRATION_SET_NAME] = {
-			sPath: SAP_ILLUSTRATION_SET_PATH,
-			aSymbols: SAP_ILLUSTRATION_SET_SYMBOLS,
-			bIsPending: false,
-			aCollections: []
-		};
-
 		var aSymbolsInDOM = [], // Array with IDs of the symbols which are already in the DOM
 			oAssetRegistry = Object.create(null), // Object with IDs of the assets which are loaded or being loaded
 			oLoadedSymbols = Object.create(null), // Object which stores the loaded HTML raw data for a given asset for future reuse (might not be in the DOM yet)
@@ -127,6 +121,46 @@ sap.ui.define([
 			IllustrationPool._requireSVG(sSet, sAssetId, sInstanceId, sIdPrefix);
 		};
 
+		IllustrationPool._extractAssetMetadataConfig = function(sSet, sSize, sSymbol) {
+			var oMetadata = IllustrationPool.getIllustrationSetMetadata(sSet),
+				sIdPrefix = IllustrationPool._getThemePath(oMetadata),
+				oPathConfig = oMetadata && oMetadata.oPathSymbolsConfig && oMetadata.oPathSymbolsConfig[sIdPrefix] && oMetadata.oPathSymbolsConfig[sIdPrefix][sSymbol],
+				oRootConfig = oMetadata && oMetadata.oPathSymbolsConfig && oMetadata.oPathSymbolsConfig["root"] && oMetadata.oPathSymbolsConfig["root"][sSymbol],
+				oSymbolConfig = oPathConfig || oRootConfig, // if there is no path config, fallback to root config (if available)
+				sSizeSubstitute = sSize,
+				sSymbolSubstitute = sSymbol;
+
+				if (oSymbolConfig) {
+					sSizeSubstitute = IllustrationPool._getSizeSubstitute(oSymbolConfig, sSize);
+					sSymbolSubstitute = IllustrationPool._getSymbolSubstitute(oSymbolConfig, sSymbol);
+				}
+
+			return {
+				sIdPrefix: oPathConfig ? sIdPrefix : "",
+				sAssetId: `${sSet}-${sSizeSubstitute}-${sSymbolSubstitute}`
+			};
+		};
+
+		IllustrationPool._getSymbolSubstitute = function(oSymbolConfig, sSymbol) {
+
+			if (typeof oSymbolConfig === 'string') {
+				sSymbol = oSymbolConfig;
+			} else {
+				sSymbol = oSymbolConfig["symbolReplacement"] || sSymbol;
+			}
+
+			return sSymbol;
+		};
+
+		IllustrationPool._getSizeSubstitute = function(oSymbolConfig, sSize) {
+
+			if (typeof oSymbolConfig === 'object') {
+				sSize = oSymbolConfig["sizeReplacement"][sSize] || sSize;
+			}
+
+			return sSize;
+		};
+
 		/**
 		 * Returns the metadata of an Illustration Set.
 		 * The metadata contains the names of the symbols and the theme mappings.
@@ -179,20 +213,22 @@ sap.ui.define([
 		 * @param {string} oConfig.setURI URL Path of the Illustration Set
 		 * @param {boolean} bLoadAllResources whether or not all of the assets for the Illustration Set
 		 * should be loaded once the metadata is loaded
+		 * @param {array} aOptionalSymbols optional array containing the Illustration Set symbols
 		 * @static
 		 * @public
 		 */
-		IllustrationPool.registerIllustrationSet = function(oConfig, bLoadAllResources) {
+		IllustrationPool.registerIllustrationSet = async function(oConfig, bLoadAllResources, aOptionalSymbols) {
 			var sName = oConfig.setFamily,
 				sPath = oConfig.setURI;
 
 			if (oSetRegistry[sName]) {
 				if (oSetRegistry[sName].bIsPending) {
 					Log.warning("Illustration Set is currently being loaded.");
+					return await oSetRegistry[sName].oPromise;
 				} else {
 					Log.warning("Illustration Set already registered.");
 				}
-				return;
+				return Promise.resolve();
 			}
 
 			// add trailing slash if necessary for more convenience
@@ -204,7 +240,7 @@ sap.ui.define([
 			oSetRegistry[sName].sPath = sPath;
 			oSetRegistry[sName].bIsPending = true;
 
-			IllustrationPool._loadMetadata(sName, sPath, bLoadAllResources);
+			await IllustrationPool._loadMetadata(sName, sPath, bLoadAllResources, aOptionalSymbols);
 		};
 
 		/**
@@ -257,20 +293,21 @@ sap.ui.define([
 		 * @param {string} sName the name of the Illustration Set for which the metadata is being loaded
 		 * @param {string} sPath the path of the Illustration Set for which the metadata is being loaded
 		 * @param {boolean} bLoadAllResources whether or not all of the assets for the Illustration Set should be loaded
+		 * @param {array} aOptionalSymbols optional array containing the Illustration Set symbols
 		 * @return {Promise} Promise which resolves when the metadata is loaded
 		 * @static
 		 * @private
 		 */
-		IllustrationPool._loadMetadata = function(sName, sPath, bLoadAllResources) {
+		IllustrationPool._loadMetadata = async function(sName, sPath, bLoadAllResources, aOptionalSymbols) {
 			var sMetadataPath = sPath + "metadata.json";
 
-			return new Promise(function (fnResolve) {
+			oSetRegistry[sName].oPromise = new Promise(function (fnResolve) {
 				jQuery.ajax(sMetadataPath, {
 					type: "GET",
 					dataType: "json",
 					success: function (oMetadataJSON) {
 						Log.info("Metadata for illustration set (" + sName + ") successfully loaded");
-						IllustrationPool._metadataLoaded(sName, oMetadataJSON, bLoadAllResources);
+						IllustrationPool._metadataLoaded(sName, oMetadataJSON, bLoadAllResources, aOptionalSymbols);
 						fnResolve(oMetadataJSON); // passing the json in the resolve for testing purposes
 					},
 					error: function (jqXHR, sStatus) {
@@ -282,6 +319,8 @@ sap.ui.define([
 					}
 				});
 			});
+
+			return await oSetRegistry[sName].oPromise;
 		};
 
 		/**
@@ -290,16 +329,19 @@ sap.ui.define([
 		 * @param {string} sName the name of the Illustration Set for which the metadata is loaded
 		 * @param {object} oMetadataJSON the loaded metadata object
 		 * @param {boolean} bLoadAllResources whether or not all of the assets for the Illustration Set should be loaded
+		 * @param {array} aOptionalSymbols optional array containing the Illustration Set symbols
 		 * @static
 		 * @private
 		 */
-		IllustrationPool._metadataLoaded = function(sName, oMetadataJSON, bLoadAllResources) {
-			var aSymbols = oMetadataJSON.symbols,
-				aCollections = oMetadataJSON.collections,
+		IllustrationPool._metadataLoaded = function(sName, oMetadataJSON, bLoadAllResources, aOptionalSymbols) {
+			var aSymbols = aOptionalSymbols || oMetadataJSON.symbols,
+				oThemePathMap = oMetadataJSON.config && oMetadataJSON.config.themePath,
+				oPathSymbolsConfig = oMetadataJSON.pathSymbolsConfig,
 				bHasPatterns = oMetadataJSON.requireCustomPatterns;
 
 			oSetRegistry[sName].aSymbols = aSymbols;
-			oSetRegistry[sName].aCollections = aCollections;
+			oSetRegistry[sName].oThemePathMap = oThemePathMap;
+			oSetRegistry[sName].oPathSymbolsConfig = oPathSymbolsConfig;
 
 			// Load the patterns (if available) as soon as possible, since they can be used in any of the symbols.
 			if (bHasPatterns) {
@@ -311,6 +353,15 @@ sap.ui.define([
 			}
 
 			oSetRegistry[sName].bIsPending = false;
+			oSetRegistry[sName].oPromise = null;
+		};
+
+		IllustrationPool._registerDefaultSet = async function () {
+			const oDefaultSet = {
+				setFamily: SAP_ILLUSTRATION_SET_NAME,
+				setURI: SAP_ILLUSTRATION_SET_PATH
+			};
+			await IllustrationPool.registerIllustrationSet(oDefaultSet, false, SAP_ILLUSTRATION_SET_SYMBOLS);
 		};
 
 		/**
@@ -340,6 +391,7 @@ sap.ui.define([
 		 * @param {string} sSet the name of the Illustration Set for which the asset is being loaded
 		 * @param {string} sId the ID of the asset being loaded
 		 * @param {string} sInstanceId the ID of the Illustration instance which is requiring the asset
+		 * @param {string} sIdPrefix The prefix of the path of the asset being loaded. Used to store the asset ID in the DOM pool, so it can be distinguished from other assets with the same ID.
 		 * @return {Promise} Promise which resolves when the SVG asset is loaded
 		 * @static
 		 * @private
@@ -425,6 +477,21 @@ sap.ui.define([
 			}
 		};
 
+		/**
+		 * Gets the theme path prefix (if present) of the Illustration based on the current theme and the set's metadata.
+		 * @param {Object} oMetadata The set's metadata
+		 * @returns {string} the needed path prefix
+		 * @private
+		 */
+		IllustrationPool._getThemePath = function (oMetadata) {
+			var sCurrentTheme = Theming.getTheme(),
+				oThemePathObj = oMetadata && oMetadata.oThemePathMap,
+				sPrefix = (oThemePathObj && oThemePathObj[sCurrentTheme]) || "";
+
+			return sPrefix;
+		};
+
+
 		return IllustrationPool;
 
 	}, /* bExport= */ true);

package/src/sap/m/IllustrationRenderer.js

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

package/src/sap/m/Image.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @borrows sap.ui.core.IFormContent.getFormDoNotAdjustWidth as #getFormDoNotAdjustWidth
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @public
 	 * @alias sap.m.Image

package/src/sap/m/ImageContent.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @since 1.38
 	 *
 	 * @public

package/src/sap/m/ImageContentRenderer.js

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

package/src/sap/m/ImageCustomData.js

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

package/src/sap/m/ImageHelper.js

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

package/src/sap/m/ImageRenderer.js

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

package/src/sap/m/Input.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -162,7 +162,7 @@ function(
 	 * @extends sap.m.InputBase
 	 * @implements sap.ui.core.IAccessKeySupport
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @public
@@ -759,7 +759,7 @@ function(
 			while the suggestions popover is open update the value state header.
 			If the input has FormattedText aggregation while the suggestions popover is open then
 			it's new, because the old is already switched to have the value state header as parent */
-			this._updateSuggestionsPopoverValueState();
+			this._updateSuggestionsPopoverValueState(true);
 		}
 	};
 
@@ -1017,6 +1017,15 @@ function(
 		}
 	};
 
+	Input.prototype.getValueStateLinksForAcc = function(){
+		const oFormattedText = this._getFormattedValueStateText();
+		if (!oFormattedText){
+			return [];
+		}
+		return oFormattedText.getControls();
+	};
+
+
 	/**
 	 * Gets <code>sap.m.FormattedText</code> aggregation based on its current parent.
 	 * If the SuggestionPopover is open that is the <code>sap.m.ValueStateHeader</code>, otherwise is the Input itself.
@@ -1037,7 +1046,6 @@ function(
 		}
 	};
 
-
 	/**
 	 * Updates and synchronizes the <code>selectedRow</code> association and <code>selectedKey</code> properties.
 	 *
@@ -1850,6 +1858,17 @@ function(
 		// disable the typeahead feature for android devices due to an issue on android soft keyboard, which always returns keyCode 229
 		this._bBackspaceOrDelete = (oEvent.which === KeyCodes.BACKSPACE) || (oEvent.which === KeyCodes.DELETE);
 		this._bDoTypeAhead = !Device.os.android && this.getAutocomplete() && !this._bBackspaceOrDelete;
+
+		if (this.areHotKeysPressed(oEvent)) {
+			if (this._isSuggestionsPopoverOpen()){
+				var oSuggestionsPopover = this._getSuggestionsPopover();
+				oSuggestionsPopover.setValueStateActiveState(true);
+				oSuggestionsPopover._handleValueStateLinkNav(this, oEvent);
+				oSuggestionsPopover.updateFocus(this, null);
+			} else {
+				this._handleValueStateLinkNav();
+			}
+		}
 	};
 
 	Input.prototype.onkeyup = function (oEvent) {
@@ -1968,7 +1987,7 @@ function(
 	/**
 	 * Applies Suggestion Accessibility
 	 *
-	 * Adds the aria-desribedby text with the number of available suggestions.
+	 * Adds the aria-describedby text with the number of available suggestions.
 	 *
 	 * @param {int} iNumItems
 	 * @private
@@ -2593,6 +2612,10 @@ function(
 	 * @public
 	 */
 	Input.prototype.setValue = function(sValue) {
+		// set the type syncronously before the value is set
+		// to avoid password field's text to be shown when triggering type
+		this.getDomRef("inner")?.setAttribute("type", this.getType().toLowerCase());
+
 		this._iSetCount++;
 		InputBase.prototype.setValue.call(this, sValue);
 		this._onValueUpdated(sValue);
@@ -3312,16 +3335,15 @@ function(
 	 */
 	Input.prototype._openSuggestionsPopover = function () {
 		this.closeValueStateMessage();
-		this._updateSuggestionsPopoverValueState();
 		this._getSuggestionsPopover().getPopover().open();
 	};
 
 	/**
 	 * Updates the suggestions popover value state
-	 *
+	 * @param {boolean} bUpdateValueStateLinkDelagate Whether to reinitialize the value state link delegate
 	 * @private
 	 */
-	Input.prototype._updateSuggestionsPopoverValueState = function() {
+	Input.prototype._updateSuggestionsPopoverValueState = function(bUpdateValueStateLinkDelagate) {
 		var oSuggPopover = this._getSuggestionsPopover(),
 			sValueState = this.getValueState(),
 			bNewValueState = this.getValueState() !== oSuggPopover._getValueStateHeader().getValueState(),
@@ -3339,7 +3361,7 @@ function(
 			this.setFormattedValueStateText(oSuggPopover._getValueStateHeader().getFormattedText());
 		}
 
-		oSuggPopover.updateValueState(sValueState, (oNewFormattedValueStateText || sValueStateText), this.getShowValueStateMessage());
+		oSuggPopover.updateValueState(sValueState, (oNewFormattedValueStateText || sValueStateText), this.getShowValueStateMessage(), bUpdateValueStateLinkDelagate);
 
 		if (this.isMobileDevice()) {
 			oSuggPopover.getInput().setValueState(sValueState);