@sapui5/sap.ushell 1.128.1 → 1.129.1

package/src/main/js/sap/ushell/renderers/fiori2/Shell.view.js

@@ -9,23 +9,23 @@ sap.ui.define([
     "sap/base/Log",
     "sap/m/Avatar",
     "sap/m/library",
-    "sap/ui/Device",
-    "sap/ushell/components/_HeaderManager/ShellHeader.controller",
+    "sap/ushell/renderer/shellHeader/ShellHeader.controller",
     "sap/ushell/ui/launchpad/AccessibilityCustomData",
     "sap/ushell/EventHub",
     "sap/ushell/resources",
     "sap/ushell/utils",
     "sap/ui/core/mvc/XMLView",
     "sap/ui/core/Core",
+    "sap/ui/core/Component",
     "sap/ushell/Container",
     "sap/ushell/renderer/ShellLayout",
     "sap/ushell/state/ShellModel",
-    "sap/ushell/state/StateManager"
+    "sap/ushell/state/StateManager",
+    "sap/ushell/state/BindingHelper"
 ], function (
     Log,
     Avatar,
     mobileLibrary,
-    Device,
     ShellHeaderController,
     AccessibilityCustomData,
     EventHub,
@@ -33,10 +33,12 @@ sap.ui.define([
     utils,
     XMLView,
     Core,
+    Component,
     Container,
     ShellLayout,
     ShellModel,
-    StateManager
+    StateManager,
+    BindingHelper
 ) {
     "use strict";
 
@@ -56,10 +58,6 @@ sap.ui.define([
         List: "List"
     };
 
-    function fnShellUpdateAggItem (sId, oContext) {
-        return sap.ui.getCore().byId(oContext.getObject());
-    }
-
     // eslint-disable-next-line ushell/no-deprecated
     sap.ui.jsview("sap.ushell.renderers.fiori2.Shell", { // LEGACY API (deprecated)
         getControllerName: function () {
@@ -133,8 +131,8 @@ sap.ui.define([
         createRendererRootViewSync: function () {
             var oController = this.getController();
             // eslint-disable-next-line ushell/no-deprecated
-            var oRendererRootView = sap.ui.xmlfragment("sap.ushell.ui.RendererRootView", oController); // LEGACY API (deprecated)
-            oRendererRootView.updateAggregation = this.updateShellAggregation;
+            var oRendererRootView = sap.ui.xmlfragment("sap.ushell.renderer.RendererRootView", oController); // LEGACY API (deprecated)
+            BindingHelper.overrideUpdateAggregation(oRendererRootView);
 
             return oRendererRootView;
         },
@@ -142,11 +140,10 @@ sap.ui.define([
         createShellHeaderSync: function () {
             // Create own model for the header
             var oHeaderController = new ShellHeaderController();
-            oHeaderController.onInit();
 
             // eslint-disable-next-line ushell/no-deprecated
-            var oShellHeader = sap.ui.xmlfragment("sap.ushell.ui.ShellHeader", oHeaderController); // LEGACY API (deprecated)
-            oShellHeader.updateAggregation = this.updateShellAggregation;
+            var oShellHeader = sap.ui.xmlfragment("sap.ushell.renderer.shellHeader.ShellHeader", oHeaderController); // LEGACY API (deprecated)
+            BindingHelper.overrideUpdateAggregation(oShellHeader);
 
             if (StateManager.getShellMode() === ShellMode.Embedded) {
                 oShellHeader.setNoLogo();
@@ -161,6 +158,7 @@ sap.ui.define([
 
             this.waitForShellLayout().then(function () {
                 oShellHeader.placeAt(ShellLayoutMapping.ShellHeader, "only");
+                oHeaderController.onInit();
             });
             return oShellHeader;
         },
@@ -193,10 +191,10 @@ sap.ui.define([
                     visible: "{shellModel>/rightFloatingContainer/visible}",
                     floatingContainerItems: {
                         path: "shellModel>/rightFloatingContainer/items",
-                        factory: fnShellUpdateAggItem
+                        factory: BindingHelper.factory
                     }
                 });
-                oRightFloatingContainer.updateAggregation = this.updateShellAggregation;
+                BindingHelper.overrideUpdateAggregation(oRightFloatingContainer);
 
                 oRightFloatingContainer.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oRightFloatingContainer);
@@ -238,10 +236,10 @@ sap.ui.define([
                     id: "subhdr",
                     content: {
                         path: "shellModel>/subHeader/items",
-                        factory: fnShellUpdateAggItem
+                        factory: BindingHelper.factory
                     }
                 });
-                oSubHeader.updateAggregation = this.updateShellAggregation;
+                BindingHelper.overrideUpdateAggregation(oSubHeader);
 
                 oSubHeader.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oSubHeader);
@@ -253,61 +251,9 @@ sap.ui.define([
         },
 
         createFloatingContainer: function () {
-            return new Promise(function (resolve, reject) {
-                sap.ui.require([
-                    "sap/ushell/ui/shell/FloatingContainer",
-                    "sap/ui/util/Storage"
-                ], function (FloatingContainer, Storage) {
-                    var oFloatingContainer = new FloatingContainer({
-                        id: "shell-floatingContainer",
-                        visible: "{shellModel>/floatingContainer/visible}",
-                        content: {
-                            path: "shellModel>/floatingContainer/items",
-                            factory: fnShellUpdateAggItem
-                        }
-                    });
-                    oFloatingContainer.updateAggregation = this.updateShellAggregation;
-
-                    if (Device.system.desktop) {
-                        // add tabindex for the floating container so it can be tab/f6
-                        oFloatingContainer.addCustomData(new AccessibilityCustomData({
-                            key: "tabindex",
-                            value: "-1",
-                            writeToDom: true
-                        }));
-                    }
-
-                    oFloatingContainer.setModel(ShellModel.getModel(), "shellModel");
-                    this.addDanglingControl(oFloatingContainer);
-
-                    this.waitForShellLayout().then(function () {
-                        oFloatingContainer.placeAt(ShellLayoutMapping.FloatingContainer, "only");
-
-                        var oStorage = new Storage(Storage.Type.local, "com.sap.ushell.adapters.local.FloatingContainer");
-                        var oFloatingContainerWrapper = document.getElementById(ShellLayoutMapping.FloatingContainer);
-
-                        var bFirstTimeRender = !oFloatingContainerWrapper.classList.contains("sapUshellFloatingContainerWrapper");
-                        var sCssStyles = oStorage.get("floatingContainerStyle");
-
-                        if (bFirstTimeRender && !sCssStyles) {
-                            var emSize = jQuery(".sapUshellShellHeadItm").position() ? jQuery(".sapUshellShellHeadItm").position().left : 0;
-                            var iLeftPos = (jQuery(window).width() - jQuery("#shell-floatingContainer").width() - emSize) * 100 / jQuery(window).width();
-                            var iTopPos = jQuery(".sapUshellShellHeader").height() * 100 / jQuery(window).height();
-                            oFloatingContainerWrapper.style.left = iLeftPos + "%";
-                            oFloatingContainerWrapper.style.top = iTopPos + "%";
-                            oFloatingContainerWrapper.style.position = "absolute";
-                            oStorage.put("floatingContainerStyle", oFloatingContainerWrapper.style.cssText);
-
-                        } else if (sCssStyles) {
-                            oFloatingContainerWrapper.style.cssText = sCssStyles;
-                        }
-
-                        oFloatingContainerWrapper.classList.add("sapUshellFloatingContainerWrapper");
-
-                        resolve();
-                    });
-                }.bind(this));
-            }.bind(this));
+            return Component.create({
+                name: "sap.ushell.components.shell.FloatingContainer"
+            });
         },
 
         createSidePane: function () {
@@ -317,10 +263,10 @@ sap.ui.define([
                     visible: "{shellModel>/sidePane/visible}",
                     content: {
                         path: "shellModel>/sidePane/items",
-                        factory: fnShellUpdateAggItem
+                        factory: BindingHelper.factory
                     }
                 });
-                oSidePane.updateAggregation = this.updateShellAggregation;
+                BindingHelper.overrideUpdateAggregation(oSidePane);
 
                 oSidePane.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oSidePane);
@@ -338,10 +284,10 @@ sap.ui.define([
                     visible: "{shellModel>/toolArea/visible}",
                     toolAreaItems: {
                         path: "shellModel>/toolArea/items",
-                        factory: fnShellUpdateAggItem
+                        factory: BindingHelper.factory
                     }
                 });
-                oShellToolArea.updateAggregation = this.updateShellAggregation;
+                BindingHelper.overrideUpdateAggregation(oShellToolArea);
 
                 oShellToolArea.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oShellToolArea);
@@ -358,10 +304,10 @@ sap.ui.define([
                     id: "shell-floatingActions",
                     floatingActions: {
                         path: "shellModel>/floatingActions/items",
-                        factory: fnShellUpdateAggItem
+                        factory: BindingHelper.factory
                     }
                 });
-                oShellFloatingActions.updateAggregation = this.updateShellAggregation;
+                BindingHelper.overrideUpdateAggregation(oShellFloatingActions);
 
                 oShellFloatingActions.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oShellFloatingActions);
@@ -408,6 +354,17 @@ sap.ui.define([
                 Popup.setInitialZIndex(11);
             });
 
+            // FloatingContainer
+            this.bindFactory({
+                model: oShellModel,
+                factory: this.createFloatingContainer.bind(this),
+                bindingPath: "/floatingContainer/visible",
+                bindingType: BINDING_TYPE.Property,
+                valueCheck: function (bValue) {
+                    return !!bValue;
+                }
+            });
+
             // RightFloatingContainer
             this.bindFactory({
                 model: oShellModel,
@@ -525,27 +482,6 @@ sap.ui.define([
             return this._oRightFloatingContainer;
         },
 
-        updateShellAggregation: function (sName) {
-            const oBindingInfo = this.mBindingInfos[sName];
-            const oAggregationInfo = this.getMetadata().getJSONKeys()[sName];
-            const fnGet = this[oAggregationInfo._sGetter].bind(this);
-            const fnRemove = this[oAggregationInfo._sRemoveMutator].bind(this);
-            const fnUpdate = this[oAggregationInfo._sMutator].bind(this);
-
-            const aControls = fnGet() || [];
-            // make a shallow copy to avoid issues with iteration on the original array
-            [...aControls].forEach((oControlToRemove) => {
-                fnRemove(oControlToRemove);
-            });
-
-            oBindingInfo.binding.getContexts().forEach((v, i) => {
-                const oClone = oBindingInfo.factory(this.getId() + "-" + i, v)
-                    ? oBindingInfo.factory(this.getId() + "-" + i, v).setBindingContext(v, oBindingInfo.model)
-                    : "";
-                fnUpdate(oClone);
-            });
-        },
-
         /**
          * Executes the factory instantly in case the <code>model already fulfills the valueCheck.
          * Otherwise binds the factory against the model path.

package/src/main/js/sap/ushell/services/AppLifeCycle.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's AppLifeCycle service enables plug-ins to enquire the which
  *    application is currently displayed and listen to life cycle events.
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -35,7 +35,7 @@ sap.ui.define([
 ) {
     "use strict";
 
-    var S_APP_LOADED_EVENT = "appLoaded";
+    const S_APP_LOADED_EVENT = "appLoaded";
 
     /**
      * @alias sap.ushell.services.AppLifeCycle

package/src/main/js/sap/ushell/services/AppState.js

@@ -6,7 +6,7 @@
  * This is *not* an application facing service, but for Shell Internal usage.
  * This service should be accessed by the application via the CrossApplicationNavigation service.
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/ui/base/Object",

package/src/main/js/sap/ushell/services/Bookmark.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.128.1
+ * @version 1.129.1
  * @deprecated As of version 1.120
  */
 sap.ui.define([

package/src/main/js/sap/ushell/services/BookmarkV2.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/Formatter.js

@@ -13,7 +13,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/InboundIndex.js

@@ -27,7 +27,7 @@
  *
  * @private
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/InboundProvider.js

@@ -34,7 +34,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/ushell/services/ClientSideTargetResolution/VirtualInbounds",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/PrelaunchOperations.js

@@ -4,7 +4,7 @@
  * @file PrelaunchOperations are executed just before launching the application (post parameter mapping and app state merging) if the
  * <code>sap-prelaunch-operations</code> parameter is specified as a technical parameter.
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/Search.js

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/StagedLogger.js

@@ -39,7 +39,7 @@
  *
  * This is a dependency of ClientSideTargetResolution. Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/Log"

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/SystemContext.js

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution. Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/Utils.js

@@ -6,7 +6,7 @@
  * This is a dependency of ClientSideTargetResolution.
  * Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/util/deepExtend"

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/VirtualInbounds.js

@@ -12,7 +12,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces
  * exposed by this module may change at any time without notice.</p>
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/XAppStateProcessing.js

@@ -6,7 +6,7 @@
  * Operations in this module are assumed to be executed after the target mapping has been identified (post search).
  *
  * @private
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/ushell/services/ClientSideTargetResolution/Utils",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution.js

@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/CommonDataModel/SiteConverter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Because the personalization processor only works with a CDM 3.0 site, this converter is used to transform a dedicated
  * CDM 3.1 site object into a CDM 3.0 site and backwards.
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/Log"

package/src/main/js/sap/ushell/services/CommonDataModel/vizTypeDefaults/VizTypeDefaults.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Utility for loading the default visualization types for the CDM runtime.
- * @version 1.128.1
+ * @version 1.129.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/services/CommonDataModel.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Exposes a CommonDataModel-based site document in a platform-neutral format to it's clients
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/ushell/services/CommonDataModel/PersonalizationProcessor",

package/src/main/js/sap/ushell/services/Configuration.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's Configuration service enables Components of any kind to consume parts of Configuration
  * provided by the shell. It allows to attach on updates and receive the current values
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/ConfigurationDefaults.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Configuration Defaults service exposes default configurations set in the code base.
  *
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/ContentExtensionAdapterFactory.js

@@ -4,7 +4,7 @@
  * default adapter.
  * Once instantiated, returns a map of adapters to be used by the LaunchPage Service
  *
- * @version 1.128.1
+ * @version 1.129.1
  * @deprecated since 1.120.0
  */
 sap.ui.define([