@openui5/sap.f 1.126.1 → 1.128.0

package/THIRDPARTY.txt

@@ -468,7 +468,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.12.0
+Component: SAP Theming Base Content, version: 11.16.1
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.f",
-  "version": "1.126.1",
+  "version": "1.128.0",
   "description": "OpenUI5 UI Library sap.f",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,8 +14,8 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.126.1",
-    "@openui5/sap.ui.core": "1.126.1",
-    "@openui5/sap.ui.layout": "1.126.1"
+    "@openui5/sap.m": "1.128.0",
+    "@openui5/sap.ui.core": "1.128.0",
+    "@openui5/sap.ui.layout": "1.128.0"
   }
 }

package/src/sap/f/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.126.1</version>
+  <version>1.128.0</version>
 
   <documentation>SAPUI5 library with Fiori controls.</documentation>
 

package/src/sap/f/Avatar.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.m.Avatar
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/AvatarGroup.js

@@ -100,7 +100,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/AvatarGroupItem.js

@@ -32,11 +32,10 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public
-	 * @experimental Since 1.73. This class is experimental and provides only limited functionality. Also the API might be changed in future.
 	 * @since 1.73
 	 * @alias sap.f.AvatarGroupItem
 	 */

package/src/sap/f/CalendarAppointmentInCard.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * This calendar appointment is used in card content of type Calendar.
 	 *
 	 * @extends sap.ui.unified.CalendarAppointment
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/f/CalendarInCard.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * <code>sap.m.Toolbar</code> with <code>sap.m.Buttons</code>.
 	 *
 	 * @extends sap.ui.unified.Calendar
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/f/Card.js

@@ -71,7 +71,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/CardBase.js

@@ -5,24 +5,19 @@
  */
 sap.ui.define([
 	"sap/ui/core/Control",
-	"sap/f/library",
-	"sap/m/library",
 	"sap/ui/core/InvisibleText",
-	"sap/m/BadgeEnabler",
 	"sap/f/CardRenderer",
-	"sap/ui/core/Lib"
+	"sap/ui/core/Lib",
+	"sap/f/cards/util/CardBadgeEnabler"
 ], function (
 	Control,
-	library,
-	mLibrary,
 	InvisibleText,
-	BadgeEnabler,
 	CardRenderer,
-	Library
+	Library,
+	CardBadgeEnabler
 ) {
 	"use strict";
 
-	var BadgeState = mLibrary.BadgeState;
 	var BADGE_AUTOHIDE_TIME = 3000;
 
 	/**
@@ -37,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public
@@ -62,12 +57,22 @@ sap.ui.define([
 				 */
 				height: {type: "sap.ui.core.CSSSize", group: "Appearance", defaultValue: "auto"}
 			},
-			aggregations: {}
+			aggregations: {
+
+				/**
+				 * Defines the internally used <code>sap.m.ObjectStatus</code>.
+				 */
+				_cardBadges: {
+					type: "sap.m.ObjectStatus",
+					multiple: true,
+					visibility: "hidden"
+				}
+			}
 		},
 		renderer: CardRenderer
 	});
 
-	BadgeEnabler.call(CardBase.prototype);
+	CardBadgeEnabler.call(CardBase.prototype);
 
 	/**
 	 * Initialization hook.
@@ -83,8 +88,7 @@ sap.ui.define([
 
 		this._ariaText = new InvisibleText({id: this.getId() + "-ariaText"});
 		this._ariaText.setText(this._oRb.getText("ARIA_ROLEDESCRIPTION_CARD"));
-
-		this.initBadgeEnablement();
+		this.initCardBadgeEnablement();
 	};
 
 	CardBase.prototype.exit = function () {
@@ -193,49 +197,15 @@ sap.ui.define([
 	};
 
 	CardBase.prototype._hideBadge = function () {
+		const oCardBadgeCustomData = this._getCardBadgeCustomData();
 
-		var oBadgeCustomData = this.getBadgeCustomData();
-		if (oBadgeCustomData) {
-			oBadgeCustomData.setVisible(false);
+		if (oCardBadgeCustomData?.length > 0) {
+			this._hideBadges();
 		}
 
 		this._iHideBadgeTimeout = null;
 	};
 
-	CardBase.prototype.onBadgeUpdate = function (sValue, sState, sBadgeId) {
-
-		var oHeader = this.getCardHeader(),
-			oDomRef,
-			sAriaLabelledBy;
-
-		if (oHeader) {
-			oDomRef = oHeader.getFocusDomRef();
-		} else {
-			oDomRef = this.getDomRef("contentSection");
-		}
-
-		if (!oDomRef) {
-			return;
-		}
-
-		sAriaLabelledBy = oDomRef.getAttribute("aria-labelledby") || "";
-
-		switch (sState) {
-			case BadgeState.Appear:
-				sAriaLabelledBy = sBadgeId + " " + sAriaLabelledBy;
-				oDomRef.setAttribute("aria-labelledby", sAriaLabelledBy);
-				break;
-			case BadgeState.Disappear:
-				sAriaLabelledBy = sAriaLabelledBy.replace(sBadgeId, "").trim();
-				oDomRef.setAttribute("aria-labelledby", sAriaLabelledBy);
-				break;
-		}
-	};
-
-	CardBase.prototype.getAriaLabelBadgeText = function () {
-		return this.getBadgeCustomData().getValue();
-	};
-
 	/**
 	 * Gets the ids of the elements labelling the Card container.
 	 *

package/src/sap/f/CardRenderer.js

@@ -32,12 +32,17 @@ sap.ui.define([
 	 */
 	CardRenderer.render = function (oRm, oCard) {
 		var oHeader = oCard.getCardHeader(),
-			bHeaderTop = oHeader && oCard.getCardHeaderPosition() === HeaderPosition.Top;
+			bHeaderTop = oHeader && oCard.getCardHeaderPosition() === HeaderPosition.Top,
+			bHasCardBadgeCustomData = oCard._getCardBadgeCustomData().length > 0;
 
 		oRm.openStart("div", oCard);
 		this.renderContainerAttributes(oRm, oCard);
 		oRm.openEnd();
 
+		 if (bHasCardBadgeCustomData) {
+			this.renderCardBadge(oRm, oCard);
+		}
+
 		// header at the top
 		if (bHeaderTop) {
 			oRm.renderControl(oHeader);
@@ -56,6 +61,9 @@ sap.ui.define([
 
 		oRm.renderControl(oCard._ariaText);
 		oRm.renderControl(oCard._ariaContentText);
+		if (bHasCardBadgeCustomData) {
+			oRm.renderControl(oCard._getInvisibleCardBadgeText());
+		}
 
 		oRm.close("div");
 	};
@@ -72,7 +80,8 @@ sap.ui.define([
 			bHasHeader = !!(oHeader && oHeader.getVisible()),
 			bHasContent = !!oContent,
 			bCardHeaderBottom = bHasHeader && oCard.getCardHeaderPosition() === HeaderPosition.Bottom,
-			sTooltip = oCard.getTooltip_AsString();
+			sTooltip = oCard.getTooltip_AsString(),
+			bHasCardBadgeCustomData = oCard._getCardBadgeCustomData().length > 0;
 
 		oRm.class("sapFCard")
 			.style("width", oCard.getWidth());
@@ -105,7 +114,8 @@ sap.ui.define([
 		//Accessibility state
 		oRm.accessibilityState(oCard, {
 			role: "region",
-			labelledby: { value: oCard._getAriaLabelledIds(), append: true }
+			labelledby: { value: oCard._getAriaLabelledIds(), append: true },
+			describedby: {value: bHasCardBadgeCustomData ? oCard._getInvisibleCardBadgeText().getId() : undefined}
 		});
 	};
 
@@ -147,5 +157,22 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Render card badge section.
+	 *
+	 * @protected
+	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
+	 * @param {sap.f.Card} oCard An object representation of the control that should be rendered.
+	 */
+	CardRenderer.renderCardBadge = function (oRm, oCard) {
+		oRm.openStart("div", oCard.getId() + "-cardBadgeSection")
+			.class("sapFCardBadgePlaceholder")
+			.openEnd();
+				oCard._getCardBadges()?.forEach((oCardBadge) => {
+					oRm.renderControl(oCardBadge);
+				});
+		oRm.close("div");
+	};
+
 	return CardRenderer;
 });

package/src/sap/f/DynamicPage.js

@@ -118,7 +118,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public
@@ -454,7 +454,8 @@ sap.ui.define([
 	DynamicPage.prototype.onAfterRendering = function () {
 
 		var bShouldSnapWithScroll,
-			iCurrentScrollPosition;
+			iCurrentScrollPosition,
+			oHeader = this.getHeader();
 
 		if (this.getPreserveHeaderStateOnScroll()) {
 			// Ensure that in this tick DP and it's aggregations are rendered
@@ -486,6 +487,10 @@ sap.ui.define([
 
 		this._updateToggleHeaderVisualIndicators();
 		this._updateTitleVisualState();
+
+		if (exists(oHeader) && oHeader._setLandmarkInfo) {
+			oHeader._setLandmarkInfo(this.getLandmarkInfo());
+		}
 	};
 
 	DynamicPage.prototype.exit = function () {
@@ -632,7 +637,7 @@ sap.ui.define([
 		var vResult = this.setProperty("fitContent", bFitContent, true);
 
 		if (exists(this.$())) {
-			this._updateFitContainer();
+			this._toggleScrollingStyles();
 		}
 
 		return vResult;
@@ -999,6 +1004,7 @@ sap.ui.define([
 
 		if (!this._bHeaderInTitleArea) {
 			this._moveHeaderToTitleArea(true);
+			this._adjustStickyContent();
 			this._updateTitlePositioning();
 		}
 
@@ -1381,12 +1387,17 @@ sap.ui.define([
 
 		this.toggleStyleClass("sapFDynamicPageWithScroll", bScrollBarNeeded);
 
-		setTimeout(this._updateFitContainer.bind(this), 0);
+		 // update styles for scrolling after a timeout of 0, in order to obtain the final state
+		 // e.g. after the ResizeHandler looped though *all* resized controls (to notify them) =>
+		 // so all of them completed their adjustments for the new size (notably any nested table adjusted its
+		 // visible rows count upon being notified by ResizeHandler for change of height of its container)
+		setTimeout(this._toggleScrollingStyles.bind(this), 0);
 	};
 
-	DynamicPage.prototype._updateFitContainer = function (bNeedsVerticalScrollBar) {
+	DynamicPage.prototype._toggleScrollingStyles = function (bNeedsVerticalScrollBar) {
 		var bNoScrollBar = typeof bNeedsVerticalScrollBar !== 'undefined' ? !bNeedsVerticalScrollBar : !this._needsVerticalScrollBar();
 
+		this.toggleStyleClass("sapFDynamicPageWithScroll", !bNoScrollBar);
 		this.$contentFitContainer.toggleClass("sapFDynamicPageContentFitContainer", bNoScrollBar);
 	};
 
@@ -1874,7 +1885,7 @@ sap.ui.define([
 
 		// FitContainer needs to be updated, when height is changed and scroll bar appear, to enable calc of original height
 		if (bNeedsVerticalScrollBar) {
-			this._updateFitContainer(bNeedsVerticalScrollBar);
+			this._toggleScrollingStyles(bNeedsVerticalScrollBar);
 		}
 
 		this._adjustSnap();
@@ -2015,6 +2026,12 @@ sap.ui.define([
 	 */
 	DynamicPage.prototype._onTitlePress = function () {
 		if (this.getToggleHeaderOnTitleClick() && this._hasVisibleTitleAndHeader()) {
+			if (!this.getHeaderExpanded() && this._headerBiggerThanAllowedToBeExpandedInTitleArea() && !this._preserveHeaderStateOnScroll()) {
+				// if the header will expanded and it is bigger than the allowed height to be shown in the title area
+				// we explicitly move it to the content area unless the preserveHeaderStateOnScroll is set
+				// the header is then always displayed in the title are by definition as is always sticky
+				this._moveHeaderToContentArea(true);
+			}
 			this._titleExpandCollapseWhenAllowed(true /* user interaction */);
 			this.getTitle()._focus();
 		}

package/src/sap/f/DynamicPageAccessibleLandmarkInfo.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public
@@ -88,7 +88,16 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 			 *
 			 * If not set (and a landmark different than <code>sap.ui.core.AccessibleLandmarkRole.None</code> is defined), no label is set.
 			 */
-			footerLabel : {type : "string", defaultValue : null}
+			footerLabel : {type : "string", defaultValue : null},
+
+			/**
+			* Texts which describe the landmark of the section inside the header container of the corresponding <code>sap.f.DynamicPage</code> control.
+			*
+			* If not set, default "Expanded header" aria-label is set.
+			* @public
+			* @since 1.127.0
+			*/
+			headerContentLabel: {type : "string", defaultValue : null}
 		}
 	}});
 

package/src/sap/f/DynamicPageHeader.js

@@ -64,7 +64,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.126.1
+		 * @version 1.128.0
 		 *
 		 * @constructor
 		 * @public
@@ -141,10 +141,10 @@ sap.ui.define([
 		DynamicPageHeader.prototype.init = function() {
 			this._bShowCollapseButton = true;
 			this._oInvisibleMessage = null;
+			this._oLandmarkInfo = null;
 		};
 
 		DynamicPageHeader.prototype.onAfterRendering = function () {
-			this._initARIAState();
 			this._initPinButtonARIAState();
 
 			if (!this._oInvisibleMessage) {
@@ -155,6 +155,8 @@ sap.ui.define([
 			if (this.getPinnable()) {
 				this._setPressedStatePinIcon();
 			}
+
+			this._applyAriaAttributes();
 		};
 
 		/*************************************** Private members ******************************************/
@@ -212,13 +214,25 @@ sap.ui.define([
 		};
 
 		/**
-		 * Initializes the <code>DynamicPageHeader</code> ARIA State.
+		 * Applies the <code>DynamicPageHeader</code> ARIA attributes.
 		 * @private
 		 */
-		DynamicPageHeader.prototype._initARIAState = function () {
-			var $header = this.$();
+		DynamicPageHeader.prototype._applyAriaAttributes = function () {
+			var $header = this.$(),
+				bHasHeaderContentLabel = this._oLandmarkInfo && this._oLandmarkInfo.getHeaderContentLabel();
+
+			if (bHasHeaderContentLabel) {
+				var sHeaderContentLabel = this._oLandmarkInfo.getHeaderContentLabel();
+				$header.attr(DynamicPageHeader.ARIA.ARIA_LABEL, sHeaderContentLabel);
+			} else {
+				$header.attr(DynamicPageHeader.ARIA.ARIA_LABEL, DynamicPageHeader.ARIA.LABEL_EXPANDED);
+			}
+		};
+
+		DynamicPageHeader.prototype._setLandmarkInfo = function (oLandmarkInfo) {
+			this._oLandmarkInfo = oLandmarkInfo;
 
-			$header.attr(DynamicPageHeader.ARIA.ARIA_LABEL, DynamicPageHeader.ARIA.LABEL_EXPANDED);
+			this._applyAriaAttributes();
 		};
 
 		/**

package/src/sap/f/DynamicPageTitle.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public