@sapui5/sap.ushell 1.142.0 → 1.143.0

package/src/main/js/sap/ushell/ui/cards/RecentActivitiesExtension.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Extension for recent activities card
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ui/integration/Extension",
@@ -109,7 +109,7 @@ sap.ui.define([
             const aCardItems = [];
             for (let i = 0; i < aActivities.length; i++) {
                 if (aActivities[i].url && aActivities[i].url !== "") {
-                    const oShellHash = UrlParsing.parseShellHash(aActivities[i].url);
+                    const oParsedHash = UrlParsing.parseShellHash(aActivities[i].url);
                     const oCardItem = {
                         Name: _titleFormatter(aActivities[i].title, aActivities[i].appType),
                         Description: _descriptionFormatter(aActivities[i].appType),
@@ -117,12 +117,12 @@ sap.ui.define([
                         Url: aActivities[i].url
                     };
 
-                    if (oShellHash) {
+                    if (oParsedHash) {
                         oCardItem.Intent = {
-                            SemanticObject: oShellHash.semanticObject,
-                            Action: oShellHash.action,
-                            Parameters: oShellHash.params,
-                            AppSpecificRoute: oShellHash.appSpecificRoute
+                            SemanticObject: oParsedHash.semanticObject,
+                            Action: oParsedHash.action,
+                            Parameters: oParsedHash.params,
+                            AppSpecificRoute: oParsedHash.appSpecificRoute
                         };
                     } else {
                         oCardItem.Url = aActivities[i].url;
@@ -162,18 +162,18 @@ sap.ui.define([
          * @private
          */
         _isActionEnabled: function (oActivity) {
-            const oShellHash = UrlParsing.parseShellHash(oActivity.Url);
+            const oParsedHash = UrlParsing.parseShellHash(oActivity.Url);
 
-            if (!oShellHash) {
+            if (!oParsedHash) {
                 return Promise.resolve(true);
             }
 
-            const oParameters = oShellHash.params;
+            const oParameters = oParsedHash.params;
 
             const oNavigation = {
                 target: {
-                    semanticObject: oShellHash.semanticObject,
-                    action: oShellHash.action
+                    semanticObject: oParsedHash.semanticObject,
+                    action: oParsedHash.action
                 },
                 params: oParameters
             };

package/src/main/js/sap/ushell/ui/launchpad/ExtendedChangeDetection.js

@@ -7,7 +7,7 @@
  * of recreating them. Items which get removed from the aggregation get destroyed and items which get added to the
  * aggregation get created.
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ui/base/ManagedObject",

package/src/main/js/sap/ushell/ui/launchpad/Section.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provides control sap.ushell.ui.launchpad.Section
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/ui/launchpad/VizInstance.js

@@ -216,7 +216,7 @@ sap.ui.define([
             state: this.getState()
         });
 
-        this._disableTabindexOfGenericTile(oContent);
+        this._disableTabindexOfInnerTile(oContent);
 
         this.setAggregation("content", oContent);
     };
@@ -396,16 +396,16 @@ sap.ui.define([
             content.data("tile-id", sVizRefId, true);
         }
 
-        this._sGenericTileId = null;
+        this._oInnerTile = null;
         this._disableTabindexOfContent(content);
 
         this.setAggregation("content", content);
     };
 
     /**
-     * Removes the tabindex of a possible genericTile inside of the given control.
+     * Heuristic to find and disable the tabindex of a possible tile inside of the given control.
      *
-     * @param {sap.ui.core.Control} [content] the control to search in
+     * @param {sap.ui.core.Control} [content] the control to search in.
      *
      * @since 1.121
      * @private
@@ -431,36 +431,42 @@ sap.ui.define([
             } else if (content.isA("sap.cloudfnd.smartbusiness.lib.reusetiles.Singleton")) {
                 // Some SSB tiles have a FlexBox-View-Singleton-GenericTile structure
                 this._disableTabindexOfContent(content.getContent());
-            } else if (content.isA("sap.m.GenericTile")) {
-                this._disableTabindexOfGenericTile(content);
+            } else if (content.isA("sap.m.SlideTile") || content.isA("sap.m.GenericTile")) {
+                // News tiles are SlideTiles and have multiple inner GenericTiles,
+                // the inner tiles are already disabled, but the slide tile itself is not
+                this._disableTabindexOfInnerTile(content);
             }
         }
     };
 
     /**
      * Removes the tabindex of tile, so we avoid the inner and outer focus issue.
+     * Stores the inner tile for later use in onAfterRendering.
      *
-     * @param {sap.m.GenericTile} genericTile the tile that should not be focusable
+     * @param {sap.m.GenericTile | sap.m.SlideTile} innerTile the tile that should not be focusable
      *
      * @since 1.121
      * @private
      */
-    VizInstance.prototype._disableTabindexOfGenericTile = function (genericTile) {
-        function removeTabindex (control) {
-            const oFocusDomRef = control.getFocusDomRef();
-            if (oFocusDomRef) {
-                this._sGenericTileId = oFocusDomRef.id;
-                if (oFocusDomRef.getAttribute("tabindex") === "0") {
-                    oFocusDomRef.setAttribute("tabindex", -1);
-                    oFocusDomRef.tabIndex = -1;
+    VizInstance.prototype._disableTabindexOfInnerTile = function (innerTile) {
+        function removeTabindex () {
+            const oFocusDomRef = this.getFocusDomRef();
+            if (oFocusDomRef && oFocusDomRef.getAttribute("tabindex") === "0") {
+                if (oFocusDomRef.tagName === "A") {
+                    oFocusDomRef.setAttribute("tabindex", "-1");
+                    oFocusDomRef.tabindex = -1;
+                } else {
+                    oFocusDomRef.removeAttribute("tabindex");
                 }
             }
         }
 
+        this._oInnerTile = innerTile;
+
         // Some SSB tiles are already rendered
-        removeTabindex.call(this, genericTile);
-        genericTile.addEventDelegate({
-            onAfterRendering: removeTabindex.bind(this, genericTile)
+        removeTabindex.call(innerTile);
+        innerTile.addEventDelegate({
+            onAfterRendering: removeTabindex.bind(innerTile)
         });
     };
 
@@ -563,11 +569,30 @@ sap.ui.define([
         }
     };
 
+    /**
+     * SAPUI5 Lifecycle hook which is called before the control is re-rendered.
+     * Cleans up event listeners added in onAfterRendering.
+     * @override
+     * @private
+     */
     VizInstance.prototype.onBeforeRendering = function () {
         const oDomRef = this.getDomRef();
         if (oDomRef) {
-            oDomRef.removeEventListener("keyup", this._fnKeyupHandler);
-            oDomRef.removeEventListener("touchend", this._fnTouchendHandler);
+            oDomRef.removeEventListener("keyup", this._fnKeyupHandler, true);
+            oDomRef.removeEventListener("touchend", this._fnTouchendHandler, true);
+            delete this._fnKeyupHandler;
+            delete this._fnTouchendHandler;
+
+            if (oDomRef.parentElement) {
+                oDomRef.parentElement.removeAttribute("aria-description");
+                oDomRef.parentElement.removeAttribute("aria-labelledby");
+                oDomRef.parentElement.removeEventListener("focusin", this._fnOnParentElementFocusInHandler, true);
+                oDomRef.parentElement.removeEventListener("focusout", this._fnOnParentElementFocusOutHandler, true);
+                oDomRef.parentElement.removeEventListener("keyup", this._fnOnParentElementKeyupHandler, true);
+                delete this._fnOnParentElementFocusInHandler;
+                delete this._fnOnParentElementFocusOutHandler;
+                delete this._fnOnParentElementKeyupHandler;
+            }
         }
     };
 
@@ -604,10 +629,76 @@ sap.ui.define([
 
         if (oDomRef.parentElement) {
             oDomRef.parentElement.setAttribute("aria-description", resources.i18n.getText("VizInstance.AriaDescription.Link"));
-            if (this._sGenericTileId) {
-                oDomRef.parentElement.setAttribute("aria-labelledby", this._sGenericTileId);
+            if (this._oInnerTile) {
+                const sInnerTileId = this._oInnerTile.getId();
+                if (this._oInnerTile.isA("sap.m.SlideTile")) {
+                    oDomRef.parentElement.setAttribute("aria-labelledby", `${sInnerTileId}-ariaText`);
+                    this._fnOnParentElementFocusInHandler = this._onParentElementFocusIn.bind(this, this._oInnerTile);
+                    this._fnOnParentElementFocusOutHandler = this._onParentElementFocusOut.bind(this, this._oInnerTile);
+                    this._fnOnParentElementKeyupHandler = this._onParentElementKeyup.bind(this, this._oInnerTile);
+                    oDomRef.parentElement.addEventListener("focusin", this._fnOnParentElementFocusInHandler, true);
+                    oDomRef.parentElement.addEventListener("focusout", this._fnOnParentElementFocusOutHandler, true);
+                    oDomRef.parentElement.addEventListener("keyup", this._fnOnParentElementKeyupHandler, true);
+                } else {
+                    oDomRef.parentElement.setAttribute("aria-labelledby", sInnerTileId);
+                }
+            }
+        }
+    };
+
+    /**
+     * Handles the focusin event on the parent element of the vizinstance in case the inner tile is a slidetile.
+     * It pauses the slidetile if not already paused.
+     *
+     * @param {sap.m.SlideTile} slideTile the slidetile inside the vizinstance.
+     * @private
+     */
+    VizInstance.prototype._onParentElementFocusIn = function (slideTile) {
+        if (!slideTile.mouseDown) {
+            const oSlideTileDomRef = slideTile.getDomRef();
+            if (oSlideTileDomRef && oSlideTileDomRef.classList.contains("sapMSTPauseIcon")) {
+                slideTile.addStyleClass("sapUshellPaused");
+                slideTile.addStyleClass("sapMSTIconPressed");
+                slideTile.onmouseup();
+            }
+        }
+    };
+
+    /**
+     * Handles the focusout event on the parent element of the vizinstance in case the inner tile is a slidetile.
+     * It resumes the slidetile if it was paused on focusin.
+     *
+     * @param {sap.m.SlideTile} slideTile the slidetile inside the vizinstance.
+     * @private
+     */
+    VizInstance.prototype._onParentElementFocusOut = function (slideTile) {
+        if (!slideTile.mouseDown && slideTile.hasStyleClass("sapUshellPaused")) {
+            slideTile.removeStyleClass("sapUshellPaused");
+            slideTile.addStyleClass("sapMSTIconPressed");
+            slideTile.onmouseup();
+        }
+        slideTile.mouseDown = false;
+    };
+
+    /**
+     * Handles the keyup event on the parent element of the vizinstance in case the inner tile is a slidetile.
+     * It removes the custom paused state on space key press.
+     *
+     * @param {sap.m.SlideTile} slideTile the slidetile inside the vizinstance.
+     * @param {KeyboardEvent} event the keyboard event.
+     * @private
+     */
+    VizInstance.prototype._onParentElementKeyup = function (slideTile, event) {
+        if (PseudoEvents.events.sapspace.fnCheck(event)) {
+            if (slideTile.hasStyleClass("sapUshellPaused")) {
+                slideTile.removeStyleClass("sapUshellPaused");
             }
         }
+
+        if (event.key === "b" || event.key === "B"
+            || event.key === "f" || event.key === "F") {
+            this.getParent().focus();
+        }
     };
 
     /**

package/src/main/js/sap/ushell/ui/launchpad/section/CompactArea.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provides control sap.ushell.ui.launchpad.section.CompactArea
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 
 sap.ui.define([

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.142.0
+     * @version 1.143.0
      *
      * @public
      * @since 1.30.5

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.142.0
+ * @version 1.143.0
  * @private
  */
 

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The ShellUIService UI5 service factory
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/util/Deferred",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The UserStatus UI5 service
  *
- * @version 1.142.0
+ * @version 1.143.0
  * @deprecated since 1.70. Support for this service has been discontinued.
  */
 sap.ui.define([

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

@@ -6,13 +6,25 @@
 sap.ui.define([
     "sap/base/util/deepClone",
     "sap/ushell/utils",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ui/core/Lib"
 ], (
     deepClone,
     ushellUtils,
-    Container
+    Container,
+    Library
 ) => {
     "use strict";
+
+    /**
+     * @class
+     * @classdesc Utility functions for Smart Business
+     *
+     * Smart Business implements some logic in their custom tiles that needs support
+     * from ushell side.
+     *
+     * @private
+     */
     class SmartBusiness {
         #pStoredEvaluationIdResolutionResult = null;
         #oSmartBusinessLibraryUtils = null;
@@ -80,6 +92,31 @@ sap.ui.define([
             }
         }
 
+        /**
+         * Loads the Smart Business library.
+         * Smart Business uses the same namespace for different platforms.
+         * The path it is loaded from might have to be adapted for the specific platform.
+         * Usually this mapping is done by Smart Business. It only has to be done
+         * by the ushell if Smart Business has not been loaded yet,
+         * e.g. during the direct app start.
+         *
+         * @param {string} [sPath] The platform specific path
+         * @returns {Promise} A promise that resolves when the library is loaded
+         */
+        loadSmartBusinessLibrary (sPath) {
+            if (sPath) {
+                sap.ui.loader.config({
+                    paths: {
+                        "sap/cloudfnd/smartbusiness/lib/reusetiles": sPath
+                    }
+                });
+            }
+
+            return Library.load({
+                name: "sap.cloudfnd.smartbusiness.lib.reusetiles"
+            });
+        }
+
         /**
          * Loads and returns the Smart Business library utils instance.
          * Instantiates the util UI component if not already available.