@openui5/sap.uxap 1.71.46 → 1.71.47

package/LICENSE.txt

@@ -581,7 +581,7 @@ License: MIT License
 <copyright holders> = Bjarke Walling
 <year> = 2014
 
-Component: URI.js 1.19.10
+Component: URI.js 1.19.11
 Licensor: Rodney Rehm
 Website: http://github.com/medialize/URI.js/
 License: MIT License

package/package.json

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

package/src/sap/uxap/.library

@@ -3,7 +3,7 @@
 
 	<name>sap.uxap</name>
 	<vendor>SAP SE</vendor>
-	<version>1.71.46</version>
+	<version>1.71.47</version>
 	<copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>

package/src/sap/uxap/BlockBaseMetadata.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/thirdparty/jquery", "sap/ui/core/ElementMetadata", "sap/b
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.71.46
+	 * @version 1.71.47
 	 * @since 1.26
 	 * @alias sap.uxap.BlockBaseMetadata
 	 * @extends sap.ui.core.ElementMetadata

package/src/sap/uxap/ObjectPageAccessibleLandmarkInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.71.46
+	 * @version 1.71.47
 	 *
 	 * @constructor
 	 * @public

package/src/sap/uxap/ObjectPageDynamicHeaderContent.js

@@ -49,7 +49,7 @@ sap.ui.define([
 		 * @implements sap.uxap.IHeaderContent
 		 *
 		 * @author SAP SE
-		 * @version 1.71.46
+		 * @version 1.71.47
 		 *
 		 * @constructor
 		 * @public

package/src/sap/uxap/ObjectPageDynamicHeaderTitle.js

@@ -49,7 +49,7 @@ sap.ui.define([
 		 * @implements sap.uxap.IHeaderTitle
 		 *
 		 * @author SAP SE
-		 * @version 1.71.46
+		 * @version 1.71.47
 		 *
 		 * @constructor
 		 * @public

package/src/sap/uxap/ObjectPageLazyLoader.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.71.46
+	 * @version 1.71.47
 	 *
 	 * @constructor
 	 * @public

package/src/sap/uxap/ObjectPageSection.js

@@ -6,7 +6,6 @@
 
 // Provides control sap.uxap.ObjectPageSection.
 sap.ui.define([
-    "sap/ui/core/InvisibleText",
     "./ObjectPageSectionBase",
     "sap/ui/Device",
     "sap/m/Button",
@@ -16,7 +15,6 @@ sap.ui.define([
     "sap/m/library",
     "./ObjectPageSectionRenderer"
 ], function(
-    InvisibleText,
 	ObjectPageSectionBase,
 	Device,
 	Button,
@@ -76,10 +74,6 @@ sap.ui.define([
 				 */
 				subSections: {type: "sap.uxap.ObjectPageSubSection", multiple: true, singularName: "subSection"},
 
-				/**
-				 * Screen Reader ariaLabelledBy
-				 */
-				ariaLabelledBy: {type: "sap.ui.core.InvisibleText", multiple: false, visibility: "hidden"},
 				_showHideAllButton: {type: "sap.m.Button", multiple: false, visibility: "hidden"},
 				_showHideButton: {type: "sap.m.Button", multiple: false, visibility: "hidden"}
 			},
@@ -117,6 +111,17 @@ sap.ui.define([
 		return sap.ui.getCore().getLibraryResourceBundle("sap.uxap");
 	};
 
+	/**
+	 * Returns the control name text.
+	 *
+	 * @override
+	 * @return {string} control name text
+	 * @protected
+	 */
+	ObjectPageSection.prototype.getSectionText = function (sValue) {
+		return ObjectPageSection._getLibraryResourceBundle().getText("SECTION_CONTROL_NAME");
+	};
+
 	ObjectPageSection.prototype._expandSection = function () {
 		ObjectPageSectionBase.prototype._expandSection.call(this)
 			._updateShowHideAllButton(!this._thereAreHiddenSubSections());
@@ -131,18 +136,6 @@ sap.ui.define([
 		this._detachMediaContainerWidthChange(this._updateImportance, this);
 	};
 
-	ObjectPageSection.prototype.setTitle = function (sValue) {
-		ObjectPageSectionBase.prototype.setTitle.call(this, sValue);
-
-		var oAriaLabelledBy = this.getAggregation("ariaLabelledBy"),
-			sSectionText = ObjectPageSection._getLibraryResourceBundle().getText("SECTION_CONTROL_NAME");
-
-		if (oAriaLabelledBy) {
-			sap.ui.getCore().byId(oAriaLabelledBy.getId()).setText(sValue + " " + sSectionText);
-		}
-		return this;
-	};
-
 	ObjectPageSection.prototype._getImportanceLevelToHide = function (oCurrentMedia) {
 		var oObjectPage = this._getObjectPageLayout(),
 			oMedia = oCurrentMedia || this._getCurrentMediaContainerRange(),
@@ -191,11 +184,7 @@ sap.ui.define([
 	};
 
 	ObjectPageSection.prototype.onBeforeRendering = function () {
-		var sAriaLabeledBy = "ariaLabelledBy";
-
-		if (!this.getAggregation(sAriaLabeledBy)) {
-			this.setAggregation(sAriaLabeledBy, this._getAriaLabelledBy(), true); // this is called onBeforeRendering, so suppress invalidate
-		}
+		ObjectPageSectionBase.prototype.onBeforeRendering.call(this);
 
 		this._detachMediaContainerWidthChange(this._updateImportance, this);
 
@@ -206,30 +195,6 @@ sap.ui.define([
 		this._attachMediaContainerWidthChange(this._updateImportance, this);
 	};
 
-	/**
-	 * provide a default aria-labeled by text
-	 * @private
-	 * @returns {*} sap.ui.core.InvisibleText
-	 */
-	ObjectPageSection.prototype._getAriaLabelledBy = function () {
-		// Each section should be labelled as:
-		// 'titleName Section' - if the section has a title
-		// 'Section' - if it does not have a title
-
-		var sLabel = "",
-			sTitle = this._getTitle();
-
-		if (sTitle) {
-			sLabel += sTitle + " ";
-		}
-
-		sLabel += ObjectPageSection._getLibraryResourceBundle().getText("SECTION_CONTROL_NAME");
-
-		return new InvisibleText({
-			text: sLabel
-		}).toStatic();
-	};
-
 	/**
 	 * Determines if the <code>ObjectPageSection</code> title is visible.
 	 * @private

package/src/sap/uxap/ObjectPageSectionBase.js

@@ -6,6 +6,7 @@
 
 // Provides control sap.uxap.ObjectPageSectionBase.
 sap.ui.define([
+    "sap/ui/core/InvisibleText",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/Control",
 	"sap/ui/core/library",
@@ -14,7 +15,7 @@ sap.ui.define([
 	"sap/ui/events/KeyCodes",
 	// jQuery Plugin "firstFocusableDomRef"
 	"sap/ui/dom/jquery/Focusable"
-], function(jQuery, Control, coreLibrary, library, Log, KeyCodes) {
+], function(InvisibleText, jQuery, Control, coreLibrary, library, Log, KeyCodes) {
 	"use strict";
 
 	// shortcut for sap.ui.core.TitleLevel
@@ -77,7 +78,10 @@ sap.ui.define([
 				}
 			},
 			aggregations: {
-
+				/**
+				 * Screen Reader ariaLabelledBy
+				 */
+				ariaLabelledBy: {type: "sap.ui.core.InvisibleText", multiple: false, visibility: "hidden"},
 				/**
 				 * The custom button that will provide a link to the section in the ObjectPageLayout anchor bar.
 				 * This button will be used as a custom template to be into the ObjectPageLayout anchorBar area, therefore property changes happening on this button template after the first rendering won't affect the actual button copy used in the anchorBar.
@@ -121,6 +125,16 @@ sap.ui.define([
 		}
 	};
 
+	ObjectPageSectionBase.prototype.onBeforeRendering = function () {
+		var sAriaLabeledBy = "ariaLabelledBy";
+
+		this.setInvisibleTextLabelValue(this._getTitle());
+
+		if (!this.getAggregation(sAriaLabeledBy)) {
+			this.setAggregation(sAriaLabeledBy, this._getAriaLabelledBy(), true); // this is called onBeforeRendering, so suppress invalidate
+		}
+	};
+
 	ObjectPageSectionBase.prototype.setCustomAnchorBarButton = function (oButton) {
 		var vResult = this.setAggregation("customAnchorBarButton", oButton, true);
 
@@ -131,6 +145,58 @@ sap.ui.define([
 		return vResult;
 	};
 
+	/**
+	 * Returns the control name text.
+	 *
+	 * To be overwritten by the specific control method.
+	 *
+	 * @return {string} control name text
+	 * @protected
+	 */
+	ObjectPageSectionBase.prototype.getSectionText = function () {
+		return "";
+	};
+
+	/**
+	 * Returns the DOM Element that should get the focus.
+	 *
+	 * To be overwritten by the specific control method.
+	 *
+	 * @return {sap.uxap.ObjectPageSectionBase} this for chaining
+	 * @protected
+	 */
+	ObjectPageSectionBase.prototype.setInvisibleTextLabelValue = function (sValue) {
+		var oAriaLabelledBy = this.getAggregation("ariaLabelledBy"),
+			sLabel = "";
+
+		sLabel = sValue || this.getSectionText();
+
+		if (oAriaLabelledBy) {
+			sap.ui.getCore().byId(oAriaLabelledBy.getId()).setText(sLabel);
+		}
+
+		return this;
+	};
+
+	/**
+	 * provide a default aria-labeled by text
+	 * @private
+	 * @returns {*} sap.ui.core.InvisibleText
+	 */
+	ObjectPageSectionBase.prototype._getAriaLabelledBy = function () {
+		// Each section should be labelled as:
+		// 'titleName' - if the section has a title
+		// 'Section' - if it does not have a title
+
+		var sLabel = "";
+
+		sLabel = this._getTitle() || this.getSectionText();
+
+		return new InvisibleText({
+			text: sLabel
+		}).toStatic();
+	};
+
 	/**
 	 * set the internal visibility of the sectionBase. This is set by the ux rules (for example don't display a section that has no subSections)
 	 * @param {boolean} bValue
@@ -308,6 +374,8 @@ sap.ui.define([
 		this.setProperty("title", sValue, bSuppressInvalidate);
 		this._notifyObjectPageLayout();
 
+		this.setInvisibleTextLabelValue(sValue);
+
 		return this;
 	};
 

package/src/sap/uxap/ObjectPageSubSection.js

@@ -232,6 +232,17 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Returns the control name text.
+	 *
+	 * @override
+	 * @return {string} control name text
+	 * @protected
+	 */
+	ObjectPageSubSection.prototype.getSectionText = function (sValue) {
+		return ObjectPageSubSection._getLibraryResourceBundle().getText("SUBSECTION_CONTROL_NAME");
+	};
+
 	/**
 	 * Returns Title DOM ID of the Title of this SubSection
 	 * @returns {string|boolean} DOM ID

package/src/sap/uxap/ObjectPageSubSectionRenderer.js

@@ -14,8 +14,10 @@ sap.ui.define(function () {
 	var ObjectPageSubSectionRenderer = {};
 
 	ObjectPageSubSectionRenderer.render = function (oRm, oControl) {
+
 		var aActions, bHasTitle, bHasTitleLine, bHasActions, bUseTitleOnTheLeft, bHasVisibleActions,
-			bAccessibilityOn = sap.ui.getCore().getConfiguration().getAccessibility();
+			bAccessibilityOn = sap.ui.getCore().getConfiguration().getAccessibility(),
+			oLabelledBy = oControl.getAggregation("ariaLabelledBy");
 
 		if (!oControl.getVisible() || !oControl._getInternalVisible()) {
 			return;
@@ -43,12 +45,8 @@ sap.ui.define(function () {
 		oRm.addClass("ui-helper-clearfix");
 		oRm.writeClasses();
 
-		if (bAccessibilityOn) {
-			if (bHasTitle) {
-				oRm.writeAttributeEscaped("aria-labelledby", oControl.getId() + "-headerTitle");
-			} else {
-				oRm.writeAttribute("aria-label", sap.uxap.ObjectPageSubSection._getLibraryResourceBundle().getText("SUBSECTION_CONTROL_NAME"));
-			}
+		if (bAccessibilityOn && oLabelledBy) {
+			oRm.attr("aria-labelledby", oLabelledBy.getId());
 		}
 
 		oRm.write(">");

package/src/sap/uxap/changeHandler/MoveObjectPageSection.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "sap/ui/thirdparty/jquery
 	 * @constructor
 	 * @alias sap.uxap.changeHandler.MoveObjectPageSection
 	 * @author SAP SE
-	 * @version 1.71.46
+	 * @version 1.71.47
 	 * @experimental Since 1.54
 	 */
 

package/src/sap/uxap/changeHandler/RenameObjectPageSection.js

@@ -21,7 +21,7 @@ function (
 	 * @constructor
 	 * @alias sap.uxap.changeHandler.RenameObjectPageSection
 	 * @author SAP SE
-	 * @version 1.71.46
+	 * @version 1.71.47
 	 * @experimental Since 1.50
 	 */
 

package/src/sap/uxap/library.js

@@ -65,7 +65,7 @@ sap.ui.define([
 			"sap.uxap.ObjectPageHeaderLayoutData",
 			"sap.uxap.ObjectPageLazyLoader"
 		],
-		version: "1.71.46",
+		version: "1.71.47",
 		extensions: {
 			flChangeHandlers: {
 				"sap.uxap.ObjectPageHeader": "sap/uxap/flexibility/ObjectPageHeader",

package/src/sap/uxap/messagebundle_ko.properties

@@ -23,7 +23,7 @@ BREADCRUMB_TRAIL_LABEL=\uD0D0\uC0C9 \uACBD\uB85C \uCD94\uC801
 SHOW_ALL=\uBAA8\uB450 \uD45C\uC2DC
 
 #XBUT,12: Text displayed on the button to click to collapse all subsections
-HIDE_ALL=\uAC04\uB2E8\uD788 \uD45C\uC2DC
+HIDE_ALL=\uAC04\uB2E8\uD788 \uBCF4\uAE30
 
 #XBUT,9: Text displayed on the button to click to expand section
 SHOW=\uD3BC\uCE58\uAE30