@openui5/sap.m 1.113.0 → 1.114.0

package/src/sap/m/upload/UploadSet.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * and requests, unified behavior of instant and deferred uploads, as well as improved progress indication.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -88,13 +88,13 @@ sap.ui.define([
 				 */
 				noDataDescription: {type: "string", defaultValue: null},
 				/**
-				 * Defines custom text for the 'No data' text label.
+				 * Defines custom text for the drag and drop text label.
 				 */
-				 dragDropText: {type: "string", defaultValue: null},
-				 /**
-				  * Defines custom text for the 'No data' description label.
-				  */
-				 dragDropDescription: {type: "string", defaultValue: null},
+				dragDropText: {type: "string", defaultValue: null},
+				/**
+				 * Defines custom text for the drag and drop description label.
+				 */
+				dragDropDescription: {type: "string", defaultValue: null},
 				/**
 				 * Defines whether the upload process should be triggered as soon as the file is added.<br>
 				 * If set to <code>false</code>, no upload is triggered when a file is added.
@@ -647,7 +647,7 @@ sap.ui.define([
 				this._handleItemEditCancelation(oEvent, oItem);
 				break;
 			case KeyCodes.DELETE:
-				if (!oItem.$("fileNameEdit").hasClass("sapMInputFocused")) {
+				if (!oItem.$("fileNameEdit").hasClass("sapMInputFocused") && oItem.getEnabledRemove() && oItem.getVisibleRemove()) {
 					this._handleItemDelete(oEvent, oItem);
 				}
 				break;
@@ -868,12 +868,14 @@ sap.ui.define([
 	};
 
 	UploadSet.prototype.setUploadButtonInvisible = function (bUploadButtonInvisible) {
-		if (this.getUploadButtonInvisible() === bUploadButtonInvisible) {
-			return this;
+		if (bUploadButtonInvisible !== this.getUploadButtonInvisible()) {
+			var bVisible = !bUploadButtonInvisible;
+			this.getDefaultFileUploader().setVisible(bVisible);
+			if (this._oUploadButton) {
+				this._oUploadButton.setVisible(bVisible);
+			}
+			this.setProperty("uploadButtonInvisible", bUploadButtonInvisible, true);
 		}
-		this.setProperty("uploadButtonInvisible", bUploadButtonInvisible, true);
-		this.getDefaultFileUploader().setVisible(!bUploadButtonInvisible);
-
 		return this;
 	};
 
@@ -947,7 +949,8 @@ sap.ui.define([
 			this._oUploadButton = new Button({
 				id: this.getId() + "-uploadButton",
 				type: MobileLibrary.ButtonType.Standard,
-				visible: this.getUploadEnabled(),
+				enabled: this.getUploadEnabled(),
+				visible: !this.getUploadButtonInvisible(),
 				text: this._oRb.getText("UPLOADCOLLECTION_UPLOAD"),
 				ariaDescribedBy: this.getAggregation("_illustratedMessage").getId(),
 				press: function () {
@@ -1020,7 +1023,7 @@ sap.ui.define([
 		var oDragSession = oEvent.getParameter("dragSession");
 		var oDraggedControl = oDragSession.getDragControl();
 		this._oDragIndicator = true;
-        this._getIllustratedMessage();
+    this._getIllustratedMessage();
 		if (oDraggedControl) {
 			oEvent.preventDefault();
 		}
@@ -2100,11 +2103,11 @@ sap.ui.define([
 	// Using UploadSet's dragleave abstract method with custom implementation to capture UploadSet dragleave event
 	UploadSet.prototype.ondragleave = function (oEvent) {
 		var oDragSession = oEvent.dragSession;
-		// condition to reset the illustrated message to deafult message from drag & drop message on leaving the drop area.
+		// condition to reset the illustrated message to default message from drag & drop message on leaving the drop area.
 		// getDropControl returns the valid drop target underneath the drop control, if no dropcontrol available UploadSet control to reset the illustrated message
-		if (!oDragSession || !oDragSession.getDropControl()) {
+		if (!oDragSession || !oDragSession.getDropControl() || (oDragSession && !oEvent.relatedTarget)) {
 			this._oDragIndicator = false;
-            this._getIllustratedMessage();
+      this._getIllustratedMessage();
 		}
 	};
 

package/src/sap/m/upload/UploadSetItem.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @class Item that represents one file to be uploaded using the {@link sap.m.upload.UploadSet} control.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -916,19 +916,20 @@ sap.ui.define([
 	};
 
 	UploadSetItem.prototype._renderAttributes = function (oRm) {
-		var iLastAttribure = this.getAttributes().length - 1;
-
-		if (this.getAttributes().length > 0) {
-			oRm.openStart("div").class("sapMUCAttrContainer").openEnd();
-			this.getAttributes().forEach(function (oAttribute, iIndex) {
-				oRm.renderControl(oAttribute.addStyleClass("sapMUCAttr"));
-				if (iIndex < iLastAttribure && oAttribute.getVisible()) {
-					oRm.openStart("div").class("sapMUCSeparator").openEnd();
-					oRm.text("\u00a0\u00B7\u00a0").close("div");
-				}
-			});
-			oRm.close("div");
+		if (this.getAttributes().length === 0) {
+			return;
 		}
+		var bFirstVisible = false;
+		oRm.openStart("div").class("sapMUCAttrContainer").openEnd();
+		this.getAttributes().forEach(function (oAttribute, iIndex) {
+			if (bFirstVisible && oAttribute.getVisible()) {
+				oRm.openStart("div").class("sapMUCSeparator").openEnd();
+				oRm.text("\u00a0\u00B7\u00a0").close("div");
+			}
+			bFirstVisible = bFirstVisible || oAttribute.getVisible();
+			oRm.renderControl(oAttribute.addStyleClass("sapMUCAttr"));
+		});
+		oRm.close("div");
 	};
 
 	UploadSetItem.prototype._renderMarkers = function (oRm) {
@@ -942,19 +943,20 @@ sap.ui.define([
 	};
 
 	UploadSetItem.prototype._renderStatuses = function (oRm) {
-		var iLastStatus = this.getStatuses().length - 1;
-
-		if (this.getStatuses().length > 0) {
-			oRm.openStart("div").class("sapMUCStatusContainer").openEnd();
-			this.getStatuses().forEach(function (oStatus, iIndex) {
-				oRm.renderControl(oStatus);
-				if (iIndex < iLastStatus) {
-					oRm.openStart("div").class("sapMUCSeparator").openEnd();
-					oRm.text("\u00a0\u00B7\u00a0").close("div");
-				}
-			});
-			oRm.close("div");
+		if (this.getStatuses().length === 0) {
+			return;
 		}
+		var bFirstVisible = false;
+		oRm.openStart("div").class("sapMUCStatusContainer").openEnd();
+		this.getStatuses().forEach(function (oStatus, iIndex) {
+			if (bFirstVisible && oStatus.getVisible()) {
+				oRm.openStart("div").class("sapMUCSeparator").openEnd();
+				oRm.text("\u00a0\u00B7\u00a0").close("div");
+			}
+			bFirstVisible = bFirstVisible || oStatus.getVisible();
+			oRm.renderControl(oStatus);
+		});
+		oRm.close("div");
 	};
 
 	UploadSetItem.prototype._renderStateAndProgress = function (oRm) {

package/src/sap/m/upload/UploadSetToolbarPlaceholder.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomDynamicDateOption.js

@@ -1,110 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-
-// Provides control sap.m.CustomDynamicDateOption.
-sap.ui.define(['sap/m/DynamicDateOption'],
-	function(DynamicDateOption) {
-		"use strict";
-
-		/**
-		 * Constructor for a new CustomDynamicDateOption.
-		 *
-		 * @param {string} [sId] id for the new control, generated automatically if no id is given
-		 * @param {object} [mSettings] initial settings for the new control
-		 *
-		 * @class
-		 * A custom option for the DynamicDateRange control.
-		 * @extends sap.m.DynamicDateOption
-		 *
-		 * @author SAP SE
-		 * @version 1.113.0
-		 *
-		 * @public
-		 * @since 1.92
-		 * @alias sap.m.CustomDynamicDateOption
-		 * @experimental Since 1.92. This class is experimental and provides only limited functionality. Also the API might be changed in future.
-		 */
-		var CustomDynamicDateOption = DynamicDateOption.extend("sap.m.CustomDynamicDateOption", /** @lends sap.m.CustomDynamicDateOption.prototype */ {
-			metadata: {
-				library: "sap.m",
-				properties: {
-					/**
-					 * Defines a method that provides the option's label text.
-					 */
-					getText: { type: "function" },
-					/**
-					 * Defines a method that provides the option's value help UI types. Based on the types a functional
-					 * value help dialog will be created. Types are DynamicDateValueHelpUIType instances.
-					 */
-					getValueHelpUITypes: { type: "function" },
-					/**
-					 * Defines a method that can create the option's value help UI. For custom scenarios where
-					 * getValueHelpUITypes is not enough to define the UI.
-					 */
-					createValueHelpUI: { type: "function" },
-					/**
-					 * Defines a method that can validate all controls from the value help UI related to a given option.
-					 */
-					validateValueHelpUI: { type: "function" },
-					/**
-					 * Defines a method that can collect the value from the value help UI.
-					 */
-					getValueHelpOutput: { type: "function" },
-					/**
-					 * Defines a method that provides the order index of the option's group.
-					 * Used for grouping within the options list inside a DynamicDateRange's popup.
-					 */
-					getGroup: { type: "function" },
-					/**
-					 * Defines a method that provides the option's group header text.
-					 */
-					getGroupHeader: { type: "function" },
-					/**
-					 * Defines a method that formats the option's value to a string. See DynamicDateOption.format.
-					 */
-					format: { type: "function" },
-					/**
-					 * Defines a method that parses the option's value from a string. See DynamicDateOption.parse.
-					 */
-					parse: { type: "function" },
-					/**
-					 * Defines a method that calculates an absolute date range from the options relative value. See DynamicDateOption.toDates.
-					 */
-					toDates: { type: "function" },
-					/**
-					 * Defines a method that controls whether the formatted date range should be concatenated to the
-					 * formatted value when displayed.
-					 */
-					enhanceFormattedValue: { type: "function" }
-				}
-			}
-		});
-
-		function capitalize(sString) {
-			return sString.charAt(0).toUpperCase() + sString.slice(1);
-		}
-
-		["getText", "getValueHelpUITypes", "createValueHelpUI", "getValueHelpOutput", "validateValueHelpUI",
-			"getGroup", "getGroupHeader", "format", "parse", "toDates", "enhanceFormattedValue"]
-			.forEach(function(sFnName) {
-				CustomDynamicDateOption.prototype[sFnName] = function() {
-					var sGetterName = "get" + capitalize(sFnName);
-					var fnCustomFn = this[sGetterName]();
-					return fnCustomFn ? fnCustomFn.apply(this, arguments)
-						: DynamicDateOption.prototype[sFnName].apply(this, arguments);
-				};
-			});
-
-		CustomDynamicDateOption.prototype.getGroupHeader = function() {
-			if ((this.getGroup() < 7 && this.getGroup() > -1) || !this.getGetGroupHeader()) {
-				return DynamicDateOption.prototype.getGroupHeader.apply(this, arguments);
-			} else {
-				return this.getGetGroupHeader().apply(this, arguments);
-			}
-		};
-
-		return CustomDynamicDateOption;
-	});