@openui5/sap.f 1.132.1 → 1.134.0

package/.reuse/dep5

@@ -235,8 +235,8 @@ License: Apache-2.0
 Comment: these files belong to: Google-Caja JS HTML Sanitizer
 
 Files: src/sap.ui.core/src/sap/ui/core/cldr/*
-Copyright: 1991-2023 Unicode, Inc.
-License: Unicode-DFS-2015
+Copyright: 1991-2024 Unicode, Inc.
+License: LicenseRef-Unicode-3.0
 Comment: these files belong to: Unicode Common Locale Data Repository
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/mobiscroll/*
@@ -364,13 +364,6 @@ Copyright:
 License: Apache-2.0 and ISC
 Comment: these files contain content from SAP and node-lru-cache: LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.
 
-Files: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
-Copyright:
-    2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
-    Arthur David Olson, Paul Eggert and other contributors
-License: Apache-2.0 and LicenseRef-tzdata-PublicDomain
-Comment: these files contain content from SAP and Time Zone Database: _timezones.js is overall written by SAP, but the list of IANA timezone IDs is taken from the Timezone Database
-
 
 # Library: sap.ui.documentation:
 

package/LICENSES/LicenseRef-Unicode-3.0.txt

@@ -0,0 +1,39 @@
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.

package/THIRDPARTY.txt

@@ -22,7 +22,7 @@ Contained in: src/sap.m/test/sap/m/qunit/_thirdparty/qunit-composite.css
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.31.1
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.36.5
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -187,10 +187,10 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/caja-html-sanitizer.js
 
-Component: Unicode Common Locale Data Repository, version: 44
-Copyright: 1991-2023 Unicode, Inc.
-License: Unicode-DFS-2015
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
+Component: Unicode Common Locale Data Repository, version: 46.1.0
+Copyright: 1991-2024 Unicode, Inc.
+License: LicenseRef-Unicode-3.0
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/LicenseRef-Unicode-3.0.txt
 Contained in: src/sap.ui.core/src/sap/ui/core/cldr/*
 
 Component: MobiScroll, version: 2.9.0
@@ -342,12 +342,6 @@ License: ISC
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/ISC.txt
 Contained in: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 
-Component: Time Zone Database, version: 2023d
-Copyright: Arthur David Olson, Paul Eggert and other contributors
-License: LicenseRef-tzdata-PublicDomain
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/LicenseRef-tzdata-PublicDomain.txt
-Contained in: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
-
 
 Library: sap.ui.documentation:
 
@@ -967,17 +961,51 @@ END of license: LicenseRef-JSONinJSPublicDomain
 
 
 =================================
-BEGIN of license: LicenseRef-tzdata-PublicDomain
+BEGIN of license: LicenseRef-Unicode-3.0
 =================================
 
-Unless specified below, all files in the tz code and data (including
-this LICENSE file) are in the public domain.
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
 
-If the files date.c, newstrftime.3, and strftime.c are present, they
-contain material derived from BSD and use the BSD 3-clause license.
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
 
 =================================
-END of license: LicenseRef-tzdata-PublicDomain
+END of license: LicenseRef-Unicode-3.0
 =================================
 
 
@@ -1009,64 +1037,3 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 END of license: MIT
 =================================
 
-
-=================================
-BEGIN of license: Unicode-DFS-2015
-=================================
-
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-Unicode Data Files include all data files under the directories http://www.unicode.org/Public/,
-http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/. Unicode
-Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/.
-Software includes any source code published in the Unicode Standard or under
-the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/,
-and http://www.unicode.org/cldr/data/.
-
-NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
-INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"),
-AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND
-BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE,
-DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright © 1991-2015 Unicode, Inc. All rights reserved. Distributed under
-the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the Unicode data files and any associated documentation (the "Data Files")
-or Unicode software and any associated documentation (the "Software") to deal
-in the Data Files or Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, and/or sell copies
-of the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that
-
-(a) this copyright and permission notice appear with all copies of the Data
-Files or Software,
-
-(b) this copyright and permission notice appear in associated documentation,
-and
-
-(c) there is clear notice in each modified Data File or in the Software as
-well as in the documentation associated with the Data File(s) or Software
-that the data or software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
-BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in these Data Files or Software without prior written authorization of the
-copyright holder.
-
-=================================
-END of license: Unicode-DFS-2015
-=================================
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.f",
-  "version": "1.132.1",
+  "version": "1.134.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.132.1",
-    "@openui5/sap.ui.core": "1.132.1",
-    "@openui5/sap.ui.layout": "1.132.1"
+    "@openui5/sap.m": "1.134.0",
+    "@openui5/sap.ui.core": "1.134.0",
+    "@openui5/sap.ui.layout": "1.134.0"
   }
 }

package/src/sap/f/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.132.1</version>
+  <version>1.134.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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/AvatarGroupItem.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @public

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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/CardBase.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @public
@@ -48,7 +48,8 @@ sap.ui.define([
 			library: "sap.f",
 			interfaces: [
 				"sap.f.ICard",
-				"sap.m.IBadge"
+				"sap.m.IBadge",
+				"sap.f.IGridContainerItem"
 			],
 			properties: {
 
@@ -63,7 +64,10 @@ sap.ui.define([
 				height: {type: "sap.ui.core.CSSSize", group: "Appearance", defaultValue: "auto"},
 
 				/**
-				 * Defines the role of the Card Header.
+				 * Defines the accessibility role of the control.
+				 *
+				 * **Note:** When the control is placed inside a <code>sap.f.GridContainer</code>,
+				 * its accessibility role is overridden by the accessibility role specified by the <code>sap.f.GridContainer</code>.
 				 *
 				 * @experimental since 1.131
 				 */
@@ -92,7 +96,9 @@ sap.ui.define([
 			events: {
 				/**
 				 * Fired when action is added on card level.
-				 * Note: Can be used only if <code>semanticRole</code> is <code>sap.f.cards.SemanticRole.ListItem</code>.
+				 *
+				 * **Note**: Can be used only if <code>semanticRole</code> is <code>sap.f.cards.SemanticRole.ListItem</code>
+				 * or the control is placed inside a <code>sap.f.GridContainer</code>.
 				 * @experimental since 1.131
 				 */
 				press: {}
@@ -118,6 +124,8 @@ sap.ui.define([
 		this._ariaText = new InvisibleText({id: this.getId() + "-ariaText"});
 		this._ariaText.setText(this._oRb.getText("ARIA_ROLEDESCRIPTION_CARD"));
 
+		this._sGridItemRole = null;
+
 		this.initCardBadgeEnablement();
 	};
 
@@ -205,7 +213,7 @@ sap.ui.define([
 	 * @protected
 	 */
 	CardBase.prototype.getFocusDomRef = function () {
-		if (this.isInteractive() && this.getSemanticRole() === SemanticRole.ListItem) {
+		if (this.isRoleListItem()) {
 			return this.getDomRef();
 		}
 
@@ -261,13 +269,6 @@ sap.ui.define([
 		const sBlockingMessageAriaLabelsIds = this._getBlockingMessageAriaLabelledByIds();
 
 		if (oHeader) {
-			if (this._isInsideGridContainer()) {
-				if (sBlockingMessageAriaLabelsIds) {
-					return oHeader._getAriaLabelledBy() + " " + sBlockingMessageAriaLabelsIds;
-				}
-				return oHeader._getAriaLabelledBy();
-			}
-
 			if (oHeader._getTitle && oHeader._getTitle()) {
 				if (sBlockingMessageAriaLabelsIds) {
 					return oHeader._getTitle().getId() + " " + sBlockingMessageAriaLabelsIds;
@@ -305,6 +306,9 @@ sap.ui.define([
 	 * @param {object} oEvent event
 	 */
 	CardBase.prototype.ontap = function (oEvent) {
+		if (this.isMouseInteractionDisabled()) {
+			return;
+		}
 		this._handleTapOrSelect(oEvent);
 	};
 
@@ -323,7 +327,9 @@ sap.ui.define([
 	 * @param {object} oEvent event
 	 */
 	CardBase.prototype._handleTapOrSelect = function (oEvent) {
-		if (!this.isInteractive() || oEvent.isMarked() || this.getSemanticRole() !== SemanticRole.ListItem) {
+		if (!this.isInteractive() ||
+			oEvent.isMarked() ||
+			!this.isRoleListItem()) {
 			return;
 		}
 
@@ -337,16 +343,6 @@ sap.ui.define([
 		oEvent.preventDefault();
 	};
 
-	/**
-	 * Returns if the control is inside a sap.f.GridContainer
-	 *
-	 * @private
-	 */
-	CardBase.prototype._isInsideGridContainer = function() {
-		var oParent = this.getParent();
-		return oParent && oParent.isA("sap.f.GridContainer");
-	};
-
 	/**
 	 * @ui5-restricted
 	 */
@@ -360,14 +356,58 @@ sap.ui.define([
 		return null;
 	};
 
+	/**
+	 * Checks if the card is interactive.
+	 * @private
+	 * @ui5-restricted sap.f.CardRenderer
+	 * @returns {boolean} Whether the card is interactive.
+	 */
 	CardBase.prototype.isInteractive = function() {
 		const bIsInteractive = this.hasListeners("press");
 
-		if (bIsInteractive && this.getSemanticRole() !== SemanticRole.ListItem) {
-			Log.error("The full card cannot be interactive if the 'semanticRole' is not 'ListItem'", this);
+		if (bIsInteractive && !this.isRoleListItem()) {
+			Log.error("The full card cannot be interactive if the 'semanticRole' is not 'ListItem' or the control is not placed inside a sap.f.GridContainer", this);
 		}
 		return bIsInteractive;
 	};
 
+	/**
+	 * Checks if the card should be fully interactive with the mouse.
+	 * @private
+	 * @ui5-restricted sap.f.CardRenderer
+	 * @returns {boolean} False if the card should not be fully interactive with the mouse.
+	 */
+	CardBase.prototype.isMouseInteractionDisabled = function() {
+		return false;
+	};
+
+	/**
+	 * Sets the accessibility role for the <code>sap.f.GridContainer</code> item.
+	 *
+	 * **Note:** This method is automatically called by the <code>sap.f.GridContainer</code> control.
+	 *
+	 * @param {string} sRole The accessibility role for the <code>sap.f.GridContainer</code> item
+	 * @private
+	 * @ui5-restricted sap.f.GridContainer
+	 *
+	 */
+	CardBase.prototype.setGridItemRole = function (sRole) {
+		this._sGridItemRole = sRole;
+	};
+
+	/**
+	 * Returns the accessibility role for the <code>sap.f.GridContainer</code> item.
+	 *
+	 * @returns {string} The accessibility role for the <code>sap.f.GridContainer</code> item
+	 * @public
+	 */
+	CardBase.prototype.getGridItemRole = function () {
+		return this._sGridItemRole;
+	};
+
+	CardBase.prototype.isRoleListItem = function () {
+		return (this.getSemanticRole() === SemanticRole.ListItem) || this.getGridItemRole();
+	};
+
 	return CardBase;
 });

package/src/sap/f/CardRenderer.js

@@ -13,8 +13,7 @@ sap.ui.define([
 	library
 ) {
 	"use strict";
-	var HeaderPosition = library.cards.HeaderPosition,
-		SemanticRole = library.cards.SemanticRole;
+	var HeaderPosition = library.cards.HeaderPosition;
 
 	/**
 	 * <code>Card</code> renderer.
@@ -84,7 +83,8 @@ sap.ui.define([
 			bHasContent = !!oContent,
 			bCardHeaderBottom = bHasHeader && oCard.getCardHeaderPosition() === HeaderPosition.Bottom,
 			sTooltip = oCard.getTooltip_AsString(),
-			bHasCardBadgeCustomData = oCard._getCardBadgeCustomData().length > 0;
+			bHasCardBadgeCustomData = oCard._getCardBadgeCustomData().length > 0,
+			sAriaRole = oCard.getGridItemRole() || oCard.getSemanticRole().toLowerCase();
 
 		oRm.class("sapFCard")
 			.style("width", oCard.getWidth());
@@ -102,13 +102,16 @@ sap.ui.define([
 			oRm.class("sapFCardSectionInteractive");
 		}
 
-
-		if (oCard.getSemanticRole() === SemanticRole.ListItem) {
+		if (oCard.isRoleListItem()) {
 			oRm.class("sapFCardFocus");
 			oRm.attr("tabindex", "0");
 
 			if (bIsInteractive) {
 				oRm.class("sapFCardInteractive");
+
+				if (oCard.isMouseInteractionDisabled()) {
+					oRm.class("sapFCardDisableMouseInteraction");
+				}
 			}
 		}
 
@@ -127,7 +130,7 @@ sap.ui.define([
 		//Accessibility state
 		oRm.accessibilityState(oCard, {
 			// TODO if role is not only used with accessibility values, this should be changed
-			role: oCard.getSemanticRole().toLowerCase(),
+			role: sAriaRole,
 			labelledby: { value: oCard._getAriaLabelledIds(), append: true },
 			describedby: {value: bHasCardBadgeCustomData ? oCard._getInvisibleCardBadgeText().getId() : undefined}
 		});

package/src/sap/f/DynamicPage.js

@@ -118,7 +118,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @public
@@ -2502,6 +2502,17 @@ sap.ui.define([
 		return {};
 	};
 
+	DynamicPage.prototype._getAccessibilityStateTitle = function () {
+		var oInfo = this._formatLandmarkInfo(this.getLandmarkInfo(), "Header"),
+			oTitle = this.getTitle();
+
+		if (oTitle) {
+			oInfo.label = oTitle._getTitleText() || oInfo.label;
+		}
+
+		return oInfo;
+	};
+
 	/**
 	 * Returns HTML tag of the page header.
 	 *

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.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/DynamicPageHeader.js

@@ -64,7 +64,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.132.1
+		 * @version 1.134.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/f/DynamicPageRenderer.js

@@ -60,7 +60,7 @@ sap.ui.define(["sap/ui/Device"], function (Device) {
 		if (!bHeaderHasContent) {
 			oRm.class("sapFDynamicPageTitleOnly");
 		}
-		oRm.accessibilityState(oDynamicPage, oDynamicPage._formatLandmarkInfo(oLandmarkInfo, "Header"));
+		oRm.accessibilityState(oDynamicPage, oDynamicPage._getAccessibilityStateTitle());
 		oRm.attr("data-sap-ui-customfastnavgroup", true);
 
 		oRm.openEnd();

package/src/sap/f/DynamicPageTitle.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @public
@@ -378,6 +378,8 @@ sap.ui.define([
 	DynamicPageTitle.TOGGLE_HEADER_TEXT_ID = InvisibleText.getStaticId("sap.f", "TOGGLE_HEADER");
 	DynamicPageTitle.DEFAULT_HEADER_TEXT_ID = InvisibleText.getStaticId("sap.f", "DEFAULT_HEADER_TEXT");
 
+	DynamicPageTitle.KNOWN_HEADING_CONTROL_CLASS_NAMES = ["sap.m.Title", "sap.m.Text", "sap.m.FormattedText", "sap.m.Label"];
+
 	/**
 	 * Retrieves the resource bundle for the <code>sap.f</code> library.
 	 * @returns {Object} the resource bundle object
@@ -414,6 +416,20 @@ sap.ui.define([
 		return typeof oObject === "function";
 	}
 
+	function findTitleInFlexBox(oHeading) {
+		var oTitle = null;
+
+		for (var item of oHeading.getItems()) {
+			if (item.isA("sap.m.Title")) {
+				return item;
+			} else if (item.isA("sap.m.FlexBox")) {
+				oTitle = findTitleInFlexBox(item);
+			}
+		}
+
+		return oTitle;
+	}
+
 	/* ========== LIFECYCLE METHODS  ========== */
 	DynamicPageTitle.prototype.init = function () {
 		this._bExpandedState = true;
@@ -704,6 +720,23 @@ sap.ui.define([
 
 	/* ========== PRIVATE METHODS  ========== */
 
+	DynamicPageTitle.prototype._getTitleText = function() {
+		var oHeading = this.getHeading(),
+			sClassName = oHeading && oHeading.getMetadata().getName(),
+			oTitle,
+			sTitleText;
+
+		if (DynamicPageTitle.KNOWN_HEADING_CONTROL_CLASS_NAMES.indexOf(sClassName) > -1) {
+			sTitleText = oHeading.getText();
+		} else if (oHeading?.isA("sap.m.FlexBox")) {
+			oTitle = findTitleInFlexBox(oHeading);
+			sTitleText = oTitle?.getText();
+		}
+
+		return sTitleText;
+	};
+
+
 	/**
 	 * Creates and caches an instance of the {@link sap.ui.core.InvisibleText} control for the specified aria label.
 	 * @param {string} sId The ID for the invisible text control.