@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.macros/src/sap/fe/macros/SizeHelper-dbg.js

@@ -3,39 +3,172 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/m/Button", "sap/ui/dom/units/Rem"], function(Button, Rem) {
-	"use strict";
-
-	var SizeHelper = {
-		init: function() {
-			// Create a new button in static area sap.ui.getCore().getStaticAreaRef()
-			this.oBtn = new Button().placeAt(sap.ui.getCore().getStaticAreaRef());
-			// Hide button from accessibility tree
-			this.oBtn.setVisible(false);
-		},
-		/**
-		 * Method to calculate button's width from a temp created button placed in static area.
-		 *
-		 * @param {string} sText The text to masure inside the Button.
-		 * @returns {number} The value of the Button width.
-		 */
-		getButtonWidth: function(sText) {
-			if (this.oBtn.getVisible() === false) {
-				this.oBtn.setVisible(true);
+sap.ui.define(
+	["sap/m/Button", "sap/ui/dom/units/Rem", "sap/ui/mdc/table/Column", "sap/ui/mdc/table/PropertyHelper", "sap/base/Log"],
+	function(Button, Rem, MDCColumn, PropertyHelper, Log) {
+		"use strict";
+
+		var SizeHelper = {
+			init: function() {
+				// Create a new button in static area sap.ui.getCore().getStaticAreaRef()
+				this.nbCalls = this.nbCalls ? this.nbCalls : 0;
+				this.nbCalls++;
+				this.oBtn = this.oBtn ? this.oBtn : new Button().placeAt(sap.ui.getCore().getStaticAreaRef());
+				// Hide button from accessibility tree
+				this.oBtn.setVisible(false);
+			},
+			/**
+			 * Method to calculate button's width from a temp created button placed in static area.
+			 *
+			 * @param {string} sText The text to masure inside the Button.
+			 * @returns {number} The value of the Button width.
+			 */
+			getButtonWidth: function(sText) {
+				if (this.oBtn.getVisible() === false) {
+					this.oBtn.setVisible(true);
+				}
+				this.oBtn.setText(sText);
+				//adding missing styles from buttons inside a table
+				// for sync rendering
+				this.oBtn.rerender();
+				var nButtonWidth = Rem.fromPx(this.oBtn.getDomRef().scrollWidth);
+				this.oBtn.setVisible(false);
+				return Math.round(nButtonWidth * 100) / 100;
+			},
+
+			/**
+			 * Method to calculate MDC Column's width from a temp column.
+			 *
+			 * @param {object} oProperty The PropertyInfo Object for which the width will be calculated.
+			 * @param {Array} aProperties Array containing all PropertyInfo objects.
+			 * @param {object} oTable The Table reference.
+			 * @private
+			 * @alias sap.fe.macros.SizeHelper
+			 * @returns {number} The value of the Column width.
+			 */
+			getMDCColumnWidth: function(oProperty, aProperties, oTable) {
+				var oVirtualColumn = new MDCColumn(),
+					sTableId = oTable.getId();
+				oVirtualColumn.setDataProperty(oProperty.name);
+				if (!this._getPropertyHelperCache(sTableId)) {
+					this._setPropertyHelperCache(sTableId, new PropertyHelper(aProperties, null, oTable));
+				}
+				this._getPropertyHelperCache(sTableId).setColumnWidth(oVirtualColumn);
+				return parseFloat(oVirtualColumn.getWidth());
+				// }
+			},
+
+			_getPropertyHelperCache: function(sTableId) {
+				return this.propertyHelper && this.propertyHelper[sTableId];
+			},
+			_setPropertyHelperCache: function(sTableId, oPropertyHelper) {
+				this.propertyHelper = Object.assign({}, this.propertyHelper);
+				this.propertyHelper[sTableId] = oPropertyHelper;
+			},
+
+			/**
+			 * Method to calculate  width of a DataFieldAnnotation object contained in a fieldgroup.
+			 *
+			 * @param {object} oData DataFieldAnnotation object.
+			 * @param {boolean} bShowDataFieldsLabel Label is displayed inside the field
+			 * @param {Array} aProperties Array containing all PropertyInfo objects.
+			 * @param {object} oContext Context Object of the parent property.
+			 * @private
+			 * @alias sap.fe.macros.SizeHelper
+			 * @returns {object} Object containing the width of the label and the width of the property.
+			 */
+			getWidthForDataFieldForAnnotation: function(oData, bShowDataFieldsLabel, aProperties, oContext) {
+				var oObject = oContext.getObject(oData.Target.$AnnotationPath),
+					oValue = oObject.Value,
+					oTargetedProperty,
+					nPropertyWidth = 0,
+					fLabelWidth = 0;
+				if (oValue) {
+					oTargetedProperty = this._getPropertiesByPath(
+						aProperties,
+						oContext.getObject(oData.Target.$AnnotationPath).Value.$Path
+					);
+					var oVisualization = oContext.getObject(oData.Target.$AnnotationPath).Visualization;
+					switch (oVisualization && oVisualization.$EnumMember) {
+						case "com.sap.vocabularies.UI.v1.VisualizationType/Rating":
+							var iTargetedValue = oContext.getObject(oData.Target.$AnnotationPath).TargetValue;
+							nPropertyWidth = parseInt(iTargetedValue, 10) * 1.375;
+							break;
+						case "com.sap.vocabularies.UI.v1.VisualizationType/Progress":
+						default:
+							nPropertyWidth = 5;
+					}
+					var sLabel = oTargetedProperty ? oTargetedProperty.label : oData.Label || "";
+					fLabelWidth = bShowDataFieldsLabel && sLabel ? SizeHelper.getButtonWidth(sLabel) : 0;
+				} else {
+					Log.error("Cannot compute width for type object: " + oObject.$Type);
+				}
+
+				return { labelWidth: fLabelWidth, propertyWidth: nPropertyWidth };
+			},
+
+			/**
+			 * Method to calculate  width of a DataField object.
+			 *
+			 * @param {object} oData DataFieldAnnotation object.
+			 * @param {boolean} bShowDataFieldsLabel Label is displayed inside the field.
+			 * @param {Array} aProperties Array containing all PropertyInfo objects.
+			 * @param {object} oContext Context Object of the parent property.
+			 * @param {object} oTable The Table reference.
+			 * @private
+			 * @alias sap.fe.macros.SizeHelper
+			 * @returns {object} Object containing the width of the label and the width of the property.
+			 */
+
+			getWidthForDataField: function(oData, bShowDataFieldsLabel, aProperties, oContext, oTable) {
+				var oTargetedProperty = this._getPropertiesByPath(aProperties, oData.Value.$Path),
+					nPropertyWidth = 0,
+					fLabelWidth = 0,
+					oTextArrangmentTarget = oContext.getObject(oData.Value.$Path + "@com.sap.vocabularies.Common.v1.Text"),
+					oTextArrangmentType = oContext.getObject(
+						oData.Value.$Path + "@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"
+					);
+				if (oTargetedProperty) {
+					var TextArrangmentTargetWidth = 0;
+					if (oTextArrangmentTarget && oTextArrangmentType) {
+						var oTextArrangmentTargetProperty = this._getPropertiesByPath(aProperties, oTextArrangmentTarget.$Path);
+						TextArrangmentTargetWidth =
+							oTextArrangmentTargetProperty && this.getMDCColumnWidth(oTextArrangmentTargetProperty, aProperties, oTable) - 1;
+					}
+					switch (oTextArrangmentType && oTextArrangmentType.$EnumMember) {
+						case "com.sap.vocabularies.UI.v1.TextArrangementType/TextFirst":
+						case "com.sap.vocabularies.UI.v1.TextArrangementType/TextLast":
+							nPropertyWidth = this.getMDCColumnWidth(oTargetedProperty, aProperties, oTable) - 1 + TextArrangmentTargetWidth;
+							break;
+						case "com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly":
+							nPropertyWidth = TextArrangmentTargetWidth;
+							break;
+						case "com.sap.vocabularies.UI.v1.TextArrangementType/TextSeparate":
+						default:
+							nPropertyWidth = this.getMDCColumnWidth(oTargetedProperty, aProperties, oTable) - 1;
+					}
+					var sLabel = oData.Label ? oData.Label : oTargetedProperty.label;
+					fLabelWidth = bShowDataFieldsLabel && sLabel ? SizeHelper.getButtonWidth(sLabel) : 0;
+				} else {
+					Log.error("Cannot compute width for type object: " + oData.$Type);
+				}
+				return { labelWidth: fLabelWidth, propertyWidth: nPropertyWidth };
+			},
+
+			_getPropertiesByPath: function(aProperties, sPath) {
+				return aProperties.find(function(oProperty) {
+					return oProperty.path === sPath;
+				});
+			},
+
+			exit: function() {
+				this.nbCalls--;
+				if (this.nbCalls === 0) {
+					this.oBtn.destroy();
+					this.oBtn = null;
+				}
 			}
-			this.oBtn.setText(sText);
-			//adding missing styles from buttons inside a table
-			this.oBtn.addStyleClass("sapMListTblCell");
-			// for sync rendering
-			this.oBtn.rerender();
-			var nButtonWidth = Rem.fromPx(this.oBtn.getDomRef().scrollWidth);
-			this.oBtn.setVisible(false);
-			return nButtonWidth;
-		},
-
-		exit: function() {
-			this.oBtn.destroy();
-		}
-	};
-	return SizeHelper;
-});
+		};
+		return SizeHelper;
+	}
+);

package/packages/sap.fe.macros/src/sap/fe/macros/SizeHelper.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/m/Button","sap/ui/dom/units/Rem"],function(B,R){"use strict";var S={init:function(){this.oBtn=new B().placeAt(sap.ui.getCore().getStaticAreaRef());this.oBtn.setVisible(false);},getButtonWidth:function(t){if(this.oBtn.getVisible()===false){this.oBtn.setVisible(true);}this.oBtn.setText(t);this.oBtn.addStyleClass("sapMListTblCell");this.oBtn.rerender();var n=R.fromPx(this.oBtn.getDomRef().scrollWidth);this.oBtn.setVisible(false);return n;},exit:function(){this.oBtn.destroy();}};return S;});
+sap.ui.define(["sap/m/Button","sap/ui/dom/units/Rem","sap/ui/mdc/table/Column","sap/ui/mdc/table/PropertyHelper","sap/base/Log"],function(B,R,M,P,L){"use strict";var S={init:function(){this.nbCalls=this.nbCalls?this.nbCalls:0;this.nbCalls++;this.oBtn=this.oBtn?this.oBtn:new B().placeAt(sap.ui.getCore().getStaticAreaRef());this.oBtn.setVisible(false);},getButtonWidth:function(t){if(this.oBtn.getVisible()===false){this.oBtn.setVisible(true);}this.oBtn.setText(t);this.oBtn.rerender();var n=R.fromPx(this.oBtn.getDomRef().scrollWidth);this.oBtn.setVisible(false);return Math.round(n*100)/100;},getMDCColumnWidth:function(p,a,t){var v=new M(),T=t.getId();v.setDataProperty(p.name);if(!this._getPropertyHelperCache(T)){this._setPropertyHelperCache(T,new P(a,null,t));}this._getPropertyHelperCache(T).setColumnWidth(v);return parseFloat(v.getWidth());},_getPropertyHelperCache:function(t){return this.propertyHelper&&this.propertyHelper[t];},_setPropertyHelperCache:function(t,p){this.propertyHelper=Object.assign({},this.propertyHelper);this.propertyHelper[t]=p;},getWidthForDataFieldForAnnotation:function(d,s,p,c){var o=c.getObject(d.Target.$AnnotationPath),v=o.Value,t,n=0,l=0;if(v){t=this._getPropertiesByPath(p,c.getObject(d.Target.$AnnotationPath).Value.$Path);var V=c.getObject(d.Target.$AnnotationPath).Visualization;switch(V&&V.$EnumMember){case"com.sap.vocabularies.UI.v1.VisualizationType/Rating":var T=c.getObject(d.Target.$AnnotationPath).TargetValue;n=parseInt(T,10)*1.375;break;case"com.sap.vocabularies.UI.v1.VisualizationType/Progress":default:n=5;}var a=t?t.label:d.Label||"";l=s&&a?S.getButtonWidth(a):0;}else{L.error("Cannot compute width for type object: "+o.$Type);}return{labelWidth:l,propertyWidth:n};},getWidthForDataField:function(d,s,p,c,t){var T=this._getPropertiesByPath(p,d.Value.$Path),n=0,l=0,o=c.getObject(d.Value.$Path+"@com.sap.vocabularies.Common.v1.Text"),a=c.getObject(d.Value.$Path+"@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement");if(T){var b=0;if(o&&a){var e=this._getPropertiesByPath(p,o.$Path);b=e&&this.getMDCColumnWidth(e,p,t)-1;}switch(a&&a.$EnumMember){case"com.sap.vocabularies.UI.v1.TextArrangementType/TextFirst":case"com.sap.vocabularies.UI.v1.TextArrangementType/TextLast":n=this.getMDCColumnWidth(T,p,t)-1+b;break;case"com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly":n=b;break;case"com.sap.vocabularies.UI.v1.TextArrangementType/TextSeparate":default:n=this.getMDCColumnWidth(T,p,t)-1;}var f=d.Label?d.Label:T.label;l=s&&f?S.getButtonWidth(f):0;}else{L.error("Cannot compute width for type object: "+d.$Type);}return{labelWidth:l,propertyWidth:n};},_getPropertiesByPath:function(p,s){return p.find(function(o){return o.path===s;});},exit:function(){this.nbCalls--;if(this.nbCalls===0){this.oBtn.destroy();this.oBtn=null;}}};return S;});

package/packages/sap.fe.macros/src/sap/fe/macros/Table.fragment.xml

@@ -36,8 +36,8 @@
 		<template:with path="collection>" helper="COMMON.getTargetCollection" var="targetCollection">
 			<template:with path="metaPath>" helper="COMMON.createPresentationPathContext" var="presentationPath">
 				<template:with path="metaPath>" helper="TABLE.getUiLineItem" var="lineItem">
-					<!-- macrodata has to be an expression binding if it needs to be set as attribute via change handler during templating -->
-					<mdc:Table
+						<!-- macrodata has to be an expression binding if it needs to be set as attribute via change handler during templating -->
+						<mdc:Table
 						binding="{= '{internal>controls/' + ${this>id} + '}' }"
 						unittest:id="TableMacroFragment"
 						core:require="{TableRuntime: 'sap/fe/macros/table/TableRuntime', API: 'sap/fe/macros/TableAPI'}"
@@ -71,20 +71,20 @@
 						class="{= ${tableDefinition>control/useCondensedTableLayout} === true ? 'sapUiSizeCondensed' : undefined }"
 						multiSelectMode="{= ${tableDefinition>control/multiSelectMode} }"
 						macrodata:rowsBindingInfo="{=
-							TABLE.getRowsBindingInfo(
-								${this>},
-								${collection>},
-								${collection>@sapui.name},
-								${targetCollection>@},
-								${tableDefinition>operationAvailableProperties},
-								!${tableDefinition>enableAnalytics} ? ${lineItem>@@TABLE.addNavigationAvailableFieldsToSelectQuery} : '',
-								${metaPath>},
-								${presentationPath>},
-								${targetCollection>./@com.sap.vocabularies.Common.v1.SemanticKey},
-								${lineItem>@@TABLE.addFieldsHavingTextArrangementToSelectQuery},
-								${tableDefinition>enableAnalytics}
-							)
-						}"
+								TABLE.getRowsBindingInfo(
+									${this>},
+									${collection>},
+									${collection>@sapui.name},
+									${targetCollection>@},
+									${tableDefinition>operationAvailableProperties},
+									!${tableDefinition>enableAnalytics} ? ${lineItem>@@TABLE.addNavigationAvailableFieldsToSelectQuery} : '',
+									${metaPath>},
+									${presentationPath>},
+									${targetCollection>./@com.sap.vocabularies.Common.v1.SemanticKey},
+									${lineItem>@@TABLE.addFieldsHavingTextArrangementToSelectQuery},
+									${tableDefinition>enableAnalytics}
+								)
+							}"
 						macrodata:enableAnalytics="{tableDefinition>enableAnalytics}"
 						macrodata:creationMode="{this>creationMode}"
 						macrodata:showCreate="{this>showCreate}"
@@ -107,118 +107,116 @@
 						enableAutoColumnWidth="{this>enableAutoColumnWidth}"
 					>
 
-						<mdc:dataStateIndicator>
-							<plugins:DataStateIndicator
+							<mdc:dataStateIndicator>
+								<plugins:DataStateIndicator
 								filter="API.shouldFilterDataStateMessage"
 								enableFiltering="{tableDefinition>enableDataStateFilter}"
 								dataStateChange="API.onDataStateChange"
 							/>
-						</mdc:dataStateIndicator>
-						<mdc:type>
-							<template:if test="{= ${this>tableType} === 'GridTable' }">
-								<template:then>
-									<mdcTable:GridTableType rowCountMode="Auto" rowCount="3" selectionLimit="{this>selectionLimit}" />
-								</template:then>
-								<template:else>
-									<mdcTable:ResponsiveTableType
+							</mdc:dataStateIndicator>
+							<mdc:type>
+								<template:if test="{= ${this>tableType} === 'GridTable' }">
+									<template:then>
+										<mdcTable:GridTableType rowCountMode="Auto" rowCount="3" selectionLimit="{this>selectionLimit}" />
+									</template:then>
+									<template:else>
+										<mdcTable:ResponsiveTableType
 										showDetailsButton="true"
 										detailsButtonSetting="{=['Low', 'Medium', 'None']}"
 										growingMode="{= ${collection>$kind} === 'EntitySet' ? 'Scroll' : undefined }"
 									/>
-								</template:else>
-							</template:if>
-						</mdc:type>
-						<mdc:dependents>
-							<template:if test="{= !${this>readOnly} &amp;&amp; ${tableDefinition>columns} }">
-								<template:repeat list="{tableDefinition>columns}" var="column">
-									<template:if test="{= ${column>availability} === 'Default' &amp;&amp; ${column>type} === 'Annotation'}">
-										<template:with path="column>annotationPath" var="dataField">
-											<core:Fragment fragmentName="sap.fe.macros.table.ValueHelp" type="XML" />
-										</template:with>
+									</template:else>
+								</template:if>
+							</mdc:type>
+							<mdc:dependents>
+								<template:if test="{= !${this>readOnly} &amp;&amp; ${tableDefinition>columns} }">
+									<template:repeat list="{tableDefinition>columns}" var="column">
+										<template:if test="{= ${column>availability} === 'Default' &amp;&amp; ${column>type} === 'Annotation'}">
+											<template:with path="column>annotationPath" var="dataField">
+												<core:Fragment fragmentName="sap.fe.macros.table.ValueHelp" type="XML" />
+											</template:with>
+										</template:if>
+									</template:repeat>
+								</template:if>
+								<template:with path="tableDefinition>annotation/standardActions/actions" var="standardActions">
+									<template:if test="{= ${standardActions>create/isTemplated} &amp;&amp; ${this>creationMode} !== 'CreationRow' }">
+										<control:CommandExecution
+										execute="{= TABLE.pressEventForCreateButton(${this>}, true)}"
+										visible="{standardActions>create/visible}"
+										enabled="{standardActions>create/enabled}"
+										command="Create"
+									/>
 									</template:if>
-								</template:repeat>
-							</template:if>
-							<template:if test="{= TABLE.createButtonTemplating(${this>}) &amp;&amp; ${this>creationMode} !== 'CreationRow' }">
-								<control:CommandExecution
-									execute="{= TABLE.pressEventForCreateButton(${this>}, true)}"
-									visible="{= ${this>showCreate} || true }"
-									enabled="{= TABLE.isCreateButtonEnabled(
-								${collection>},
-								${collection>@sapui.name},
-								${parentEntitySet>@Org.OData.Capabilities.V1.NavigationRestrictions/RestrictedProperties},
-								${targetCollection>@Org.OData.Capabilities.V1.InsertRestrictions/Insertable})}"
-									command="Create"
-								/>
-							</template:if>
-							<template:if test="{=  TABLE.deleteButtonTemplating(${this>}) }">
-								<control:CommandExecution
-									execute="{= TABLE.pressEventForDeleteButton(${this>}, ${collection>@sapui.name})}"
-									visible="{this>showDelete}"
-									enabled="{= TABLE.isDeleteButtonEnabled(${this>})}"
-									command="DeleteEntry"
-								/>
-							</template:if>
-							<control:CommandExecution execute="TableRuntime.displayTableSettings" command="TableSettings" />
-							<template:if test="{= ${this>variantManagement} === 'None'}">
-								<!-- Persistence provider offers persisting personalization changes without variant management -->
-								<p13n:PersistenceProvider id="{= ID.generate([${this>id}, 'PersistenceProvider']) }" for="{this>id}" />
-							</template:if>
-						</mdc:dependents>
-						<mdc:actions>
-							<!-- TODO: This should be moved out of macros and should be added as a macro aggregation to macro table-->
-							<template:if test="{this>onSegmentedButtonPressed}">
-								<mdcat:ActionToolbarAction layoutInformation="{
-									aggregationName: 'end',
-									alignment: 'End'
-								}">
-									<SegmentedButton
+									<template:if test="{standardActions>delete/isTemplated}">
+										<control:CommandExecution
+										execute="{= TABLE.pressEventForDeleteButton(${this>}, ${collection>@sapui.name})}"
+										visible="{standardActions>delete/visible}"
+										enabled="{standardActions>delete/enabled}"
+										command="DeleteEntry"
+									/>
+									</template:if>
+								</template:with>
+								<control:CommandExecution execute="TableRuntime.displayTableSettings" command="TableSettings" />
+								<template:if test="{= ${this>variantManagement} === 'None'}">
+									<!-- Persistence provider offers persisting personalization changes without variant management -->
+									<p13n:PersistenceProvider id="{= ID.generate([${this>id}, 'PersistenceProvider']) }" for="{this>id}" />
+								</template:if>
+							</mdc:dependents>
+							<mdc:actions>
+								<!-- TODO: This should be moved out of macros and should be added as a macro aggregation to macro table-->
+								<template:if test="{this>onSegmentedButtonPressed}">
+									<mdcat:ActionToolbarAction layoutInformation="{
+										aggregationName: 'end',
+										alignment: 'End'
+									}">
+										<SegmentedButton
 										id="{= ID.generate([${this>id}, 'SegmentedButton', 'TemplateContentView']) }"
 										select="{this>onSegmentedButtonPressed}"
 										visible="{= ${pageInternal>alpContentView} === 'Table' }"
 										selectedKey="{pageInternal>alpContentView}"
 									>
-										<items>
-											<template:if test="{= COMMON.isDesktop() }">
-												<SegmentedButtonItem tooltip="{this.i18n>M_COMMON_HYBRID_SEGMENTED_BUTTON_ITEM_TOOLTIP}" key="Hybrid" icon="sap-icon://chart-table-view" />
-											</template:if>
-											<SegmentedButtonItem tooltip="{this.i18n>M_COMMON_CHART_SEGMENTED_BUTTON_ITEM_TOOLTIP}" key="Chart" icon="sap-icon://bar-chart" />
-											<SegmentedButtonItem tooltip="{this.i18n>M_COMMON_TABLE_SEGMENTED_BUTTON_ITEM_TOOLTIP}" key="Table" icon="sap-icon://table-view" />
-										</items>
-									</SegmentedButton>
-								</mdcat:ActionToolbarAction>
-							</template:if>
-							<core:Fragment fragmentName="sap.fe.macros.table.Actions" type="XML" />
-						</mdc:actions>
-						<mdc:rowSettings>
-							<mdcTable:RowSettings
+											<items>
+												<template:if test="{= COMMON.isDesktop() }">
+													<SegmentedButtonItem tooltip="{this.i18n>M_COMMON_HYBRID_SEGMENTED_BUTTON_ITEM_TOOLTIP}" key="Hybrid" icon="sap-icon://chart-table-view" />
+												</template:if>
+												<SegmentedButtonItem tooltip="{this.i18n>M_COMMON_CHART_SEGMENTED_BUTTON_ITEM_TOOLTIP}" key="Chart" icon="sap-icon://bar-chart" />
+												<SegmentedButtonItem tooltip="{this.i18n>M_COMMON_TABLE_SEGMENTED_BUTTON_ITEM_TOOLTIP}" key="Table" icon="sap-icon://table-view" />
+											</items>
+										</SegmentedButton>
+									</mdcat:ActionToolbarAction>
+								</template:if>
+								<core:Fragment fragmentName="sap.fe.macros.table.Actions" type="XML" />
+							</mdc:actions>
+							<mdc:rowSettings>
+								<mdcTable:RowSettings
 								navigated="{tableDefinition>annotation/row/rowNavigated}"
 								highlight="{tableDefinition>annotation/row/rowHighlighting}"
 							/>
-						</mdc:rowSettings>
+							</mdc:rowSettings>
 
-						<mdc:columns>
-							<core:Fragment fragmentName="sap.fe.macros.table.Columns" type="XML" />
-						</mdc:columns>
-						<template:if test="{= ${this>creationMode} === 'CreationRow'}">
-							<mdc:creationRow>
-								<core:Fragment fragmentName="sap.fe.macros.table.CreationRow" type="XML" />
-							</mdc:creationRow>
-						</template:if>
-						<template:if test="{= ${this>variantManagement} === 'Control'}">
-							<mdc:variant>
-								<variant:VariantManagement
+							<mdc:columns>
+								<core:Fragment fragmentName="sap.fe.macros.table.Columns" type="XML" />
+							</mdc:columns>
+							<template:if test="{= ${this>creationMode} === 'CreationRow'}">
+								<mdc:creationRow>
+									<core:Fragment fragmentName="sap.fe.macros.table.CreationRow" type="XML" />
+								</mdc:creationRow>
+							</template:if>
+							<template:if test="{= ${this>variantManagement} === 'Control'}">
+								<mdc:variant>
+									<variant:VariantManagement
 									id="{= ID.generate([${this>id}, 'VM']) }"
 									for="{this>id}"
 									showSetAsDefault="true"
 									select="{this>variantSelected}"
 									save="{this>variantSaved}"
 								/>
-							</mdc:variant>
-						</template:if>
-						<template:if test="{tableDefinition>control/filters/quickFilters}">
-							<template:with path="tableDefinition>control/filters/quickFilters" var="quickFilters">
-								<mdc:quickFilter>
-								<macroTable:QuickFilterContainer
+								</mdc:variant>
+							</template:if>
+							<template:if test="{tableDefinition>control/filters/quickFilters}">
+								<template:with path="tableDefinition>control/filters/quickFilters" var="quickFilters">
+									<mdc:quickFilter>
+									<macroTable:QuickFilterContainer
 										id="{= ID.generate([${this>id}, 'QuickFilterContainer']) }"
 										enabled="{= ${quickFilters>enabled} || true }"
 										entitySet="{collection>@@COMMON.getMetaPath}"
@@ -227,11 +225,11 @@
 										macrodata:filters="{=TABLE.formatHiddenFilters(${tableDefinition>control/filters/quickFilters})}"
 										batchGroupId="{this>requestGroupId}"
 									/>
-								</mdc:quickFilter>
-							</template:with>
-						</template:if>
-					</mdc:Table>
-				</template:with>
+									</mdc:quickFilter>
+								</template:with>
+							</template:if>
+						</mdc:Table>
+					</template:with>
 			</template:with>
 		</template:with>
 	</macro:TableAPI>