@sapui5/sap.ushell 1.120.7 → 1.121.0

package/src/main/js/sap/ushell/components/runtimeSwitcher/view/RuntimeSwitcher.view.xml

@@ -3,17 +3,21 @@
     xmlns:core="sap.ui.core"
     xmlns:mvc="sap.ui.core.mvc"
     controllerName="sap.ushell.components.runtimeSwitcher.controller.RuntimeSwitcher"
-    height="100%">
-
+    height="100%"
+    core:require="{
+        mobileLibrary: 'sap/m/library'
+    }">
     <NavContainer id="switcherNavContainer">
         <Page
             id="emptyPage"
-            showHeader="false" />
+            showHeader="false"
+            backgroundDesign="{= mobileLibrary.PageBackgroundDesign.Transparent }"/>
 
         <Page
             id="pagesRuntime"
             enableScrolling="false"
-            showHeader="false">
+            showHeader="false"
+            backgroundDesign="{= mobileLibrary.PageBackgroundDesign.Transparent }">
             <core:ComponentContainer
                 height="100%"
                 usage="pagesComponent"
@@ -25,15 +29,16 @@
         <Page
             id="workpagesRuntime"
             enableScrolling="false"
-            showHeader="false">
+            showHeader="false"
+            backgroundDesign="{= mobileLibrary.PageBackgroundDesign.Transparent }">
             <core:ComponentContainer
                 height="100%"
-                usage="workpageComponent"
+                name="{/workPageComponent/name}"
+                url="{/workPageComponent/url}"
+                settings="{/workPageComponent/settings}"
                 manifest="true"
                 componentCreated=".workPageComponentCreated"
                 async="true"/>
         </Page>
-
     </NavContainer>
-
 </mvc:View>

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

@@ -3,12 +3,14 @@ sap.ui.define([
     "sap/ui/core/UIComponent",
     "sap/ui/core/ComponentContainer",
     "sap/ui/core/mvc/XMLView",
-    "sap/ushell/Config"
+    "sap/ushell/Config",
+    "sap/ushell/Container"
 ], function (
     UIComponent,
     ComponentContainer,
     XMLView,
-    Config
+    Config,
+    Container
 ) {
     "use strict";
 
@@ -22,7 +24,7 @@ sap.ui.define([
         init: function () {
             UIComponent.prototype.init.apply(this, arguments);
 
-            this.oMenuModelPromise = sap.ushell.Container.getServiceAsync("Menu")
+            this.oMenuModelPromise = Container.getServiceAsync("Menu")
                 .then(function (oMenuService) {
                     return Promise.all([
                         oMenuService.isMenuEnabled(),
@@ -43,7 +45,7 @@ sap.ui.define([
                                 id: "menuBarComponentContainer",
                                 component: this
                             });
-                            sap.ushell.Container.getRenderer().setNavigationBar(oComponentContainer);
+                            Container.getRendererInternal().setNavigationBar(oComponentContainer);
                         }.bind(this));
                     }
             }.bind(this));

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

@@ -27,21 +27,20 @@ sap.ui.define([
     "use strict";
 
     /**
-     * Controller of the MenuBar view.
+     * @alias sap.ushell.components.shell.MenuBar.controller.MenuBar
+     * @class
+     * @classdesc Controller of the MenuBar view.
      * It is responsible for changing the hash after selecting a Menu entry.
      *
      * @param {string} sId Controller id
      * @param {object} oParams Controller parameter
      *
-     * @class
      * @extends sap.ui.core.mvc.Controller
      *
-     * @private
      * @since 1.72.0
-     * @alias sap.ushell.components.shell.MenuBar.controller.MenuBar
+     * @private
      */
-
-    return Controller.extend("sap.ushell.components.shell.MenuBar.controller.MenuBar" /** @lends sap.ushell.components.shell.MenuBar.controller.MenuBar.prototype */, {
+    return Controller.extend("sap.ushell.components.shell.MenuBar.controller.MenuBar", /** @lends sap.ushell.components.shell.MenuBar.controller.MenuBar.prototype */ {
 
         /**
          * UI5 lifecycle method which is called upon controller initialization.
@@ -52,7 +51,7 @@ sap.ui.define([
          * @since 1.72.0
          */
         onInit: function () {
-            this.oContainerRouter = sap.ushell.Container.getRenderer().getRouter();
+            this.oContainerRouter = sap.ushell.Container.getRendererInternal().getRouter();
 
             this.oContainerRouter.getRoute("home").attachMatched(this._selectIndexAfterRouteChange, this);
             this.oContainerRouter.getRoute("openFLPPage").attachMatched(this._selectIndexAfterRouteChange, this);

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.120.7"
+            "version": "1.121.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.120.7
+ * @version 1.121.0
  * @private
  */
 sap.ui.define([
@@ -16,7 +16,8 @@ sap.ui.define([
     "sap/ui/model/FilterOperator",
     "sap/ui/model/Sorter",
     "sap/ushell/resources",
-    "sap/ushell/utils/WindowUtils"
+    "sap/ushell/utils/WindowUtils",
+    "sap/ushell/Container"
 ], function (
     InvisibleMessage,
     coreLibrary,
@@ -26,7 +27,8 @@ sap.ui.define([
     FilterOperator,
     Sorter,
     resources,
-    WindowUtils
+    WindowUtils,
+    Container
 ) {
     "use strict";
 
@@ -37,20 +39,20 @@ sap.ui.define([
     var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
 
     /**
-     * Controller of the NavigationBarMenu view.
+     * @alias sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu
+     * @class
+     * @classdesc Controller of the NavigationBarMenu view.
      * It is responsible for the popover handling, pinning / unpinning spaces, rearranging spaces via DnD and do persistence of these changes.
      *
      * @param {string} sId Controller id
      * @param {object} oParams Controller parameter
      *
-     * @class
      * @extends sap.ui.core.mvc.Controller
      *
-     * @private
      * @since 1.114.0
-     * @alias sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu
-     */
-    return Controller.extend("sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu", {
+     * @private
+     */ // eslint-disable-next-line max-len
+    return Controller.extend("sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu", /** @lends sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu.prototype */ {
         /**
          * Initializes the controller. ResourceBundle and Menu service promise are set.
          *
@@ -58,7 +60,7 @@ sap.ui.define([
          * @since 1.114.0
          */
         onInit: function () {
-            this.pMenuServicePromise = sap.ushell.Container.getServiceAsync("Menu");
+            this.pMenuServicePromise = Container.getServiceAsync("Menu");
             this._oInvisibleMessageInstance = InvisibleMessage.getInstance();
         },
 
@@ -436,7 +438,7 @@ sap.ui.define([
          * @since 1.114.0
          */
         _performNavigation: function (oDestinationTarget) {
-            return sap.ushell.Container.getServiceAsync("Navigation")
+            return Container.getServiceAsync("Navigation")
                 .then(function (oNavigationService) {
                     var oParams = {};
                     oDestinationTarget.parameters.forEach(function (oParameter) {

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

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

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

@@ -2,7 +2,8 @@
 
 sap.ui.define([
     "sap/base/Log",
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ui/core/IconPool",
     "sap/ui/core/InvisibleText",
     "sap/ui/core/UIComponent",
@@ -13,10 +14,12 @@ sap.ui.define([
     "sap/ushell/library",
     "sap/ushell/resources",
     "sap/ushell/utils",
-    "sap/ushell/ui/shell/ShellHeadItem"
+    "sap/ushell/ui/shell/ShellHeadItem",
+    "sap/ushell/Container"
 ], function (
     Log,
-    Core,
+    Element,
+    EventBus,
     IconPool,
     InvisibleText,
     UIComponent,
@@ -27,7 +30,8 @@ sap.ui.define([
     ushellLibrary,
     resources,
     utils,
-    ShellHeadItem
+    ShellHeadItem,
+    Container
 ) {
     "use strict";
 
@@ -39,12 +43,12 @@ sap.ui.define([
 
 
     function getNotificationButton () {
-        return Core.byId("NotificationsCountButton");
+        return Element.getElementById("NotificationsCountButton");
     }
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.120.7",
+            version: "1.121.0",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]
@@ -53,14 +57,14 @@ sap.ui.define([
 
         createContent: function () {
             this._aTimeouts = [];
-            this.oRenderer = sap.ushell.Container.getRenderer("fiori2");
+            this.oRenderer = Container.getRendererInternal("fiori2");
             this.oShellModel = this.oRenderer.shellCtrl.getModel();
-            sap.ushell.Container.getServiceAsync("NotificationsV2").then(function (oNotificationsService) {
+            Container.getServiceAsync("NotificationsV2").then(function (oNotificationsService) {
 
                 this.oNotificationsService = oNotificationsService;
 
                 if (this.oNotificationsService.isEnabled() === true) {
-                    Core.getEventBus().subscribe("sap.ushell.services.Notifications", "onNewNotifications", this._handleAlerts, this);
+                    EventBus.getInstance().subscribe("sap.ushell.services.Notifications", "onNewNotifications", this._handleAlerts, this);
                     this.oShellModel.setProperty("/enableNotifications", true);
                     this.oNotificationsService.init();
                     if (this.oRenderer.getShellConfig().enableNotificationsUI === true) {
@@ -211,7 +215,7 @@ sap.ui.define([
 
                 // if the button is hidden in the overflow, use the overflow button itself
                 if (!oSource.$().width()) {
-                    oSource = Core.byId("endItemsOverflowBtn");
+                    oSource = Element.getElementById("endItemsOverflowBtn");
                 }
 
                 if (oPopover.isOpen()) {
@@ -229,7 +233,7 @@ sap.ui.define([
         },
 
         exit: function () {
-            Core.getEventBus().unsubscribe("sap.ushell.services.Notifications", "onNewNotifications", this._handleAlerts, this);
+            EventBus.getInstance().unsubscribe("sap.ushell.services.Notifications", "onNewNotifications", this._handleAlerts, this);
             if (this.oNotificationsService && this.oNotificationsService.isEnabled() === true) {
                 this.oNotificationsService.destroy();
             }
@@ -241,7 +245,7 @@ sap.ui.define([
                 oNotificationBtn.destroy();
             }
             this.oRenderer = null;
-            var oNotificationsPopover = Core.byId("notificationsView");
+            var oNotificationsPopover = Element.getElementById("notificationsView");
             if (oNotificationsPopover) {
                 oNotificationsPopover.destroy();
                 oNotificationsPopover = null;

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

@@ -1,8 +1,8 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ui/core/Core",
     "sap/ui/Device",
+    "sap/ui/core/Element",
     "sap/ushell/utils",
     "sap/ushell/resources",
     "sap/m/Text",
@@ -17,8 +17,8 @@ sap.ui.define([
     "sap/ui/core/library",
     "sap/ui/core/mvc/Controller"
 ], function (
-    Core,
     Device,
+    Element,
     utils,
     resources,
     Text,
@@ -305,7 +305,7 @@ sap.ui.define([
                 if (jqElement.hasClass("sapUshellNotificationsListItem")) {
                     nextElem = jqElement.next();
                     closeBtn = jqElement.find(".sapMNLB-CloseButton")[0];
-                    Core.byId(closeBtn.id).firePress();
+                    Element.getElementById(closeBtn.id).firePress();
 
                     // set focus on the next list item.
                     if (nextElem) {
@@ -585,7 +585,7 @@ sap.ui.define([
 
         onListItemPress: function (sNotificationId, sSemanticObject, sAction, aParameters) {
             if (sSemanticObject && sAction) {
-                var viewPortContainer = Core.byId("viewPortContainer");
+                var viewPortContainer = Element.getElementById("viewPortContainer");
                 if (viewPortContainer) { // qUnits do not create the viewport container
                     viewPortContainer.switchState("Center");
                 }
@@ -1116,7 +1116,7 @@ sap.ui.define([
         getItemNotificationId: function (elNotificationItem) {
             var sItemModelPath,
                 sItemNotificationId;
-            sItemModelPath = Core.byId(elNotificationItem.getAttribute("Id")).getBindingContext().sPath;
+            sItemModelPath = Element.getElementById(elNotificationItem.getAttribute("Id")).getBindingContext().sPath;
 
             sItemNotificationId = this.getView().getModel().getProperty(sItemModelPath + "/Id");
             return sItemNotificationId;

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

@@ -1,29 +1,29 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/base/i18n/Localization",
     "sap/ui/Device",
     "sap/ui/core/Component",
-    "sap/ui/core/Core",
     "sap/ui/core/CustomData",
+    "sap/ui/core/Element",
     "sap/ui/core/IconPool",
     "sap/ushell/Config",
     "sap/ushell/EventHub",
     "sap/ushell/library",
     "sap/ushell/resources",
-    "sap/ushell/ui/shell/ShellHeadItem",
-    "sap/ui/core/Configuration"
+    "sap/ushell/ui/shell/ShellHeadItem"
 ], function (
+    Localization,
     Device,
     Component,
-    Core,
     CustomData,
+    Element,
     IconPool,
     Config,
     EventHub,
     ushellLibrary,
     resources,
-    ShellHeadItem,
-    Configuration
+    ShellHeadItem
 ) {
     "use strict";
 
@@ -40,7 +40,7 @@ sap.ui.define([
             library: "sap.ushell"
         },
         init: function () {
-            var oShellConfig = sap.ushell.Container.getRenderer("fiori2").getShellConfig();
+            var oShellConfig = sap.ushell.Container.getRendererInternal("fiori2").getShellConfig();
 
             aCreatedControlIds.push(this._createBackButton());
             aCreatedControlIds.push(this._createOverflowButton());
@@ -57,13 +57,13 @@ sap.ui.define([
 
             this._createShellNavigationMenu(oShellConfig);
 
-            var oShellHeader = Core.byId("shell-header");
+            var oShellHeader = Element.getElementById("shell-header");
             oShellHeader.updateAggregation("headItems");
             oShellHeader.updateAggregation("headEndItems");
         },
 
         _createBackButton: function () {
-            var sBackButtonIcon = Configuration.getRTL() ? "feeder-arrow" : "nav-back";
+            var sBackButtonIcon = Localization.getRTL() ? "feeder-arrow" : "nav-back";
             var oBackButton = new ShellHeadItem({
                 id: "backBtn",
                 tooltip: resources.i18n.getText("backBtn_tooltip"),
@@ -77,7 +77,7 @@ sap.ui.define([
         },
 
         _createOverflowButton: function () {
-            var oShellModel = sap.ushell.Container.getRenderer("fiori2").getShellController().getModel();
+            var oShellModel = sap.ushell.Container.getRendererInternal("fiori2").getShellController().getModel();
             var oEndItemsOverflowBtn = new ShellHeadItem({
                 id: "endItemsOverflowBtn",
                 tooltip: {
@@ -127,7 +127,7 @@ sap.ui.define([
             return new Promise(function (fnResolve) {
                 sap.ui.require(["sap/ushell/ui/footerbar/ContactSupportButton"], function (ContactSupportButton) {
                     var sButtonName = "ContactSupportBtn";
-                    var oSupportButton = Core.byId(sButtonName);
+                    var oSupportButton = Element.getElementById(sButtonName);
                     if (!oSupportButton) {
                         // Create an ActionItem from UserActionsMenu (ContactSupportButton)
                         // in order to to take its text and icon
@@ -228,10 +228,10 @@ sap.ui.define([
                         }
                     });
 
-                    var oShellHeader = Core.byId("shell-header");
+                    var oShellHeader = Element.getElementById("shell-header");
                     oShellNavigationMenu.setModel(oShellHeader.getModel());
 
-                    var oShellAppTitle = Core.byId("shellAppTitle");
+                    var oShellAppTitle = Element.getElementById("shellAppTitle");
                     if (oShellAppTitle) {
                         oShellAppTitle.setNavigationMenu(oShellNavigationMenu);
                         oShellAppTitle.setModel(oShellHeader.getModel());
@@ -245,7 +245,7 @@ sap.ui.define([
 
         exit: function () {
             aCreatedControlIds.forEach(function (sControl) {
-                var oControl = Core.byId(sControl);
+                var oControl = Element.getElementById(sControl);
                 if (oControl) {
                     oControl.destroy();
                 }

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
     "sap/ui/core/UIComponent",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
@@ -11,7 +11,7 @@ sap.ui.define([
     "sap/ushell/ui/shell/ShellHeadItem"
 ], function (
     Log,
-    Core,
+    Element,
     UIComponent,
     Device,
     JSONModel,
@@ -23,17 +23,17 @@ sap.ui.define([
     "use strict";
 
     function getProductSwitchButton () {
-        return Core.byId("productSwitchBtn");
+        return Element.getElementById("productSwitchBtn");
     }
 
     function getProductSwitchPopover () {
-        return Core.byId("sapUshellProductSwitchPopover");
+        return Element.getElementById("sapUshellProductSwitchPopover");
     }
 
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.120.7",
+            version: "1.121.0",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {
@@ -94,7 +94,7 @@ sap.ui.define([
                 var oSource = getProductSwitchButton();
                 // if the button is hidden in the overflow, use the overflow button itself
                 if (!oSource || !oSource.$().width()) {
-                    oSource = Core.byId("endItemsOverflowBtn");
+                    oSource = Element.getElementById("endItemsOverflowBtn");
                 }
 
                 oPopover.openBy(oSource);
@@ -121,7 +121,7 @@ sap.ui.define([
                 ariaHaspopup: "dialog",
                 press: this._openProductSwitch.bind(this)
             });
-            sap.ushell.Container.getRenderer("fiori2").showHeaderEndItem([oProductSwitchButton.getId()], false);
+            sap.ushell.Container.getRendererInternal("fiori2").showHeaderEndItem([oProductSwitchButton.getId()], false);
         },
 
 

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

@@ -1,12 +1,13 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/ui/core/EventBus",
     "sap/ushell/components/shell/Search/ESearch",
     "sap/ui/core/UIComponent",
     "sap/ui/core/Component",
     "sap/ushell/utils",
     "sap/base/util/ObjectPath"
-], function (ESearch, UIComponent, Component, Utils, ObjectPath) {
+], function (EventBus, ESearch, UIComponent, Component, Utils, ObjectPath) {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.Search.Component", {
@@ -19,12 +20,12 @@ sap.ui.define([
             var that = this;
             var bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined;
             // check that search is enabled
-            var oShellCtrl = sap.ushell.Container.getRenderer("fiori2").getShellController(),
+            var oShellCtrl = sap.ushell.Container.getRendererInternal("fiori2").getShellController(),
                 oShellView = oShellCtrl.getView(),
                 oShellConfig = (oShellView.getViewData() ? oShellView.getViewData().config : {}) || {};
             var bSearchEnable = (oShellConfig.enableSearch !== false);
             if (!bSearchEnable) {
-                sap.ui.getCore().getEventBus().publish("shell", "searchCompLoaded", { delay: 0 });
+                EventBus.getInstance().publish("shell", "searchCompLoaded", { delay: 0 });
                 return;
             }
 
@@ -36,7 +37,7 @@ sap.ui.define([
                     });
                 } else {
                     ESearch.createContent(that);
-                    sap.ui.getCore().getEventBus().publish("shell", "searchCompLoaded", { delay: 0 });
+                    EventBus.getInstance().publish("shell", "searchCompLoaded", { delay: 0 });
                 }
                 Utils.setPerformanceMark("FLP -- search component is loaded");
             });

package/src/main/js/sap/ushell/components/shell/Search/ESearch.js

@@ -1,12 +1,14 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/ui/core/Element",
+    "sap/ui/core/Lib",
     "sap/ushell/resources",
     "sap/ui/core/IconPool",
     "sap/ui/core/routing/HashChanger",
     "sap/ui/thirdparty/jquery",
     "sap/ushell/renderer/search/util"
-], function (resources, IconPool, HashChanger, jQuery, util) {
+], function (Element, Library, resources, IconPool, HashChanger, jQuery, util) {
     "use strict";
 
     var bDoExit = false;
@@ -14,7 +16,7 @@ sap.ui.define([
     var loadSearchShellHelper = function (oComponent) {
         if (!oComponent._searchShellHelperPromise) {
             oComponent._searchShellHelperPromise = new Promise(function (resolve) {
-                sap.ui.getCore().loadLibrary("sap.esh.search.ui", { async: true }).then(function () {
+                Library.load("sap.esh.search.ui").then(function () {
                     sap.ui.require([
                         "sap/esh/search/ui/SearchShellHelperAndModuleLoader",
                         "sap/esh/search/ui/SearchShellHelper"
@@ -45,7 +47,7 @@ sap.ui.define([
                 });
             }
         };
-        var oShellSearchBtn = sap.ushell.Container.getRenderer("fiori2")
+        var oShellSearchBtn = sap.ushell.Container.getRendererInternal("fiori2")
             .addHeaderEndItem("sap.ushell.ui.shell.ShellHeadItem", oSearchConfig, true, false);
         oShellSearchBtn.data("help-id", "shellHeader-search", true);
         if (util.isSearchFieldExpandedByDefault()) {
@@ -71,7 +73,7 @@ sap.ui.define([
         oComponent.oHashChanger.attachEvent("shellHashChanged", function (sShellHash) {
             var hashChangeInfo = sShellHash.mParameters;
             setTimeout(function () {
-                sap.ui.getCore().loadLibrary("sap.esh.search.ui", { async: true }).then(function () {
+                Library.load("sap.esh.search.ui").then(function () {
                     sap.ui.require([
                         "sap/esh/search/ui/HashChangeHandler"
                     ], function (HashChangeHandler) {
@@ -91,8 +93,8 @@ sap.ui.define([
 
     function exit () {
         if (bDoExit) {
-            sap.ushell.Container.getRenderer("fiori2").hideHeaderEndItem("sf");
-            var oSearchButton = sap.ui.getCore().byId("sf");
+            sap.ushell.Container.getRendererInternal("fiori2").hideHeaderEndItem("sf");
+            var oSearchButton = Element.getElementById("sf");
             if (oSearchButton) {
                 oSearchButton.destroy();
             }

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

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.120.7"
+            "version": "1.121.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",