@sapui5/sap.ushell 1.112.3 → 1.114.0

package/src/main/js/sap/ushell/renderers/fiori2/Renderer.js

@@ -1,8 +1,8 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * Default renderer for SAP Fiori launchpad.
- * Publishes all lifecycle events as described in the documentation of the "sap.ushell" namepsace.
+ * Publishes all lifecycle events as described in the documentation of the "sap.ushell" namespace.
  */
 sap.ui.define([
     "sap/ui/core/Core",
@@ -29,6 +29,7 @@ sap.ui.define([
     "sap/ui/core/mvc/View",
     "sap/ushell/ui/shell/ShellHeadItem",
     "sap/m/NotificationListItem",
+    "sap/ushell/renderers/fiori2/ShellLayout",
     "./RendererExtensions"
 ], function (
     Core,
@@ -54,7 +55,8 @@ sap.ui.define([
     ushellLibrary,
     View,
     ShellHeadItem,
-    NotificationListItem
+    NotificationListItem,
+    ShellLayout
     // RendererExtensions
 ) {
     "use strict";
@@ -62,6 +64,7 @@ sap.ui.define([
     // shortcut for sap.ui.core.mvc.ViewType
     var ViewType = coreLibrary.mvc.ViewType;
 
+    // shortcut for sap.ushell.AppType
     var AppType = ushellLibrary.AppType;
 
     /**
@@ -75,9 +78,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderers.fiori2.Renderer", {
         metadata: {
-            version: "1.112.3",
+            version: "1.114.0",
             dependencies: {
-                version: "1.112.3",
+                version: "1.114.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -90,80 +93,80 @@ sap.ui.define([
                     clearAggregation: false,
                     controlAggregation: "pages"
                 },
-                routes: [
-                    {
-                        name: "appfinder-legacy",
-                        pattern: "Shell-home&/appFinder/:menu:/:filter:" // TODO root intent must come from configuration
-                    }, {
-                        name: "home",
-                        pattern: ["Shell-home?:hashParameters:", "Shell-home&/:innerHash*:", "Shell-home"], // TODO must come from configuration
-                        target: (function () {
-
-
-                            if (Config.last("/core/homeApp/enabled")) {
-                                return "homeapp";
-                            }
-
-                            //CEP MyHome
-                            if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") !== null) {
-                                return "workpages";
-                            }
+                routes: [{
+                    name: "appfinder-legacy",
+                    pattern: "Shell-home&/appFinder/:menu:/:filter:" // TODO root intent must come from configuration
+                }, {
+                    name: "home",
+                    pattern: ["Shell-home?:hashParameters:", "Shell-home&/:innerHash*:", "Shell-home"], // TODO must come from configuration
+                    target: (function () {
+                        if (Config.last("/core/homeApp/enabled")) {
+                            return "homeapp";
+                        }
 
-                            //CEP Standard
-                            if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") === null) {
-                                return "runtimeSwitcher";
-                            }
+                        //CEP MyHome
+                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") !== null) {
+                            return "workpages";
+                        }
 
-                            if (Config.last("/core/spaces/enabled")) {
-                                return "pages";
-                            }
+                        //CEP Standard
+                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") === null) {
+                            return "runtimeSwitcher";
+                        }
 
+                        if (Config.last("/core/spaces/enabled")) {
+                            return "pages";
+                        }
 
-                            return "home";
-                        })()
-                    }, {
-                        name: "appfinder",
-                        pattern: [ // TODO must come from configuration
-                            "Shell-appfinder?:hashParameters:&/:innerHash*:",
-                            "Shell-appfinder?:hashParameters*:",
-                            "Shell-appfinder&/:innerHash*:",
-                            "Shell-appfinder"
-                        ],
-                        target: Config.last("/core/catalog/enabled") ? "appfinder" : undefined // Avoid the loading of Component
-                    }, {
-                        name: "openFLPPage",
-                        pattern: [
-                            "Launchpad-openFLPPage?:hashParameters:",
-                            "Launchpad-openFLPPage"
-                        ],
-                        target: (function () {
-                            //CEP MyHome
-                            if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") !== null) {
-                                return "workpages";
-                            }
+                        return "home";
+                    })()
+                }, {
+                    name: "appfinder",
+                    pattern: [ // TODO must come from configuration
+                        "Shell-appfinder?:hashParameters:&/:innerHash*:",
+                        "Shell-appfinder?:hashParameters*:",
+                        "Shell-appfinder&/:innerHash*:",
+                        "Shell-appfinder"
+                    ],
+                    target: Config.last("/core/catalog/enabled") ? "appfinder" : undefined // Avoid the loading of Component
+                }, {
+                    name: "openFLPPage",
+                    pattern: [
+                        "Launchpad-openFLPPage?:hashParameters:",
+                        "Launchpad-openFLPPage"
+                    ],
+                    target: (function () {
+                        //CEP MyHome
+                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") !== null) {
+                            return "workpages";
+                        }
 
-                            //CEP Standard
-                            if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") === null) {
-                                return "runtimeSwitcher";
-                            }
+                        //CEP Standard
+                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") === null) {
+                            return "runtimeSwitcher";
+                        }
 
-                            if (Config.last("/core/spaces/enabled")) {
-                                return "pages";
-                            }
+                        if (Config.last("/core/spaces/enabled")) {
+                            return "pages";
+                        }
 
-                            return "home";
-
-                        })()
-                    }, {
-                        //Testing workpages - technical route
-                        name: "openWorkPage",
-                        pattern: [
-                            "Launchpad-openWorkPage?:hashParameters:",
-                            "Launchpad-openWorkPage"
-                        ],
-                        target: "workpages"
-                    }
-                ],
+                        return "home";
+                    })()
+                }, {
+                    //Testing workpages - technical route
+                    name: "openWorkPage",
+                    pattern: [
+                        "Launchpad-openWorkPage?:hashParameters:",
+                        "Launchpad-openWorkPage"
+                    ],
+                    target: "workpages"
+                }, {
+                    name: "wzsearch",
+                    pattern: [ // TODO must come from configuration
+                        "WorkZoneSearchResult-display:?query:"
+                    ],
+                    target: "wzsearch"
+                }],
                 targets: {
                     home: {
                         name: "homepage",
@@ -246,6 +249,21 @@ sap.ui.define([
                                 ]
                             }
                         }
+                    },
+                    wzsearch: {
+                        name: "cepsearchresult.app",
+                        type: "Component",
+                        id: "cepsearchresult-app-component",
+                        options: {
+                            manifest: true,
+                            componentData: {
+                                // use additional settings here as needed...
+                                config: {
+                                    enablePersonalization: true,
+                                    enableHomePageSettings: false
+                                }
+                            }
+                        }
                     }
                 }
             }
@@ -290,7 +308,6 @@ sap.ui.define([
                 EventHub.emit("trackHashChange", "Shell-appFinder");
                 var oComponent = Core.getComponent(this.createId("Shell-appfinder-component"));
                 var oData = oEvent.getParameter("arguments");
-
                 if (sap.ushell.Container.getRenderer("fiori2")) {
                     AppLifeCycle.getShellUIService().setBackNavigation();
                     sap.ushell.Container.getRenderer("fiori2").setCurrentCoreView("appFinder");
@@ -309,6 +326,11 @@ sap.ui.define([
                 oSharedComponentUtils.initializeAccessKeys();
             }, this);
 
+            oRouter.getRoute("wzsearch").attachMatched(function (oEvent) {
+                AppLifeCycle.getShellUIService().setBackNavigation();
+                AppLifeCycle.switchViewState("app", false, "cepsearchresult-app");
+            });
+
             var oDeviceModel = new JSONModel(Device);
             oDeviceModel.setDefaultBindingMode("OneWay");
             this.setModel(oDeviceModel, "device");
@@ -440,7 +462,7 @@ sap.ui.define([
             viewData.config.appState = sGivenState;
         }
 
-        // the code below migrates a configuration structure from version 1.28 or older, to the defaultexpected configuration structure in 1.30
+        // the code below migrates a configuration structure from version 1.28 or older, to the default expected configuration structure in 1.30
         if (viewData.config) {
             // We need to pass this flag in order to check lately the possibility of local resolution for empty hash
             if (viewData.config.rootIntent === undefined) {
@@ -473,8 +495,13 @@ sap.ui.define([
             }
         }
 
-        var oShellModel = Config.createModel("/core/shell/model", JSONModel);
-        viewData.shellModel = oShellModel;
+        viewData.shellModel = Config.createModel("/core/shell/model", JSONModel);
+        viewData.helperModel = new JSONModel({
+            shell: {
+                floatingContainerVisible: false,
+                footerContent: ""
+            }
+        });
 
         if (!this.getComponentData().async) {
             Log.error("sap/ushell/renderers/fiori2/Renderer component is created synchronously. Synchronous instantiation is not allowed. Please use async:true in component data");
@@ -484,10 +511,8 @@ sap.ui.define([
                 height: "100%",
                 viewData: viewData
             });
-
-            oSyncView.setModel(oShellModel);
+            oSyncView.addStyleClass("sapUshellRenderer");
             this._oShellView = oSyncView;
-
             this.oShellModel = AppLifeCycle.getElementsModel();
 
             oSyncView.loaded().then(function (oCreatedView) {
@@ -503,9 +528,10 @@ sap.ui.define([
         return View.create({
             id: "mainShell",
             viewName: "module:sap/ushell/renderers/fiori2/ShellAsync.view",
+            height: "100%",
             viewData: viewData
         }).then(function (oView) {
-            oView.setModel(oShellModel);
+            oView.addStyleClass("sapUshellRenderer");
             this._oShellView = oView;
             this.oShellModel = AppLifeCycle.getElementsModel();
 
@@ -571,7 +597,7 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.applyExtendedShellState = function (sShellName, fnCustomMerge) {
-        //merge the current shell state state (HOME/APP) with the custome shell.
+        //merge the current shell state state (HOME/APP) with the custom shell.
         this.oShellModel.applyExtendedShellState(sShellName, fnCustomMerge);
     };
 
@@ -697,7 +723,7 @@ sap.ui.define([
      * @param {string|string[]} vIds A single ID or an array of IDs to add to the Tool Area.
      * @param {boolean} bCurrentState If <code>true</code>, add the items to the currently rendered shell.
      *   If <code>false</code>, add the items to the LaunchPadState itself,
-     *   causing the items to be rendered everytime the given states are active.
+     *   causing the items to be rendered every time the given states are active.
      * @param {string[]} aStates Only valid if bCurrentState is set to <code>false</code>.
      *   An array of shell states (i.e. sap.ushell.renderers.fiori2.Renderer.LaunchpadState) in which the controls are added.
      *   If no launchpad state is provided the items are added in all states.
@@ -733,9 +759,9 @@ sap.ui.define([
      * @public
      */
     Renderer.prototype.showActionButton = function (aIds, bCurrentState, aStates) {
-        var aButtons = [],
-            aActions = [],
-            oButton;
+        var aButtons = [];
+        var aActions = [];
+        var oButton;
 
         if (typeof aIds === "string") {
             aIds = [aIds];
@@ -823,7 +849,7 @@ sap.ui.define([
     };
 
     /**
-     * Sets the header visibility accrding to the given value and shell states.
+     * Sets the header visibility according to the given value and shell states.
      * (see sap.ushell.renderers.fiori2.renderer.LaunchpadState).
      *
      * <b>Example:</b>
@@ -951,7 +977,7 @@ sap.ui.define([
      * renderer.setFooter(bar);
      * </pre>
      *
-     * @param {Object} oFooter - sap.m.Bar, the control to be added as the footer of the Fiori Launchpad
+     * @param {sap.m.Bar} oFooter The control to be added as the footer of the Fiori Launchpad
      * @since 1.30
      * @public
      */
@@ -959,6 +985,26 @@ sap.ui.define([
         this.shellCtrl.setFooter(oFooter);
     };
 
+    /**
+     * @param {sap.ui.core.Control} oNavigationBar The NavigationBar Control
+     *
+     * @private
+     * @since 1.114.0
+     */
+    Renderer.prototype.setNavigationBar = function (oNavigationBar) {
+        this.shellCtrl.setNavigationBar(oNavigationBar);
+    };
+
+    /**
+     * @param {sap.ui.core.Control | HTMLElement} oShellShapes The shapes
+     *
+     * @private
+     * @since 1.114.0
+     */
+    Renderer.prototype.setShellShapes = function (oShellShapes) {
+        this.shellCtrl.setShellShapes(oShellShapes);
+    };
+
     /**
      * Creates and displays an SAPUI5 control as the footer of the Fiori launchpad shell.<br>
      * The footer will be displayed in all states. <br>
@@ -988,17 +1034,16 @@ sap.ui.define([
      *     The (class) name of the control type to create, for example: <code>"sap.m.Bar"</code><br>
      *   - {object} oControlProperties<br>
      *     The properties that will be passed to the created control, for example: <code>{id: "testBar"}</code><br>
-     * @returns {object} jQuery.deferred.promise object that when resolved, returns the newly created control
+     * @returns {jQuery.Deferred.promise} object that when resolved, returns the newly created control
      * @since 1.48
      * @public
      */
     Renderer.prototype.setShellFooter = function (oParameters) {
-        var oDeferred = new jQuery.Deferred(),
-            that = this,
-            sControlResource,
-            oControlInstance,
-            controlType = oParameters.controlType,
-            oControlProperties = oParameters.oControlProperties;
+        var oDeferred = new jQuery.Deferred();
+        var that = this;
+        var oControlInstance;
+        var controlType = oParameters.controlType;
+        var oControlProperties = oParameters.oControlProperties;
 
         // If a control instance is already created - get it by its id
         if (oControlProperties && oControlProperties.id && Core.byId(oControlProperties.id)) {
@@ -1017,7 +1062,7 @@ sap.ui.define([
         }
 
         if (controlType) {
-            sControlResource = controlType.replace(/\./g, "/");
+            var sControlResource = controlType.replace(/\./g, "/");
             sap.ui.require([sControlResource],
                 function (ControlObject) {
                     oControlInstance = new ControlObject(oControlProperties);
@@ -1062,29 +1107,28 @@ sap.ui.define([
      *   For example: <code>"sap.m.Bar"</code><br>
      * @param {object} oControlProperties The properties that will be passed to the created control.<br>
      *   For example: <code>{id: "testBar"}</code><br>
-     * @returns {object} The created control
+     * @returns {sap.ui.core.Control} The created control
      * @since 1.42
      * @deprecated since 1.48. Please use {@link #setShellFooter} instead.
      * @public
      */
     Renderer.prototype.setFooterControl = function (controlType, oControlProperties) {
-        var sControlResource = controlType.replace(/\./g, "/"),
-            // Try to require the control in case it is already loaded
-            ControlObject = sap.ui.require(sControlResource),
-            oControlInstance,
-            bResourceLoadedAsObject = false;
+        var sControlResource = controlType.replace(/\./g, "/");
+        // Try to require the control in case it is already loaded
+        var ControlObject = sap.ui.require(sControlResource);
+        var bResourceLoadedAsObject = false;
 
         // Verify whether the control type is already loaded
         if (ControlObject) {
             bResourceLoadedAsObject = true;
         } else if (!ObjectPath.get(controlType || "")) {
             // since 1.94, follow up for deprecation in 1.48
-            Log.error("Renderer.setFooterControl: the referenced control resourse " + controlType + " is not available.",
+            Log.error("Renderer.setFooterControl: the referenced control resource " + controlType + " is not available.",
                 undefined, "sap.ushell.renderers.fiori2.Renderer");
             return undefined;
         }
 
-        oControlInstance = this.createItem(oControlProperties, undefined, function (oProperties) {
+        var oControlInstance = this.createItem(oControlProperties, undefined, function (oProperties) {
             if (controlType) {
                 if (bResourceLoadedAsObject) {
                     return new ControlObject(oProperties);
@@ -1139,7 +1183,7 @@ sap.ui.define([
      * @param {string|string[]} vIds A single ID or an array of IDs to remove from the Tool Area.
      * @param {boolean} bCurrentState If <code>true</code>, remove the items from the currently rendered shell.
      *   If <code>false</code>, remove the items from the LaunchPadState itself,
-     *   causing the items to be removed everytime the given states are active.
+     *   causing the items to be removed every time the given states are active.
      * @param {string[]} aStates (only valid if bCurrentState is set to <code>false</code>) -
      *   An array of shell states (i.e. sap.ushell.renderers.fiori2.Renderer.LaunchpadState) from which the controls are removed.
      *   If no launchpad state is provided the items are removed from all states.
@@ -1365,15 +1409,14 @@ sap.ui.define([
      * @public
      */
     Renderer.prototype.addShellSubHeader = function (oParameters) {
-        var oDeferred = new jQuery.Deferred(),
-            that = this,
-            sControlResource,
-            oControlInstance,
-            controlType = oParameters.controlType,
-            oControlProperties = oParameters.oControlProperties,
-            bIsVisible = oParameters.bIsVisible,
-            bCurrentState = oParameters.bCurrentState,
-            aStates = oParameters.aStates;
+        var oDeferred = new jQuery.Deferred();
+        var that = this;
+        var oControlInstance;
+        var controlType = oParameters.controlType;
+        var oControlProperties = oParameters.oControlProperties;
+        var bIsVisible = oParameters.bIsVisible;
+        var bCurrentState = oParameters.bCurrentState;
+        var aStates = oParameters.aStates;
 
         // If a control instance is already created - get it by its id
         if (oControlProperties && oControlProperties.id && Core.byId(oControlProperties.id)) {
@@ -1386,7 +1429,7 @@ sap.ui.define([
             }
         }
         if (controlType) {
-            sControlResource = controlType.replace(/\./g, "/");
+            var sControlResource = controlType.replace(/\./g, "/");
             sap.ui.require([sControlResource],
                 function (ControlObject) {
                     oControlInstance = new ControlObject(oControlProperties);
@@ -1442,24 +1485,22 @@ sap.ui.define([
      * @public
      */
     Renderer.prototype.addSubHeader = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
-        var sControlResource = controlType.replace(/\./g, "/"),
-            // Try to require the control in case it is already loaded
-            ControlObject = sap.ui.require(sControlResource),
-            oControlInstance,
-            bResourceLoadedAsObject = false;
+        var sControlResource = controlType.replace(/\./g, "/");
+        // Try to require the control in case it is already loaded
+        var ControlObject = sap.ui.require(sControlResource);
+        var bResourceLoadedAsObject = false;
 
         // Verify whether the control type is already loaded
         if (ControlObject) {
             bResourceLoadedAsObject = true;
         } else if (!ObjectPath.get(controlType || "")) {
             // since 1.94, follow up for deprecation in 1.48
-            Log.error("Renderer.setFooterControl: the referenced control resourse " + controlType + " is not available.",
+            Log.error("Renderer.setFooterControl: the referenced control resource " + controlType + " is not available.",
                 undefined, "sap.ushell.renderers.fiori2.Renderer");
             return undefined;
         }
 
-
-        oControlInstance = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
+        var oControlInstance = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
             if (controlType) {
                 if (bResourceLoadedAsObject) {
                     return new ControlObject(oProperties);
@@ -1520,17 +1561,15 @@ sap.ui.define([
      * @public
      */
     Renderer.prototype.addUserAction = function (oParameters) {
-        var oDeferred = new jQuery.Deferred(),
-            that = this,
-            sControlResource,
-            oControlInstance,
-            controlType = oParameters.controlType,
-            oControlProperties = oParameters.oControlProperties,
-            bIsVisible = oParameters.bIsVisible,
-            bCurrentState = oParameters.bCurrentState,
-            oModelToUpdate = bCurrentState ? AppLifeCycle.shellElements().getStateModelToUpdate() : this.oShellModel.getModelToUpdate(),
-            aStates = oParameters.aStates,
-            sNoControlTypeErrorMessage;
+        var oDeferred = new jQuery.Deferred();
+        var that = this;
+        var oControlInstance;
+        var controlType = oParameters.controlType;
+        var oControlProperties = oParameters.oControlProperties;
+        var bIsVisible = oParameters.bIsVisible;
+        var bCurrentState = oParameters.bCurrentState;
+        var oModelToUpdate = bCurrentState ? AppLifeCycle.shellElements().getStateModelToUpdate() : this.oShellModel.getModelToUpdate();
+        var aStates = oParameters.aStates;
 
         // If a control instance is already created - get it by its id
         if (oControlProperties) {
@@ -1545,7 +1584,7 @@ sap.ui.define([
             if (controlType === "sap.m.Button") {
                 controlType = "sap.ushell.ui.launchpad.ActionItem";
             }
-            sControlResource = controlType.replace(/\./g, "/");
+            var sControlResource = controlType.replace(/\./g, "/");
             sap.ui.require([sControlResource], function (ControlClass) {
                 // change model
                 var oOrigShellModel;
@@ -1577,7 +1616,7 @@ sap.ui.define([
                 oDeferred.resolve(oControlInstance);
             });
         } else {
-            sNoControlTypeErrorMessage = "You must specify control type in order to create it";
+            var sNoControlTypeErrorMessage = "You must specify control type in order to create it";
             Log.warning(sNoControlTypeErrorMessage);
             oDeferred.reject(sNoControlTypeErrorMessage);
         }
@@ -1614,15 +1653,13 @@ sap.ui.define([
      * @public
      */
     Renderer.prototype.addActionButton = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
-        var sControlResource,
-            oControlInstance,
-            bResourceLoadedAsObject = false;
+        var bResourceLoadedAsObject = false;
 
         if (controlType === "sap.m.Button") {
             controlType = "sap.ushell.ui.launchpad.ActionItem";
         }
 
-        sControlResource = controlType.replace(/\./g, "/");
+        var sControlResource = controlType.replace(/\./g, "/");
         // Try to require the control in case it is already loaded
         var ControlObject = sap.ui.require(sControlResource);
 
@@ -1631,12 +1668,12 @@ sap.ui.define([
             bResourceLoadedAsObject = true;
         } else if (!ObjectPath.get(controlType || "")) {
             // since 1.94, follow up for deprecation in 1.48
-            Log.error("Renderer.setFooterControl: the referenced control resourse " + controlType + " is not available.",
+            Log.error("Renderer.setFooterControl: the referenced control resource " + controlType + " is not available.",
                 undefined, "sap.ushell.renderers.fiori2.Renderer");
             return undefined;
         }
 
-        oControlInstance = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
+        var oControlInstance = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
             if (controlType) {
                 if (bResourceLoadedAsObject) {
                     return new ControlObject(oProperties);
@@ -1686,15 +1723,15 @@ sap.ui.define([
      * @deprecated since 1.52
      */
     Renderer.prototype.addFloatingButton = function (oParameters) {
-        var oDeferred = new jQuery.Deferred(),
-            that = this,
-            sControlResource,
-            oControlInstance,
-            controlType = oParameters.controlType,
-            oControlProperties = oParameters.oControlProperties,
-            bIsVisible = oParameters.bIsVisible,
-            bCurrentState = oParameters.bCurrentState,
-            aStates = oParameters.aStates;
+        var oDeferred = new jQuery.Deferred();
+        var that = this;
+        var sControlResource;
+        var oControlInstance;
+        var controlType = oParameters.controlType;
+        var oControlProperties = oParameters.oControlProperties;
+        var bIsVisible = oParameters.bIsVisible;
+        var bCurrentState = oParameters.bCurrentState;
+        var aStates = oParameters.aStates;
 
         // If a control instance is already created - get it by its id
         if (oControlProperties && oControlProperties.id && Core.byId(oControlProperties.id)) {
@@ -1754,30 +1791,27 @@ sap.ui.define([
      * @public
      */
     Renderer.prototype.addFloatingActionButton = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
-        var sControlResource,
-            ControlObject,
-            oControlInstance,
-            bResourceLoadedAsObject = false;
+        var bResourceLoadedAsObject = false;
 
         if (!controlType) {
             controlType = "sap.m.Button";
         }
 
-        sControlResource = controlType.replace(/\./g, "/");
+        var sControlResource = controlType.replace(/\./g, "/");
         // Try to require the control in case it is already loaded
-        ControlObject = sap.ui.require(sControlResource);
+        var ControlObject = sap.ui.require(sControlResource);
 
         // Verify whether the control type is already loaded
         if (ControlObject) {
             bResourceLoadedAsObject = true;
         } else if (!ObjectPath.get(controlType || "")) {
             // since 1.94, follow up for deprecation in 1.48
-            Log.error("Renderer.setFooterControl: the referenced control resourse " + controlType + " is not available.",
+            Log.error("Renderer.setFooterControl: the referenced control resource " + controlType + " is not available.",
                 undefined, "sap.ushell.renderers.fiori2.Renderer");
             return undefined;
         }
 
-        oControlInstance = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
+        var oControlInstance = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
             if (controlType) {
                 if (bResourceLoadedAsObject) {
                     return new ControlObject(oProperties);
@@ -1837,15 +1871,14 @@ sap.ui.define([
      * @public
      */
     Renderer.prototype.addSidePaneContent = function (oParameters) {
-        var oDeferred = new jQuery.Deferred(),
-            that = this,
-            sControlResource,
-            oControlInstance,
-            controlType = oParameters.controlType,
-            oControlProperties = oParameters.oControlProperties,
-            bIsVisible = oParameters.bIsVisible,
-            bCurrentState = oParameters.bCurrentState,
-            aStates = oParameters.aStates;
+        var oDeferred = new jQuery.Deferred();
+        var that = this;
+        var oControlInstance;
+        var controlType = oParameters.controlType;
+        var oControlProperties = oParameters.oControlProperties;
+        var bIsVisible = oParameters.bIsVisible;
+        var bCurrentState = oParameters.bCurrentState;
+        var aStates = oParameters.aStates;
 
         // If a control instance is already created - get it by its id
         if (oControlProperties && oControlProperties.id && Core.byId(oControlProperties.id)) {
@@ -1856,7 +1889,7 @@ sap.ui.define([
         }
 
         if (controlType) {
-            sControlResource = controlType.replace(/\./g, "/");
+            var sControlResource = controlType.replace(/\./g, "/");
             sap.ui.require([sControlResource],
                 function (ControlObject) {
                     oControlInstance = new ControlObject(oControlProperties);
@@ -1900,17 +1933,17 @@ sap.ui.define([
      * @public
      */
     Renderer.prototype.addLeftPaneContent = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
-        var sControlResource = controlType.replace(/\./g, "/"),
-            // Try to require the control in case it is already loaded
-            ControlObject = sap.ui.require(sControlResource),
-            bResourceLoadedAsObject;
+        var sControlResource = controlType.replace(/\./g, "/");
+        // Try to require the control in case it is already loaded
+        var ControlObject = sap.ui.require(sControlResource);
+        var bResourceLoadedAsObject;
 
         // Verify whether the control type is already loaded
         if (ControlObject) {
             bResourceLoadedAsObject = true;
         } else if (!ObjectPath.get(controlType || "")) {
             // since 1.94, follow up for deprecation in 1.48
-            Log.error("Renderer.setFooterControl: the referenced control resourse " + controlType + " is not available.",
+            Log.error("Renderer.setFooterControl: the referenced control resource " + controlType + " is not available.",
                 undefined, "sap.ushell.renderers.fiori2.Renderer");
             return undefined;
         }
@@ -1974,7 +2007,7 @@ sap.ui.define([
      */
     Renderer.prototype.addHeaderItem = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
         // in order to support deprecation of the never used argument: 'controlType' , we'll need to check whether it was passed to
-        // the function by checking the typs of the first two arguments
+        // the function by checking the types of the first two arguments
         if (typeof (arguments[0]) === "object" && typeof (arguments[1]) === "boolean") {
             oControlProperties = arguments[0];
             bIsVisible = arguments[1];
@@ -2063,7 +2096,7 @@ sap.ui.define([
      * @param {boolean} bIsVisible Specify whether to display the control.
      * @param {boolean} bCurrentState If <code>true</code>, add the item to the currently rendered shell.
      *    If <code>false</code>, add the item to the given LaunchPadStates
-     *    This causes the items to be rendered everytime the given states are active.
+     *    This causes the items to be rendered every time the given states are active.
      * @param {string[]} aStates (only valid if bCurrentState is set to <code>false</code>) -
      *    An array of shell states (i.e. sap.ushell.renderers.fiori2.Renderer.LaunchpadState) in which the controls are added.
      *    If no launchpad state is provided the items are added in all states.
@@ -2143,7 +2176,7 @@ sap.ui.define([
      */
     Renderer.prototype.addHeaderEndItem = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
         // in order to support deprecation of the never used argument: 'controlType' , we'll need to check whether it was passed to
-        // the function by checking the typs of the first two arguments
+        // the function by checking the types of the first two arguments
         if (typeof (arguments[0]) === "object" && typeof (arguments[1]) === "boolean") {
             oControlProperties = arguments[0];
             bIsVisible = arguments[1];
@@ -2179,7 +2212,7 @@ sap.ui.define([
      */
     Renderer.prototype.addEndUserFeedbackCustomUI = function (oCustomUIContent, bShowCustomUIContent) {
         if (oCustomUIContent || bShowCustomUIContent) {
-            Log.info("Application calls sap.ushell.Rederer.addEndUserFeedbackCustomUI. This funciton is deprecated. The call has no effect.");
+            Log.info("Application calls sap.ushell.Renderer.addEndUserFeedbackCustomUI. This function is deprecated. The call has no effect.");
         }
     };
 
@@ -2347,7 +2380,7 @@ sap.ui.define([
      * @param {sap.ui.core.Control} oControl The UI control that is set to be the content of the floating container
      * @param {boolean} bCurrentState If <code>true</code> (and the container's visibility is set to <code>true</code>)
      *   then the given content is displayed by the container in the current shell state.<br>
-     *   When the user navigates to a different state (including navitating to a different application) then the content will be removed.<br>
+     *   When the user navigates to a different state (including navigating to a different application) then the content will be removed.<br>
      *   If <code>false</code> then the content is added to the states mentioned in the parameter <code>aStates</code>.<br>
      * @param {string[]} aStates (Valid only if bCurrentState is <code>false</code>)<br>
      *   A list of shell states (i.e. sap.ushell.renderers.fiori2.Renderer.LaunchpadState) in which the given content is shown in
@@ -2363,7 +2396,7 @@ sap.ui.define([
     /**
      * Set the current visibility state of the floating container
      *
-     * @param {boolean} bVisible The visiblily state of the floating container
+     * @param {boolean} bVisible The visibility state of the floating container
      * @private
      */
     Renderer.prototype.setFloatingContainerVisibility = function (bVisible) {
@@ -2403,7 +2436,7 @@ sap.ui.define([
     /**
      * Set the element that will capture the floating container
      *
-     * @param {string} sElementToCaptureSelector Element to capure selector.
+     * @param {string} sElementToCaptureSelector Element to capture selector.
      * @private
      */
     Renderer.prototype.setFloatingContainerDragSelector = function (sElementToCaptureSelector) {
@@ -2436,11 +2469,10 @@ sap.ui.define([
     /*---------------Generic--------------------*/
 
     Renderer.prototype.convertButtonsToActions = function (aIds, bCurrentState, aStates) {
-        var oProperties = {},
-            oButton,
-            that = this;
+        var oProperties = {};
+        var that = this;
         aIds.forEach(function (sId) {
-            oButton = Core.byId(sId);
+            var oButton = Core.byId(sId);
             oProperties.id = oButton.getId();
             oProperties.text = oButton.getText();
             oProperties.icon = oButton.getIcon();
@@ -2578,9 +2610,9 @@ sap.ui.define([
     };
 
     /**
-     * Calls the provider with an object providing the tile informations
+     * Calls the provider with an object providing the tile information
      * @example of a tile actions provider callback:
-     *   <code>
+     * <pre>
      *     function fnProvider (oTileObject){
      *       // oTileObject properties:
      *       // controlId: The id of the actual control in the dom
@@ -2604,7 +2636,7 @@ sap.ui.define([
      *         }
      *       ];
      *     }
-     *   </code>
+     * </pre>
      * @param {function} fnProvider A function returning an array
      * @returns {Promise<void>} Resolves once the provider was registered
      *
@@ -2730,5 +2762,35 @@ sap.ui.define([
         });
     };
 
+    /**
+     * @returns {Promise} Resolves once the Renderer was placed and the ShellLayout was created
+     *
+     * @private
+     * @since 1.114.0
+     */
+    Renderer.prototype.waitForShellLayout = function () {
+        return this.shellCtrl.getView().waitForShellLayout();
+    };
+
+    /**
+     * @returns {Promise} Resolves all initializations have settled
+     *
+     * @private
+     * @since 1.114.0
+     */
+    Renderer.prototype.awaitPendingInitializations = function () {
+        if (this.shellCtrl.getView().awaitPendingInitializations) {
+            return this.shellCtrl.getView().awaitPendingInitializations();
+        }
+        return Promise.resolve();
+    };
+
+    /**
+     * @private
+     */
+    Renderer.prototype.exit = function () {
+        ShellLayout.destroyLayout();
+    };
+
     return Renderer;
 }, true);