@openui5/sap.m 1.115.1 → 1.117.0

package/src/sap/m/Table.js

@@ -8,6 +8,7 @@
 sap.ui.define([
 	"sap/ui/events/KeyCodes",
 	"sap/ui/core/Core",
+	"sap/ui/core/ControlBehavior",
 	"./library",
 	"./ListBase",
 	"./ListItemBase",
@@ -20,10 +21,11 @@ sap.ui.define([
 	"sap/m/ListBaseRenderer",
 	"sap/ui/core/Icon",
 	"sap/m/table/Util",
-	// jQuery custom selectors ":sapTabbable"
+	"sap/ui/core/Lib",
+    // jQuery custom selectors ":sapTabbable"
 	"sap/ui/dom/jquery/Selectors"
 ],
-	function(KeyCodes, Core, library, ListBase, ListItemBase, CheckBox, TableRenderer, BaseObject, ResizeHandler, PasteHelper, jQuery, ListBaseRenderer, Icon, Util) {
+	function(KeyCodes, Core, ControlBehavior, library, ListBase, ListItemBase, CheckBox, TableRenderer, BaseObject, ResizeHandler, PasteHelper, jQuery, ListBaseRenderer, Icon, Util, Library) {
 	"use strict";
 
 
@@ -65,7 +67,7 @@ sap.ui.define([
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @public
@@ -369,7 +371,7 @@ sap.ui.define([
 				this.invalidate();
 			} else {
 				// Only set the no columns string, if there is no illustrated message present
-				this.$("nodata-text").text(Core.getLibraryResourceBundle("sap.m").getText("TABLE_NO_COLUMNS"));
+				this.$("nodata-text").text(Library.getResourceBundleFor("sap.m").getText("TABLE_NO_COLUMNS"));
 			}
 		}
 
@@ -404,47 +406,13 @@ sap.ui.define([
 	Table.prototype.onBeforeRendering = function() {
 		ListBase.prototype.onBeforeRendering.call(this);
 
-		this._bHasDynamicWidthCol = this._hasDynamicWidthColumn();
-
-		if (this.getAutoPopinMode()) {
-			this._configureAutoPopin();
-		}
-
-		// for initial contextualWidth setting
+		this._configureAutoPopin();
 		this._applyContextualWidth(this._sContextualWidth);
-
-		this._ensureColumnsMedia();
-		this._notifyColumns("ItemsRemoved");
-	};
-
-	/*
-	 * Returns whether a visible column has dynamic width or not
-	 * @protected
-	 */
-	Table.prototype._hasDynamicWidthColumn = function(oColumn, sColumnWidth) {
-		if (this.getFixedLayout() != "Strict") {
-			return true;
-		}
-
-		return this.getColumns().some(function(oCurrentColumn) {
-			if (oCurrentColumn.getVisible() && !oCurrentColumn.isPopin()) {
-				var sWidth = oColumn && oColumn == oCurrentColumn ? sColumnWidth : oCurrentColumn.getWidth();
-				return !sWidth || sWidth == "auto";
-			}
-		});
-	};
-
-	Table.prototype._ensureColumnsMedia = function() {
-		this.getColumns().forEach(function (oColumn) {
-			if (oColumn._bShouldAddMedia) {
-				oColumn._addMedia();
-			}
-		});
+		this._notifyColumns("TableRendering");
 	};
 
 	Table.prototype.onAfterRendering = function() {
 		ListBase.prototype.onAfterRendering.call(this);
-		this.updateSelectAllCheckbox();
 
 		if (!this.isPropertyInitial("showOverlay")) {
 			this._handleOverlay();
@@ -532,7 +500,7 @@ sap.ui.define([
 		}
 
 		if ($this[0].clientWidth < oTableDomRef.clientWidth) {
-			$this.find(".sapMListTblCell:visible").eq(0).addClass("sapMTableLastColumn").width("");
+			$this.find(".sapMListTblCell:visible").eq(0).addClass("sapMTableForcedColumn").width("");
 		}
 
 		this._bCheckLastColumnWidth = false;
@@ -570,11 +538,6 @@ sap.ui.define([
 		return ListBase.prototype.destroyItems.apply(this, arguments);
 	};
 
-	Table.prototype.removeAllItems = function() {
-		this._notifyColumns("ItemsRemoved");
-		return ListBase.prototype.removeAllItems.apply(this, arguments);
-	};
-
 	Table.prototype.removeSelections = function() {
 		ListBase.prototype.removeSelections.apply(this, arguments);
 		this.updateSelectAllCheckbox();
@@ -591,8 +554,8 @@ sap.ui.define([
 	/**
 	 * Getter for aggregation columns.
 	 *
-	 * @param {boolean} [bSort] set true to get the columns in an order that respects personalization settings
-	 * @returns {sap.m.Column[]} columns of the Table
+	 * @param {boolean} [bSort] Set true to get the columns in an order that respects personalization settings.
+	 * @returns {sap.m.Column[]} Columns of the Table
 	 * @public
 	 */
 	Table.prototype.getColumns = function(bSort) {
@@ -605,6 +568,24 @@ sap.ui.define([
 		return aColumns;
 	};
 
+	/**
+	 * Returns the columns of the table, including the column in the popin, in the rendering order.
+	 *
+	 * @returns {sap.m.Column[]} Columns of the Table in the rendering order.
+	 * @private
+	 */
+	Table.prototype.getRenderedColumns = function() {
+		return this.getColumns(true).filter(function(oColumn) {
+			return oColumn.getVisible() && (oColumn.isPopin() || !oColumn.isHidden());
+		}).sort(function(oCol1, oCol2) {
+			var iCol1Index = oCol1.getIndex(), iCol2Index = oCol2.getIndex(), iIndexDiff = iCol1Index - iCol2Index;
+			if (iIndexDiff == 0) { return 0; }
+			if (iCol1Index < 0) { return 1; }
+			if (iCol2Index < 0) { return -1; }
+			return iIndexDiff;
+		});
+	};
+
 	// @see JSDoc generated by SAPUI5 control
 	Table.prototype.setFixedLayout = function(vFixedLayout) {
 
@@ -685,10 +666,9 @@ sap.ui.define([
 
 	// this gets called when selected property of the item is changed
 	Table.prototype.onItemSelectedChange = function(oItem, bSelect) {
+		clearTimeout(this._iSelectAllCheckboxTimer);
+		this._iSelectAllCheckboxTimer = setTimeout(this.updateSelectAllCheckbox.bind(this));
 		ListBase.prototype.onItemSelectedChange.apply(this, arguments);
-		setTimeout(function() {
-			this.updateSelectAllCheckbox();
-		}.bind(this), 0);
 	};
 
 	/*
@@ -765,96 +745,8 @@ sap.ui.define([
 	 * @protected
 	 */
 	Table.prototype.onColumnResize = function(oColumn) {
-		// if list did not have pop-in and will not have pop-in
-		// then we do not need re-render, we can just change display of column
-		if (!this.hasPopin() && !this._mutex) {
-			var hasPopin = this.getColumns().some(function(col) {
-				return col.isPopin();
-			});
-
-			if (!hasPopin) {
-				oColumn.setDisplay(this.getTableDomRef(), !oColumn.isHidden());
-				this._firePopinChangedEvent();
-				this._oGrowingDelegate && this._oGrowingDelegate.adaptTriggerButtonWidth(this);
-				return;
-			}
-		}
-
-		this._dirty = this._getMediaContainerWidth() || window.innerWidth;
-		if (!this._mutex) {
-			var clean = this._getMediaContainerWidth() || window.innerWidth;
-			this._mutex = true;
-			this._bFirePopinChanged = true;
-			this.invalidate();
-
-			// do not re-render if resize event comes so frequently
-			setTimeout(function() {
-				// but check if any event come during the wait-time
-				if (this._dirty != clean) {
-					this._dirty = 0;
-					this._bFirePopinChanged = true;
-					this.invalidate();
-				}
-				this._mutex = false;
-			}.bind(this), 200);
-		}
-	};
-
-	/*
-	 * This method is called from Column control when column visibility is changed via CSS media query
-	 *
-	 * @param {boolean} bColVisible whether column is now visible or not
-	 * @protected
-	 */
-	Table.prototype.setTableHeaderVisibility = function(bColVisible) {
-		if (!this.getDomRef()) {
-			return;
-		}
-
-		if (!this.shouldRenderItems()) {
-			return this.invalidate();
-		}
-
-		// find first visible column
-		var $headRow = this.$("tblHeader"),
-			bHeaderVisible = !$headRow.hasClass("sapMListTblHeaderNone"),
-			aVisibleColumns = $headRow.find(".sapMListTblCell:not([aria-hidden=true]"),
-			$firstVisibleCol = aVisibleColumns.eq(0);
-
-		// check if only one column is visible
-		if (aVisibleColumns.length == 1) {
-			if (this.getFixedLayout() == "Strict") {
-				this._checkLastColumnWidth();
-			} else {
-				$firstVisibleCol.width("");	// cover the space
-			}
-		} else {
-			$firstVisibleCol.removeClass("sapMTableLastColumn");
-			// set original width of columns
-			aVisibleColumns.each(function() {
-				this.style.width = this.getAttribute("data-sap-width") || "";
-			});
-		}
-
-		// update the visible column count and colspan
-		// highlight, navigation and navigated indicator columns are getting rendered always
-		var iDummyColumnLength = $headRow.find(".sapMListTblDummyCell").length;
-		this._colCount = aVisibleColumns.length + 3 + !!ListBaseRenderer.ModeOrder[this.getMode()] + iDummyColumnLength;
-		this.$("tblBody").find(".sapMGHLICell").attr("colspan", this.getColSpan() - iDummyColumnLength);
-		this.$("nodata-text").attr("colspan", this.getColCount());
-
-		if (this.hasPopin()) {
-			this.$("tblBody").find(".sapMListTblSubRowCell").attr("colspan", this.getColSpan());
-		}
-
-		// remove or show column header row(thead) according to column visibility value
-		if (!bColVisible && bHeaderVisible) {
-			$headRow[0].className = "sapMListTblRow sapMLIBFocusable sapMListTblHeader";
-			this._headerHidden = false;
-		} else if (bColVisible && !bHeaderVisible && !aVisibleColumns.length) {
-			$headRow[0].className = "sapMListTblHeaderNone";
-			this._headerHidden = true;
-		}
+		this._bFirePopinChanged = true;
+		this.invalidate();
 	};
 
 	// updates the type column visibility and sets the aria flag
@@ -914,7 +806,7 @@ sap.ui.define([
 			this._clearAllButton = new Icon({
 				id: this.getId() + "-clearSelection",
 				src: "sap-icon://clear-all",
-				tooltip: Core.getLibraryResourceBundle("sap.m").getText("TABLE_CLEARBUTTON_TOOLTIP"),
+				tooltip: Library.getResourceBundleFor("sap.m").getText("TABLE_CLEARBUTTON_TOOLTIP"),
 				decorative: false,
 				press: this.removeSelections.bind(this, false, true, false)
 			}).setParent(this, null, true).addEventDelegate({
@@ -922,6 +814,7 @@ sap.ui.define([
 					this._clearAllButton.getDomRef().setAttribute("tabindex", -1);
 				}
 			}, this);
+			this.updateSelectAllCheckbox();
 		}
 
 		return this._clearAllButton;
@@ -943,7 +836,7 @@ sap.ui.define([
 			this._selectAllCheckBox = new CheckBox({
 				id: this.getId("sa"),
 				activeHandling: false,
-				tooltip: Core.getLibraryResourceBundle("sap.m").getText("TABLE_SELECT_ALL_TOOLTIP")
+				tooltip: Library.getResourceBundleFor("sap.m").getText("TABLE_SELECT_ALL_TOOLTIP")
 			}).addStyleClass("sapMLIBSelectM").setParent(this, null, true).attachSelect(function () {
 				if (this._selectAllCheckBox.getSelected()) {
 					this.selectAll(true);
@@ -951,11 +844,10 @@ sap.ui.define([
 					this.removeSelections(false, true);
 				}
 			}, this).setTabIndex(-1);
+			this._selectAllCheckBox.useEnabledPropagator(false);
+			this.updateSelectAllCheckbox();
 		}
 
-		// prevent disabling of internal controls by the sap.ui.core.EnabledPropagator
-		this._selectAllCheckBox.useEnabledPropagator(false);
-
 		return this._selectAllCheckBox;
 	};
 
@@ -999,28 +891,18 @@ sap.ui.define([
 	 */
 	Table.prototype.enhanceAccessibilityState = function(oElement, mAriaProps) {
 		if (oElement == this._clearAllButton) {
-			mAriaProps.label = Core.getLibraryResourceBundle("sap.m").getText("TABLE_ICON_DESELECT_ALL");
+			mAriaProps.label = Library.getResourceBundleFor("sap.m").getText("TABLE_ICON_DESELECT_ALL");
 		} else if (oElement == this._selectAllCheckBox) {
-			mAriaProps.label = Core.getLibraryResourceBundle("sap.m").getText("TABLE_CHECKBOX_SELECT_ALL");
+			mAriaProps.label = Library.getResourceBundleFor("sap.m").getText("TABLE_CHECKBOX_SELECT_ALL");
 		}
 	};
 
 	/*
-	 * Returns colspan for all columns except navigation and navigation indicator
-	 * Because we render these columns always even it is empty
-	 * @protected
-	 */
-	Table.prototype.getColSpan = function() {
-		var iInternalTDs = this.shouldRenderDummyColumn() ? 3 : 2;
-		return (this._colCount || 1 ) - iInternalTDs;
-	};
-
-	/*
-	 * Returns the number of total columns
+	 * Returns the number of <th> elements
 	 * @protected
 	 */
 	Table.prototype.getColCount = function() {
-		return (this._colCount || 0);
+		return this._colCount || 0;
 	};
 
 	/*
@@ -1028,7 +910,7 @@ sap.ui.define([
 	 * @protected
 	 */
 	Table.prototype.shouldRenderDummyColumn = function() {
-		return !this._bHasDynamicWidthCol && this.shouldRenderItems();
+		return Boolean(this._dummyColumn);
 	};
 
 	/*
@@ -1036,7 +918,7 @@ sap.ui.define([
 	 * @protected
 	 */
 	Table.prototype.hasPopin = function() {
-		return !!this._hasPopin;
+		return Boolean(this._hasPopin);
 	};
 
 	/*
@@ -1059,21 +941,19 @@ sap.ui.define([
 
 	// returns accessibility role
 	Table.prototype.getAccessibilityType = function() {
-		return Core.getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_TABLE");
+		return Library.getResourceBundleFor("sap.m").getText("ACC_CTR_TYPE_TABLE");
 	};
 
 	Table.prototype._setHeaderAnnouncement = function() {
-		var oBundle = Core.getLibraryResourceBundle("sap.m"),
+		var oBundle = Library.getResourceBundleFor("sap.m"),
 			sAnnouncement = oBundle.getText("ACC_CTR_TYPE_HEADER_ROW") + " ";
 
 		if (this.isAllSelectableSelected()) {
 			sAnnouncement += oBundle.getText("LIST_ALL_SELECTED");
 		}
 
-		var aHiddenInPopin = this._getHiddenInPopin();
 		this.getColumns(true).forEach(function(oColumn, i) {
-			// only set the header announcement for visible columns
-			if (!oColumn.getVisible() || aHiddenInPopin.indexOf(oColumn) > -1) {
+			if (!oColumn.getVisible() || oColumn.isHidden()) {
 				return;
 			}
 
@@ -1087,10 +967,9 @@ sap.ui.define([
 	};
 
 	Table.prototype._setFooterAnnouncement = function() {
-		var sAnnouncement = Core.getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_FOOTER_ROW") + " ";
+		var sAnnouncement = Library.getResourceBundleFor("sap.m").getText("ACC_CTR_TYPE_FOOTER_ROW") + " ";
 		this.getColumns(true).forEach(function(oColumn, i) {
-			// only set the footer announcement for visible columns
-			if (!oColumn.getVisible()) {
+			if (!oColumn.getVisible() || oColumn.isHidden()) {
 				return;
 			}
 
@@ -1112,10 +991,11 @@ sap.ui.define([
 	Table.prototype._setNoColumnsMessageAnnouncement = function (oTarget) {
 		if (!this.shouldRenderItems()) {
 			var oNoData = this.getNoData();
+			var sDescription = Core.getLibraryResourceBundle("sap.m").getText("TABLE_NO_COLUMNS");
 			if (oNoData && typeof oNoData !== "string" && oNoData.isA("sap.m.IllustratedMessage")) {
-				var sDescription = ListItemBase.getAccessibilityText(this.getAggregation("_noColumnsMessage"));
-				this.updateInvisibleText(sDescription, oTarget);
+				sDescription = ListItemBase.getAccessibilityText(this.getAggregation("_noColumnsMessage"));
 			}
+			this.updateInvisibleText(sDescription, oTarget);
 		}
 	};
 
@@ -1306,10 +1186,13 @@ sap.ui.define([
 	 * @private
 	 */
 	Table.prototype._configureAutoPopin = function() {
+		if (!this.getAutoPopinMode()) {
+			return;
+		}
+
 		var aVisibleColumns = this.getColumns(true).filter(function(oColumn) {
 			return oColumn.getVisible();
 		});
-
 		if (!aVisibleColumns.length) {
 			return;
 		}
@@ -1425,12 +1308,8 @@ sap.ui.define([
 	};
 
 	Table.prototype._getPopins = function() {
-		var aVisiblePopinColumns =  this.getColumns().filter(function(oColumn) {
-			return oColumn.getVisible() && oColumn.getDemandPopin();
-		});
-
-		return aVisiblePopinColumns.filter(function(oVisibleColumn) {
-			return oVisibleColumn._media && !oVisibleColumn._media.matches;
+		return this.getColumns().filter(function(oColumn) {
+			return oColumn.getVisible() && oColumn.getDemandPopin() && oColumn.isHidden();
 		});
 	};
 
@@ -1460,7 +1339,7 @@ sap.ui.define([
 	Table.prototype.onItemFocusIn = function(oItem, oFocusedControl) {
 		ListBase.prototype.onItemFocusIn.apply(this, arguments);
 
-		if (oItem != oFocusedControl || !Core.getConfiguration().getAccessibility()) {
+		if (oItem != oFocusedControl || !ControlBehavior.isAccessibilityEnabled()) {
 			return;
 		}
 

package/src/sap/m/TablePersoController.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class Table Personalization Controller
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @alias sap.m.TablePersoController
 	 */
 	var TablePersoController = ManagedObject.extend("sap.m.TablePersoController", /** @lends sap.m.TablePersoController.prototype */

package/src/sap/m/TablePersoDialog.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @class Table Personalization Dialog
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @alias sap.m.TablePersoDialog
 	 */
 	var TablePersoDialog = ManagedObject.extend("sap.m.TablePersoDialog", /** @lends sap.m.TablePersoDialog.prototype */

package/src/sap/m/TablePersoProvider.js

@@ -17,11 +17,13 @@ sap.ui.define(['sap/ui/base/ManagedObject', "sap/base/Log"],
 	 *
 	 * @public
 	 *
+	 * @deprecated since 1.115.
+	 *
 	 * @class Table Personalization Provider
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @alias sap.m.TablePersoProvider
 	 */
 	var TablePersoProvider = ManagedObject.extend("sap.m.TablePersoProvider", /** @lends sap.m.TablePersoProvider.prototype */
@@ -34,6 +36,7 @@ sap.ui.define(['sap/ui/base/ManagedObject', "sap/base/Log"],
 		},
 
 		metadata: {
+			deprecated: true,
 			"abstract": true,
 			library: "sap.m"
 		}