@openui5/sap.m 1.105.0 → 1.106.0

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental

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

@@ -8,16 +8,18 @@ sap.ui.define([
 	"./QuickActionItem",
 	"./QuickAction",
 	"sap/m/ToggleButton",
+	"sap/m/library",
 	"sap/ui/core/library"
 ], function (
 	QuickActionItem,
 	QuickAction,
 	ToggleButton,
-	library
+	library,
+	CoreLibrary
 ) {
 	"use strict";
 
-	var SortOrder = library.SortOrder;
+	var SortOrder = CoreLibrary.SortOrder;
 
 	/**
 	 * Constructor for a new QuickSortItem.
@@ -32,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental
@@ -43,7 +45,7 @@ sap.ui.define([
 		metadata: {
 			library: "sap.m",
 			properties: {
-				sortOrder: { type: "sap.ui.core.SortOrder", defaultValue: library.SortOrder.None }
+				sortOrder: { type: "sap.ui.core.SortOrder", defaultValue: CoreLibrary.SortOrder.None }
 			},
 			aggregations: {
 				quickAction: { type: "sap.m.table.columnmenu.QuickAction", multiple: false, visibility: "hidden" }
@@ -60,7 +62,8 @@ sap.ui.define([
 		} else {
 			oQuickAction = new QuickAction({
 				label: sLabel,
-				content: [this._createContent()]
+				content: [this._createContent()],
+				category: library.table.columnmenu.Category.Sort
 			});
 		}
 

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

@@ -6,10 +6,12 @@
 
 sap.ui.define([
 	"sap/m/table/columnmenu/QuickActionBase",
-	"sap/m/ToggleButton"
+	"sap/m/ToggleButton",
+	"sap/m/library"
 ], function (
 	QuickActionBase,
-	ToggleButton
+	ToggleButton,
+	library
 ) {
 	"use strict";
 
@@ -25,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental
@@ -151,5 +153,9 @@ sap.ui.define([
 		this.getMenu().close();
 	};
 
+	QuickTotal.prototype.getCategory = function() {
+		return library.table.columnmenu.Category.Aggregate;
+	};
+
 	return QuickTotal;
 });

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @experimental

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

@@ -58,7 +58,7 @@
 }
 
 //show the left and right arrows when the carousel is focused
-.sapMCrsl:focus .sapMCrslHud a {
+.sapMCrsl:focus .sapMCrslHud .sapMCrslArrow {
 	opacity: 0.3;
 }
 
@@ -191,7 +191,7 @@ html[data-sap-ui-animation='off'] .sapMCrslInner {
 	width: 100%;
 }
 
-.sapMCrslHud a {
+.sapMCrslHud .sapMCrslArrow {
 	z-index: 2;
 	opacity: 0;
 	display: none;
@@ -241,15 +241,15 @@ html[data-sap-ui-animation='off'] .sapMCrslInner {
 	}
 }
 
-.sapMCrslHudMiddle a {
+.sapMCrslHudMiddle .sapMCrslArrow {
 	top:  calc(~"50% - 1rem");
 }
 
-.sapMCrslHudTop a {
+.sapMCrslHudTop .sapMCrslArrow {
 	top: 50%;
 }
 
-.sapMCrslHudBottom a {
+.sapMCrslHudBottom .sapMCrslArrow {
 	top: calc(~"50% - 2rem");
 }
 
@@ -486,8 +486,8 @@ html[data-sap-ui-animation='off'] {
 	background: @sapUiBaseBG;
 }
 
-.sapMCrsl .sapMCrslHud.sapMCrslLeftmost a.sapMCrslPrev,
-.sapMCrsl .sapMCrslHud.sapMCrslRightmost a.sapMCrslNext {
+.sapMCrsl .sapMCrslHud.sapMCrslLeftmost .sapMCrslArrow.sapMCrslPrev,
+.sapMCrsl .sapMCrslHud.sapMCrslRightmost .sapMCrslArrow.sapMCrslNext {
 	opacity: 0;
 	display: none;
 }
@@ -530,7 +530,7 @@ html[data-sap-ui-animation='off'] {
 	overflow: hidden;
 }
 
-.sapMCrsl:hover .sapMCrslHud a {
+.sapMCrsl:hover .sapMCrslHud .sapMCrslArrow {
 	opacity: 1;
 	display: block;
 }

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

@@ -17,7 +17,7 @@
 	text-overflow: ellipsis;
 	min-width: 3rem;
 	display: block;
-	font-size: 1.125rem;
+	font-size: @sapFontLargeSize;
 	-webkit-box-align: center;
 	align-items: center;
 	color: @sapUiListTextColor;
@@ -34,7 +34,7 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	min-width: 3rem;
-	font-size: 0.875rem;
+	font-size: @sapMFontMediumSize;
 	margin-left: 1rem;
 	text-align: right;
 	color: @sapUiContentLabelColor;
@@ -70,5 +70,5 @@ html[dir=rtl] .sapMDLIValue {
 }
 
 .sapUiSizeCompact .sapMDLILabel {
-	font-size: @sapMFontMediumSize;
+	font-size: @sapFontSize;
 }

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

@@ -876,6 +876,13 @@ html.sap-desktop .sapMGT:focus:not([tabindex]) {
 		}
 	}
 }
+
+.sapMGT.sapMGTIconMode {
+	.sapUiIcon.sapMGTTileIcon {
+		text-shadow: @sapContent_ContrastTextShadow;
+	}
+}
+
 .sapMGT.sapMGTScopeActions.sapMGTIconMode{
 	.sapMBtn.sapMGTMoreIcon{
 		&:before{

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

@@ -29,10 +29,11 @@ sap.ui.define([
 	"sap/m/upload/UploadSetToolbarPlaceholder",
 	"sap/m/IllustratedMessage",
 	"sap/m/IllustratedMessageType",
-	"sap/m/IllustratedMessageSize"
+	"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) {
+			DragDropInfo, DropInfo, Library, UploadSetToolbarPlaceholder, IllustratedMessage,IllustratedMessageType, IllustratedMessageSize, Core) {
 	"use strict";
 
 	/**
@@ -46,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.105.0
+	 * @version 1.106.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -144,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: {
@@ -500,6 +516,7 @@ sap.ui.define([
 				description: this.getNoDataDescription()
 			});
 		this.setAggregation("_illustratedMessage", illustratedMessage);
+		this._cloudFilePickerControl = null;
 	};
 
 	UploadSet.prototype.exit = function () {
@@ -602,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);
@@ -614,6 +631,7 @@ sap.ui.define([
 					// fallback position to add file uploader control if UploadSetToolbarPlaceHolder instance not found
 					this._oToolbar.addContent(this.getDefaultFileUploader());
 				}
+				this._oToolbar.addContent(this._getCloudFilePicker());
 			}
 		}
 
@@ -861,6 +879,14 @@ sap.ui.define([
 		return this._oUploadButton;
 	};
 
+	UploadSet.prototype.setUploadUrl = function (sUploadUrl) {
+		this.setProperty("uploadUrl", sUploadUrl);
+		if (this._oUploader) {
+			this._oUploader.setUploadUrl(sUploadUrl);
+		}
+		return this;
+	};
+
 	/* ============== */
 	/* Public methods */
 	/* ============== */
@@ -1723,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

@@ -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.105.0
+	 * @version 1.106.0
 	 * @constructor
 	 * @public
 	 * @since 1.63

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

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