@sapui5/sap.ushell 1.119.3 → 1.120.0

package/src/main/js/sap/ushell/{renderers/fiori2/ShellAsync.view.js → renderer/Shell.view.js}

@@ -15,7 +15,8 @@ sap.ui.define([
     "sap/ui/core/mvc/XMLView",
     "sap/ui/core/Fragment",
     "sap/ui/core/Core",
-    "sap/ushell/renderers/fiori2/ShellLayout"
+    "sap/ushell/renderer/ShellLayout",
+    "sap/ushell/renderer/Shell.controller" // controller must be preloaded to avoid naming clashes
 ], function (
     Log,
     Device,
@@ -31,7 +32,8 @@ sap.ui.define([
     XMLView,
     Fragment,
     Core,
-    ShellLayout
+    ShellLayout,
+    ShellController
 ) {
     "use strict";
 
@@ -46,9 +48,9 @@ sap.ui.define([
         List: "List"
     };
 
-    return View.extend("sap.ushell.renderers.fiori2.ShellAsync", {
+    return View.extend("sap.ushell.renderer.Shell", {
         getControllerName: function () {
-            return "sap.ushell.renderers.fiori2.Shell";
+            return "sap.ushell.renderer.Shell";
         },
 
         waitForShellLayout: function () {
@@ -356,6 +358,9 @@ sap.ui.define([
             }.bind(this));
         },
 
+        /**
+         * @deprecated since 1.120.0
+         */
         createFloatingActions: function () {
             sap.ui.require(["sap/ushell/ui/shell/ShellFloatingActions"], function (ShellFloatingActions) {
                 var oShellFloatingActions = new ShellFloatingActions({
@@ -387,7 +392,7 @@ sap.ui.define([
         createAllMyAppsView: function () {
             return XMLView.create({
                 id: "allMyAppsView",
-                viewName: "sap.ushell.renderers.fiori2.allMyApps.AllMyApps"
+                viewName: "sap.ushell.renderer.allMyApps.AllMyApps"
             }).then(function (allMyAppsView) {
                 allMyAppsView.setModel(this.getShellModel());
                 allMyAppsView.setModel(resources.i18nModel, "i18n");
@@ -456,16 +461,22 @@ sap.ui.define([
                 }
             });
 
-            // FloatingActions (deprecated)
-            this.bindFactory({
-                model: oShellModel,
-                factory: this.createFloatingActions.bind(this),
-                bindingPath: "/currentState/floatingActions",
-                bindingType: BINDING_TYPE.List,
-                valueCheck: function (aValues) {
-                    return !!aValues.length;
-                }
-            });
+            /**
+             * code shall be automatically removed by tooling
+             * @deprecated since 1.120.0
+             */
+            (function () {
+                // FloatingActions (deprecated)
+                this.bindFactory({
+                    model: oShellModel,
+                    factory: this.createFloatingActions.bind(this),
+                    bindingPath: "/currentState/floatingActions",
+                    bindingType: BINDING_TYPE.List,
+                    valueCheck: function (aValues) {
+                        return !!aValues.length;
+                    }
+                });
+            }.bind(this))();
 
             this.addPendingInitialization(this.initAllMyAppsView());
         },
@@ -581,7 +592,7 @@ sap.ui.define([
         /**
          * Adds a binding which is destroyed on Renderer destroy
          * @param {sap.ui.model.Binding} oBinding The Binding
-         * @see sap.ushell.renderers.fiori2.Shell.controller#onExit
+         * @see sap.ushell.renderer.Shell.controller#onExit
          *
          * @private
          * @since 1.114.0
@@ -592,7 +603,7 @@ sap.ui.define([
 
         /**
          * @param {sap.ui.model.Binding} oBinding The Binding
-         * @see sap.ushell.renderers.fiori2.Shell.controller#onExit
+         * @see sap.ushell.renderer.Shell.controller#onExit
          *
          * @private
          * @since 1.114.0
@@ -603,7 +614,7 @@ sap.ui.define([
 
         /**
          * @param {sap.ui.core.Control} oControl The Control
-         * @see sap.ushell.renderers.fiori2.Shell.controller#onExit
+         * @see sap.ushell.renderer.Shell.controller#onExit
          *
          * @private
          * @since 1.114.0

package/src/main/js/sap/ushell/{renderers/fiori2 → renderer}/ShellLayout.js

@@ -16,7 +16,7 @@ sap.ui.define([
         ToolArea: "toolArea-shellArea",
         SubHeader: "subHeader-shellArea",
         NavigationBar: "navigationBar-shellArea",
-        FloatingActions: "floatingActions-shellArea",
+        FloatingActions: "floatingActions-shellArea", // deprecated
         FloatingContainer: "floatingContainer-shellArea",
         FloatingContainerDockStart: "floatingContainerDockStart-shellArea",
         FloatingContainerDockEnd: "floatingContainerDockEnd-shellArea",
@@ -51,7 +51,7 @@ sap.ui.define([
             "                    <div id='navigationBar-shellArea' data-sap-ui-root-content=true></div>",
             "                    <div class='sapUshellFlexGrowShrink sapUshellPositionRelative sapUshellOverflowHidden sapUshellFlexColumn'>",
             "                        <div id='" + LAYOUT_MAPPING.RendererRootView + "' class='sapUshellFlexGrowShrink sapUshellPositionRelative sapUshellShell' data-sap-ui-root-content=true></div>",
-            "                        <div id='floatingActions-shellArea' data-sap-ui-root-content=true></div>",
+            "                        <div id='floatingActions-shellArea' data-sap-ui-root-content=true></div>", // deprecated
             "                        <div id='rightFloatingContainer-shellArea' data-sap-ui-root-content=true></div>",
             "                    </div>",
             "                </div>",
@@ -74,7 +74,7 @@ sap.ui.define([
         });
 
         if (bLayoutAlreadyApplied) {
-            Log.warning("Found a ShellArea element. Did not apply the layout", "sap.ushell.renderers.fiori2.ShellLayout");
+            Log.warning("Found a ShellArea element. Did not apply the layout", "sap.ushell.renderer.ShellLayout");
             return;
         }
 

package/src/main/js/sap/ushell/{renderers/fiori2 → renderer}/allMyApps/AllMyApps.controller.js

@@ -12,8 +12,8 @@ sap.ui.define([
     "sap/ui/performance/Measurement",
     "sap/ushell/Config",
     "sap/ushell/library",
-    "sap/ushell/renderers/fiori2/allMyApps/AllMyAppsKeyboardHandler",
-    "sap/ushell/renderers/fiori2/allMyApps/AllMyAppsManager",
+    "sap/ushell/renderer/allMyApps/AllMyAppsKeyboardHandler",
+    "sap/ushell/renderer/allMyApps/AllMyAppsManager",
     "sap/ushell/resources",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/EventHub"
@@ -50,7 +50,7 @@ sap.ui.define([
 
     var bSingleDataSource = false;
 
-    return Controller.extend("sap.ushell.renderers.fiori2.allMyApps.AllMyApps", {
+    return Controller.extend("sap.ushell.renderer.allMyApps.AllMyApps", {
         iNumberOfProviders: 0,
 
         /**
@@ -626,7 +626,7 @@ sap.ui.define([
         },
 
         getControllerName: function () {
-            return "sap.ushell.renderers.fiori2.allMyApps.AllMyApps";
+            return "sap.ushell.renderer.allMyApps.AllMyApps";
         },
 
         formatListItemType: function (type, level) {

package/src/main/js/sap/ushell/{renderers/fiori2 → renderer}/allMyApps/AllMyApps.view.xml

@@ -1,5 +1,5 @@
 <mvc:View
-    controllerName="sap.ushell.renderers.fiori2.allMyApps.AllMyApps"
+    controllerName="sap.ushell.renderer.allMyApps.AllMyApps"
     xmlns="sap.m"
     xmlns:mvc="sap.ui.core.mvc"
     height="100%">

package/src/main/js/sap/ushell/renderer/allMyApps/AllMyAppsKeyboardHandler.js

@@ -0,0 +1,108 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+sap.ui.define([
+    "sap/ui/events/KeyCodes",
+    "sap/ui/thirdparty/jquery"
+], function (KeyCodes, jQuery) {
+    "use strict";
+
+    var KeyboardNavigation = function () { };
+
+    KeyboardNavigation.prototype.init = function (oView) {
+        oView.byId("sapUshellAllMyAppsDataSourcesList").addEventDelegate({
+            // on tab next (Tab)
+            onsaptabnext: function (e) {
+                var aDetailAppsElements = jQuery(".sapUshellAllMyAppsListItem");
+
+                this.jqDetailAreaElement = oView.byId("oItemsContainerlist").$();
+                this.jqDetailAreaElement.on("keydown.keyboardNavigation", this.keydownHandler.bind(this));
+
+                // Focus the first App in the Detail Area.
+                this._setItemFocus(e, aDetailAppsElements[0]);
+            }.bind(this)
+        });
+        oView.byId("oItemsContainerlist").addEventDelegate({
+            onsaptabprevious: function (/*e*/) {
+                var oCurrentlyFocusedAppElement = jQuery('.sapUshellAllMyAppsListItem[tabindex="0"]')[0];
+
+                jQuery(oCurrentlyFocusedAppElement).attr("tabindex", -1);
+            },
+            onsaptabnext: function (/*e*/) {
+                var aCustomPanel = jQuery(".sapUshellAllMyAppsCustomPanel");
+                var oCurrentlyFocusedAppElement = jQuery('.sapUshellAllMyAppsListItem[tabindex="0"]')[0];
+
+                // Since the is no custom panel, there is no need to "remember" the last selected item
+                if (aCustomPanel.length === 0) {
+                    jQuery(oCurrentlyFocusedAppElement).attr("tabindex", -1);
+                }
+            }
+        });
+        // Clicking SHIFT+TAB from the custom panel should return the focus to the last selected item/app.
+        // Clicking TAB should move the focus to the master list and "forget" the last selected item/app
+        oView.byId("sapUshellAllMyAppsCustomPanel").addEventDelegate({
+            onsaptabnext: function (e) {
+                var oCurrentlyFocusedAppElement = jQuery('.sapUshellAllMyAppsListItem[tabindex="0"]')[0];
+                jQuery(oCurrentlyFocusedAppElement).attr("tabindex", -1);
+            }
+        });
+    };
+
+    KeyboardNavigation.prototype.keydownHandler = function (e) {
+        switch (e.keyCode) {
+            case KeyCodes.ARROW_UP:
+                this.arrowKeyHandler(e, -2);
+                break;
+            case KeyCodes.ARROW_DOWN:
+                this.arrowKeyHandler(e, 2);
+                break;
+            case KeyCodes.ARROW_LEFT:
+                this.arrowKeyHandler(e, -1);
+                break;
+            case KeyCodes.ARROW_RIGHT:
+                this.arrowKeyHandler(e, 1);
+                break;
+            default:
+                break;
+        }
+    };
+
+    KeyboardNavigation.prototype.arrowKeyHandler = function (e, iDirectionFactor) {
+        var aDetailAppsElements = jQuery(".sapUshellAllMyAppsListItem").toArray();
+        var oCurrentlyFocusedAppElement = jQuery('.sapUshellAllMyAppsListItem[tabindex="0"]')[0];
+        var iCurrentlyFocusedIndex = aDetailAppsElements.indexOf(oCurrentlyFocusedAppElement);
+        var oElementToFocus = aDetailAppsElements[iCurrentlyFocusedIndex + iDirectionFactor];
+
+        if (oElementToFocus) {
+            jQuery(oCurrentlyFocusedAppElement).attr("tabindex", -1);
+            this._setItemFocus(e, oElementToFocus);
+        }
+    };
+
+    KeyboardNavigation.prototype._setItemFocus = function (e, oElementToFocus) {
+        if (oElementToFocus) {
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            jQuery(oElementToFocus).attr("tabindex", 0);
+            oElementToFocus.focus();
+        }
+    };
+
+    KeyboardNavigation.prototype.destroy = function () {
+        if (this.jqDetailAreaElement) {
+            this.jqDetailAreaElement.off(".keyboardNavigation");
+        }
+        delete this.jqDetailAreaElement;
+    };
+
+    /**
+     * restore deprecated globals
+     * @deprecated since 1.120.0
+     */
+    (function () {
+        setTimeout(() => { // defer by a tick to avoid circular dependencies
+            sap.ui.require(["sap/ushell/renderers/fiori2/allMyApps/AllMyAppsKeyboardHandler"], function () {});
+        }, 0);
+    })();
+
+    return new KeyboardNavigation();
+});