@openui5/sap.m 1.111.6 → 1.112.1

package/src/sap/m/Page.js

@@ -16,6 +16,7 @@ sap.ui.define([
 	"sap/ui/core/util/ResponsivePaddingsEnablement",
 	"sap/ui/core/library",
 	"sap/ui/core/Element",
+	"sap/ui/core/InvisibleText",
 	"./TitlePropagationSupport",
 	"./PageRenderer",
 	"sap/ui/thirdparty/jquery",
@@ -32,6 +33,7 @@ function(
 	ResponsivePaddingsEnablement,
 	coreLibrary,
 	Element,
+	InvisibleText,
 	TitlePropagationSupport,
 	PageRenderer,
 	jQuery,
@@ -91,7 +93,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 * @mixes sap.ui.core.ContextMenuSupport
 		 * @author SAP SE
-		 * @version 1.111.6
+		 * @version 1.112.1
 		 *
 		 * @public
 		 * @alias sap.m.Page
@@ -304,7 +306,12 @@ function(
 		};
 
 		Page.prototype.onBeforeRendering = function () {
-			var oHeader = this.getCustomHeader() || this.getAggregation("_internalHeader");
+			var oHeader = this.getCustomHeader() || this.getAggregation("_internalHeader"),
+				oFooter = this.getFooter();
+
+			if (oFooter && !oFooter.getAriaLabelledBy().length) {
+				oFooter.addAriaLabelledBy(this._getFooterToolbarAriaLabelledBy(oFooter.getId()));
+			}
 
 			if (this._oScroller && !this._hasScrolling()) {
 				this._oScroller.destroy();
@@ -327,7 +334,6 @@ function(
 			if (oHeader && oHeader.setTitleAlignment) {
 				oHeader.setProperty("titleAlignment", this.getTitleAlignment(), true);
 			}
-
 		};
 
 		Page.prototype.onAfterRendering = function () {
@@ -360,6 +366,14 @@ function(
 				this._appIcon.destroy();
 				this._appIcon = null;
 			}
+			if (this._oHeaderToolbarInvisibleText) {
+				this._oHeaderToolbarInvisibleText.destroy();
+				this._oHeaderToolbarInvisibleText = null;
+			}
+			if (this._oFooterToolbarInvisibleText) {
+				this._oFooterToolbarInvisibleText.destroy();
+				this._oFooterToolbarInvisibleText = null;
+			}
 		};
 
 		Page.prototype.setBackgroundDesign = function (sBgDesign) {
@@ -527,8 +541,11 @@ function(
 		Page.prototype._getInternalHeader = function () {
 			var oInternalHeader = this.getAggregation("_internalHeader");
 			if (!oInternalHeader) {
-				this.setAggregation("_internalHeader", new Bar(this.getId() + "-intHeader", {
-					titleAlignment: this.getTitleAlignment()
+				var sId = this.getId() + "-intHeader";
+
+				this.setAggregation("_internalHeader", new Bar(sId, {
+					titleAlignment: this.getTitleAlignment(),
+					ariaLabelledBy: this._getHeaderToolbarAriaLabelledBy(sId)
 				}), true); // don"t invalidate - this is only called before/during rendering, where invalidation would lead to double rendering,  or when invalidation anyway happens
 				oInternalHeader = this.getAggregation("_internalHeader");
 
@@ -703,5 +720,45 @@ function(
 			return this._getAnyHeader();
 		};
 
+		/**
+		 * Returns an InvisibleText control for the ARIA labelled-by attribute of the header toolbar of the page.
+		 *
+		 * @memberof Page.prototype
+		 * @function
+		 * @name _getHeaderToolbarAriaLabelledBy
+		 * @param {string} sId - The ID of header toolbar aggregation.
+		 * @returns {sap.ui.core.InvisibleText} The InvisibleText control for the header toolbar ARIA labelled-by attribute.
+		 *
+		 */
+		Page.prototype._getHeaderToolbarAriaLabelledBy = function (sId) {
+			if (!this._oHeaderToolbarInvisibleText) {
+				this._oHeaderToolbarInvisibleText = new InvisibleText(sId + "-InvisibleText", {
+					text: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ARIA_LABEL_TOOLBAR_HEADER_ACTIONS")
+				}).toStatic();
+			}
+
+			return this._oHeaderToolbarInvisibleText;
+		};
+
+		/**
+		 * Returns an InvisibleText control for the ARIA labelled-by attribute of the footer toolbar of the page.
+		 *
+		 * @memberof Page.prototype
+		 * @function
+		 * @name _getFooterToolbarAriaLabelledBy
+		 * @param {string} sId - The ID of the page.
+		 * @returns {sap.ui.core.InvisibleText} The InvisibleText control for the footer toolbar ARIA labelled-by attribute.
+		 *
+		 */
+		Page.prototype._getFooterToolbarAriaLabelledBy = function (sId) {
+			if (!this._oFooterToolbarInvisibleText) {
+				this._oFooterToolbarInvisibleText = new InvisibleText(sId + "-InvisibleText", {
+					text: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ARIA_LABEL_TOOLBAR_FOOTER_ACTIONS")
+				}).toStatic();
+			}
+
+			return this._oFooterToolbarInvisibleText;
+		};
+
 		return Page;
 	});

package/src/sap/m/PageAccessibleLandmarkInfo.js

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

package/src/sap/m/PagingButton.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.111.6
+		 * @version 1.112.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/Panel.js

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PanelRenderer.js

@@ -68,13 +68,22 @@ sap.ui.define(["sap/m/library", "sap/ui/Device"],
 		var bIsExpandable = oControl.getExpandable(),
 			bIsExpanded = oControl.getExpanded(),
 			oHeaderTBar = oControl.getHeaderToolbar(),
-			sHeaderClass,
-			sHeaderElement = oHeaderTBar ? "header" : "div";
+			sHeaderClass;
+
+		oRm.openStart("div");
+		oRm.class("sapMPanelHeadingDiv");
+
+		if (!oHeaderTBar) {
+			oRm.attr('role', 'heading');
+			oRm.attr('aria-level', '2');
+		}
+
+		oRm.openEnd();
 
 		if (bIsExpandable) {
 			// we need a wrapping div around button and header
 			// otherwise the border needed for both do not exact align
-			oRm.openStart(sHeaderElement);
+			oRm.openStart("div");
 			if (oHeaderTBar) {
 				sHeaderClass = "sapMPanelWrappingDivTb";
 			} else {
@@ -103,17 +112,19 @@ sap.ui.define(["sap/m/library", "sap/ui/Device"],
 			oRm.renderControl(oHeaderTBar);
 
 		} else if (sHeaderText || bIsExpandable) {
-			oRm.openStart("h2", oControl.getId() + "-header");
+			oRm.openStart("div", oControl.getId() + "-header");
 			oRm.class("sapMPanelHdr");
 			oRm.openEnd();
 			oRm.text(sHeaderText);
-			oRm.close("h2");
+			oRm.close("div");
 		}
 
 		if (bIsExpandable) {
-			oRm.close(sHeaderElement);
+			oRm.close("div");
 		}
 
+		oRm.close("div");
+
 		var oInfoTBar = oControl.getInfoToolbar();
 
 		if (oInfoTBar) {