@sapui5/sap.ushell 1.132.1 → 1.134.0

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

@@ -1,12 +1,11 @@
-//Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+//Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.132.1
+ * @version 1.134.0
  */
 sap.ui.define([
     "sap/ui/core/Element",
-    "sap/ui/core/Fragment",
     "sap/ui/core/EventBus",
     "sap/ushell/library",
     "sap/ui/core/mvc/Controller",
@@ -35,7 +34,6 @@ sap.ui.define([
     "sap/ui/dom/jquery/Focusable"
 ], function (
     Element,
-    Fragment,
     EventBus,
     ushellLibrary,
     Controller,
@@ -470,15 +468,13 @@ sap.ui.define([
                                 // Special logic for "Add Tiles to My Home" when personalization is disabled.
                                 this._setActionModeLogic(bMyHomeActive);
 
-                                let oNavigationPromise = Promise.resolve();
                                 // Placeholder page for empty My Home
                                 if (bMyHomeActive && this._isMyHomePageEmpty()) { // If the home page is empty, show the splash screen
-                                    oNavigationPromise = this._navigateToInitialMyHome();
+                                    await this._navigateToInitialMyHome();
                                 } else {
-                                    oNavigationPromise = this._navigate(pageId, spaceId);
+                                    await this._navigate(pageId, spaceId);
                                 }
 
-                                await oNavigationPromise;
                                 return this._onAfterPageNavigated(pageId, spaceId);
                             }
                         })
@@ -502,16 +498,15 @@ sap.ui.define([
 
             if (vError instanceof Error) {
                 // E.g. UI5 modules cannot be loaded
-                this._oErrorPageModel.setProperty("/details", vError.toString());
                 this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.GeneralError.Text"));
+                this._oErrorPageModel.setProperty("/details", vError.toString());
                 this._oErrorPageModel.setProperty("/technicalError", vError.toString());
                 this._oErrorPageModel.setProperty("/pageAndSpaceId", "");
-
             } else if (sPageId && sSpaceId) {
                 this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.CannotLoadPage.Title"));
-                this._oErrorPageModel.setProperty("/details", resources.i18n.getText("PageRuntime.CannotLoadPage.Details", [JSON.stringify(vError)]));
-                this._oErrorPageModel.setProperty("/pageAndSpaceId", resources.i18n.getText("PageRuntime.CannotLoadPage.PageAndSpaceId", [sPageId, sSpaceId]));
+                this._oErrorPageModel.setProperty("/details", resources.i18n.getText("PageRuntime.CannotLoadPage.SystemErrorMessagePrefix", [JSON.stringify(vError)]));
                 this._oErrorPageModel.setProperty("/technicalError", JSON.stringify(vError));
+                this._oErrorPageModel.setProperty("/pageAndSpaceId", resources.i18n.getText("PageRuntime.CannotLoadPage.PageAndSpaceId", [sPageId, sSpaceId]));
             } else {
                 this._oErrorPageModel.setProperty("/title", resources.i18n.getText("PageRuntime.GeneralError.Text"));
                 this._oErrorPageModel.setProperty("/details", resources.i18n.getText("PageRuntime.CannotLoadPage.SystemErrorMessagePrefix", [JSON.stringify(vError)]));
@@ -539,8 +534,8 @@ sap.ui.define([
          * @private
          * @since 1.72.0
          */
-        _navigate: function (targetPageId, spaceId, keepActionMode) {
-            var oPageControl = this.oPagesNavContainer.getPages().find(function (oControl) {
+        _navigate: async function (targetPageId, spaceId, keepActionMode) {
+            const oPageControl = this.oPagesNavContainer.getPages().find(function (oControl) {
                 return targetPageId === oControl.data("pageId");
             });
 
@@ -548,54 +543,40 @@ sap.ui.define([
                 return Promise.reject();
             }
 
-            var oMenuService;
-            return Container.getServiceAsync("Menu")
-                .then(function (oService) {
-                    oMenuService = oService;
-                    return Promise.all([
-                        oMenuService.hasMultiplePages(spaceId),
-                        oMenuService.isPinned(spaceId)
-                    ]);
-                })
-                .then(function (aResult) {
-                    var bHasMultiplePages = aResult[0];
-                    var isPinned = aResult[1];
-
-                    var bSamePage = this.oPagesNavContainer.getCurrentPage() === oPageControl;
+            const oMenuService = await Container.getServiceAsync("Menu");
+            const bSamePage = this.oPagesNavContainer.getCurrentPage() === oPageControl;
 
-                    this.oPagesNavContainer.to(oPageControl);
-                    this.oPagesRuntimeNavContainer.to(this.oPagesNavContainer);
+            this.oPagesNavContainer.to(oPageControl);
+            this.oPagesRuntimeNavContainer.to(this.oPagesNavContainer);
 
-                    // Only cancel edit mode in case of navigation to a different page
-                    if (!bSamePage && !keepActionMode) {
-                        this._cancelActionMode();
-                    }
-
-                    // 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);
+            // Only cancel edit mode in case of navigation to a different page
+            if (!bSamePage && !keepActionMode) {
+                this._cancelActionMode();
+            }
 
-                            var oSpacePageData = {
-                                pageTitle: oTitles.pageTitle,
-                                spaceTitle: oTitles.spaceTitle,
-                                hash: hasher.getHash()
-                            };
+            // no need to wait for this to finish the navigation
+            const oTitles = await oMenuService.getSpaceAndPageTitles(spaceId, targetPageId);
+            const bHasMultiplePages = await oMenuService.hasMultiplePages(spaceId);
+            const bIsPinned = await oMenuService.isPinned(spaceId);
+
+            // 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.
+            const oFLPPageControl = oPageControl.getContent()[0];
+            const bShowTitle = bHasMultiplePages || !bIsPinned;
+            oFLPPageControl.setTitle(this._formatPageTitle(oTitles.pageTitle, oTitles.spaceTitle, bHasMultiplePages, !bIsPinned));
+            oFLPPageControl.setShowTitle(bShowTitle);
+
+            const oSpacePageData = {
+                pageTitle: oTitles.pageTitle,
+                spaceTitle: oTitles.spaceTitle,
+                hash: hasher.getHash()
+            };
 
-                            // Needed for navigation target of the header Logo in Spaces mode
-                            this._updateHomeUri(oSpacePageData);
+            // Needed for navigation target of the header Logo in Spaces mode
+            this._updateHomeUri(oSpacePageData);
 
-                            // Needed for Hierarchy Menu in Spaces mode - see sap/ushell/components/applicationIntegration/AppMeta
-                            Config.emit("/core/spaces/currentSpaceAndPage", oSpacePageData);
-                        }.bind(this));
-                }.bind(this));
+            // Needed for Hierarchy Menu in Spaces mode - see sap/ushell/components/applicationIntegration/AppMeta
+            Config.emit("/core/spaces/currentSpaceAndPage", oSpacePageData);
         },
 
         /**
@@ -606,29 +587,29 @@ sap.ui.define([
          * @private
          * @since 1.89.0
          */
-        _navigateToInitialMyHome: function () {
+        _navigateToInitialMyHome: async function () {
             if (!this._pLoadMyHomeView) {
-                this._pLoadMyHomeView = new Promise(function (resolve, reject) {
-                    sap.ui.require(["sap/ui/core/mvc/XMLView"], function (XMLView) {
+                this._pLoadMyHomeView = new Promise((resolve, reject) => {
+                    sap.ui.require(["sap/ui/core/mvc/XMLView"], (XMLView) => {
                         XMLView.create({
                             id: "sapUshellMyHomePage",
                             viewName: "sap.ushell.components.pages.view.MyHomeStart"
-                        }).then(function (page) {
-                            page.getController().connect({
+                        }).then((oMyHomeStartPage) => {
+                            oMyHomeStartPage.getController().connect({
                                 onEdit: this.pressActionModeButton.bind(this),
                                 onOpenDialog: this.openMyHomeImportDialog.bind(this)
                             });
-                            resolve(page);
-                        }.bind(this)).catch(reject);
-                    }.bind(this), reject);
-                }.bind(this));
+                            resolve(oMyHomeStartPage);
+                        }).catch(reject);
+                    }, reject);
+                });
             }
 
-            return this._pLoadMyHomeView.then(function (page) {
+            return this._pLoadMyHomeView.then((oMyHomePage) => {
                 this._cancelActionMode();
-                this.oPagesRuntimeNavContainer.insertPage(page, 0);
-                this.oPagesRuntimeNavContainer.to(page);
-            }.bind(this));
+                this.oPagesRuntimeNavContainer.insertPage(oMyHomePage, 0);
+                this.oPagesRuntimeNavContainer.to(oMyHomePage);
+            });
         },
 
         /**
@@ -661,20 +642,27 @@ sap.ui.define([
          * @since 1.73.0
          * @private
          */
-        _pressViewDetailsButton: function () {
-            if (!this._oDialog) {
-                Fragment.load({
-                    name: "sap.ushell.components.pages.fragment.DialogPageNotExists",
-                    controller: this
-                }).then(function (oDialog) {
-                    this._oDialog = oDialog;
-                    this.getView().addDependent(this._oDialog);
-                    this._oDialog.open();
-                }.bind(this));
-            } else {
-                this._oDialog.open();
+        _pressViewDetailsButton: async function () {
+            if (!this._oDetailsDialogPromise) {
+                this._oDetailsDialogPromise = new Promise((resolve, reject) => {
+                    sap.ui.require(["sap/ui/core/Fragment"], async (Fragment) => {
+                        try {
+                            const oDetailsDialog = await Fragment.load({
+                                name: "sap.ushell.components.pages.fragment.DialogPageNotExists",
+                                controller: this
+                            });
 
+                            this.getView().addDependent(oDetailsDialog);
+                            resolve(oDetailsDialog);
+                        } catch (error) {
+                            reject(error);
+                        }
+                    }, reject);
+                });
             }
+
+            const oDetailsDialog = await this._oDetailsDialogPromise;
+            oDetailsDialog.open();
         },
 
         /**
@@ -683,8 +671,9 @@ sap.ui.define([
          * @since 1.132.0
          * @private
          */
-        _onDialogClose: function () {
-            this._oDialog.close();
+        _onDialogClose: async function () {
+            const oDetailsDialog = await this._oDetailsDialogPromise;
+            oDetailsDialog.close();
         },
 
         /**
@@ -894,35 +883,38 @@ sap.ui.define([
          * @param {sap.ushell.ui.launchpad.VizInstance} oVizInstance The VizInstance to be moved.
          * @returns {Promise<undefined>} Resolves when the Move Visualization Dialog is opened.
          */
-        _openMoveVisualizationDialog: function (oEvent, oVizInstance) {
+        _openMoveVisualizationDialog: async function (oEvent, oVizInstance) {
             this._oVizInstanceToBeMoved = oVizInstance;
-            var oVizInstanceToBeMovedContextPath = oVizInstance.getBindingContext().getPath();
-            var aVizInstancePathParts = oVizInstanceToBeMovedContextPath.split("/");
-            var sSectionID = oVizInstance.getParent().getBindingContext().getProperty("id");
-            var sBindingPath = "/pages/" + aVizInstancePathParts[2] + "/sections";
+            const sVizInstanceToBeMovedContextPath = oVizInstance.getBindingContext().getPath();
+            const aVizInstancePathParts = sVizInstanceToBeMovedContextPath.split("/");
+            const sSectionID = oVizInstance.getParent().getBindingContext().getProperty("id");
+            const sBindingPath = `/pages/${aVizInstancePathParts[2]}/sections`;
 
             if (!this._oMoveVisualizationDialogPromise) {
-                this._oMoveVisualizationDialogPromise = new Promise(function (resolve) {
-                    sap.ui.require(["sap/ui/core/Fragment"], function (Fragment) {
-                        Fragment.load({
-                            name: "sap.ushell.components.pages.MoveVisualization",
-                            controller: this
-                        }).then(function (oDialog) {
-                            this.getView().addDependent(oDialog);
-                            resolve(oDialog);
-                        }.bind(this));
-                    }.bind(this));
-                }.bind(this));
+                this._oMoveVisualizationDialogPromise = new Promise((resolve, reject) => {
+                    sap.ui.require(["sap/ui/core/Fragment"], async (Fragment) => {
+                        try {
+                            const oMoveVisualizationDialog = await Fragment.load({
+                                name: "sap.ushell.components.pages.MoveVisualization",
+                                controller: this
+                            });
+
+                            this.getView().addDependent(oMoveVisualizationDialog);
+                            resolve(oMoveVisualizationDialog);
+                        } catch (error) {
+                            reject(error);
+                        }
+                    }, reject);
+                });
             }
 
-            return this._oMoveVisualizationDialogPromise.then(function (oDialog) {
-                oDialog.bindObject({ path: sBindingPath });
-                oDialog.getBinding("items").filter([
-                    new Filter("default", FilterOperator.EQ, false),
-                    new Filter("id", FilterOperator.NE, sSectionID)
-                ]);
-                oDialog.open();
-            });
+            const oMoveVisualizationDialog = await this._oMoveVisualizationDialogPromise;
+            oMoveVisualizationDialog.bindObject({ path: sBindingPath });
+            oMoveVisualizationDialog.getBinding("items").filter([
+                new Filter("default", FilterOperator.EQ, false),
+                new Filter("id", FilterOperator.NE, sSectionID)
+            ]);
+            oMoveVisualizationDialog.open();
         },
 
         /**
@@ -1301,10 +1293,10 @@ sap.ui.define([
          * @since 1.74.0
          */
         pressActionModeButton: function () {
-            var oViewSettingsModel = this.getView().getModel("viewSettings");
-            var bActionModeActive = oViewSettingsModel.getProperty("/actionModeActive");
-            var bPersonalizationEnabled = oViewSettingsModel.getProperty("/personalizationEnabled");
-            var bAddToMyHomeOnly = oViewSettingsModel.getProperty("/addToMyHomeOnly");
+            const oViewSettingsModel = this.getView().getModel("viewSettings");
+            const bActionModeActive = oViewSettingsModel.getProperty("/actionModeActive");
+            const bPersonalizationEnabled = oViewSettingsModel.getProperty("/personalizationEnabled");
+            const bAddToMyHomeOnly = oViewSettingsModel.getProperty("/addToMyHomeOnly");
 
             sap.ui.require([
                 "sap/ushell/components/pages/ActionMode"
@@ -1649,15 +1641,15 @@ sap.ui.define([
          * @returns {Promise<undefined>} A promise resolving when navigation is finished.
          * @since 1.89.0
          */
-        handleMyHomeActionMode: function (editMode) {
+        handleMyHomeActionMode: async function (editMode) {
             if (this._isMyHomeRouteActive()) {
                 if (editMode) {
-                    return this._enterMyHomeActionMode(); // Add message strip in edit mode
+                    await this._enterMyHomeActionMode(); // Add message strip in edit mode
                 } else if (this._isMyHomePageEmpty()) {
-                    return this._navigateToInitialMyHome(); // Navigate to illustrated page
+                    await this._navigateToInitialMyHome(); // Navigate to illustrated page
                 }
             }
-            return Promise.resolve(); // Do nothing - normal navigation
+            // Do nothing - normal navigation
         },
 
         /**
@@ -1667,41 +1659,43 @@ sap.ui.define([
          * @private
          * @since 1.89.0
          */
-        _enterMyHomeActionMode: function () {
-            return Promise.all([
-                this._navigate(this.sCurrentTargetPageId, this.sCurrentTargetSpaceId, true),
-                MyHomeImport.isImportEnabled()
-            ]).then(function (aResult) {
-                if (!aResult[1]) {
-                    if (this._pMessageStrip) { // do not show the message strip after user dismissed it
-                        this._pMessageStrip.then(function (messageStrip) {
-                            messageStrip.setVisible(false);
-                        });
-                    }
-                    return Promise.resolve(); // Import is disabled. Don't show the message strip
+        _enterMyHomeActionMode: async function () {
+            await this._navigate(this.sCurrentTargetPageId, this.sCurrentTargetSpaceId, true);
+            const bIsImportEnabled = await MyHomeImport.isImportEnabled();
+
+            if (!bIsImportEnabled) {
+                if (this._pMessageStrip) { // do not show the message strip after user dismissed it
+                    this._pMessageStrip.then(function (messageStrip) {
+                        messageStrip.setVisible(false);
+                    });
                 }
-                if (!this._pMessageStrip) {
-                    this._pMessageStrip = new Promise(function (resolve, reject) {
-                        sap.ui.require(["sap/ui/core/Fragment"], function (Fragment) {
-                            Fragment.load({
+                return; // Import is disabled. Don't show the message strip
+            }
+
+            if (!this._pMessageStrip) {
+                this._pMessageStrip = new Promise((resolve, reject) => {
+                    sap.ui.require(["sap/ui/core/Fragment"], async (Fragment) => {
+                        try {
+                            const oMessageStrip = await Fragment.load({
                                 name: "sap.ushell.components.pages.view.MessageStrip",
                                 controller: this
-                            }).then(function (messageStrip) {
-                                // In case the message strip visibility is managed in another place
-                                EventHub.on("importBookmarksFlag").do(function (value) {
-                                    messageStrip.setVisible(!!value);
-                                });
-                                messageStrip.addStyleClass("sapUiSmallMarginBottom");
-                                resolve(messageStrip);
-                            }).catch(reject);
-                        }.bind(this), reject);
-                    }.bind(this));
-                }
+                            });
 
-                return this._pMessageStrip.then(function (messageStrip) {
-                    this.oPagesNavContainer.getCurrentPage().getContent()[0].setMessageStrip(messageStrip);
-                }.bind(this));
-            }.bind(this));
+                            // In case the message strip visibility is managed in another place
+                            EventHub.on("importBookmarksFlag").do(function (value) {
+                                oMessageStrip.setVisible(!!value);
+                            });
+                            oMessageStrip.addStyleClass("sapUiSmallMarginBottom");
+                            resolve(oMessageStrip);
+                        } catch (error) {
+                            reject(error);
+                        }
+                    }, reject);
+                });
+            }
+
+            const oMessageStrip = await this._pMessageStrip;
+            this.oPagesNavContainer.getCurrentPage().getContent()[0].setMessageStrip(oMessageStrip);
         },
 
         /**

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ushell/resources",

package/src/main/js/sap/ushell/components/pages/fragment/DialogPageNotExists.fragment.xml

@@ -1,25 +1,26 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
     <Dialog
         id="pageNotExistsDialog"
-        title="Error"
+        title="{i18n>PageRuntime.CannotLoadPage.ErrorTitle}"
         class="sapUiResponsivePadding"
         state="Error">
         <content>
             <VBox class="sapUiSmallMargin">
                 <Text text="{errorPage>/details}" />
-                <Text text="{errorPage>/pageAndSpaceId}" />
+                <Text class="sapUiSmallMarginTop" text="{errorPage>/technicalError}" />
+                <Text class="sapUiSmallMarginTop" text="{errorPage>/pageAndSpaceId}" />
             </VBox>
         </content>
         <beginButton>
             <Button
                 id="pageNotExistsDialogCopyButton"
-                text="Copy"
+                text="{i18n>PageRuntime.CannotLoadPage.CopyButton}"
                 press="._copyToClipboard" />
         </beginButton>
         <endButton>
             <Button
                 id="pageNotExistsDialogCancelButton"
-                text="Close"
+                text="{i18n>PageRuntime.CannotLoadPage.CloseButton}"
                 press="._onDialogClose"
                 type="Emphasized" />
         </endButton>

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.132.1"
+            "version": "1.134.0"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/UIComponent"

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

@@ -1,8 +1,8 @@
-//Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+//Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.132.1
+ * @version 1.134.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.132.1"
+            "version": "1.134.0"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/i18n/Localization",

package/src/main/js/sap/ushell/components/shell/FloatingContainer/controls/FloatingContainer.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 /**
  * @fileoverview An invisible container,

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.FloatingContainer",
         "applicationVersion": {
-            "version": "1.132.1"
+            "version": "1.134.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/UIComponent",
     "sap/ui/core/ComponentContainer",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/CustomData",
     "sap/ui/core/mvc/Controller",
@@ -340,7 +340,6 @@ sap.ui.define([
             return new IconTabFilter(sId, {
                 key: oData.uid, // is not unique if used multiple times in a hierarchy
                 text: "{menu>title}",
-                icon: "{menu>icon}",
                 enabled: "{viewConfiguration>/enableMenuBarNavigation}",
                 items: {
                     path: "menu>menuEntries",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.132.1"
+            "version": "1.134.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -1,16 +1,51 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/ui/core/UIComponent"
-], function (UIComponent) {
+    "sap/ui/core/UIComponent",
+    "sap/ui/core/mvc/XMLView",
+    "sap/ushell/library"
+], function (UIComponent, XMLView, ushellLibrary) {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.NavigationBarMenu.Component", {
         metadata: {
             manifest: "json",
-            library: "sap.ushell"
+            library: "sap.ushell",
+            interfaces: ["sap.ui.core.IAsyncContentCreation"],
+            properties: {
+                renderType: {
+                    type: "string",
+                    defaultValue: "Button",
+                    group: "Behavior"
+                }
+            }
         },
         init: function () {
+            this.oSettingsAppliedPromise = new Promise( (resolve) => {
+                this.fnResolveSettingsApplied = resolve;
+            });
             UIComponent.prototype.init.apply(this, arguments);
+        },
+
+        applySettings: function (mSettings) {
+            UIComponent.prototype.applySettings.apply(this, arguments);
+            this.fnResolveSettingsApplied();
+        },
+
+        createContent: function () {
+            return new Promise( (resolve) => {
+                this.oSettingsAppliedPromise.then(async () => {
+                    let sViewName = "sap.ushell.components.shell.NavigationBarMenu.view.NavigationBarMenuButton";
+                    if (this.getRenderType() === ushellLibrary.NavigationBarMenuState.Menu) {
+                        sViewName = "sap.ushell.components.shell.NavigationBarMenu.view.NavigationBarMenu";
+                    }
+                    this.runAsOwner(async () => {
+                        this.oMainView = await XMLView.create({
+                            viewName: sViewName
+                        });
+                        resolve(this.oMainView);
+                    });
+                });
+            });
         }
     });
 });