@sapui5/sap.ushell 1.113.0 → 1.114.0

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

@@ -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";
@@ -76,9 +78,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderers.fiori2.Renderer", {
         metadata: {
-            version: "1.113.0",
+            version: "1.114.0",
             dependencies: {
-                version: "1.113.0",
+                version: "1.114.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -493,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");
@@ -504,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) {
@@ -523,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();
 
@@ -971,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
      */
@@ -979,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>
@@ -1008,7 +1034,7 @@ 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
      */
@@ -1081,7 +1107,7 @@ 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
@@ -2736,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);