@openui5/sap.m 1.117.1 → 1.118.0

package/src/sap/m/ColumnListItemRenderer.js

@@ -8,11 +8,12 @@ sap.ui.define([
 	"sap/ui/core/Renderer",
 	"sap/ui/core/library",
 	"sap/ui/core/Core",
+	"sap/ui/Device",
 	"sap/base/Log",
 	"./library",
 	"./ListItemBaseRenderer"
 ],
-	function(Renderer, coreLibrary, Core, Log, library, ListItemBaseRenderer) {
+	function(Renderer, coreLibrary, Core, Device, Log, library, ListItemBaseRenderer) {
 	"use strict";
 
 	// shortcut for sap.m.PopinDisplay
@@ -50,12 +51,30 @@ sap.ui.define([
 		}
 	};
 
+	ColumnListItemRenderer.makeFocusable = function(rm) {
+		if (Device.system.desktop) {
+			rm.attr("tabindex", "-1");
+			rm.class("sapMTblCellFocusable");
+		}
+	};
+
+	ColumnListItemRenderer.openStartGridCell = function(rm, oLI, sTag, sId, sClass) {
+		rm.openStart(sTag, sId);
+		rm.class(sClass);
+		rm.attr("role", "gridcell");
+		rm.attr("aria-colindex", oLI.aAriaOwns.push(sId));
+		this.makeFocusable(rm);
+		if (oLI.isSelectable()) {
+			rm.attr("aria-selected", oLI.getSelected());
+		}
+		return rm;
+	};
+
 	// render type highlight always within a cell
 	ColumnListItemRenderer.renderHighlight = function(rm, oLI) {
 		rm.openStart("td");
 		rm.class("sapMListTblHighlightCell");
 		rm.attr("role", "presentation");
-		rm.attr("aria-hidden", "true");
 		rm.openEnd();
 
 		// let the list item base render the highlight
@@ -68,7 +87,6 @@ sap.ui.define([
 		rm.openStart("td");
 		rm.class("sapMListTblNavigatedCell");
 		rm.attr("role", "presentation");
-		rm.attr("aria-hidden", "true");
 		rm.openEnd();
 
 		// let the list item base render the navigated state
@@ -79,11 +97,12 @@ sap.ui.define([
 
 	// render type content always within a cell
 	ColumnListItemRenderer.renderType = function(rm, oLI) {
-		rm.openStart("td");
-		rm.class("sapMListTblNavCol");
-		rm.attr("role", "presentation");
-		rm.attr("aria-hidden", "true");
-		rm.openEnd();
+		var oTable = oLI.getTable();
+		if (!oTable || !oTable.doItemsNeedTypeColumn()) {
+			return;
+		}
+
+		this.openStartGridCell(rm, oLI, "td", oLI.getId() + "-TypeCell", "sapMListTblNavCol").openEnd();
 
 		// let the list item base render the type
 		ListItemBaseRenderer.renderType.apply(this, arguments);
@@ -93,11 +112,7 @@ sap.ui.define([
 
 	// wrap mode content with a cell
 	ColumnListItemRenderer.renderModeContent = function(rm, oLI) {
-		rm.openStart("td");
-		rm.class("sapMListTblSelCol");
-		rm.attr("role", "presentation");
-		rm.attr("aria-hidden", "true");
-		rm.openEnd();
+		this.openStartGridCell(rm, oLI, "td", oLI.getId() + "-ModeCell", "sapMListTblSelCol").openEnd();
 
 		// let the list item base render the mode control
 		ListItemBaseRenderer.renderModeContent.apply(this, arguments);
@@ -111,7 +126,17 @@ sap.ui.define([
 
 	// Returns aria accessibility role
 	ColumnListItemRenderer.getAriaRole = function(oLI) {
-		return "";
+		return "row";
+	};
+
+	ColumnListItemRenderer.getAccessbilityPosition = function(oLI) {
+		var oTable = oLI.getTable();
+		if (oTable) {
+			var iRowIndex = oTable.getVisibleItems().indexOf(oLI) + oTable.hasHeaderRow() + 1;
+			return {
+				rowindex: iRowIndex
+			};
+		}
 	};
 
 	ColumnListItemRenderer.renderLIAttributes = function(rm, oLI) {
@@ -122,15 +147,13 @@ sap.ui.define([
 		}
 
 		var oTable = oLI.getTable();
-		if (oTable && oTable.getAlternateRowColors()) {
-			var iPos = oTable.indexOfItem(oLI);
-			if (iPos % 2 == 0) {
+		if (oTable) {
+			if (oTable.getAlternateRowColors()) {
 				rm.class("sapMListTblRowAlternate");
 			}
 		}
 	};
 
-
 	/**
 	 * Overwriting hook method of ListItemBase
 	 *
@@ -152,65 +175,56 @@ sap.ui.define([
 		oLI._destroyClonedHeaders();
 
 		aColumns.forEach(function(oColumn, iColumnIndex) {
-			var oHeader,
-				bRenderCell = true,
-				oCell = aCells[oColumn.getInitialOrder()];
-
-			if (!oCell || !oColumn.getVisible() || oColumn.isHidden()) {
+			if (!oColumn.getVisible() || oColumn.isHidden()) {
 				return;
 			}
 
-			rm.openStart("td", oLI.getId() + "_cell" + iColumnIndex);
-			rm.class("sapMListTblCell");
-			rm.attr("data-sap-ui-column", oColumn.getId());
+			var aStyleClass = oColumn.getStyleClass().split(" ").filter(Boolean),
+				sCellId = oLI.getId() + "-cell" + iColumnIndex,
+				oCell = aCells[oColumn.getInitialOrder()],
+				vAlign = oColumn.getVAlign(),
+				bRenderCell = true;
 
-			// check column properties
-			if (oColumn) {
-				var aStyleClass = oColumn.getStyleClass().split(" ").filter(Boolean);
-				aStyleClass.forEach(function(sClassName) {
-					rm.class(sClassName);
-				});
-
-				// aria for virtual keyboard mode
-				oHeader = oColumn.getHeader();
-				if (oHeader) {
-					rm.attr("headers", oColumn.getId());
-				}
+			this.openStartGridCell(rm, oLI, "td", sCellId, "sapMListTblCell");
+			rm.attr("data-sap-ui-column", oColumn.getId());
+			rm.style("text-align", oColumn.getCssAlign());
+			aStyleClass.forEach(function(sClassName) {
+				rm.class(sClassName);
+			});
+			if (vAlign != VerticalAlign.Inherit) {
+				rm.style("vertical-align", vAlign.toLowerCase());
+			}
 
-				// merge duplicate cells
-				if (!oTable.hasPopin() && oColumn.getMergeDuplicates()) {
-					var sFuncWithParam = oColumn.getMergeFunctionName(),
-						aFuncWithParam = sFuncWithParam.split("#"),
-						sFuncParam = aFuncWithParam[1],
-						sFuncName = aFuncWithParam[0];
-
-					if (typeof oCell[sFuncName] != "function") {
-						Log.warning("mergeFunctionName property is defined on " + oColumn + " but this is not function of " + oCell);
-					} else if (oTable._bRendering || !oCell.bOutput) {
-						var lastColumnValue = oColumn.getLastValue(),
-							cellValue = oCell[sFuncName](sFuncParam);
-
-						if (lastColumnValue === cellValue) {
-							// it is not necessary to render the cell content but screen readers need the content to announce it
-							bRenderCell = Core.getConfiguration().getAccessibility();
-							oCell.addStyleClass("sapMListTblCellDupCnt");
-							rm.class("sapMListTblCellDup");
-						} else {
-							oColumn.setLastValue(cellValue);
-						}
-					} else if (oCell.hasStyleClass("sapMListTblCellDupCnt")) {
+			// merge duplicate cells
+			if (oCell && !oTable.hasPopin() && oColumn.getMergeDuplicates()) {
+				var sFuncWithParam = oColumn.getMergeFunctionName(),
+					aFuncWithParam = sFuncWithParam.split("#"),
+					sFuncParam = aFuncWithParam[1],
+					sFuncName = aFuncWithParam[0];
+
+				if (typeof oCell[sFuncName] != "function") {
+					Log.warning("mergeFunctionName property is defined on " + oColumn + " but this is not function of " + oCell);
+				} else if (oTable._bRendering || !oCell.bOutput) {
+					var vLastColumnValue = oColumn.getLastValue(),
+						vCellValue = oCell[sFuncName](sFuncParam);
+
+					if (vLastColumnValue === vCellValue) {
+						// it is not necessary to render the cell content but screen readers need the content to announce it
+						bRenderCell = Core.getConfiguration().getAccessibility();
+						oCell.addStyleClass("sapMListTblCellDupCnt");
 						rm.class("sapMListTblCellDup");
+					} else {
+						oColumn.setLastValue(vCellValue);
 					}
+				} else if (oCell.hasStyleClass("sapMListTblCellDupCnt")) {
+					rm.class("sapMListTblCellDup");
 				}
-
-				oColumn.getVAlign() != "Inherit" && rm.style("vertical-align", oColumn.getVAlign().toLowerCase());
-				rm.style("text-align", oColumn.getCssAlign());
 			}
 
 			rm.openEnd();
 
-			if (bRenderCell) {
-				this.applyAriaLabelledBy(oHeader, oCell);
+			if (oCell && bRenderCell) {
+				this.applyAriaLabelledBy(oColumn.getHeader(), oCell, true);
 				rm.renderControl(oCell);
 			}
 
@@ -222,19 +236,18 @@ sap.ui.define([
 		rm.openStart("td");
 		rm.class("sapMListTblDummyCell");
 		rm.attr("role", "presentation");
-		rm.attr("aria-hidden", "true");
 		rm.openEnd();
 		rm.close("td");
 	};
 
-	ColumnListItemRenderer.applyAriaLabelledBy = function(oHeader, oCell) {
-		/* add the header as an aria-labelled by association for the cells if it does not already exists */
-		/* only set the header text to the aria-labelledby association if the header is a textual control and visible */
-		if (oHeader &&
-			oHeader.getText &&
-			oHeader.getVisible() &&
-			oCell.getAriaLabelledBy &&
-			(oCell.getAriaLabelledBy() || []).indexOf(oHeader.getId()) == -1) {
+	ColumnListItemRenderer.applyAriaLabelledBy = function(oHeader, oCell, bRemove) {
+		if (!oHeader || !oHeader.getText || !oHeader.getVisible() || !oCell.getAriaLabelledBy) {
+			return;
+		}
+
+		if (bRemove) {
+			oCell.removeAriaLabelledBy(oHeader);
+		} else if (!oCell.getAriaLabelledBy().includes(oHeader.getId())) {
 			oCell.addAriaLabelledBy(oHeader);
 		}
 	};
@@ -252,10 +265,9 @@ sap.ui.define([
 		// popin row
 		rm.openStart("tr", oLI.getPopin());
 		rm.class("sapMListTblSubRow");
+		rm.attr("role", "none");
+		rm.attr("tabindex", "-1");
 		rm.attr("data-sap-ui-related", oLI.getId());
-		if (oLI.isSelectable()) {
-			rm.attr("aria-selected", oLI.getSelected());
-		}
 		rm.openEnd();
 
 		this.renderHighlight(rm, oLI);
@@ -263,13 +275,12 @@ sap.ui.define([
 		// cell
 		rm.openStart("td", oLI.getId() + "-subcell");
 		rm.class("sapMListTblSubRowCell");
+		rm.attr("role", "none");
 		rm.attr("colspan", oTable.getColCount() - 2 /* Highlight and Navigated cells are always rendered in popin */);
-		rm.attr("aria-labelledby", this.getAriaAnnouncement(null, "TABLE_POPIN_ROLE_DESCRIPTION"));
 		rm.openEnd();
 
 		// container
-		rm.openStart("div");
-		rm.class("sapMListTblSubCnt");
+		this.openStartGridCell(rm, oLI, "div", oLI.getId() + "-subcont", "sapMListTblSubCnt");
 		rm.class("sapMListTblSubCnt" + oTable.getPopinLayout());
 		rm.openEnd();
 
@@ -352,9 +363,11 @@ sap.ui.define([
 	 * @param {sap.m.ListItemBase} [oLI] List item
 	 */
 	ColumnListItemRenderer.addLegacyOutlineClass = function(rm, oLI) {
-		var oTable = oLI.isA("sap.m.Table") ? oLI : oLI.getTable();
-		if (oTable && !oTable.hasPopin() && oTable.shouldRenderDummyColumn()) {
-			rm.class("sapMTableRowCustomFocus");
+		var oTable = oLI.getTable();
+		if (oTable) {
+			if (oTable.hasPopin() || oTable.shouldRenderDummyColumn()) {
+				rm.class("sapMTableRowCustomFocus");
+			}
 		}
 	};
 

package/src/sap/m/ColumnPopoverActionItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/Button'], function(ColumnPopoverIte
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverCustomItem.js

@@ -17,7 +17,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/ToggleButton'], function(ColumnPopo
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['sap/ui/core/Element'], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverSelectListItem.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @since 1.86

package/src/sap/m/ColumnPopoverSortItem.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @since 1.66

package/src/sap/m/ComboBox.js

@@ -106,7 +106,7 @@ sap.ui.define([
 		 * </ul>
 		 *
 		 * @author SAP SE
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 *
 		 * @constructor
 		 * @extends sap.m.ComboBoxBase

package/src/sap/m/ComboBoxBase.js

@@ -66,7 +66,7 @@ sap.ui.define([
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ComboBoxTextField.js

@@ -29,7 +29,7 @@ sap.ui.define([
 		 * @extends sap.m.InputBase
 		 *
 		 * @author SAP SE
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/CustomListItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ListItemBase', './library', './CustomListItemRenderer'],
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomTile.js

@@ -21,7 +21,7 @@ sap.ui.define(['./Tile', './library', './CustomTileRenderer'],
 	 * Use the CustomTile control to display application specific content in the Tile control.
 	 * The tile width is 8.5em and height is 10em.
 	 * @extends sap.m.Tile
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomTreeItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *        <code>Table, Form</code> etc, should not be aggregated as content.
 	 * @extends sap.m.TreeItemBase
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 * @constructor
 	 * @public
 	 * @since 1.48.0

package/src/sap/m/DatePicker.js

@@ -186,7 +186,7 @@ sap.ui.define([
 	 * the close event), or select Cancel.
 	 *
 	 * @extends sap.m.DateTimeField
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateRangeSelection.js

@@ -165,8 +165,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.117.1
-	 * @version 1.117.1
+	 * @version 1.118.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimeField.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimeInput.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimePicker.js

@@ -176,7 +176,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public
@@ -1076,7 +1076,7 @@ sap.ui.define([
 		// convert the date to local date for the calendar and the clocks if binding is used
 		if (this._isTimezoneBinding()) {
 			sFormattedDate = this._getPickerParser().format(oDate, this._getTimezone(true));
-			oDate = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[0];
+			oDate = this._getPickerParser().parse(sFormattedDate)[0];
 		}
 		this._oCalendar.focusDate(oDate);
 
@@ -1118,7 +1118,7 @@ sap.ui.define([
 		}
 
 		if (this._isTimezoneBinding()) {
-			sFormattedDate = this._getPickerParser().format(oDate, TimezoneUtil.getLocalTimezone());
+			sFormattedDate = this._getPickerParser().format(oDate);
 			oParts = this._getPickerParser().parse(sFormattedDate, this._getTimezone(true));
 			oDate = oParts && oParts[0];
 		}

package/src/sap/m/Dialog.js

@@ -173,7 +173,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.117.1
+		* @version 1.118.0
 		*
 		* @constructor
 		* @public

package/src/sap/m/DisplayListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DraftIndicator.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DynamicDate.js

@@ -38,7 +38,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/DynamicDateFormat.js

@@ -254,6 +254,10 @@ sap.ui.define([
 				}, this);
 			}
 
+			if (aFormattedParams.length === 0) {
+				aFormattedParams = null;
+			}
+
 			return this._resourceBundle.getText("DYNAMIC_DATE_" + sKey.toUpperCase() + "_FORMAT", aFormattedParams);
 		};
 

package/src/sap/m/DynamicDateOption.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 *
 		 * @public
 		 * @since 1.92
@@ -259,7 +259,7 @@ sap.ui.define([
 		 * 5 - Quarters
 		 * 6 - Years
 		 *
-		 * @returns {int} A group index
+		 * @returns { int | string} A group key from {@link sap.m.DynamicDateRangeGroups}
 		 * @public
 		 */
 		DynamicDateOption.prototype.getGroup = function() {