@openui5/sap.m 1.103.1 → 1.106.0

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

@@ -6,7 +6,6 @@
 
 sap.ui.define([
 	"sap/ui/core/Control",
-	"sap/ui/core/Icon",
 	"sap/ui/events/KeyCodes",
 	"sap/base/Log",
 	"sap/base/util/deepEqual",
@@ -27,9 +26,14 @@ sap.ui.define([
 	"sap/ui/core/dnd/DragDropInfo",
 	"sap/ui/core/dnd/DropInfo",
 	"sap/m/library",
-	"sap/m/upload/UploadSetToolbarPlaceholder"
-], function (Control, Icon, KeyCodes, Log, deepEqual, MobileLibrary, Button, Dialog, List, MessageBox, OverflowToolbar,
-			 StandardListItem, Text, ToolbarSpacer, FileUploader, UploadSetItem, Uploader, Renderer, UploaderHttpRequestMethod, DragDropInfo, DropInfo, Library, UploadSetToolbarPlaceholder) {
+	"sap/m/upload/UploadSetToolbarPlaceholder",
+	"sap/m/IllustratedMessage",
+	"sap/m/IllustratedMessageType",
+	"sap/m/IllustratedMessageSize",
+	"sap/ui/core/Core"
+], function (Control, KeyCodes, Log, deepEqual, MobileLibrary, Button, Dialog, List, MessageBox, OverflowToolbar,
+			 StandardListItem, Text, ToolbarSpacer, FileUploader, UploadSetItem, Uploader, Renderer, UploaderHttpRequestMethod,
+			DragDropInfo, DropInfo, Library, UploadSetToolbarPlaceholder, IllustratedMessage,IllustratedMessageType, IllustratedMessageSize, Core) {
 	"use strict";
 
 	/**
@@ -43,7 +47,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.103.1
+	 * @version 1.106.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -83,6 +87,14 @@ sap.ui.define([
 				 * Defines custom text for the 'No data' description label.
 				 */
 				noDataDescription: {type: "string", defaultValue: null},
+				/**
+				 * Defines custom text for the 'No data' text label.
+				 */
+				 dragDropText: {type: "string", defaultValue: null},
+				 /**
+				  * Defines custom text for the 'No data' 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.
@@ -133,7 +145,22 @@ sap.ui.define([
 				 * In addition, if instant upload is set to false the mode sap.m.ListMode.MultiSelect is not supported and will be automatically set to sap.m.ListMode.None.
 				 * @since 1.100.0
 				 */
-				mode: {type: "sap.m.ListMode", group: "Behavior", defaultValue: Library.ListMode.MultiSelect}
+				mode: {type: "sap.m.ListMode", group: "Behavior", defaultValue: Library.ListMode.MultiSelect},
+				/**
+				  * Enables CloudFile picker feature to upload files from cloud.
+				  * @experimental Since 1.106.
+				  */
+				 cloudFilePickerEnabled: {type: "boolean", group: "Behavior", defaultValue: false},
+				/**
+				  * Url of the FileShare OData V4 service supplied for CloudFile picker control.
+				  * @experimental Since 1.106.
+				  */
+				 cloudFilePickerServiceUrl: {type: "sap.ui.core.URI", group: "Data", defaultValue: ""},
+				/**
+				  * The text of the CloudFile picker button. The default text is "Upload from cloud" (translated to the respective language).
+				  * @experimental Since 1.106.
+				  */
+				 cloudFilePickerButtonText: {type: 'string', defaultValue: ""}
 				},
 			defaultAggregation: "items",
 			aggregations: {
@@ -156,7 +183,12 @@ sap.ui.define([
 				/**
 				 * Defines the uploader to be used. If not specified, the default implementation is used.
 				 */
-				uploader: {type: "sap.m.upload.Uploader", multiple: false}
+				uploader: {type: "sap.m.upload.Uploader", multiple: false},
+				/**
+			 	 * An illustrated message is displayed when no data is loaded or provided
+				 * @private
+				 */
+				 _illustratedMessage: { type: "sap.m.IllustratedMessage", multiple: false, visibility: "hidden" }
 			},
 			events: {
 				/**
@@ -462,14 +494,12 @@ sap.ui.define([
 		this._oRb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 		this._oList = null;
-		this._oNoDataIcon = new Icon(this.getId() + "-no-data-icon", {
-			src: "sap-icon://document",
-			size: "6rem",
-			noTabStop: true
-		});
 		this._oEditedItem = null;
 		this._oItemToBeDeleted = null;
 		this._mListItemIdToItemMap = {};
+		this._oUploadButton = null;
+		this._oDragIndicator = false;
+		this._bAttachEventListener = false;
 
 		// Drag&drop
 		this._$Body = null;
@@ -479,11 +509,17 @@ sap.ui.define([
 		this._aGroupHeadersAdded = [];
 		this._iFileUploaderPH = null;
 		this._oItemToUpdate = null;
+		var illustratedMessage = new IllustratedMessage({
+				illustrationType: IllustratedMessageType.NoData,
+				illustrationSize: IllustratedMessageSize.Auto,
+				title: this.getNoDataText(),
+				description: this.getNoDataDescription()
+			});
+		this.setAggregation("_illustratedMessage", illustratedMessage);
+		this._cloudFilePickerControl = null;
 	};
 
 	UploadSet.prototype.exit = function () {
-		this._oNoDataIcon.destroy();
-		this._oNoDataIcon = null;
 		if (this._oList) {
 			this._oList.destroy();
 			this._oList = null;
@@ -522,6 +558,12 @@ sap.ui.define([
 				});
 				oInput.trigger("focus");
 			}
+			if (this._oEditedItem && this._oEditedItem.getEditState()) {
+				var oMarkerContainer = this._oEditedItem.getListItem().getDomRef().querySelector(".sapMUSObjectMarkerContainer");
+				if (oMarkerContainer) {
+					oMarkerContainer.setAttribute("style", "display: none");
+				}
+			}
 		}
 	};
 
@@ -577,7 +619,7 @@ sap.ui.define([
 			this._oToolbar = this.getAggregation("toolbar");
 			if (!this._oToolbar) {
 				this._oToolbar = new OverflowToolbar(this.getId() + "-toolbar", {
-					content: [this._oNumberOfAttachmentsTitle, new ToolbarSpacer(), this.getDefaultFileUploader()]
+					content: [this._oNumberOfAttachmentsTitle, new ToolbarSpacer(), this.getDefaultFileUploader(), this._getCloudFilePicker()]
 				});
 				this._iFileUploaderPH = 2;
 				this.addDependent(this._oToolbar);
@@ -586,8 +628,10 @@ sap.ui.define([
 				if (this._oToolbar && this._iFileUploaderPH > -1) {
 					this._setFileUploaderInToolbar(this.getDefaultFileUploader());
 				} else if (this._oToolbar) {
-					this._oToolbar.insertContent(this.getDefaultFileUploader());
+					// fallback position to add file uploader control if UploadSetToolbarPlaceHolder instance not found
+					this._oToolbar.addContent(this.getDefaultFileUploader());
 				}
+				this._oToolbar.addContent(this._getCloudFilePicker());
 			}
 		}
 
@@ -606,6 +650,18 @@ sap.ui.define([
 		return sNoDataDescription;
 	};
 
+	UploadSet.prototype.getDragDropText = function () {
+		var sDragDropText = this.getProperty("dragDropText");
+		sDragDropText = sDragDropText || this._oRb.getText("IllustratedMessage_TITLE_UploadCollection");
+		return sDragDropText;
+	};
+
+	UploadSet.prototype.getDragDropDescription = function () {
+		var sDragDropDescription = this.getProperty("dragDropDescription");
+		sDragDropDescription = sDragDropDescription || this._oRb.getText("IllustratedMessage_DESCRIPTION_UploadCollection");
+		return sDragDropDescription;
+	};
+
 	UploadSet.prototype.setToolbar = function (oToolbar) {
 		this.setAggregation("toolbar", oToolbar);
 		this.getToolbar();
@@ -787,6 +843,50 @@ sap.ui.define([
 		return this;
 	};
 
+	UploadSet.prototype._getIllustratedMessage = function () {
+		var oAggregation = this.getAggregation("_illustratedMessage");
+		if (oAggregation) {
+			if (this._getDragIndicator()) {
+				oAggregation.setIllustrationType(IllustratedMessageType.UploadCollection);
+				oAggregation.setTitle(this.getDragDropText());
+				oAggregation.setDescription(this.getDragDropDescription());
+				oAggregation.removeAllAdditionalContent();
+			} else {
+				oAggregation.setIllustrationType(IllustratedMessageType.NoData);
+				oAggregation.setTitle(this.getNoDataText());
+				oAggregation.setDescription(this.getNoDataDescription());
+				oAggregation.addAdditionalContent(this.getUploadButtonForIllustratedMessage());
+			}
+		}
+		return oAggregation;
+	};
+
+	UploadSet.prototype.getUploadButtonForIllustratedMessage = function () {
+		if (!this._oUploadButton) {
+			this._oUploadButton = new Button({
+				id: this.getId() + "-uploadButton",
+				type: MobileLibrary.ButtonType.Standard,
+				visible: this.getUploadEnabled(),
+				text: this._oRb.getText("UPLOADCOLLECTION_UPLOAD"),
+				ariaDescribedBy: this.getAggregation("_illustratedMessage").getId(),
+				press: function () {
+					var FileUploader = this.getDefaultFileUploader();
+					FileUploader.$().find("input[type=file]").trigger("click");
+				}.bind(this)
+			});
+		}
+
+		return this._oUploadButton;
+	};
+
+	UploadSet.prototype.setUploadUrl = function (sUploadUrl) {
+		this.setProperty("uploadUrl", sUploadUrl);
+		if (this._oUploader) {
+			this._oUploader.setUploadUrl(sUploadUrl);
+		}
+		return this;
+	};
+
 	/* ============== */
 	/* Public methods */
 	/* ============== */
@@ -837,6 +937,15 @@ sap.ui.define([
 	UploadSet.prototype._onDragEnterFile = function (oEvent) {
 		var oDragSession = oEvent.getParameter("dragSession");
 		var oDraggedControl = oDragSession.getDragControl();
+		if (!this._bAttachEventListener) {
+            window.addEventListener("focus", function() {
+                this._oDragIndicator = false;
+                this._getIllustratedMessage();
+            }.bind(this), true);
+            this._bAttachEventListener = true;
+        }
+		this._oDragIndicator = true;
+        this._getIllustratedMessage();
 		if (oDraggedControl) {
 			oEvent.preventDefault();
 		}
@@ -844,6 +953,8 @@ sap.ui.define([
 
 	UploadSet.prototype._onDropFile = function (oEvent) {
 		var oFiles;
+		this._oDragIndicator = false;
+		this._getIllustratedMessage();
 		oEvent.preventDefault();
 		if (this.getUploadEnabled()) {
 			oFiles = oEvent.getParameter("browserEvent").dataTransfer.files;
@@ -858,6 +969,10 @@ sap.ui.define([
 		}
 	};
 
+	UploadSet.prototype._getDragIndicator = function () {
+		return this._oDragIndicator;
+	};
+
 	/**
 	 * Starts uploading all files that comply with the restrictions defined in the <code>fileTypes</code>,
 	 * <code>maxFileNameLength</code>, <code>maxFileSize</code>, and <code>mediaTypes</code> properties.
@@ -1009,7 +1124,7 @@ sap.ui.define([
 
 	/**
 	 * Opens the FileUploader dialog. When an UploadSetItem is provided, this method can be used to update a file with a new version.
-	 * @param {sap.m.UploadSetItem} item The UploadSetItem to update with a new version. This parameter is mandatory.
+	 * @param {sap.m.upload.UploadSetItem} item The UploadSetItem to update with a new version. This parameter is mandatory.
 	 * @returns {this} this to allow method chaining
 	 * @since 1.103.0
 	 * @public
@@ -1153,7 +1268,7 @@ sap.ui.define([
 	 * Removes the error state from the list item. Used when the name of the file has been corrected.
 	 * @private
 	 * @param {object} oContext The UploadSet instance on which an attempt was made to save a new name of an existing List item.
-	 * @param {sap.m.UploadSetItem} oItem The List item on which the event was triggered.
+	 * @param {sap.m.upload.UploadSetItem} oItem The List item on which the event was triggered.
 	 */
 	UploadSet.prototype._removeErrorStateFromItem = function(oContext, oItem) {
 		oItem.errorState = null;
@@ -1518,7 +1633,7 @@ sap.ui.define([
 	/**
 	 * Returns UploadSetItem based on the items aggregation
 	 * @param {string} uploadSetItemId used for finding the UploadSetItem
-	 * @returns {sap.m.UploadSetItem} The matching UploadSetItem
+	 * @returns {sap.m.upload.UploadSetItem} The matching UploadSetItem
 	 * @private
 	 */
 	 UploadSet.prototype._getUploadSetItemById = function(uploadSetItemId) {
@@ -1534,7 +1649,7 @@ sap.ui.define([
 	/**
 	 * Returns an array of UploadSet items based on the items aggregation
 	 * @param {sap.m.ListItemBase[]} listItems The list items used for finding the UploadSetItems
-	 * @returns {sap.m.UploadSetItem[]} The matching UploadSetItems
+	 * @returns {sap.m.upload.UploadSetItem[]} The matching UploadSetItems
 	 * @private
 	 */
 	 UploadSet.prototype._getUploadSetItemsByListItems = function(listItems) {
@@ -1569,7 +1684,7 @@ sap.ui.define([
 
 	/**
 	 * Map group for item.
-	 * @param {sap.m.UploadSetItem} item The UploadSetItem to map group
+	 * @param {sap.m.upload.UploadSetItem} item The UploadSetItem to map group
 	 * @private
 	 */
 	 UploadSet.prototype._mapGroupForItem = function(item) {
@@ -1598,7 +1713,7 @@ sap.ui.define([
 
 	/**
 	 * Fills list with uploadSet items.
-	 * @param {sap.m.UploadSetItem[]} aItems The UploadSetItems the internal list is to be filled with
+	 * @param {sap.m.upload.UploadSetItem[]} aItems The UploadSetItems the internal list is to be filled with
 	 * @private
 	 */
 	UploadSet.prototype._fillListWithUploadSetItems = function (aItems){
@@ -1634,5 +1749,167 @@ sap.ui.define([
 		this._oToolbar.getContent()[this._iFileUploaderPH].setVisible(false);
 		this._oToolbar.insertContent(fileUploader, this._iFileUploaderPH);
 	};
+
+	/**
+	 * Returns CloudFile picker button
+	 * @return {sap.m.Button} CloudPicker button
+	 * @private
+	 */
+	 UploadSet.prototype._getCloudFilePicker = function() {
+		if (this.getCloudFilePickerEnabled()) {
+			return new Button({
+				text:  this.getCloudFilePickerButtonText() ? this.getCloudFilePickerButtonText() :  this._oRb.getText("UPLOAD_SET_DEFAULT_CFP_BUTTON_TEXT"),
+				press: [this._invokeCloudFilePicker, this]
+			});
+		}
+		return null;
+	};
+
+	/**
+	 * Creates and invokes CloudFilePicker control instance
+	 * @private
+	 * @returns {Object} cloudFile picker instance
+	 */
+	 UploadSet.prototype._invokeCloudFilePicker = function() {
+		 var oCloudFilePickerInstance = null;
+		 if (this._cloudFilePickerControl) {
+			oCloudFilePickerInstance = this._getCloudFilePickerInstance();
+			oCloudFilePickerInstance.open();
+		 } else {
+			 // Dynamically load and cache CloudFilePicker control for first time
+			 this._loadCloudFilePickerDependency()
+			 .then(function(cloudFilePicker){
+				this._cloudFilePickerControl = cloudFilePicker;
+				oCloudFilePickerInstance = this._getCloudFilePickerInstance();
+				oCloudFilePickerInstance.open();
+			 }.bind(this))
+			 .catch(function(error) {
+				 Log.error(error);
+			 });
+		 }
+		return oCloudFilePickerInstance;
+	};
+
+	/**
+	 * Event handler for CloudFile picker selector
+	 * @param {Object} oEvent CloudFile picker file selection DOM change event
+	 * @private
+	 */
+	UploadSet.prototype._onCloudPickerFileChange = function(oEvent) {
+
+		var mParameters = oEvent.getParameters();
+		var aFiles = [];
+		if (mParameters && mParameters.selectedFiles) {
+			mParameters.selectedFiles.forEach(function (file) {
+				aFiles.push(this._createFileFromCloudPickerFile(file));
+			}.bind(this));
+		}
+
+		// invoking this method to handle file uploads
+		this._processNewCloudPickerFileObjects(aFiles);
+	};
+
+	/**
+	 * Creates file object that is to be uploaded from the CloudFilePicker file object
+	 * @param {sap.suite.ui.commons.CloudFileInfo} oCloudFile CloudFilepicker file object
+	 * @returns {Object} file metadata with file object and fileshare properties
+	 * @private
+	 */
+	UploadSet.prototype._createFileFromCloudPickerFile = function(oCloudFile) {
+		var parts = [new Blob([])];
+		var oFileMetaData = {
+			type: oCloudFile.getFileShareItemContentType(),
+			size: oCloudFile.getFileShareItemContentSize(),
+			webkitRelativePath: '',
+			name: oCloudFile.getFileShareItemName()
+		};
+		var oFile = new File(parts, oCloudFile.getFileShareItemName(), oFileMetaData);
+		return {
+			file: oFile,
+			fileShareProperties: oCloudFile.mProperties
+		};
+	};
+
+	/**
+	 * Maps the UploadSetItem with fileShare properties from the CloudFilePicker
+	 * @param {sap.m.UploadSetItem} oItem UploadSetItem to be mapped
+	 * @param {Object} oFileShareItem fileshare properties used for mapping
+	 * @private
+	 */
+	UploadSet.prototype._mapFileShareItemToUploadSetItem = function(oItem, oFileShareItem) {
+		oItem.setFileName(oFileShareItem.fileShareItemName);
+		oItem.setUrl(oFileShareItem.fileShareItemContentLink);
+	};
+
+	/**
+	 * Processing and uploading of file objects selected from the CloudFilePicker
+	 * @param {Array} oFiles File metadata list containing file to be uploaded and fileshare properties used for mapping
+	 * @private
+	 */
+	UploadSet.prototype._processNewCloudPickerFileObjects = function (oFiles) {
+		var	oItem;
+
+		oFiles.forEach(function (oFileMetaData) {
+			var oFile = oFileMetaData.file,
+			oFileShareProperties = oFileMetaData.fileShareProperties;
+			oItem = new UploadSetItem({
+				uploadState: UploadState.Ready
+			});
+			if (oFileShareProperties && oFileShareProperties !== null) {
+				// invoked and each selected file to map the fileshare properties to uploadsetItem to be uploaded
+				this._mapFileShareItemToUploadSetItem(oItem, oFileShareProperties);
+			}
+			oItem._setFileObject(oFile);
+			oItem.setFileName(oFile.name);//For handling curly braces in file name we have to use setter.Otherwise it will be treated as binding.
+
+			if (!this.fireBeforeItemAdded({item: oItem})) {
+				return;
+			}
+			this.insertIncompleteItem(oItem);
+			this.fireAfterItemAdded({item: oItem});
+
+			if (this.getInstantUpload()) {
+				this._uploadItemIfGoodToGo(oItem);
+			}
+		}.bind(this));
+	};
+
+	/**
+	 * Dynamically require CloudFilePicker Control
+	 * @returns {Promise} Promise that resolves on sucessful load of CloudFilePicker control
+	 * @private
+	 */
+	UploadSet.prototype._loadCloudFilePickerDependency = function() {
+		return new Promise(function (resolve, reject) {
+			Core.loadLibrary("sap.suite.ui.commons", { async: true })
+				.then(function() {
+					sap.ui.require(["sap/suite/ui/commons/CloudFilePicker"], function(cloudFilePicker) {
+						resolve(cloudFilePicker);
+					}, function (error) {
+						reject(error);
+					});
+				})
+				.catch(function () {
+					reject("CloudFilePicker Control not available.");
+				});
+		});
+	};
+
+	/**
+	 * Creates CloudFilePicker Instance
+	 * @returns {sap.suite.ui.commons.CloudFilePicker} CloudFilePicker instance
+	 * @private
+	 */
+	UploadSet.prototype._getCloudFilePickerInstance = function() {
+		return new this._cloudFilePickerControl({
+			serviceUrl: this.getCloudFilePickerServiceUrl(),
+			confirmButtonText: this._oRb.getText("SELECT_PICKER_TITLE_TEXT"),
+			title: this._oRb.getText("SELECT_PICKER_TITLE_TEXT"),
+			fileNameMandatory: true,
+			enableDuplicateCheck:this.getSameFilenameAllowed(),
+			select: this._onCloudPickerFileChange.bind(this)
+		});
+	};
+
 	return UploadSet;
-});
+});

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

@@ -11,9 +11,7 @@ sap.ui.define([
 	"sap/ui/core/Icon",
 	"sap/ui/core/IconPool",
 	"sap/ui/core/HTML",
-	"sap/ui/core/util/File",
 	"sap/m/library",
-	"sap/m/BusyIndicator",
 	"sap/m/Button",
 	"sap/m/CustomListItem",
 	"sap/m/Image",
@@ -23,8 +21,8 @@ sap.ui.define([
 	"sap/m/ProgressIndicator",
 	"sap/m/VBox",
 	"sap/m/HBox"
-], function (Log, CoreLibrary, Element, Icon, IconPool, HTML, FileUtil,
-			 MobileLibrary, BusyIndicator, Button, CustomListItem, Image, Input, Label, Link, ProgressIndicator, VBox,
+], function (Log, CoreLibrary, Element, Icon, IconPool, HTML,
+			 MobileLibrary, Button, CustomListItem, Image, Input, Label, Link, ProgressIndicator, VBox,
 			 HBox) {
 	"use strict";
 
@@ -36,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.103.1
+	 * @version 1.106.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -452,7 +450,7 @@ sap.ui.define([
 	 * Validates if the item is restricted, which means that it is restricted for the file type, media type, maximum file name length and maximum file size limit.
 	 *
 	 * @public
-         * @since 1.98
+	 * @since 1.98
 	 * @returns {boolean} <code>true</code> if item is restricted, <code>false</code> otherwise.
 	 *
 	 */
@@ -460,6 +458,18 @@ sap.ui.define([
 		return this._isRestricted();
 	};
 
+	/**
+	 * Returns edit state of the item.
+	 *
+	 * @public
+	 * @since 1.104.0
+	 * @returns {boolean} edit state of uploadSetItem
+	 *
+	 */
+	UploadSetItem.prototype.getEditState = function () {
+		return this._bInEditMode;
+	};
+
 	/* ============== */
 	/* Event handlers */
 	/* ============== */
@@ -483,6 +493,7 @@ sap.ui.define([
 				]
 			});
 			this._oListItem.addStyleClass("sapMUCItem");
+			this._oListItem.setTooltip(this.getTooltip_Text());
 		}
 
 		return this._oListItem;
@@ -699,7 +710,7 @@ sap.ui.define([
 	 * Retrieves the sap.m.ListItem from the internal sap.m.List based on the ID
 	 * @param {string} listItemId The item ID used for finding the UploadSetItem
 	 * @param {sap.m.ListItemBase[]} listItems The array of list items to search in
-	 * @returns {sap.m.UploadSetItem|null} The matching UploadSetItem or null if none is found
+	 * @returns {sap.m.upload.UploadSetItem|null} The matching UploadSetItem or null if none is found
 	 * @private
 	 */
 	UploadSetItem._findById = function(listItemId, listItems) {

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

@@ -54,29 +54,21 @@ sap.ui.define([
 
 	UploadSetRenderer.renderNoData = function(oRm, oControl) {
 		var oUploadSet = oControl.getParent();
+		oUploadSet.fnOriginalRenderDummyArea = oUploadSet.getList().getRenderer().renderDummyArea;
+		oUploadSet.getList().getRenderer().renderDummyArea = oUploadSet.getRenderer().renderDummyArea;
 		oRm.openStart("li", oUploadSet.getList().getId("nodata"));
 		oRm.attr("tabindex", 0);
 		oRm.class("sapMLIB").class("sapMUCNoDataPage");
 		ListItemBaseRenderer.addFocusableClasses.call(ListItemBaseRenderer, oRm);
 		oRm.openEnd();
-
-		oRm.renderControl(oUploadSet._oNoDataIcon);
-
-		oRm.openStart("div", oUploadSet.getId() + "-no-data-text");
-		oRm.class("sapMUCNoDataText");
-		oRm.openEnd();
-		oRm.text(oUploadSet.getNoDataText());
-		oRm.close("div");
-
-		if (oUploadSet.getUploadEnabled()) {
-			oRm.openStart("div" , oUploadSet.getId() + "-no-data-description");
-			oRm.class("sapMUCNoDataDescription");
-			oRm.openEnd();
-			oRm.text(oUploadSet.getNoDataDescription());
-			oRm.close("div");
-		}
+		oRm.renderControl(oUploadSet._getIllustratedMessage());
 		oRm.close("li");
 	};
 
+	UploadSetRenderer.renderDummyArea = function(oRm, oControl, sAreaId, iTabIndex) {
+		var oUploadSet = oControl.getParent();
+		oUploadSet.getList().getRenderer().renderDummyArea = oUploadSet.fnOriginalRenderDummyArea;
+	};
+
 	return UploadSetRenderer;
 });

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

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

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

@@ -10,10 +10,9 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/util/File",
 	"sap/ui/Device",
-	"sap/ui/core/Item",
 	"sap/m/upload/UploadSetItem",
 	"sap/m/upload/UploaderHttpRequestMethod"
-], function (Log, MobileLibrary, Element, FileUtil, Device, HeaderField, UploadSetItem, UploaderHttpRequestMethod) {
+], function (Log, MobileLibrary, Element, FileUtil, Device, UploadSetItem, UploaderHttpRequestMethod) {
 	"use strict";
 
 	/**