@openui5/sap.f 1.133.2 → 1.135.0

package/.reuse/dep5

@@ -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/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
@@ -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: 2024b
-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:
 
@@ -468,7 +462,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.24.0
+Component: SAP Theming Base Content, version: 11.28.2
 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
@@ -1015,21 +1009,6 @@ END of license: LicenseRef-Unicode-3.0
 =================================
 
 
-=================================
-BEGIN of license: LicenseRef-tzdata-PublicDomain
-=================================
-
-Unless specified below, all files in the tz code and data (including
-this LICENSE file) are in the public domain.
-
-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.
-
-=================================
-END of license: LicenseRef-tzdata-PublicDomain
-=================================
-
-
 =================================
 BEGIN of license: MIT
 =================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.f",
-  "version": "1.133.2",
+  "version": "1.135.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.133.2",
-    "@openui5/sap.ui.core": "1.133.2",
-    "@openui5/sap.ui.layout": "1.133.2"
+    "@openui5/sap.m": "1.135.0",
+    "@openui5/sap.ui.core": "1.135.0",
+    "@openui5/sap.ui.layout": "1.135.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.133.2</version>
+  <version>1.135.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.133.2
+	 * @version 1.135.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.133.2
+	 * @version 1.135.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.133.2
+	 * @version 1.135.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.133.2
+	 * @version 1.135.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.133.2
+	 * @version 1.135.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.133.2
+	 * @version 1.135.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/f/CardBase.js

@@ -10,7 +10,10 @@ sap.ui.define([
 	"sap/ui/core/Lib",
 	"sap/f/cards/util/CardBadgeEnabler",
 	"sap/f/library",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/ui/events/KeyCodes",
+	// jQuery Plugin "firstFocusableDomRef", "lastFocusableDomRef"
+	"sap/ui/dom/jquery/Focusable"
 ], function (
 	Control,
 	InvisibleText,
@@ -18,7 +21,8 @@ sap.ui.define([
 	Library,
 	CardBadgeEnabler,
 	library,
-	Log
+	Log,
+	KeyCodes
 ) {
 	"use strict";
 
@@ -37,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.133.2
+	 * @version 1.135.0
 	 *
 	 * @constructor
 	 * @public
@@ -48,7 +52,8 @@ sap.ui.define([
 			library: "sap.f",
 			interfaces: [
 				"sap.f.ICard",
-				"sap.m.IBadge"
+				"sap.m.IBadge",
+				"sap.f.IGridContainerItem"
 			],
 			properties: {
 
@@ -63,7 +68,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 +100,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 +128,14 @@ sap.ui.define([
 		this._ariaText = new InvisibleText({id: this.getId() + "-ariaText"});
 		this._ariaText.setText(this._oRb.getText("ARIA_ROLEDESCRIPTION_CARD"));
 
+		this._describedByInteractiveText = new InvisibleText({ id: this.getId() + "-describedByInteractive" });
+		this._describedByInteractiveText.setText(this._oRb.getText("ARIA_ACTIVATE_CARD"));
+
+		this._describedByCardTypeText = new InvisibleText({ id: this.getId() + "-describedByCardTypeText"});
+		this._describedByCardTypeText.setText(this._oRb.getText("ARIA_ROLEDESCRIPTION_CARD"));
+
+		this._sGridItemRole = null;
+
 		this.initCardBadgeEnablement();
 	};
 
@@ -135,6 +153,17 @@ sap.ui.define([
 			this._ariaText = null;
 		}
 
+		this._describedByInteractiveText.destroy();
+		this._describedByInteractiveText = null;
+
+		this._describedByCardTypeText.destroy();
+		this._describedByCardTypeText = null;
+
+		if (this._invisibleTitle) {
+			this._invisibleTitle.destroy();
+			this._invisibleTitle = null;
+		}
+
 		this.destroyCardBadgeEnablement();
 	};
 
@@ -205,7 +234,7 @@ sap.ui.define([
 	 * @protected
 	 */
 	CardBase.prototype.getFocusDomRef = function () {
-		if (this.isInteractive() && this.getSemanticRole() === SemanticRole.ListItem) {
+		if (this.isRoleListItem()) {
 			return this.getDomRef();
 		}
 
@@ -228,7 +257,10 @@ sap.ui.define([
 		this._hideBadge();
 	};
 
-	CardBase.prototype.onfocusin = function () {
+	CardBase.prototype.onfocusin = function (oEvent) {
+		if (oEvent.target !== this.getDomRef()) {
+			this.oLastFocusedElement = oEvent.target;
+		}
 		this._startBadgeHiding();
 	};
 
@@ -259,26 +291,42 @@ sap.ui.define([
 	CardBase.prototype._getAriaLabelledIds = function () {
 		var oHeader = this.getCardHeader();
 		const sBlockingMessageAriaLabelsIds = this._getBlockingMessageAriaLabelledByIds();
-
-		if (oHeader) {
-			if (this._isInsideGridContainer()) {
-				if (sBlockingMessageAriaLabelsIds) {
-					return oHeader._getAriaLabelledBy() + " " + sBlockingMessageAriaLabelsIds;
-				}
-				return oHeader._getAriaLabelledBy();
-			}
-
+		if (oHeader && oHeader.getVisible()) {
 			if (oHeader._getTitle && oHeader._getTitle()) {
 				if (sBlockingMessageAriaLabelsIds) {
 					return oHeader._getTitle().getId() + " " + sBlockingMessageAriaLabelsIds;
 				}
 				return oHeader._getTitle().getId();
 			}
+		} else if (oHeader?.getTitle()) {
+			if (!this._invisibleTitle) {
+				this._invisibleTitle = new InvisibleText({ id: this.getId() + "-invisibleTitle" });
+			}
+			this._invisibleTitle.setText(oHeader.getTitle());
+
+			return this._invisibleTitle.getId();
 		}
 
 		return this._ariaText.getId();
 	};
 
+	CardBase.prototype._getAriaDescribedByIds = function () {
+		const bHasCardBadgeCustomData = this._getCardBadgeCustomData().length > 0;
+		const aIds = [];
+
+		aIds.push(this._describedByCardTypeText.getId());
+
+		if (this.isInteractive() && this.isRoleListItem()) {
+			aIds.push(this._describedByInteractiveText.getId());
+		}
+
+		if (bHasCardBadgeCustomData) {
+			aIds.push(this._getInvisibleCardBadgeText().getId());
+		}
+
+		return aIds.join(" ");
+	};
+
 	/**
 	 * Gets the ids of the elements in the illustrated message that have to be labelled.
 	 *
@@ -299,22 +347,45 @@ sap.ui.define([
 		return sTitleId;
 	};
 
-	/**
-	 * Listens for ontap event
-	 *
-	 * @param {object} oEvent event
-	 */
-	CardBase.prototype.ontap = function (oEvent) {
-		this._handleTapOrSelect(oEvent);
+	CardBase.prototype.onkeydown = function (oEvent) {
+
+		if (oEvent.code === "F7") {
+			this._handleF7Key(oEvent);
+			return;
+		}
+
+		if (oEvent.target === this.getDomRef() && !oEvent.ctrlKey && !oEvent.metaKey) {
+			if (oEvent.which === KeyCodes.ENTER) {
+				this._handleTap(oEvent);
+			} else if (oEvent.which === KeyCodes.SPACE) {
+				// To prevent the browser scrolling.
+				oEvent.preventDefault();
+			} else if (oEvent.which === KeyCodes.SHIFT || oEvent.which === KeyCodes.ESCAPE) {
+				this._bPressedEscapeOrShift = true;
+			}
+		}
+	};
+
+	CardBase.prototype.onkeyup = function (oEvent) {
+		if (oEvent.target === this.getDomRef()) {
+			if (oEvent.which === KeyCodes.SPACE && !this._bPressedEscapeOrShift) {
+				this._handleTap(oEvent);
+			} else if (oEvent.which === KeyCodes.SHIFT || oEvent.which === KeyCodes.ESCAPE) {
+				this._bPressedEscapeOrShift = false;
+			}
+		}
 	};
 
 	/**
-	 * Listens for onsapselect event
+	 * Listens for ontap event
 	 *
 	 * @param {object} oEvent event
 	 */
-	CardBase.prototype.onsapselect = function (oEvent) {
-		this._handleTapOrSelect(oEvent);
+	CardBase.prototype.ontap = function (oEvent) {
+		if (this.isMouseInteractionDisabled()) {
+			return;
+		}
+		this._handleTap(oEvent);
 	};
 
 	/**
@@ -322,8 +393,10 @@ sap.ui.define([
 	 *
 	 * @param {object} oEvent event
 	 */
-	CardBase.prototype._handleTapOrSelect = function (oEvent) {
-		if (!this.isInteractive() || oEvent.isMarked() || this.getSemanticRole() !== SemanticRole.ListItem) {
+	CardBase.prototype._handleTap = function (oEvent) {
+		if (!this.isInteractive() ||
+			oEvent.isMarked() ||
+			!this.isRoleListItem()) {
 			return;
 		}
 
@@ -334,17 +407,34 @@ sap.ui.define([
 		this.firePress({
 			originalEvent: oEvent
 		});
+
 		oEvent.preventDefault();
+		oEvent.stopPropagation();
 	};
 
 	/**
-	 * Returns if the control is inside a sap.f.GridContainer
-	 *
+	 * Handler for F7 key
+	 * @param {Object} oEvent - key object
 	 * @private
 	 */
-	CardBase.prototype._isInsideGridContainer = function() {
-		var oParent = this.getParent();
-		return oParent && oParent.isA("sap.f.GridContainer");
+	CardBase.prototype._handleF7Key = function (oEvent) {
+		if (!this.isInteractive() || !this.isRoleListItem()) {
+			return;
+		}
+
+		const oTarget = oEvent.target;
+		const $FirstFocusableItem = this.$().firstFocusableDomRef();
+
+		if (oTarget !== this.getDomRef()) {
+			this.getDomRef().focus();
+		} else if (this.oLastFocusedElement && !$FirstFocusableItem.classList.contains("sapMListUl")) { // to prevent the list from getting the F7 event and trap the focus
+			this.oLastFocusedElement.focus();
+		} else if ($FirstFocusableItem) {
+			$FirstFocusableItem.focus();
+		}
+
+		oEvent.preventDefault();
+		oEvent.stopPropagation();
 	};
 
 	/**
@@ -360,14 +450,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.
@@ -62,6 +61,13 @@ sap.ui.define([
 
 		oRm.renderControl(oCard._ariaText);
 		oRm.renderControl(oCard._ariaContentText);
+
+		oRm.renderControl(oCard._describedByCardTypeText);
+		oRm.renderControl(oCard._describedByInteractiveText);
+		if (oCard._invisibleTitle) {
+			oRm.renderControl(oCard._invisibleTitle);
+		}
+
 		if (bHasCardBadgeCustomData) {
 			oRm.renderControl(oCard._getInvisibleCardBadgeText());
 		}
@@ -84,7 +90,7 @@ sap.ui.define([
 			bHasContent = !!oContent,
 			bCardHeaderBottom = bHasHeader && oCard.getCardHeaderPosition() === HeaderPosition.Bottom,
 			sTooltip = oCard.getTooltip_AsString(),
-			bHasCardBadgeCustomData = oCard._getCardBadgeCustomData().length > 0;
+			sAriaRole = oCard.getGridItemRole() || oCard.getSemanticRole().toLowerCase();
 
 		oRm.class("sapFCard")
 			.style("width", oCard.getWidth());
@@ -102,13 +108,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");
+				}
 			}
 		}
 
@@ -126,10 +135,9 @@ 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}
+			describedby: { value: oCard._getAriaDescribedByIds(), append: true }
 		});
 	};
 

package/src/sap/f/DynamicPage.js

@@ -118,7 +118,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.133.2
+	 * @version 1.135.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.133.2
+	 * @version 1.135.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.133.2
+		 * @version 1.135.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.133.2
+	 * @version 1.135.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.

package/src/sap/f/FlexibleColumnLayout.js

@@ -108,7 +108,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.133.2
+	 * @version 1.135.0
 	 *
 	 * @constructor
 	 * @public