@openui5/sap.m 1.133.1 → 1.135.0

package/src/sap/m/table/columnmenu/Menu.js

@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.MenuBase
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -191,40 +191,11 @@ sap.ui.define([
 		const fnOpen = () => {
 			this._initPopover();
 
-			if (this._oQuickSortList) {
-				this._oQuickSortList.destroy();
-				this._oQuickSortList = null;
-			}
 			this._oQuickSortList = this._initQuickActionList(Category.Sort);
-
-			if (this._oQuickFilterList) {
-				this._oQuickFilterList.destroy();
-				this._oQuickFilterList = null;
-			}
 			this._oQuickFilterList = this._initQuickActionList(Category.Filter);
-
-			if (this._oQuickGroupList) {
-				this._oQuickGroupList.destroy();
-				this._oQuickGroupList = null;
-			}
 			this._oQuickGroupList = this._initQuickActionList(Category.Group);
-
-			if (this._oQuickAggregateList) {
-				this._oQuickAggregateList.destroy();
-				this._oQuickAggregateList = null;
-			}
 			this._oQuickAggregateList = this._initQuickActionList(Category.Aggregate);
-
-			if (this._oQuickGenericList) {
-				this._oQuickGenericList.destroy();
-				this._oQuickGenericList = null;
-			}
 			this._oQuickGenericList = this._initQuickActionList(Category.Generic);
-
-			if (this._oItemsContainer) {
-				this._oItemsContainer.destroy();
-				this._oItemsContainer = null;
-			}
 			this._initItemsContainer();
 
 			if (!this.getParent()) {
@@ -269,9 +240,8 @@ sap.ui.define([
 
 	function createTableSettingsButton(oMenu) {
 		return new Button({
-			text: oMenu._getResourceText("table.COLUMNMENU_TABLE_SETTINGS"),
 			icon: "sap-icon://action-settings",
-			type: "Transparent",
+			tooltip: oMenu._getResourceText("table.COLUMNMENU_TABLE_SETTINGS"),
 			press: () => {
 				oMenu._oPopover.close();
 				oMenu.fireTableSettingsPressed();
@@ -300,31 +270,39 @@ sap.ui.define([
 		this._previousView = null;
 		if (this._oPopover && this._oPopover.isOpen()) {
 			if (this._oQuickSortList) {
+				// Destroying the list does not destroy the quick action content, which may be reused somewhere else.
+				// The list is removed from the control tree so that upon destruction its DOM is removed synchronously.
+				this.removeDependent(this._oQuickSortList);
 				this._oQuickSortList.destroy();
 				this._oQuickSortList = null;
 			}
 
 			if (this._oQuickFilterList) {
+				this.removeDependent(this._oQuickFilterList);
 				this._oQuickFilterList.destroy();
 				this._oQuickFilterList = null;
 			}
 
 			if (this._oQuickGroupList) {
+				this.removeDependent(this._oQuickGroupList);
 				this._oQuickGroupList.destroy();
 				this._oQuickGroupList = null;
 			}
 
 			if (this._oQuickAggregateList) {
+				this.removeDependent(this._oQuickAggregateList);
 				this._oQuickAggregateList.destroy();
 				this._oQuickAggregateList = null;
 			}
 
 			if (this._oQuickGenericList) {
+				this.removeDependent(this._oQuickGenericList);
 				this._oQuickGenericList.destroy();
 				this._oQuickGenericList = null;
 			}
 
 			if (this._oItemsContainer) {
+				this.removeDependent(this._oItemsContainer);
 				this._oItemsContainer.destroy();
 				this._oItemsContainer = null;
 			}
@@ -431,7 +409,7 @@ sap.ui.define([
 		}
 
 		if (oEvent.type == "mousedown" || oEvent.type == "touchstart") {
-			if (!containsOrEquals(this.getDomRef(), oEvent.target) && !containsOrEquals(StaticArea.getDomRef(), oEvent.target) && !isInControlTree(this, Element.closestTo(oEvent.target))) {
+			if (!containsOrEquals(this.getDomRef(), oEvent.target) && !containsOrEquals(this._oPopover.getDomRef(), oEvent.target) && !isInControlTree(this, Element.closestTo(oEvent.target))) {
 				this.close();
 			}
 		}
@@ -465,6 +443,7 @@ sap.ui.define([
 
 	var AssociativeControl = Control.extend("sap.m.table.columnmenu.AssociativeControl", {
 		metadata: {
+			library: "sap.m",
 			"final": true,
 			properties: {
 				height: {type: "boolean", defaultValue: false}
@@ -482,6 +461,16 @@ sap.ui.define([
 				oRm.renderControl(Element.getElementById(oControl.getControl()));
 				oRm.close("div");
 			}
+		},
+		addAriaLabelledBy: function(vAriaLabelledBy) {
+			const oControl = Element.getElementById(this.getControl());
+			oControl?.removeAllAssociation("ariaLabelledBy");
+			oControl?.addAriaLabelledBy?.(vAriaLabelledBy);
+			return this;
+		},
+		getAriaLabelledBy: function() {
+			const oControl = Element.getElementById(this.getControl());
+			return oControl?.getAriaLabelledBy?.() || [];
 		}
 	});
 
@@ -569,10 +558,13 @@ sap.ui.define([
 			}, this]
 		});
 
-		const oResourceBundle = Library.getResourceBundleFor("sap.m");
+		const sTitle = this._hasQuickActions() ?
+					this._getResourceText("table.COLUMNMENU_LIST_ITEMS_TITLE") :
+					this._getResourceText("table.COLUMNMENU_LIST_ITEMS_ONLY_TITLE");
+
 		this._oItemsContainer.setListHeader(new OverflowToolbar({
 			content: [
-				new Title({text: oResourceBundle.getText("table.COLUMNMENU_LIST_ITEMS_TITLE")})
+				new Title({text: sTitle})
 			]
 		}));
 		this._oItemsContainer.getHeader().addContentRight(new Button({
@@ -685,18 +677,26 @@ sap.ui.define([
 		oListItem?.setVisible(bVisible);
 	};
 
+	function _hasNonGenericQuickActions() {
+		return this._getAllEffectiveQuickActions(true).filter(function(oQuickAction) {
+			return oQuickAction.getVisible() && oQuickAction.getCategory() !== Category.Generic;
+		}).length > 0;
+	}
+
 	Menu.prototype._initQuickActionList = function (sCategory) {
 		var oList;
 		var aQuickActions = this._getAllEffectiveQuickActions().filter(function (oQuickAction) {
 			return oQuickAction.getVisible() && oQuickAction.getCategory() === sCategory;
 		});
 
+		const sTitle = (sCategory === Category.Generic && !_hasNonGenericQuickActions.call(this)) ?
+					this._getResourceText("table.COLUMNMENU_QUICK_GENERIC_ONLY_TITLE") :
+					this._getResourceText("table.COLUMNMENU_QUICK_" + sCategory.toUpperCase() + "_TITLE");
+
 		if (aQuickActions.length) {
 			oList = new List({
 				headerToolbar: new OverflowToolbar({
-					content: [
-						new Title({text: this._getResourceText("table.COLUMNMENU_QUICK_" + sCategory.toUpperCase() + "_TITLE")})
-					]
+					content: [new Title({text: sTitle})]
 				}),
 				keyboardMode: "Edit",
 				items: []
@@ -715,8 +715,8 @@ sap.ui.define([
 					}));
 				}
 			});
+			this.addDependent(oList);
 		}
-		this.addDependent(oList);
 		return oList;
 	};
 

package/src/sap/m/table/columnmenu/MenuBase.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.126

package/src/sap/m/table/columnmenu/QuickAction.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickActionBase.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickActionItem.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -34,7 +34,8 @@ sap.ui.define([
 	var QuickActionItem = Entry.extend("sap.m.table.columnmenu.QuickActionItem", {
 
 		metadata: {
-			library: "sap.m", properties: {
+			library: "sap.m",
+			properties: {
 				/**
 				 * The property name
 				 */

package/src/sap/m/table/columnmenu/QuickGroup.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickGroupItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -46,33 +46,42 @@ sap.ui.define([
 				 * Specifies whether the respective column is grouped.
 				 */
 				grouped: { type: "boolean", defaultValue: false }
+			},
+			aggregations: {
+				/**
+				 * Defines the quick action of the quick group item.
+				 */
+				quickAction: { type: "sap.m.table.columnmenu.QuickAction", multiple: false, visibility: "hidden" }
 			}
 		}
 	});
 
 	QuickGroupItem.prototype._getAction = function() {
+		var oQuickAction = this.getAggregation("quickAction");
 		var sLabel = this.getLabel();
-		var oQuickAction = new QuickAction({
-			label: sLabel,
-			content: [this.getContent()],
-			category: library.table.columnmenu.Category.Group,
-			contentSize: library.InputListItemContentSize.S
-		});
 
-		this.addDependent(oQuickAction);
+		if (oQuickAction) {
+			oQuickAction.setLabel(sLabel);
+		} else {
+			oQuickAction = new QuickAction({
+				label: sLabel,
+				content: [this._createContent()],
+				category: library.table.columnmenu.Category.Group,
+				contentSize: library.InputListItemContentSize.S
+			});
+		}
+
+		this.setAggregation("quickAction", oQuickAction, true);
 		return oQuickAction;
 	};
 
-	QuickGroupItem.prototype.getContent = function() {
-		if (!this._oContent) {
-			this._oContent = new Switch({
-				state: this.getGrouped(),
-				customTextOn: " ",
-				customTextOff: " ",
-				change: [{item: this}, this._onGroupChange, this]
-			});
-		}
-		return this._oContent;
+	QuickGroupItem.prototype._createContent = function() {
+		return new Switch({
+			state: this.getGrouped(),
+			customTextOn: " ",
+			customTextOff: " ",
+			change: [{item: this}, this._onGroupChange, this]
+		});
 	};
 
 	/*
@@ -80,7 +89,12 @@ sap.ui.define([
 	 */
 	QuickGroupItem.prototype.setGrouped = function(bGrouped) {
 		this.setProperty("grouped", bGrouped, true);
-		this.getContent().setState(bGrouped);
+
+		var oQuickAction = this.getAggregation("quickAction");
+		if (oQuickAction) {
+			var oSwitch = oQuickAction.getContent()[0];
+			oSwitch.setState(bGrouped);
+		}
 		return this;
 	};
 

package/src/sap/m/table/columnmenu/QuickSort.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickSortItem.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -119,8 +119,8 @@ sap.ui.define([
 
 		var oQuickAction = this.getAggregation("quickAction");
 		if (oQuickAction) {
-			var aButtons = oQuickAction.getContent();
-			aButtons[0].setSelectedKey(sSortOrder);
+			var oSegmentedButton = oQuickAction.getContent()[0];
+			oSegmentedButton.setSelectedKey(sSortOrder);
 		}
 		return this;
 	};

package/src/sap/m/table/columnmenu/QuickTotal.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickTotalItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -46,33 +46,42 @@ sap.ui.define([
 				 * Specifies whether a total for the respective column is shown.
 				 */
 				totaled: { type: "boolean", defaultValue: false }
+			},
+			aggregations: {
+				/**
+				 * Defines the quick action of the quick total item.
+				 */
+				quickAction: { type: "sap.m.table.columnmenu.QuickAction", multiple: false, visibility: "hidden" }
 			}
 		}
 	});
 
 	QuickTotalItem.prototype._getAction = function() {
+		var oQuickAction = this.getAggregation("quickAction");
 		var sLabel = this.getLabel();
-		var oQuickAction = new QuickAction({
-			label: sLabel,
-			content: [this.getContent()],
-			category: library.table.columnmenu.Category.Aggregate,
-			contentSize: library.InputListItemContentSize.S
-		});
 
-		this.addDependent(oQuickAction);
+		if (oQuickAction) {
+			oQuickAction.setLabel(sLabel);
+		} else {
+			oQuickAction = new QuickAction({
+				label: sLabel,
+				content: [this._createContent()],
+				category: library.table.columnmenu.Category.Aggregate,
+				contentSize: library.InputListItemContentSize.S
+			});
+		}
+
+		this.setAggregation("quickAction", oQuickAction, true);
 		return oQuickAction;
 	};
 
-	QuickTotalItem.prototype.getContent = function() {
-		if (!this._oContent) {
-			this._oContent = new Switch({
-				state: this.getTotaled(),
-				customTextOn: " ",
-				customTextOff: " ",
-				change: [{item: this}, this._onTotalChange, this]
-			});
-		}
-		return this._oContent;
+	QuickTotalItem.prototype._createContent = function() {
+		return new Switch({
+			state: this.getTotaled(),
+			customTextOn: " ",
+			customTextOff: " ",
+			change: [{item: this}, this._onTotalChange, this]
+		});
 	};
 
 	/*
@@ -80,7 +89,12 @@ sap.ui.define([
 	 */
 	QuickTotalItem.prototype.setTotaled = function(bTotaled) {
 		this.setProperty("totaled", bTotaled, true);
-		this.getContent().setState(bTotaled);
+
+		var oQuickAction = this.getAggregation("quickAction");
+		if (oQuickAction) {
+			var oSwitch = oQuickAction.getContent()[0];
+			oSwitch.setState(bTotaled);
+		}
 		return this;
 	};
 

package/src/sap/m/themes/base/ActionTile.less

@@ -40,7 +40,7 @@
 
 			.sapMGTTitle {
 				line-height: 1.2;
-				font-size: 0.875rem;
+				font-size: var(--sapFontSize);
 			}
 
 			.sapMTilePriorityValue {
@@ -99,7 +99,7 @@
 						overflow: hidden;
 						text-overflow: ellipsis;
 						font-weight: 400;
-						font-size: 0.875rem;
+						font-size: var(--sapFontSize);
 						margin-bottom: 0.75rem;
 						max-height: 16rem;
 					}
@@ -116,7 +116,7 @@
 						text-overflow: ellipsis;
 						color: var(--sapTextColor);
 						font-weight: 400;
-						font-size: 0.875rem;
+						font-size: var(--sapFontSize);
 						margin: 0 0 1rem 0;
 						line-height: 1.125rem;
 					}

package/src/sap/m/themes/base/DynamicDateRange.less

@@ -30,8 +30,9 @@
 		}
 	}
 
-	.sapUiCal {
+	.sapUiCal:not(.sapUiCalInt) {
 		padding: 0;
+		min-width: auto;
 	}
 
 	.sapUiCalMonthPicker {
@@ -75,4 +76,8 @@
 
 .sapMDDRHiddenInput > .sapMInputBase {
 	display: none;
+}
+
+.sapMDDRPopover .sapMTB-Info-CTX .sapMLabel .sapMLabelTextWrapper {
+	padding-right: 0.125rem;
 }

package/src/sap/m/themes/base/GenericTile.less

@@ -6,7 +6,7 @@
 .sapMGT {
 	display: inline-block;
 	text-decoration: none;
-	border-radius: 0.25rem;
+	border-radius: var(--sapTile_BorderCornerRadius);
 	position: relative;
 	outline: none;
 	box-sizing: border-box;
@@ -470,7 +470,7 @@
 .OneByOne.tileWithAppInfo {
 
 	.sapMGTTInfo {
-		margin-bottom: 0.2rem;
+		margin-bottom: 0.4rem;
 		max-width: 7rem;
 	}
 
@@ -945,7 +945,7 @@
 
 .sapMGTOverlay {
 	background-color: var(--sapTile_Background);
-	border-radius: 0.125rem;
+	border-radius: var(--sapTile_BorderCornerRadius);
 }
 
 .sapMGTOverlayMixin(@offset: 0px, @z-index: 0) {
@@ -971,7 +971,8 @@
 			.sapMGTOverlayMixin();
 			display: block;
 			content: '';
-			background-color: fade(@sapUiTileBackground, 60);
+			background-color: var(--sapTile_Background);
+			opacity: 0.7;
 		}
 	}
 
@@ -1190,7 +1191,8 @@
 			.sapMGTOverlayMixin();
 			display: block;
 			content: '';
-			background-color: fade(@sapUiTileBackground, 60);
+			background-color: var(--sapTile_Background);
+			opacity: 0.7;
 			border-radius: 0.125rem;
 		}
 	}
@@ -1633,7 +1635,8 @@ html[dir=rtl] .sapMGTLineMode {
 /* OVERLAYS AND HELPERS */
 .sapMGTOverlay {
 	.sapMGTOverlayMixin();
-	opacity: 0.8;
+		background-color: var(--sapTile_Background);
+		opacity: 0.7;
 }
 
 .sapMGT .sapMGTFocusDiv {
@@ -1920,11 +1923,11 @@ html[data-sap-ui-browser*='ff'] {
 
 		.sapMText {
 			line-height: 1rem;
-			font-size: 0.875rem;
+			font-size: var(--sapFontSize);
 		}
 
 		.sapMGTSubHdrTxt .sapMText {
-			font-size: 0.875rem;
+			font-size: var(--sapFontSize);
 		}
 
 		.sapMGTHdrIconImage {
@@ -2097,14 +2100,14 @@ html[data-sap-ui-browser*='ff'] {
 					position: initial;
 					margin-right: 0;
 					margin-left: 1rem;
-					font-size: 0.875rem;
+					font-size: var(--sapFontSize);
 					margin-top: 1rem;
 				}
 			}
 
 			.sapMTileCntFtrTxt {
 				margin: 0 1rem 1rem 1rem;
-				font-size: 0.875rem;
+				font-size: var(--sapFontSize);
 				bottom: 0;
 			}
 		}
@@ -2185,7 +2188,7 @@ html[data-sap-ui-browser*='ff'] {
 
 			.sapMText {
 				line-height: 1rem;
-				font-size: 0.875rem;
+				font-size: var(--sapFontSize);
 				font-weight: bold;
 			}
 		}
@@ -2410,7 +2413,7 @@ html[data-sap-ui-browser*='ff'] {
 }
 
 .sapMGTHdrContent.sapMGTOneByOne > .sapMGTHdrTxt > .sapMText {
-	font-size: 0.875rem;
+	font-size: var(--sapFontSize);
 	color: var(--sapContent_ContrastTextColor);
 	text-align: center !important;
 	white-space: initial;
@@ -2580,7 +2583,7 @@ html[data-sap-ui-browser*='ff'] {
 			}
 
 			.sapMGTSystemInfoText {
-				font-size: 0.75rem;
+				font-size: var(--sapFontSmallSize);
 				position: relative;
 				display: inline-block;
 				word-break: break-word;
@@ -2591,7 +2594,7 @@ html[data-sap-ui-browser*='ff'] {
 			}
 
 			.sapMGTSystemInfoText.sapMGTSeperatorPresent {
-				font-size: 0.75rem;
+				font-size: var(--sapFontSmallSize);
 				position: relative;
 				display: inline-block;
 
@@ -2630,7 +2633,7 @@ html[data-sap-ui-browser*='ff'] {
 		line-height: 1rem;
 
 		.sapMText {
-			font-size: 0.875rem;
+			font-size:var(--sapFontSize);
 			color: var(--sapContent_LabelColor);
 		}
 	}
@@ -2677,7 +2680,7 @@ html[data-sap-ui-browser*='ff'] {
 }
 
 .sapMGTTwoByHalf  > .TwoByHalf > .sapMGTHdrTxt > .sapMText {
-	font-size: 0.875rem;
+	font-size: var(--sapFontSize);
 	color: var(--sapTile_TitleTextColor);
 }
 
@@ -2894,7 +2897,6 @@ html[data-sap-ui-browser*='ff'] {
 	border: var(--sapContent_FocusWidth) var(--sapContent_FocusStyle) var(--sapContent_FocusColor);
 }
 
-.sapFGridContainer .sapFGridContainerItemWrapperNoVisualFocus:focus .sapMGTFocusDiv, /* focus inside GridContainer */
 .sapMGT:focus .sapMGTFocusDiv,
 .sapMGT:active .sapMGTFocusDiv,
 .sapMGTLineModePress .sapMGTFocusDiv {