@sapui5/sap.ushell 1.113.0 → 1.115.0

package/src/main/js/sap/ushell/components/homepage/DashboardContent.controller.js

@@ -1,6 +1,12 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+/**
+ * ONLY CALLED WHEN CLASSIC HOMEPAGE IS ENABLED!
+ *
+ * @deprecated since 1.112
+ */
 sap.ui.define([
+    "sap/base/Log",
     "sap/ui/core/Core",
     "sap/ui/core/mvc/Controller",
     "sap/ui/Device",
@@ -14,6 +20,7 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ushell/utils"
 ], function (
+    Log,
     Core,
     Controller,
     Device,
@@ -49,9 +56,9 @@ sap.ui.define([
 
         onExit: function () {
             var oEventBus = Core.getEventBus();
-            oEventBus.unsubscribe("launchpad", "contentRefresh", this._webkitMobileRenderFix, this);
             oEventBus.unsubscribe("sap.ushell", "appOpened", this._appOpenedHandler, this);
             oEventBus.unsubscribe("launchpad", "dashboardModelContentLoaded", this._modelLoaded, this);
+            oEventBus.unsubscribe("launchpad", "actionModeInactive", this._handleGroupVisibilityChanges, this);
             oEventBus.unsubscribe("launchpad", "switchTabBarItem", this._handleTabBarItemPressEventHandler, this);
             window.document.removeEventListener("visibilitychange", utils.handleTilesVisibility, false);
             if (this.oDashboardUIActionsModule) {
@@ -137,9 +144,12 @@ sap.ui.define([
         },
 
         _getIndexOfTopGroupInViewPort: function () {
-            var oViewDomRef = this.getView().getDomRef(),
-                oScrollableElement = oViewDomRef.getElementsByTagName("section")[0],
-                jqTileContainers = jQuery(oScrollableElement).find(".sapUshellTileContainer").not(".sapUshellHidden");
+            var oViewDomRef = this.getView().getDomRef();
+            if (!oViewDomRef) {
+                return 0;
+            }
+            var oScrollableElement = oViewDomRef.getElementsByTagName("section")[0];
+            var jqTileContainers = jQuery(oScrollableElement).find(".sapUshellTileContainer").not(".sapUshellHidden");
 
             // in some weird cases, "jqTileContainers" may be undefined -> bail out
             if (!jqTileContainers) {
@@ -321,12 +331,12 @@ sap.ui.define([
 
             var oGroupElement = oGroup && oGroup.getDomRef();
             if (!oGroupElement) {
-                return Promise.reject();
+                return Log.warning("Could not scroll to group: Group is not rendered!");
             }
 
             var oGroupContentElement = oGroupElement.querySelector(".sapUshellTileContainerContent"); // includes the Group header
             if (!oGroupContentElement) {
-                return Promise.reject();
+                return Log.warning("Could not scroll to group: Group Content is not rendered!");
             }
 
             var oDashboardGroupsElement = document.getElementById("dashboardGroups");

package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js

@@ -5,8 +5,10 @@
  * with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
  * and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
  *
- * @version 1.113.0
+ * @version 1.115.0
  * @name sap.ushell.components.homepage.DashboardContent.view
+ *
+ * @deprecated since 1.112
  * @private
  */
 sap.ui.define([
@@ -101,16 +103,16 @@ sap.ui.define([
             this.oRenderer.getRouter().getRoute("home").attachMatched(this._onHomeNavigation, this);
 
             this.oAnchorNavigationBar = this._getAnchorNavigationBar(oController);
+            this.oAnchorNavigationBar.setModel(this.oModel);
+            this.oRenderer.setNavigationBar(this.oAnchorNavigationBar);
 
             var oDashboardGroupsBoxModule = new DashboardGroupsBox();
             // Create the DashboardGroupsBox object that contains groups and tiles
             this.oDashboardGroupsBox = oDashboardGroupsBoxModule.createGroupsBox(oController, this.oModel);
 
             this.oPage = new Page("sapUshellDashboardPage", {
-                customHeader: this.oAnchorNavigationBar,
+                showHeader: false,
                 landmarkInfo: {
-                    headerRole: AccessibleLandmarkRole.Navigation,
-                    headerLabel: resources.i18n.getText("Dashboard.Page.Header.AriaLabel"),
                     contentRole: AccessibleLandmarkRole.Region,
                     contentLabel: resources.i18n.getText("Dashboard.Page.Content.AriaLabel"),
                     rootRole: AccessibleLandmarkRole.None
@@ -181,32 +183,37 @@ sap.ui.define([
                 overflowEnabled: false // we will enable the overflow once coreExt will be loaded!!!
             });
 
-            if (Device.system.desktop) {
-                sap.ui.require(["sap/ushell/components/ComponentKeysHandler"], function (ComponentKeysHandler) {
-                    ComponentKeysHandler.getInstance().then(function (ComponentKeysHandlerInstance) {
-                        oAnchorNavigationBar.addEventDelegate({
-                            onBeforeFastNavigationFocus: function (oEvent) {
-                                if (jQuery(".sapUshellAnchorItem").is(":visible")) {
-                                    oEvent.preventDefault();
-                                    ComponentKeysHandlerInstance.goToSelectedAnchorNavigationItem();
-                                }
-                            },
-                            onsapenter: function (oEvent) {
-                                oEvent.srcControl.getDomRef().click();
-                            },
-                            onsapspace: function (oEvent) {
-                                oEvent.srcControl.getDomRef().click();
-                            },
-                            onsaptabnext: function () {
-                                // If the OverflowButton is not visible, jump to the last visited Tile
-                                if (!sap.ui.getCore().byId("sapUshellAnchorBarOverflowButton").getVisible()) {
-                                    ComponentKeysHandlerInstance.goToLastVisitedTile();
+            this._oAnchorNavigationBarDelegatePromise = new Promise(function (resolve, reject) {
+                if (Device.system.desktop) {
+                    sap.ui.require(["sap/ushell/components/ComponentKeysHandler"], function (ComponentKeysHandler) {
+                        ComponentKeysHandler.getInstance().then(function (ComponentKeysHandlerInstance) {
+                            oAnchorNavigationBar.addEventDelegate({
+                                onBeforeFastNavigationFocus: function (oEvent) {
+                                    if (jQuery(".sapUshellAnchorItem").is(":visible")) {
+                                        oEvent.preventDefault();
+                                        ComponentKeysHandlerInstance.goToSelectedAnchorNavigationItem();
+                                    }
+                                },
+                                onsapenter: function (oEvent) {
+                                    oEvent.srcControl.getDomRef().click();
+                                },
+                                onsapspace: function (oEvent) {
+                                    oEvent.srcControl.getDomRef().click();
+                                },
+                                onsaptabnext: function () {
+                                    // If the OverflowButton is not visible, jump to the last visited Tile
+                                    if (!sap.ui.getCore().byId("sapUshellAnchorBarOverflowButton").getVisible()) {
+                                        ComponentKeysHandlerInstance.goToLastVisitedTile();
+                                    }
                                 }
-                            }
+                            });
+                            resolve();
                         });
                     });
-                });
-            }
+                } else {
+                    resolve();
+                }
+            });
 
             oAnchorNavigationBar.addStyleClass("sapContrastPlus");
 
@@ -387,7 +394,7 @@ sap.ui.define([
         },
 
         _updateAnchorNavigationBarVisibility: function () {
-            var bOldVisible = this.oPage.getShowHeader(),
+            var bOldVisible = this.oAnchorNavigationBar.getVisible(),
                 bActionModeActive = this.getModel().getObject("/tileActionModeActive"),
                 aVisibleGroups = this.getModel().getProperty("/groups").filter(function (oGroup) {
                     // Check for group's visibility AND - depending on the ActionMode - the visiblityMode
@@ -400,7 +407,7 @@ sap.ui.define([
                 }),
                 bVisible = aVisibleGroups.length > 1;
 
-            this.oPage.setShowHeader(bVisible);
+            this.oAnchorNavigationBar.setVisible(bVisible);
 
             if (bVisible && !bOldVisible) {
                 var aGroups = this.getModel().getProperty("/groups"),

package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js

@@ -6,9 +6,12 @@
  * Exposes the public function <code>createGroupsBox</code>
  * @see sap.ushell.components.homepage.DashboardContent.view
  *
- * @version 1.113.0
+ * @version 1.115.0
  * @name sap.ushell.components.homepage.DashboardGroupsBox
  * @since 1.35.0
+ *
+ * @deprecated since 1.112
+ *
  * @private
  */
 sap.ui.define([
@@ -230,7 +233,7 @@ sap.ui.define([
                         getGroups: this.getGroups.bind(this),
                         getAllGroups: that.getAllGroupsFromModel.bind(that),
                         isTabBarActive: that.isTabBarActive.bind(that)
-                    }).done(fAfterLayoutInit);
+                    }).then(fAfterLayoutInit);
 
                     //when media is changed we need to rerender Layout
                     //media could be changed by SAPUI5 without resize, or any other events. look for internal Incident ID: 1580000668
@@ -623,11 +626,11 @@ sap.ui.define([
         },
 
         _updateGroupHeaderVisibility: function () {
-            var aGroups = this.oGroupsContainer.getGroups(),
-                bEditMode = this.oModel.getProperty("/tileActionModeActive"),
-                bAnchorbar = this.oController.getView().oPage.getShowHeader(),
-                iFirstVisible,
-                iVisibleGroups = 0;
+            var aGroups = this.oGroupsContainer.getGroups();
+            var bEditMode = this.oModel.getProperty("/tileActionModeActive");
+            var bAnchorbar = this.oController.getView().oAnchorNavigationBar.getVisible();
+            var iFirstVisible;
+            var iVisibleGroups = 0;
 
             for (var i = 0; i < aGroups.length; i++) {
                 if (aGroups[i].getProperty("visible")) {

package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js

@@ -5,9 +5,12 @@
  * Extends <code>sap.ui.base.Object</code><br>
  * Exposes the public function <code>initializeUIActions</code>
  *
- * @version 1.113.0
+ * @version 1.115.0
  * @name sap.ushell.components.homepage.DashboardUIActions
  * @since 1.35.0
+ *
+ * @deprecated since 1.112
+ *
  * @private
  */
 sap.ui.define([
@@ -92,7 +95,7 @@ sap.ui.define([
                 oCommonUIActionsDataForWin8 = {
                     containerSelector: "#dashboardGroups",
                     wrapperSelector: sDashboardGroupsWrapperId ? "#" + sDashboardGroupsWrapperId : undefined, // The id of the <section> that wraps dashboardGroups div: #__page0-cont
-                    rootSelector: "#shell"
+                    rootSelector: "#mainShell"
                 },
                 // Object that contains the common attributed required of the creation of oTileUIActions and oGroupUIActions, including Win8 attributes
                 oCommonUIActionsData = deepExtend({}, oCommonUIActionsDataForWin8, {

package/src/main/js/sap/ushell/components/homepage/FLPAnalytics.js

@@ -1,5 +1,10 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+/**
+ * ONLY CALLED WHEN CLASSIC HOMEPAGE IS ENABLED!
+ *
+ * @deprecated since 1.112
+ */
 sap.ui.define([
     "sap/ushell/services/AppConfiguration", // TODO: pending dependency migration
     "sap/base/Log",

package/src/main/js/sap/ushell/components/homepage/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.homepage",
         "applicationVersion": {
-            "version": "1.113.0"
+            "version": "1.115.0"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/Component.js

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 
 sap.ui.define([
@@ -46,6 +46,10 @@ sap.ui.define([
             UIComponent.prototype.init.apply(this, arguments);
 
             SharedComponentUtils.toggleUserActivityLog();
+            SharedComponentUtils.getEffectiveHomepageSetting(
+                "/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations",
+                "/core/contentProviders/providerInfo/userConfigurable"
+            );
             SharedComponentUtils.getEffectiveHomepageSetting("/core/home/sizeBehavior", "/core/home/sizeBehaviorConfigurable");
             this.setModel(resources.i18nModel, "i18n");
 

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ushell/library",
@@ -99,7 +99,6 @@ sap.ui.define([
                 showAddButton: Config.last("/core/catalog/enabled"),
                 personalizationEnabled: Config.last("/core/shell/enablePersonalization"),
                 addToMyHomeOnly: false,
-                showPageTitle: false,
                 gridContainerGap: [],
                 gridContainerRowSize: []
             });
@@ -514,12 +513,17 @@ sap.ui.define([
             return sap.ushell.Container.getServiceAsync("Menu")
                 .then(function (oService) {
                     oMenuService = oService;
-                    return oMenuService.hasMultiplePages(spaceId);
+                    return Promise.all([
+                        oMenuService.hasMultiplePages(spaceId),
+                        oMenuService.isPinned(spaceId)
+                    ]);
                 })
-                .then(function (bHasMultiplePages) {
+                .then(function (aResult) {
+                    var bHasMultiplePages = aResult[0];
+                    var isPinned = aResult[1];
+
                     var bSamePage = this.oPagesNavContainer.getCurrentPage() === oPageControl;
 
-                    this._oViewSettingsModel.setProperty("/showPageTitle", bHasMultiplePages);
                     this.oPagesNavContainer.to(oPageControl);
                     this.oPagesRuntimeNavContainer.to(this.oPagesNavContainer);
 
@@ -531,6 +535,15 @@ sap.ui.define([
                     // no need to wait for this to finish the navigation
                     oMenuService.getSpaceAndPageTitles(spaceId, targetPageId)
                         .then(function (oTitles) {
+                            // The properties title and showTitle have to be set per page control and not only
+                            // once in the view settings model to avoid a flickering during navigation between pages.
+                            var oFLPPageControl = oPageControl.getContent()[0];
+                            var bShowTitle = bHasMultiplePages || !isPinned;
+                            if (bShowTitle) {
+                                oFLPPageControl.setTitle(this._formatPageTitle(oTitles.pageTitle, oTitles.spaceTitle, bHasMultiplePages, !isPinned));
+                            }
+                            oFLPPageControl.setShowTitle(bShowTitle);
+
                             // Needed for Hierarchy Menu in Spaces mode - see sap/ushell/components/applicationIntegration/AppMeta
                             // Needed for navigation target of the header Logo in Spaces mode - see sap/ushell/components/HeaderManager
                             var oSpacePageData = {
@@ -539,7 +552,7 @@ sap.ui.define([
                                 hash: hasher.getHash()
                             };
                             Config.emit("/core/shell/model/currentSpaceAndPage", oSpacePageData);
-                        });
+                        }.bind(this));
                 }.bind(this));
         },
 
@@ -1633,6 +1646,29 @@ sap.ui.define([
             Log.debug("cep/editMode: navigate to empty page", "Page runtime");
             this._hideActionModeButton();
             this.oPagesRuntimeNavContainer.to(this.oEmptyPage);
+        },
+
+        /**
+         * Returns the page title, the space title or both if requested.
+         *
+         * @param {string} pageTitle The page title
+         * @param {string} spaceTitle The spaceTitle
+         * @param {boolean} showPageTitle Shall the page title be displayed
+         * @param {boolean} showSpaceTitle Shall the space title be displayed
+         *
+         * @returns {string} The title to display
+         *
+         * @private
+         * @since 1.115
+         */
+        _formatPageTitle: function (pageTitle, spaceTitle, showPageTitle, showSpaceTitle) {
+            if (showPageTitle && showSpaceTitle) {
+                return spaceTitle + " - " + pageTitle;
+            } else if (showSpaceTitle) {
+                return spaceTitle;
+            }
+            return pageTitle;
         }
+
     });
 });

package/src/main/js/sap/ushell/components/pages/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.113.0"
+            "version": "1.115.0"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/pages/view/PageRuntime.view.xml

@@ -19,8 +19,6 @@
                         <launchpad:Page
                             edit="{viewSettings>/actionModeEditActive}"
                             dataHelpId="Page-{id}"
-                            showTitle="{viewSettings>/showPageTitle}"
-                            title="{title}"
                             sections="{
                                 path: 'sections',
                                 templateShareable: false,

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.113.0
+ * @version 1.115.0
  */
  sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/runtimeSwitcher/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.113.0"
+            "version": "1.115.0"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

package/src/main/js/sap/ushell/components/shell/MenuBar/Component.js

@@ -1,63 +1,66 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/UIComponent",
+    "sap/ui/core/ComponentContainer",
+    "sap/ui/core/mvc/XMLView",
     "sap/ushell/Config"
-], function (UIComponent, Config) {
+], function (
+    UIComponent,
+    ComponentContainer,
+    XMLView,
+    Config
+) {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.MenuBar.Component", {
         metadata: {
             manifest: "json",
-            library: "sap.ushell"
+            library: "sap.ushell",
+            interfaces: ["sap.ui.core.IAsyncContentCreation"]
         },
+
         init: function () {
             UIComponent.prototype.init.apply(this, arguments);
 
-            this.oInitPromise = new Promise(function (resolve, reject) {
-                this.fnResolve = resolve;
-            }.bind(this));
-
-            Config.on("/core/spaces/myHome/userEnabled").do(function () {
-                sap.ushell.Container.getServiceAsync("Menu")
-                    .then(function (oMenuService) {
-                        return Promise.all([
-                            oMenuService.isMenuEnabled(),
-                            oMenuService.getMenuModel()
-                        ]);
-                    })
-                    .then(function (aResults) {
-                        var oComponentContainer;
-                        var bIsEnabled = aResults[0];
-                        var oMenuModel = aResults[1];
+            this.oMenuModelPromise = sap.ushell.Container.getServiceAsync("Menu")
+                .then(function (oMenuService) {
+                    return Promise.all([
+                        oMenuService.isMenuEnabled(),
+                        oMenuService.getMenuModel()
+                    ]);
+                })
+                .then(function (aResults) {
+                    var bMenuEnabled = aResults[0];
+                    var oMenuModel = aResults[1];
 
-                        this.setModel(oMenuModel, "menu");
+                    this.setModel(oMenuModel, "menu");
 
-                        if (bIsEnabled) {
-                            oComponentContainer = sap.ui.getCore().byId("menuBarComponentContainer");
-                        }
-                        if (oComponentContainer) {
-                            oComponentContainer.setComponent(this);
-                        }
-
-                        this.fnResolve();
-                    }.bind(this));
+                    if (bMenuEnabled) {
+                        return this.oViewPromise.then(function () {
+                            // wait for the root view to be created, otherwise the view won't render right away
+                            // but only after an invalidation of the component container
+                            var oComponentContainer = new ComponentContainer({
+                                id: "menuBarComponentContainer",
+                                component: this
+                            });
+                            sap.ushell.Container.getRenderer().setNavigationBar(oComponentContainer);
+                        }.bind(this));
+                    }
             }.bind(this));
+        },
 
-            if (sap.ushell.Container.getRenderer().getCurrentCoreView() !== "home") {
-                this.setVisible(false);
+        createContent: function () {
+            if (Config.last("/core/menu/personalization/enabled")) {
+                this.oViewPromise = XMLView.create({
+                    viewName: "sap.ushell.components.shell.MenuBar.view.MenuBarPersonalization"
+                });
+            } else {
+                this.oViewPromise = XMLView.create({
+                    viewName: "sap.ushell.components.shell.MenuBar.view.MenuBar"
+                });
             }
-        },
 
-        /**
-         * Toggles menu visibility. In some scenarios, the menu is always visible and this function has no effect.
-         * @param {boolean} bVisible Menu visibility.
-         *
-         * @private
-         * @since 1.85.0
-         */
-        setVisible: function (bVisible) {
-            bVisible = bVisible || Config.last("/core/menu/visibleInAllStates"); // visibleInAllStates:true has priority
-            sap.ui.getCore().byId("menuBarComponentContainer").setVisible(!!bVisible);
+            return this.oViewPromise;
         }
     });
 });

package/src/main/js/sap/ushell/components/shell/MenuBar/controller/MenuBar.controller.js

@@ -8,6 +8,7 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ushell/utils/WindowUtils",
     "sap/m/IconTabFilter",
+    "sap/m/IconTabSeparator",
     "sap/ushell/utils",
     "sap/ushell/Config"
 ], function (
@@ -19,6 +20,7 @@ sap.ui.define([
     resources,
     WindowUtils,
     IconTabFilter,
+    IconTabSeparator,
     ShellUtils,
     Config
 ) {
@@ -78,6 +80,13 @@ sap.ui.define([
                 });
 
             this._selectIndexAfterRouteChange();
+
+            // According to the developer colleagues of the tnt.Toolheader this class has to be
+            // removed so that the toolheader looks correctly with the ushell styling in the Belize theme.
+            var oToolHeader = this.byId("navigationBar");
+            if (oToolHeader) {
+                oToolHeader.removeStyleClass("sapContrast");
+            }
         },
 
         /**
@@ -152,7 +161,7 @@ sap.ui.define([
          * @param {object} destinationTarget
          *  The destination target which is used for the Cross Application Navigation
          *
-         * @returns {Promise<void>}
+         * @returns {Promise<undefined>}
          *  A promise which is resolved after the CrossAppNavigation is performed
          *
          * @private
@@ -197,7 +206,7 @@ sap.ui.define([
          * Gets the space and page id out of the current hash and selects key according to them.
          * For the intent '#Shell-home' the default page of the user is taken into account.
          *
-         * @returns {Promise<void>} a promise to wait for.
+         * @returns {Promise<undefined>} a promise to wait for.
          *
          * @private
          * @since 1.72.0
@@ -208,7 +217,7 @@ sap.ui.define([
             return Promise.all([
                 this.oURLParsingService,
                 this.oGetDefaultSpacePromise,
-                this.getOwnerComponent().oInitPromise
+                this.getOwnerComponent().oMenuModelPromise
             ]).then(function (aResults) {
                 var oUrlParsingService = aResults[0];
                 var oDefaultSpace = aResults[1];
@@ -281,7 +290,7 @@ sap.ui.define([
          * @private
          * @since 1.100.0
          */
-         _getHomeAppUID: function (aMenuEntries) {
+        _getHomeAppUID: function (aMenuEntries) {
             function fnCheck (oMenuEntry) {
                 return oMenuEntry.target.semanticObject === "Shell" && oMenuEntry.target.action === "home";
             }
@@ -322,8 +331,13 @@ sap.ui.define([
          * @since 1.77.0
          */
         _menuFactory: function (sId, oContext) {
+
+            if (oContext.oModel.getProperty(oContext.sPath).type === "separator") {
+                return new IconTabSeparator();
+            }
+
             return new IconTabFilter(sId, {
-                key: "{menu>uid}",
+                key: "{menu>uid}", // is not unique if used multiple times in a hierarchy
                 text: "{menu>title}",
                 enabled: "{viewConfiguration>/enableMenuBarNavigation}",
                 items: {

package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json

@@ -2,9 +2,8 @@
     "_version": "1.21.0",
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
-
         "applicationVersion": {
-            "version": "1.113.0"
+            "version": "1.115.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",
@@ -68,15 +67,12 @@
         }
     },
     "sap.ui5": {
-        "rootView": {
-            "viewName": "sap.ushell.components.shell.MenuBar.view.MenuBar",
-            "type": "XML",
-            "async": true
-        },
         "dependencies": {
-            "minUI5Version": "1.72",
+            "minUI5Version": "1.114",
             "libs": {
-                "sap.m": {}
+                "sap.ui.core": {},
+                "sap.m": {},
+                "sap.tnt": {}
             }
         },
         "models": {},