@openui5/sap.f 1.120.11 → 1.120.13

package/src/sap/f/semantic/CloseAction.js

@@ -18,7 +18,7 @@ sap.ui.define(['./SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/CopyAction.js

@@ -18,7 +18,7 @@ sap.ui.define(['./SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/DeleteAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/DiscussInJamAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/EditAction.js

@@ -18,7 +18,7 @@ sap.ui.define(['./SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/ExitFullScreenAction.js

@@ -18,7 +18,7 @@ sap.ui.define(['./SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/FavoriteAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['./SemanticToggleButton'], function(SemanticToggleButton) {
 	* @extends sap.f.semantic.SemanticToggleButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/FlagAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['./SemanticToggleButton'], function(SemanticToggleButton) {
 	* @extends sap.f.semantic.SemanticToggleButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/FooterMainAction.js

@@ -19,7 +19,7 @@ sap.ui.define(["./MainAction"], function(MainAction) {
 	* @extends sap.f.semantic.MainAction
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/FullScreenAction.js

@@ -18,7 +18,7 @@ sap.ui.define(['./SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/MainAction.js

@@ -18,7 +18,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/MessagesIndicator.js

@@ -19,7 +19,7 @@ sap.ui.define(['./SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/NegativeAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/PositiveAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/PrintAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/SemanticButton.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	* @abstract
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/SemanticConfiguration.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	* @class
 	* Defines the visual properties and placement for each supported semantic type.
 	*
-	* @version 1.120.11
+	* @version 1.120.13
 	* @private
 	* @since 1.46.0
 	* @alias sap.f.semantic.SemanticConfiguration

package/src/sap/f/semantic/SemanticControl.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	* @abstract
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/SemanticPage.js

@@ -99,7 +99,7 @@ sap.ui.define([
 	* @extends sap.ui.core.Control
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/SemanticToggleButton.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	* @abstract
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/SendEmailAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/SendMessageAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/ShareInJamAction.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/f/semantic/SemanticButton'], function(SemanticButton) {
 	* @extends sap.f.semantic.SemanticButton
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/semantic/TitleMainAction.js

@@ -19,7 +19,7 @@ sap.ui.define(["./MainAction"], function(MainAction) {
 	* @extends sap.f.semantic.MainAction
 	*
 	* @author SAP SE
-	* @version 1.120.11
+	* @version 1.120.13
 	*
 	* @constructor
 	* @public

package/src/sap/f/shellBar/AdditionalContentSupport.js

@@ -22,7 +22,7 @@ sap.ui.define([
 
 		/**
 		 * @author SAP SE
-		 * @version 1.120.11
+		 * @version 1.120.13
 		 *
 		 * @private
 		 * @since 1.64

package/src/sap/f/shellBar/CoPilot.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.11
+	 * @version 1.120.13
 	 *
 	 * @constructor
 	 * @private

package/src/sap/f/shellBar/ControlSpacer.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Control', 'sap/f/shellBar/ControlSpacerRenderer'],
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.11
+	 * @version 1.120.13
 	 *
 	 * @constructor
 	 * @private

package/src/sap/f/shellBar/Factory.js

@@ -12,7 +12,6 @@ sap.ui.define([
 	"sap/m/ToolbarSpacer",
 	"sap/m/OverflowToolbarLayoutData",
 	"sap/m/FlexItemData",
-	"./CoPilot",
 	"./Accessibility",
 	"sap/m/library",
 	"sap/ui/core/library",
@@ -26,7 +25,6 @@ sap.ui.define([
 	ToolbarSpacer,
 	OverflowToolbarLayoutData,
 	FlexItemData,
-	CoPilot,
 	Accessibility,
 	library,
 	coreLibrary,
@@ -165,12 +163,20 @@ sap.ui.define([
 
 	Factory.prototype.getCopilot = function () {
 		if (!this._oControls.oCopilot) {
-			this._oControls.oCopilot = new CoPilot({
+			this._oControls.oCopilot = new OverflowToolbarButton({
 				tooltip: this._oAcc.getEntityTooltip("COPILOT"),
-				press: function () {
-					this._oContext.fireEvent("copilotPressed", {image: this._oControls.oCopilot});
+				text: this._oAcc.getEntityTooltip("COPILOT"),
+				icon: "sap-icon://da",
+				type: ButtonType.Transparent,
+				press: function (oEvent) {
+					var oSource = oEvent.getSource();
+					oSource.getIcon() === "sap-icon://da" ? oSource.setIcon("sap-icon://da-2") : oSource.setIcon("sap-icon://da");
+					this._oContext.fireEvent("copilotPressed", {image: null, button: this._oControls.oCopilot});
 				}.bind(this)
-			});
+			})
+			.setLayoutData(new OverflowToolbarLayoutData({
+				priority: OverflowToolbarPriority.Low
+			}));
 		}
 		return this._oControls.oCopilot;
 	};
@@ -178,7 +184,7 @@ sap.ui.define([
 	Factory.prototype.getSearch = function () {
 		if (!this._oControls.oSearch) {
 			this._oControls.oSearch = new OverflowToolbarButton({
-				text: "Search",
+				text: this._oAcc.getEntityTooltip("SEARCH"),
 				icon: "sap-icon://search",
 				type: ButtonType.Transparent,
 				tooltip: this._oAcc.getEntityTooltip("SEARCH"),
@@ -234,7 +240,7 @@ sap.ui.define([
 		if (!this._oControls.oNotifications) {
 			this._oControls.oNotifications = new OverflowToolbarButton({
 				ariaHasPopup: Accessibility.AriaHasPopup.NOTIFICATIONS,
-				text: "Notifications",
+				text: oAcc.getEntityTooltip("NOTIFICATIONS"),
 				icon: "sap-icon://bell",
 				type: ButtonType.Transparent,
 				tooltip: oAcc.getEntityTooltip("NOTIFICATIONS"),

package/src/sap/f/shellBar/ResponsiveHandler.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 */
 	ResponsiveHandler.prototype.onAfterRendering = function () {
 
-		var bPhoneRange = Device.media.getCurrentRange("StdExt", this._oControl.$().outerWidth(true)).name === "Phone";
+		var bPhoneRange = Device.media.getCurrentRange(this._oControl._sRangeSet, this._oControl.$().outerWidth(true)).name === "Phone";
 		this._oButton = this._oControl._oMegaMenu && this._oControl._oMegaMenu.getAggregation("_button");
 		this._oDomRef = this._oControl.getDomRef(); // Cache DOM Reference
 		this.bIsMegaMenuConfigured = this._oControl._oTitleControl &&
@@ -103,14 +103,19 @@ sap.ui.define([
 
 		var $Control = this._oControl.$(),
 			iWidth = $Control.outerWidth(),
-			oCurrentRange = Device.media.getCurrentRange("StdExt", iWidth),
+			oCurrentRange = Device.media.getCurrentRange(this._oControl._sRangeSet, iWidth),
 			bPhoneRange;
 
-		this.sCurrentRange = oCurrentRange.name;
+		if (this.sCurrentRange !== oCurrentRange.name) {
+			this._oControl._bOTBUpdateNeeded = true;
+			this.sCurrentRange = oCurrentRange.name;
+			this._oControl._oManagedSearch && this._oControl._oManagedSearch._setMedia(this.sCurrentRange);
+		}
 		// Adapt control padding's outside the managed area
 		if (oCurrentRange) {
 			bPhoneRange = this.sCurrentRange === "Phone";
 
+			$Control.toggleClass("sapFShellBarSizeExtraLargeDesktop", this.sCurrentRange === "ExtraLargeDesktop");
 			$Control.toggleClass("sapFShellBarSizeLargeDesktop", this.sCurrentRange === "LargeDesktop");
 			$Control.toggleClass("sapFShellBarSizeDesktop", this.sCurrentRange === "Desktop");
 			$Control.toggleClass("sapFShellBarSizeTablet", this.sCurrentRange === "Tablet");
@@ -120,12 +125,24 @@ sap.ui.define([
 		/**
 		 * Resize adaptation for the Search Bar UX requirements
 		 */
-		if (this._oControl._oManagedSearch && this._oControl._oManagedSearch.getIsOpen()) {
-			setTimeout(this._adaptSearch.bind(this), 100);
-		} else {
+		if (this._oControl._oManagedSearch && !this._oControl._oManagedSearch.getIsOpen()) {
 			this._oControl._bSearchPlaceHolder = false;
 		}
 
+		if (this.sCurrentRange === "ExtraLargeDesktop") {
+			this._oControl._oManagedSearch && this._oControl._oManagedSearch.setIsOpen(true);
+			setTimeout(this._adaptSearch.bind(this), 100);
+		}
+		if (this.sCurrentRange !== "ExtraLargeDesktop" && this._oControl._oManagedSearch && this._oControl._oManagedSearch.getIsOpen()) {
+			if (!this._oControl._oManagedSearch._bUserOpened) {
+				this._oControl._oManagedSearch.setIsOpen(false);
+			} else {
+				setTimeout(this._adaptSearch.bind(this), 100);
+			}
+		}
+
+		this._oControl._bOTBUpdateNeeded && this._oControl.invalidate();
+
 		if (this._iPreviousWidth === iWidth) {
 			return; // We have nothing to update
 		}

package/src/sap/f/shellBar/Search.js

@@ -36,7 +36,7 @@ sap.ui.define(['sap/ui/core/Control',
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.11
+		 * @version 1.120.13
 		 *
 		 * @constructor
 		 * @private
@@ -90,7 +90,11 @@ sap.ui.define(['sap/ui/core/Control',
 			this._layoutDataWhenClosed = new OverflowToolbarLayoutData({
 				priority: OverflowToolbarPriority.Low
 			});
+			this._layoutDataPhoneWhenClosed = new OverflowToolbarLayoutData({
+				priority: OverflowToolbarPriority.AlwaysOverflow
+			});
 			this._oAcc = new Accessibility();
+			this._bUserOpened = false;
 		};
 
 		Search.prototype.onBeforeRendering = function () {
@@ -191,8 +195,10 @@ sap.ui.define(['sap/ui/core/Control',
 
 			if (this.getIsOpen()) {
 				oLayoutData = this._layoutDataWhenOpen;
-			} else if (!this._bInOverflow) {
+			} else if (!this._bInOverflow && !this.getPhoneMode()) {
 				oLayoutData = this._layoutDataWhenClosed;
+			} else if (this.getPhoneMode()) {
+				oLayoutData = this._layoutDataPhoneWhenClosed;
 			}
 
 			if (!oLayoutData || this.getLayoutData() === oLayoutData) {
@@ -215,12 +221,22 @@ sap.ui.define(['sap/ui/core/Control',
 					query: oSearch.getValue(),
 					clearButtonPressed: false
 				});
-			} else {
-				this.toggleVisibilityOfSearchField();
 			}
+
+			if (this.sCurrentRange === "ExtraLargeDesktop") {
+				return;
+			}
+
+			this.toggleVisibilityOfSearchField();
+			this._bUserOpened = !this._bUserOpened;
+		};
+
+		Search.prototype._setMedia = function (sMediaRange) {
+			this.sCurrentRange = sMediaRange;
 		};
 
 		Search.prototype._onPressCancelButtonHandler = function () {
+			this._bUserOpened = false;
 			this.toggleVisibilityOfSearchField();
 		};
 

package/src/sap/f/themes/base/ShellBar.less

@@ -3,6 +3,7 @@
 @_sap_f_ShellBar_PaddingPhone: 1rem;
 @_sap_f_ShellBar_CoPilotWidth: 3rem;
 @_sap_f_ShellBar_CoPilotHalfWidth: 1.5rem;
+@_sap_f_ShellBar_SearchHalfMaxWidth: 17.5rem;
 
 @_sap_f_ShellBar_PrimaryTitle_FontSize: @sapMFontMediumSize;
 @_sap_f_ShellBar_SecondTitle_FontSize: @sapMFontSmallSize;
@@ -16,18 +17,6 @@
 	padding: 0 @_sap_f_ShellBar_PaddingDesktop;
 	display: flex;
 	align-items: center;
-	.sapFShellBarCopilot& {
-		.sapFShellBarORHB {
-			width: 50%;
-			padding-left: ~"calc(@{_sap_f_ShellBar_CoPilotHalfWidth} + 0.5rem)";
-		}
-		.sapFShellBarOLHB {
-			width: 50%;
-			padding-right: ~"calc(@{_sap_f_ShellBar_CoPilotHalfWidth} + 0.5rem)";
-
-		}
-
-	}
 
 	.sapFShellBarOLHB,
 	.sapFShellBarORHB {
@@ -385,11 +374,13 @@
 		}
 		.sapFShellBarSearchWrap {
 			 box-sizing: border-box;
-			 width: 100%;
 			 padding: 0 1.25rem;
 			 position: absolute;
+			 align-items: center;
+			 right: 0;
 			 left: 0;
 			 top: 0;
+			 bottom: 0;
 		 }
 		.sapMSF,
 		.sapFShellBarSearch {
@@ -405,6 +396,34 @@
 	}
 }
 
+.sapFShellBar.sapFShellBarSizeExtraLargeDesktop {
+	.sapFShellBarSearch {
+		max-width: 35rem; // max width of searchField + button width
+		width: 100%;
+		flex-grow: 1;
+		flex-shrink: 1;
+		box-sizing: border-box;
+		position: absolute;
+		left: ~"calc(50% - @{_sap_f_ShellBar_SearchHalfMaxWidth})";
+
+		.sapMSF {
+			max-width: 35rem;
+			min-width: auto;
+		}
+	}
+
+	&.sapFShellBarWithSearch {
+		.sapFShellBarORHB {
+			width: 50%;
+			padding-left: ~"calc(@{_sap_f_ShellBar_SearchHalfMaxWidth} + 0.5rem)";
+		}
+		.sapFShellBarOLHB {
+			width: 50%;
+			padding-right: ~"calc(@{_sap_f_ShellBar_SearchHalfMaxWidth} + 0.5rem)";
+
+		}
+	}
+}
 .sapFButtonNotifications[data-notifications],
 .sapFShellBarOverflowButton[data-notifications] {
 	overflow: visible;