@openui5/sap.ui.mdc 1.93.3 → 1.96.1

package/src/sap/ui/mdc/table/GridTableType.js

@@ -23,7 +23,6 @@ sap.ui.define([
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.mdc.table.TableTypeBase
 	 * @author SAP SE
-	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @experimental
 	 * @since 1.65

package/src/sap/ui/mdc/table/PropertyHelper.js

@@ -5,9 +5,13 @@
  */
 
 sap.ui.define([
-	"../util/PropertyHelper"
+	"../util/PropertyHelper",
+	"sap/ui/core/Core",
+	"sap/m/table/Util"
 ], function(
-	PropertyHelperBase
+	PropertyHelperBase,
+	Core,
+	TableUtil
 ) {
 	"use strict";
 
@@ -33,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @experimental
@@ -43,7 +47,7 @@ sap.ui.define([
 	 */
 	var PropertyHelper = PropertyHelperBase.extend("sap.ui.mdc.table.PropertyHelper", {
 		constructor: function(aProperties, mExtensions, oParent, mExtensionAttributeMetadata) {
-			var aAllowedAttributes = ["filterable", "sortable", "groupable", "key", "unit", "text", "exportSettings", "propertyInfos"];
+			var aAllowedAttributes = ["filterable", "sortable", "groupable", "key", "unit", "text", "exportSettings", "propertyInfos", "visualSettings"];
 			PropertyHelperBase.call(this, aProperties, mExtensions, oParent, aAllowedAttributes, mExtensionAttributeMetadata);
 		}
 	});
@@ -67,7 +71,7 @@ sap.ui.define([
 	PropertyHelper.prototype.prepareProperty = function(oProperty) {
 		PropertyHelperBase.prototype.prepareProperty.apply(this, arguments);
 		oProperty.isAggregatable = function() {
-			 return false;
+			return false;
 		};
 	};
 
@@ -205,5 +209,104 @@ sap.ui.define([
 		return oExportObj;
 	}
 
+	/**
+	 * Sets the width of the provided column based on the <code>visualSettings</code> of the relevant <code>PropertyInfo</code>.
+	 *
+	 * @param {sap.ui.mdc.table.Column} oMDCColumn The MDCColumn instance for which to set the width
+	 * @public
+	 * @since 1.95
+	 */
+	PropertyHelper.prototype.setColumnWidth = function(oMDCColumn) {
+		var sPropertyName = oMDCColumn.getDataProperty();
+		var oProperty = this.getProperty(sPropertyName);
+		if (!oProperty) {
+			return;
+		}
+
+		var mPropertyInfoVisualSettings = oProperty.getVisualSettings(sPropertyName);
+		if (mPropertyInfoVisualSettings && mPropertyInfoVisualSettings.widthCalculation === null) {
+			return;
+		}
+
+		var fWidth = this._calcColumnWidth(oProperty) + 1; // add 1rem extra for padding and border
+		oMDCColumn._updateColumnWidth(fWidth + "rem");
+	};
+
+	/**
+	 * Calculates the column width based on the provided <code>PropertyInfo</code>
+	 *
+	 * @param {object} oProperty The properties of PropertyInfo of MDCColumn instance for which to set the width for
+	 * @param {object} [mWidthCalculation] The configuration object for the width calculation
+	 * @param {int} [mWidthCalculation.minWidth=2] The minimum content width in rem
+	 * @param {int} [mWidthCalculation.maxWidth=19] The maximum content width in rem
+	 * @param {int} [mWidthCalculation.defaultWidth=8] The default column content width when type check fails
+	 * @param {boolean} [mWidthCalculation.includeLabel=true] Whether the label should be taken into account
+	 * @param {float} [mWidthCalculation.gap=0] The additional content width in rem
+	 * @param {boolean} [mWidthCalculation.verticalArrangement=false] Whether the referenced properties are arranged vertically
+	 * @param {string|array[]} [mWidthCalculation.excludeProperties=[]] A list of invisible referenced property names
+	 * @return {float} [fWidth] Calculated width
+	 * @since 1.95
+	 * @private
+	 */
+	PropertyHelper.prototype._calcColumnWidth = function (oProperty, mWidthCalculation) {
+		var fWidth = 0;
+		var fLabelWidth = 0;
+		var mPropertyInfoWidthCalculation = oProperty.getVisualSettings() ? oProperty.getVisualSettings().widthCalculation : {};
+
+		mWidthCalculation = Object.assign({
+			minWidth: 2,
+			maxWidth: 19,
+			defaultWidth: 8,
+			gap: 0,
+			includeLabel: true,
+			excludeProperties: [],
+			verticalArrangement: false
+		}, mPropertyInfoWidthCalculation, mWidthCalculation || {});
+
+		var iMinWidth = Math.max(1, mWidthCalculation.minWidth);
+		var iMaxWidth = Math.max(iMinWidth, mWidthCalculation.maxWidth);
+
+		if (oProperty.isComplex()) {
+			var aRelevantReferencedProperties = oProperty.getReferencedProperties().filter(function(oProp) {
+				return ![].concat(mWidthCalculation.excludeProperties).includes(oProp.getName());
+			});
+
+			aRelevantReferencedProperties.forEach(function(oReferencedProperty) {
+				var fReferencedPropertyWidth = this._calcColumnWidth(oReferencedProperty, {
+					includeLabel: false
+				});
+
+				if (mWidthCalculation.verticalArrangement || aRelevantReferencedProperties.length == 1) {
+					fWidth = Math.max(fReferencedPropertyWidth, fWidth);
+				} else {
+					fWidth = fWidth + fReferencedPropertyWidth + 0.5; // add 0.5rem for some extra spacing in h-alignment
+				}
+			}, this);
+		} else {
+			var oTypeConfig = oProperty.getTypeConfig();
+			var oType = oTypeConfig.typeInstance;
+
+			if (oType) {
+				fWidth = TableUtil.calcTypeWidth(oType, mWidthCalculation);
+			}
+			if (oProperty.getUnitProperty()) {
+				fWidth += 2.5;
+			}
+		}
+
+		fWidth += mWidthCalculation.gap;
+
+		if (mWidthCalculation.includeLabel) {
+			var sLabel = oProperty.getLabel() || "";
+			fLabelWidth = TableUtil.calcHeaderWidth(sLabel, fWidth, iMaxWidth, iMinWidth);
+		}
+
+		fWidth = Math.max(iMinWidth, fWidth, fLabelWidth);
+		fWidth = Math.min(fWidth, iMaxWidth);
+		fWidth = Math.round(fWidth * 100) / 100;
+
+		return fWidth;
+	};
+
 	return PropertyHelper;
 });

package/src/sap/ui/mdc/table/ResponsiveTableType.js

@@ -12,7 +12,6 @@ sap.ui.define([
 	var InnerTable, InnerColumn, InnerRow;
 	var GrowingMode = library.GrowingMode;
 	var RowAction = library.RowAction;
-
 	/**
 	 * Constructor for a new ResponsiveTableType.
 	 *
@@ -23,7 +22,6 @@ sap.ui.define([
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.mdc.table.TableTypeBase
 	 * @author SAP SE
-	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @experimental
 	 * @since 1.65
@@ -74,6 +72,16 @@ sap.ui.define([
 				detailsButtonSetting: {
 					type: "sap.ui.core.Priority[]",
 					group: "Behavior"
+				},
+				/**
+				 * Defines the layout in which the table pop-in rows are rendered.
+				 *
+				 * @since 1.96
+				 */
+				popinLayout: {
+					type : "sap.m.PopinLayout",
+					group : "Appearance",
+					defaultValue : "Block"
 				}
 			}
 		}
@@ -91,6 +99,8 @@ sap.ui.define([
 				oTable.setGrowing(vValue !== GrowingMode.None);
 			} else if (sProperty === "showDetailsButton") {
 				this.updateShowDetailsButton(oTable, vValue);
+			} else if (sProperty === "popinLayout") {
+				oTable.setPopinLayout(vValue);
 			}
 		}
 	};
@@ -204,7 +214,13 @@ sap.ui.define([
 	};
 
 	ResponsiveTableType.startColumnResize = function(oInnerTable, oColumn) {
-		ColumnResizer.getPlugin(oInnerTable).startResizing(oColumn.getDomRef());
+		var oColumnResizer = ColumnResizer.getPlugin(oInnerTable);
+
+		if (!oColumnResizer) {
+			return;
+		}
+
+		return oColumnResizer.getColumnResizeButton(oColumn);
 	};
 
 	/**

package/src/sap/ui/mdc/table/RowSettings.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * The <code>RowSettings</code> control allows you to configure a row.
 	 * You can only use this control in the context of the <code>sap.ui.mdc.Table</code> control to define row settings.
 	 * @extends sap.ui.core.Element
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/mdc/table/TableTypeBase.js

@@ -19,7 +19,6 @@ sap.ui.define([
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @abstract
 	 * @experimental

package/src/sap/ui/mdc/table/V4AnalyticsPropertyHelper.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.table.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/themes/base/FilterBar.less

@@ -19,8 +19,8 @@
 	padding-left: 0.5rem;
 }
 
-.sapUiMdcFilterBarBase .sapUiMdcFilterBarBaseLabel::after {
-	content: ":";
+.sapUiMdcFilterBarBase .sapUiMdcFilterBarBaseLabel .sapMLabelColonAndRequired::before {
+	content: attr(data-colon);
 }
 
 .sapUiMdcFilterBarBaseAFLayout > .sapUiAFLayoutItem > div,

package/src/sap/ui/mdc/themes/base/GroupView.less

@@ -17,8 +17,8 @@
 }
 
 //Display ':' for Labels
-.sapUiMDCGroupView.sapUiMDCAFLabelMarking .sapMPanelContent .sapMLabel::after {
-	content: ":";
+.sapUiMDCGroupView.sapUiMDCAFLabelMarking .sapMPanelContent .sapMLabelColonAndRequired::before {
+	content: attr(data-colon);
 }
 
 //Custom bar that should look like 'ListView' background (mock columnheader)

package/src/sap/ui/mdc/themes/base/ListView.less

@@ -1,6 +1,6 @@
 //Display ':' for Labels in the 'list' view
-.sapUiMDCListView.sapUiMDCAFLabelMarkingList tbody  .sapMLabel > span:first-child::after {
-	content: ":";
+.sapUiMDCListView.sapUiMDCAFLabelMarkingList tbody  .sapMLabel > .sapMLabelColonAndRequired::before{
+	content: attr(data-colon);
 }
 
 //Display checkbox at the top for items in the ListView

package/src/sap/ui/mdc/themes/base/ValueHelpDialog.less

@@ -52,6 +52,11 @@
 	white-space: nowrap;
 }
 
+// overrules the tokenizer display setting for empty tokenizer
+.sapMdcTokenizer .sapMTokenizerScrollContainerNoVisibleTokens {
+    display: inline-block;
+}
+
 // make the ITB header height 3rem
 .sapMdcValueHelpPanel .sapMITBHead {
 	margin-top: 0rem;
@@ -83,10 +88,13 @@
 }
 
 // makes the IconTab Header hidden when only one tabs exist
-.sapMdcValueHelpPanel .sapMdcNoHeader .sapMITH {
-    visibility: hidden;
-    height: 0px;
-}
+// .sapMdcValueHelpPanel .sapMdcNoHeader .sapMITH {
+// 	display: none;
+// }
+
+.sapMdcNoHeader > div:first-child {
+	 display: none;
+ }
 
 .sapUiMdcDefineConditionPanel .sapUiMdcDefineConditionGrid {
 	margin-bottom: 0.5rem;
@@ -94,8 +102,8 @@
 
 // give the Filterbar the required padding and max height
 .sapMdcValueHelpPanelFilterbar {
-    margin-left: 2rem;
-    margin-right: 1rem;
+	margin-left: 2rem;
+	margin-right: 1rem;
 }
 
 // allign static text
@@ -134,12 +142,12 @@
 // hide the toolbar border and give some more top margin
 .sapMdcValueHelpPanel .sapMTBStandard {
 	margin-top: 0.5rem;
-    border-bottom: solid 1px transparent;
+	border-bottom: solid 1px transparent;
 }
 
 // hide the panel bottom border
 .sapMdcValueHelpPanel .sapMPanelContent:not(.sapMPanelBGTransparent) {
-    border-bottom: none;
+	border-bottom: none;
 }
 
 
@@ -155,29 +163,56 @@
 	font-size: @sapMFontHeader5Size
 }
 
-// scrollbar for Table if FixFlex is fix
-.sapMdcValueHelpPanel .sapUiFixFlexScrolling .sapMdcTablePanel {
-	height: 200px !important;
-}
-
 // make the title shadows transparent
-.sapMdcValueHelpTitle.sapMDialog:not(.sapMDialogWithSubHeader) > header:first-of-type .sapMIBar {
-    box-shadow: inset 0 -0.0625rem transparent;
+.sapMdcValueHelpTitleShadow.sapMDialog:not(.sapMDialogWithSubHeader) > header:first-of-type .sapMIBar {
+	box-shadow: inset 0 -0.0625rem transparent;
 }
 
-.sapMdcValueHelpTitle.sapMBar {
-    box-shadow: inset 0 -0.0625rem transparent;
+.sapMdcValueHelpTitleShadow.sapMBar {
+	box-shadow: inset 0 -0.0625rem transparent;
 }
 
 // remove some borders around the IconTabBar content
 .sapMdcValueHelpPanel .sapMITBContent {
-    border-left: none;
-    border-right: none;
-    border-bottom: none;
+	border-left: none;
+	border-right: none;
+	border-bottom: none;
 }
 
 // set the 2rem padding also on the OK and Cancel buttons in the footer
 .sapMdcValueHelpTitle.sapMDialog footer .sapMTB {
-    padding: 0 2rem;
+	padding: 0 2rem;
+}
+
+
+.sapMdcValueHelpPanelTableBox {
+	padding: 0 2rem;
+}
+
+.sapMdcValueHelpPanelTableBox > .sapMFlexItem {
+	//min-height: 200px !important;
+	height: 100%;
+}
+
+.sapMdcValueHelpPanelTableBox .sapUiMdcTable .sapMTBStandard {
+	margin-top: 0;
+}
+
+.sapMdcValueHelpPanel .sapUiFixFlexScrolling .sapMdcValueHelpPanelTableBox {
+	height: 200px !important;
+}
+
+.sapMdcValueHelpPanelTableBox .sapUiMdcTable .sapMTitleTB {
+	font-size: 1rem;
+}
+
+.sapMdcValueHelpPopover.sapMdcValueHelpMultiSelect .sapUiMdcDefineConditionPanel {
+	margin-left: 1rem;
+	margin-top: 1rem;
 }
 
+.sapMdcValueHelpPopover.sapMdcValueHelpSingleSelect .sapUiMdcDefineConditionPanel {
+	margin-left: 0rem;
+	margin-right: 0.75rem;
+	margin-top: 1rem;
+}

package/src/sap/ui/mdc/ui/Container.js

@@ -22,12 +22,12 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.ui.Container
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.85.0
 	 *
 	 * @private

package/src/sap/ui/mdc/ui/ContainerItem.js

@@ -20,12 +20,12 @@ sap.ui.define(['sap/ui/core/Element'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.ui.ContainerItem
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.85.0
 	 *
 	 * @private

package/src/sap/ui/mdc/util/Common.js

@@ -0,0 +1,26 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([], function() {
+	"use strict";
+
+	var Common = {
+		cleanup: function (oTarget, aFields) {
+			aFields.forEach(function (sField) {
+				var oRemovable = oTarget[sField];
+				if (oRemovable) {
+					if (oRemovable.destroy && !oRemovable.bIsDestroyed) {
+						oRemovable.destroy();
+					}
+					oTarget[sField] = null;
+				}
+			});
+		}
+	};
+
+	return Common;
+
+}, /* bExport= */true);

package/src/sap/ui/mdc/util/FilterUtil.js

@@ -33,14 +33,25 @@ sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValid
 				 */
 				getPropertyByKey : function(aPropertiesMetadata, sKey) {
 					var oPropertyInfo = null;
+
 					aPropertiesMetadata.some(function(oProp) {
-						if (IdentifierUtil.getPropertyKey(oProp) === sKey) {
+						if (IdentifierUtil.getPropertyKeyByPath(oProp) === sKey) {
 							oPropertyInfo = oProp;
 						}
 
 						return oPropertyInfo != null;
 					});
 
+					if (!oPropertyInfo) {
+						aPropertiesMetadata.some(function(oProp) {
+							if (IdentifierUtil.getPropertyKey(oProp) === sKey) {
+								oPropertyInfo = oProp;
+							}
+
+							return oPropertyInfo != null;
+						});
+					}
+
 					return oPropertyInfo;
 				},
 

package/src/sap/ui/mdc/util/IdentifierUtil.js

@@ -63,6 +63,10 @@ sap.ui.define(['sap/ui/base/DataType'], function(DataType) {
 			return oProperty.name;
 		},
 
+		getPropertyKeyByPath:  function(oProperty) {
+			return oProperty.path;
+		},
+
 		/**
 		 * Static function that determines the key of the property<br>
 		 *