@sapui5/sap.ushell 1.120.1 → 1.120.3

package/src/main/js/sap/ushell/ui/shell/ShellAppTitle.js

@@ -97,13 +97,22 @@ sap.ui.define([
                 var sText = oControl.getText();
                 var oModel = oControl.getModel();
 
-                oRm.openStart("h1", oControl);
+                // This invisible title element is purley for accessibility reasons.
+                // It is placed outside of the main control elements,
+                // so that automated tests do not read the title string twice.
+                oRm.openStart("h1");
+                oRm.class("sapUiPseudoInvisibleText");
+                oRm.attr("aria-level", "1");
+                oRm.openEnd(); // h1 - tag
+                oRm.text(sText || "");
+                oRm.close("h1");
+
+                oRm.openStart("div", oControl);
                 oRm.class("sapUshellHeadTitle");
                 if (bShellAppTitleIsVisible || Device.system.phone) {
                     oRm.class("sapUshellAppTitleClickable");
                 }
-                oRm.attr("aria-level", "1");
-                oRm.openEnd(); // span - tag
+                oRm.openEnd(); // div - tag
 
                 oRm.openStart("div", oControl.getId() + "-button");
                 oRm.class("sapUshellAppTitle");
@@ -124,12 +133,12 @@ sap.ui.define([
                         oRm.attr("aria-label", ushellResources.i18n.getText("ShellNavigationMenu_AriaLabel", [sText]));
                     }
                 }
-                oRm.openEnd(); // span - tag
+                oRm.openEnd(); // div - tag
 
                 if (Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD).name !== "Phone") { // do not render title text on phones
                     oRm.openStart("span");
                     oRm.class("sapUshellAppTitleText");
-                    oRm.openEnd();
+                    oRm.openEnd(); // span - tag
                     oRm.text(sText || "");
                     oRm.close("span");
                 }
@@ -143,7 +152,7 @@ sap.ui.define([
                 }
                 oRm.close("div");
 
-                oRm.close("h1");
+                oRm.close("div");
             }
         }
     });
@@ -219,7 +228,7 @@ sap.ui.define([
             this.oAllMyAppsPopover = this._createAllMyAppsPopover();
         }
 
-        // might not be availabe, as AllMyApps might not be loaded yet
+        // might not be available, as AllMyApps might not be loaded yet
         if (this.oAllMyAppsPopover) {
             if (this.oAllMyAppsPopover.isOpen()) {
                 this.oAllMyAppsPopover.close();
@@ -345,16 +354,27 @@ sap.ui.define([
             oBackButton.focus();
         });
 
-        oAllMyAppsPopover.attachAfterClose(function () {
-            this._bPressedSpace = false;
-            if (!Device.system.phone && !(this.oNavMenuPopover && this.oNavMenuPopover.isOpen())) {
-                this.focus();
-            }
-        }.bind(this));
+        oAllMyAppsPopover.attachAfterClose(this._afterCloseAllMyAppsPopover.bind(this));
 
         return oAllMyAppsPopover;
     };
 
+    /*
+     * Called after closing the All My Apps popover
+     */
+    ShellAppTitle.prototype._afterCloseAllMyAppsPopover = function () {
+        this._bPressedSpace = false;
+
+        if (this._bOpenNavigationMenu === true) {
+            // make sure the navigation menu is opened after the all my apps menu
+            // is finally closed so that they don't interfere with each other
+            this._bOpenNavigationMenu = false;
+            this.oNavMenuPopover.openBy(this);
+        } else if (!Device.system.phone) {
+            this.focus();
+        }
+    };
+
     /*
     * Create and return the popover object that will contain the ShellNavMenu UI
     */
@@ -425,16 +445,27 @@ sap.ui.define([
             oNavMenu._afterOpen();
         });
 
-        oNavMenuPopover.attachAfterClose(function () {
-            this._bPressedSpace = false;
-            if (!Device.system.phone && !(this.oAllMyAppsPopover && this.oAllMyAppsPopover.isOpen())) {
-                this.focus();
-            }
-        }.bind(this));
+        oNavMenuPopover.attachAfterClose(this._afterCloseNavigationMenuPopover.bind(this));
 
         return oNavMenuPopover;
     };
 
+    /*
+     * Called after closing the Navigation Menu Popover
+     */
+    ShellAppTitle.prototype._afterCloseNavigationMenuPopover = function () {
+        this._bPressedSpace = false;
+
+        if (this._bOpenAllMyApps) {
+            // make sure the all my apps menu is opened after the navigation menu
+            // is finally closed so that they don't interfere with each other
+            this._bOpenAllMyApps = false;
+            this._openCloseAllMyAppsPopover();
+        } else if (!Device.system.phone) {
+            this.focus();
+        }
+    };
+
     ShellAppTitle.prototype._setAllMyAppsTitle = function (text) {
         var oCurrentState = Config.last("/core/shellHeader");
         if (oCurrentState.title && (oCurrentState.ShellAppTitleState === "AllMyAppsOnly" || oCurrentState.ShellAppTitleState === "AllMyApps")) {
@@ -502,7 +533,7 @@ sap.ui.define([
 
                 //Open Nav Menu popover and close allMyAppsPopover
                 this.oAllMyAppsPopover.close();
-                this.oNavMenuPopover.openBy(this);
+                this._bOpenNavigationMenu = true;
             }
         } else if (oAllMyAppsState === AllMyAppsState.SecondLevel) {
             oAllMyAppsController.switchToInitialState();
@@ -543,23 +574,9 @@ sap.ui.define([
      * Create and return the popover footer, containing a button for switching from ShellNavMenu to AllMyApps
      */
     ShellAppTitle.prototype._getPopoverFooterContent = function () {
-        var that = this;
         var oAllMyAppsButton = new Button("allMyAppsButton", {
             text: ushellResources.i18n.getText("allMyApps_launchingButtonTitle"),
-            press: function () {
-                that._openCloseAllMyAppsPopover();
-
-                // might not be available, as AllMyApps might not be loaded yet
-                if (that.oAllMyAppsPopover) {
-                    Measurement.start(
-                        "FLP:ShellNavMenu.footerClick",
-                        "Click the footer of ShellNavMenu, Launching AllMyApps",
-                        "FLP"
-                    );
-                    that.getModel().setProperty("/ShellAppTitleState", AppTitleState.AllMyApps);
-                    that.oNavMenuPopover.close();
-                }
-            },
+            press: this._allMyAppsButtonPressHandler.bind(this),
             visible: {
                 path: "/ShellAppTitleState",
                 formatter: function (oCurrentState) {
@@ -576,6 +593,24 @@ sap.ui.define([
         return oPopoverFooterContent;
     };
 
+    /*
+     * Opens the All My Apps popover
+    */
+    ShellAppTitle.prototype._allMyAppsButtonPressHandler = function () {
+        // might not be available, as AllMyApps might not be loaded yet
+        if (Core.byId(this.getAllMyApps())) {
+            Measurement.start(
+                "FLP:ShellNavMenu.footerClick",
+                "Click the footer of ShellNavMenu, Launching AllMyApps",
+                "FLP"
+            );
+
+            this.getModel().setProperty("/ShellAppTitleState", AppTitleState.AllMyApps);
+            this.oNavMenuPopover.close();
+            this._bOpenAllMyApps = true;
+        }
+    };
+
     /*************************************** Create Popover UI - End ***************************************/
     /*******************************************************************************************************/
 

package/src/main/js/sap/ushell/ui/shell/ShellHeadItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      * @author SAP SE
-     * @version 1.120.1
+     * @version 1.120.3
      *
      * @private
      * @since 1.15.1

package/src/main/js/sap/ushell/ui/shell/SysInfoBar.js

@@ -24,13 +24,21 @@ sap.ui.define([
 
     var mColor = {
         orange: "sapUshellSysInfoBarOrange",
+        Orange: "sapUshellSysInfoBarOrange",
         red: "sapUshellSysInfoBarRed",
+        Red: "sapUshellSysInfoBarRed",
         pink: "sapUshellSysInfoBarPink",
+        Pink: "sapUshellSysInfoBarPink",
         violet: "sapUshellSysInfoBarViolet",
+        Violet: "sapUshellSysInfoBarViolet",
         blue: "sapUshellSysInfoBarBlue",
+        Blue: "sapUshellSysInfoBarBlue",
         green: "sapUshellSysInfoBarGreen",
+        Green: "sapUshellSysInfoBarGreen",
         grey: "sapUshellSysInfoBarGrey",
-        gray: "sapUshellSysInfoBarGrey"
+        Grey: "sapUshellSysInfoBarGrey",
+        gray: "sapUshellSysInfoBarGrey",
+        Gray: "sapUshellSysInfoBarGrey"
     };
 
 
@@ -45,7 +53,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      * @author SAP SE
-     * @version 1.120.1
+     * @version 1.120.3
      *
      * @private
      * @alias sap.ushell.ui.shell.SysInfoBar
@@ -193,3 +201,4 @@ sap.ui.define([
 
     return SysInfoBar;
 });
+

package/src/main/js/sap/ushell/ui/shell/ToolAreaItem.js

@@ -18,7 +18,7 @@ sap.ui.define([
      * A control to be placed in the tool area
      * @extends sap.ui.core.Control
      *
-     * @version 1.120.1
+     * @version 1.120.3
      *
      * @public
      * @since 1.30.5

package/src/main/js/sap/ushell/ui/tile/DynamicTile.js

@@ -28,7 +28,7 @@ sap.ui.define([
      * An applauncher for apps that need to display dynamically updated information
      * @extends sap.ushell.ui.tile.TileBase
      *
-     * @public
+     * @private
      * @name sap.ushell.ui.tile.DynamicTile
      * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
      */
@@ -71,15 +71,5 @@ sap.ui.define([
         renderer: DynamicTileRenderer
     });
 
-    /**
-     * Applauncher displaying an application that provides a service that returns
-     * dynamic data.
-     *
-     * @name sap.ushell.ui.tile.DynamicTile
-     *
-     * @since   1.15.0
-     * @private
-     */
-
     return DynamicTile;
 });

package/src/main/js/sap/ushell/ui/tile/ImageTile.js

@@ -22,7 +22,7 @@ sap.ui.define([
      * Add your documentation for the newui/tile/ImageTile
      * @extends sap.ushell.ui.tile.TileBase
      *
-     * @public
+     * @private
      * @name sap.ushell.ui.tile.ImageTile
      * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
      */
@@ -39,15 +39,6 @@ sap.ui.define([
         renderer: ImageTileRenderer
     });
 
-    /**
-     * Applauncher displaying a tile with an added image
-     *
-     * @name sap.ushell.ui.tile.ImageTile
-     *
-     * @since   1.15.0
-     * @private
-     */
+    return ImageTile;
 
-        return ImageTile;
-
-    });
+});

package/src/main/js/sap/ushell/ui/tile/StaticTile.js

@@ -25,8 +25,9 @@ sap.ui.define([
      * An applauncher tile for simple, static apps, displaying title, subtitle, an icon and additional information
      * @extends sap.ushell.ui.tile.TileBase
      *
-     * @since   1.15.0
+     * @since 1.15.0
      * @public
+     * @deprecated since 1.120
      * @name sap.ushell.ui.tile.StaticTile
      * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
      */

package/src/main/js/sap/ushell/ui/tile/TileBase.js

@@ -29,7 +29,7 @@ sap.ui.define([
      * Base class for tiles that already provides several visual elements like title, subtitle, icon and additional information
      * @extends sap.ui.core.Control
      *
-     * @public
+     * @private
      * @name sap.ushell.ui.tile.TileBase
      * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
      */
@@ -90,29 +90,19 @@ sap.ui.define([
         renderer: TileBaseRenderer
     });
 
-    /**
-     * Base class for applaunchers that provides basic properties like title,
-     * subtitle, icon and additional information.
-     *
-     * @name sap.ushell.ui.tile.TileBase
-     *
-     * @since   1.15.0
-     * @private
-     */
+    TileBase.prototype.ontap = function (e) {
+        this.firePress({});
+    };
 
-        TileBase.prototype.ontap = function (e) {
-            this.firePress({});
-        };
+    TileBase.prototype.onsapenter = function (e) {
+        this.firePress({});
+    };
 
-        TileBase.prototype.onsapenter = function (e) {
-            this.firePress({});
-        };
+    TileBase.prototype.onsapspace = function (e) {
+        this.firePress({});
+    };
 
-        TileBase.prototype.onsapspace = function (e) {
-            this.firePress({});
-        };
 
+    return TileBase;
 
-        return TileBase;
-
-    });
+});

package/src/main/js/sap/ushell/ui/utils.js

@@ -6,7 +6,7 @@
  * This is a utility module that collects common activities implemented
  * by controllers of different ui components.
  *
- * @version 1.120.1
+ * @version 1.120.3
  * @private
  */
 

package/src/main/js/sap/ushell/ui5service/ShellUIService.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The ShellUIService UI5 service
  *
- * @version 1.120.1
+ * @version 1.120.3
  */
 
 /**

package/src/main/js/sap/ushell/ui5service/UserStatus.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The UserStatus UI5 service
  *
- * @version 1.120.1
+ * @version 1.120.3
  */
 
 /**

package/src/main/js/sap/ushell/utils/UrlShortening.js

@@ -5,7 +5,7 @@
  *
  * This module is for internal Shell usage only
  *
- * @version 1.120.1
+ * @version 1.120.3
  */
  sap.ui.define(["sap/base/Log", "sap/ushell/utils/UrlParsing"], function (Log, urlParsing) {
     "use strict";

package/src/main/js/sap/ushell/utils.js

@@ -1678,19 +1678,25 @@ sap.ui.define([
      * @since 1.119.0
      */
     utils.getThemingParameters = async function (aNames) {
-        const oParameterMap = await new Promise((resolve, reject) => {
+        const vParameterMap = await new Promise((resolve, reject) => {
             sap.ui.require(["sap/ui/core/theming/Parameters"], (ThemingParameters) => {
-                const oParameterMap = ThemingParameters.get({
+                const vParameterMap = ThemingParameters.get({
                     name: aNames,
                     callback: resolve
                 });
-                if (oParameterMap) {
-                    resolve(oParameterMap);
+                if (vParameterMap) {
+                    resolve(vParameterMap);
                 }
             });
         });
         return aNames.map((sName) => {
-            return oParameterMap[sName];
+            // If you request only one parameter as array and the parameter is already loaded,
+            // the return value is not a map, it is the value.
+            if (typeof vParameterMap === "string") {
+                 return vParameterMap;
+            } else {
+                return vParameterMap[sName];
+            }
         });
     };
 

package/src/test/js/sap/ushell/bootstrap/sandbox.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  *
- * @version 1.120.1
+ * @version 1.120.3
  */
 
 (function () {