@sapui5/sap.ushell 1.126.1 → 1.127.0

package/src/main/js/sap/ushell/renderer/Renderer.js

@@ -32,7 +32,9 @@ sap.ui.define([
     "sap/m/NotificationListItem",
     "sap/ushell/renderer/ShellLayout",
     "sap/ushell/renderer/utils",
-    "sap/ushell/ui/launchpad/ActionItem"
+    "sap/ushell/ui/launchpad/ActionItem",
+    "sap/ushell/state/StateManager",
+    "sap/ushell/state/ShellModel"
 ], function (
     Component,
     Element,
@@ -61,15 +63,32 @@ sap.ui.define([
     NotificationListItem,
     ShellLayout,
     RendererUtils,
-    ActionItem
+    ActionItem,
+    StateManager,
+    ShellModel
 ) {
     "use strict";
 
     // shortcut for sap.ui.core.mvc.ViewType
-    var ViewType = coreLibrary.mvc.ViewType;
+    const ViewType = coreLibrary.mvc.ViewType;
 
     // shortcut for sap.ushell.AppType
-    var AppType = ushellLibrary.AppType;
+    const AppType = ushellLibrary.AppType;
+
+    // shortcut for sap.ushell.state.StateManager.LaunchpadState
+    const LaunchpadState = StateManager.LaunchpadState;
+
+    // shortcut for sap.ushell.state.StateManager.Operation
+    const Operation = StateManager.Operation;
+
+    // shortcut for sap.ushell.state.StateManager.ShellMode
+    const ShellMode = StateManager.ShellMode;
+    const {
+        Headerless,
+        Merged,
+        Blank,
+        Lean
+    } = ShellMode;
 
     /**
      * @alias sap.ushell.renderer.Renderer
@@ -81,9 +100,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", /** @lends sap.ushell.renderer.Renderer.prototype */ {
         metadata: {
-            version: "1.126.1",
+            version: "1.127.0",
             dependencies: {
-                version: "1.126.1",
+                version: "1.127.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -386,7 +405,7 @@ sap.ui.define([
         var bIsRootIntentFlpHome = !sRootIntent || oUshellUtils.isFlpHomeIntent(sRootIntent);
 
         // switch to home first so that #set calls below have effect
-        AppLifeCycleAI.switchViewState(bIsRootIntentFlpHome ? "home" : "app", false, "Shell-home");
+        AppLifeCycleAI.switchViewState(bIsRootIntentFlpHome ? LaunchpadState.Home : LaunchpadState.App, false, "Shell-home");
 
         this.setCurrentCoreView("home");
         AppConfiguration.setCurrentApplication(null);
@@ -443,46 +462,18 @@ sap.ui.define([
         });
     };
 
-    /**
-     * @returns {string|undefined} so-called "appState" (not to be confused with Internal or External App State)
-     * @private
-     */
-    Renderer.prototype.getSapUshellConfigParam = function () {
-        let sState = new URLSearchParams(window.location.search).get("sap-ushell-config");
-
-        /**
-         * code shall be automatically removed by tooling
-         * @deprecated since 1.120.0
-         */
-        if (!sState) {
-            sState = new URLSearchParams(window.location.search).get("appState");
-            if (sState) {
-                Log.error("URL parameter 'appState' is given, but deprecated. Please use 'sap-ushell-config' instead!", "sap.ushell.renderer.Renderer");
-            }
-        }
-
-        return sState && sState.toLowerCase();
-    };
-
     /**
      * @returns {object} an instance of Shell view
      * @since 1.15.0
      * @private
      */
     Renderer.prototype.createContent = function () {
-        var sGivenState = Renderer.prototype.getSapUshellConfigParam();
         var viewData = this.getComponentData() || {};
         var oAppConfig = {
             applications: { "Shell-home": {} },
             rootIntent: "Shell-home"
         };
-
-        if (sGivenState) {
-            if (!viewData.config) {
-                viewData.config = {};
-            }
-            viewData.config.appState = sGivenState;
-        }
+        const sCurrentShellMode = StateManager.getShellMode();
 
         // 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) {
@@ -503,13 +494,20 @@ sap.ui.define([
             );
 
             // handle the Personalization flag
-            if (viewData.config.appState === "headerless" || viewData.config.appState === "merged" || viewData.config.appState === "blank") {
+            if ([Headerless, Merged, Blank].includes(sCurrentShellMode)) {
                 viewData.config.enablePersonalization = false;
                 Config.emit("/core/shell/enablePersonalization", false);
             } else {
                 viewData.config.enablePersonalization = Config.last("/core/shell/enablePersonalization");
             }
 
+            if ([Lean].includes(sCurrentShellMode)) {
+                viewData.config.showRecentActivity = false;
+            } else if (viewData.config.showRecentActivity === undefined) {
+                viewData.config.showRecentActivity = Config.last("/core/shell/model/showRecentActivity");
+            }
+            Config.emit("/core/shell/model/showRecentActivity", viewData.config.showRecentActivity);
+
             // If the personalization is disabled, do not create the AppFinder and Edit buttons in the header
             if (!viewData.config.enablePersonalization) {
                 viewData.config.moveEditHomePageActionToShellHeader = false;
@@ -520,14 +518,6 @@ sap.ui.define([
             }
         }
 
-        viewData.shellModel = Config.createModel("/core/shell/model", JSONModel);
-        viewData.helperModel = new JSONModel({
-            shell: {
-                floatingContainerVisible: false,
-                footerContent: ""
-            }
-        });
-
         if (!this.getComponentData().async) {
             let oView;
             Log.error("sap/ushell/renderer/Renderer component is created synchronously. Synchronous instantiation is not allowed. Please use async:true in component data");
@@ -545,7 +535,6 @@ sap.ui.define([
         }).then(function (oView) {
             oView.addStyleClass("sapUshellRenderer");
             this._oShellView = oView;
-            this.oShellModel = AppLifeCycleAI.getElementsModel();
 
             // initialize the RendererExtensions after the view is created.
             // This also publishes an external event that indicates that sap.ushell.renderer.RendererExtensions can be used.
@@ -573,7 +562,6 @@ sap.ui.define([
         });
         oSyncView.addStyleClass("sapUshellRenderer");
         this._oShellView = oSyncView;
-        this.oShellModel = AppLifeCycleAI.getElementsModel();
 
         oSyncView.loaded().then(function (oCreatedView) {
             // initialize the RendererExtensions after the view is created.
@@ -608,10 +596,10 @@ sap.ui.define([
      * @returns {object} Created Extended Shell State.
      * @since 1.35
      * @private
+     * @deprecated since 1.120 Deprecated without successor.
      */
     Renderer.prototype.createExtendedShellState = function (sShellName, fnCreationInstructions) {
-        // create a shadow shell, shell will extend custom shell state.
-        return AppLifeCycleAI.shellElements().createExtendedShellState(sShellName, fnCreationInstructions);
+        Log.error("The function createExtendedShellState was deprecated  discontinued.");
     };
 
     /**
@@ -637,10 +625,10 @@ sap.ui.define([
      * @param {function} fnCustomMerge fnCustomMerge
      * @since 1.35
      * @private
+     * @deprecated since 1.120. Functionality was discontinued.
      */
     Renderer.prototype.applyExtendedShellState = function (sShellName, fnCustomMerge) {
-        //merge the current shell state state (HOME/APP) with the custom shell.
-        this.oShellModel.applyExtendedShellState(sShellName, fnCustomMerge);
+        Log.error("The function applyExtendedShellState was discontinued.");
     };
 
     /**
@@ -655,7 +643,7 @@ sap.ui.define([
      * oRenderer.showActionButton([oButton.getId()], false, ["home", "app"]);
      * </pre>
      *
-     * @param {string|string[]} vIds Either ID or an array of IDs of elements to be added to the shell.
+     * @param {string|string[]} aIds Either ID or an array of IDs of elements to be added to the shell.
      * @param {boolean} bCurrentState if true, add the current component only to the current instance of the rendering of the shell.
      *   if false, add the component to the LaunchPadState itself.
      * @param {string[]} aStates (only valid if bCurrentState is set to false) -
@@ -663,14 +651,8 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.showLeftPaneContent = function (vIds, bCurrentState, aStates) {
-        var aIds = typeof vIds === "string" ? [vIds] : vIds;
-
-        if (bCurrentState) {
-            AppLifeCycleAI.shellElements().addShellModelForApplications("paneContent", aIds);
-        } else {
-            this.oShellModel.addLeftPaneContent(aIds, false, aStates);
-        }
+    Renderer.prototype.showLeftPaneContent = function (aIds, bCurrentState, aStates) {
+        this._updateItemStates(aIds, bCurrentState, aStates, "sidePane.items", Operation.Add);
     };
 
     /**
@@ -699,14 +681,18 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.showHeaderItem = function (vIds, bCurrentState, aStates) {
-        var aIds = typeof vIds === "string" ? [vIds] : vIds;
+    Renderer.prototype.showHeaderItem = function (vIds, bCurrentState, vStates) {
+        const aIds = Array.isArray(vIds) ? vIds : [vIds];
+        const aStates = this._sanitizeStates(vStates);
 
-        if (bCurrentState) {
-            AppLifeCycleAI.shellElements().addShellModelForApplications("headItems", aIds);
-        } else {
-            this.oShellModel.addHeaderItem(aIds, false, aStates);
-        }
+        aIds.forEach((sId) => {
+            if (bCurrentState) {
+                StateManager.updateCurrentState("header.headItems", Operation.Add, sId);
+                return;
+            }
+
+            StateManager.updateBaseStates(aStates, "header.headItems", Operation.Add, sId);
+        });
     };
 
     /**
@@ -721,7 +707,7 @@ sap.ui.define([
      * renderer.showRightFloatingContainerItem(button1.getId(), false, ["home", "app"]);
      * </pre>
      *
-     * @param {string|string[]} vIds Either ID or an array of IDs of elements to be added to the Tool Area.
+     * @param {string|string[]} aIds Either ID or an array of IDs of elements to be added to the Tool Area.
      * @param {boolean} bCurrentState if true, add the current RightFloatingContainerItems only to the current instance of the rendering of the shell.
      *   if false, add the RightFloatingContainerItems to the LaunchPadState itself.
      * @param {string[]} aStates Only valid if bCurrentState is set to false.
@@ -729,14 +715,8 @@ sap.ui.define([
      * @since 1.37
      * @private
      */
-    Renderer.prototype.showRightFloatingContainerItem = function (vIds, bCurrentState, aStates) {
-        var aIds = typeof vIds === "string" ? [vIds] : vIds;
-
-        if (bCurrentState) {
-            AppLifeCycleAI.shellElements().addShellModelForApplications("RightFloatingContainerItems", aIds);
-        } else {
-            this.oShellModel.addRightFloatingContainerItem(aIds, false, aStates);
-        }
+    Renderer.prototype.showRightFloatingContainerItem = function (aIds, bCurrentState, aStates) {
+        this._updateItemStates(aIds, bCurrentState, aStates, "rightFloatingContainer.items", Operation.Add);
     };
 
     /**
@@ -747,7 +727,7 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.showRightFloatingContainer = function (bShow) {
-        AppLifeCycleAI.shellElements().setShellModelForApplications("showRightFloatingContainer", bShow);
+        StateManager.updateCurrentState("rightFloatingContainer.visible", Operation.Set, bShow);
     };
 
     /**
@@ -763,7 +743,7 @@ sap.ui.define([
      * </pre>
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string|string[]} vIds A single ID or an array of IDs to add to the Tool Area.
+     * @param {string|string[]} aIds 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 every time the given states are active.
@@ -774,8 +754,8 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.showToolAreaItem = function (vIds, bCurrentState, aStates) {
-        this.oShellModel.addToolAreaItem(vIds, true, bCurrentState, aStates);
+    Renderer.prototype.showToolAreaItem = function (aIds, bCurrentState, aStates) {
+        this._updateItemStates(aIds, bCurrentState, aStates, "toolArea.items", Operation.Add);
     };
 
     /**
@@ -792,7 +772,7 @@ sap.ui.define([
      * </pre>
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string[]} aIds List of ID elements to that should be added to the User Actions Menu options bar.
+     * @param {string[]} vIds List of ID elements to that should be added to the User Actions Menu options bar.
      * @param {boolean} bCurrentState If true, add the created control to the current rendered shell state. When the user navigates to a
      *   different state, or to a different application, then the control is removed. If false, the control is added to the LaunchpadState.
      * @param {string[]} aStates List of the launchpad states (sap.ushell.renderer.Renderer.LaunchpadState) in which to add the aIds.
@@ -802,34 +782,29 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.showActionButton = function (aIds, bCurrentState, aStates) {
-        var aButtons = [];
-        var aActions = [];
-        var oButton;
+    Renderer.prototype.showActionButton = function (vIds, bCurrentState, aStates) {
+        const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
-        if (typeof aIds === "string") {
-            aIds = [aIds];
-        }
         // In case the method was called with instance of sap.m.Button, we need to convert it to
         // sap.ushell.ui.launchpad.ActionItem in order to apply the action item behavior and styles to this control
-        aButtons = aIds.filter(function (sId) {
-            oButton = Element.getElementById(sId);
-            return BaseObject.isObjectA(oButton, "sap.m.Button") && !(BaseObject.isObjectA(oButton, "sap.ushell.ui.launchpad.ActionItem"));
-        });
-        aActions = aIds.filter(function (sId) {
-            oButton = Element.getElementById(sId);
-            return oButton instanceof ActionItem;
-        });
-        if (aButtons.length) {
-            this.convertButtonsToActions(aButtons, bCurrentState, aStates);
-        }
-        if (aActions.length) {
-            if (bCurrentState) {
-                AppLifeCycleAI.shellElements().addShellModelForApplications("actions", aIds);
+        const { buttons, actions } = aIds.reduce(function (oResult, sId) {
+            const oElement = Element.getElementById(sId);
+            const bIsButton = BaseObject.isObjectA(oElement, "sap.m.Button") && !(BaseObject.isObjectA(oElement, "sap.ushell.ui.launchpad.ActionItem"));
+
+            if (bIsButton) {
+                oResult.buttons.push(sId);
             } else {
-                this.oShellModel.addActionButton(aIds, false, aStates);
+                oResult.actions.push(sId);
             }
+
+            return oResult;
+        }, { buttons: [], actions: [] });
+
+        if (buttons.length) {
+            this.convertButtonsToActions(buttons, bCurrentState, aStates);
         }
+
+        this._updateItemStates(actions, bCurrentState, aStates, "userActions.items", Operation.Add);
     };
 
     /**
@@ -856,11 +831,7 @@ sap.ui.define([
      * @deprecated since 1.52. Support for the FloatingActionButton has been discontinued.
      */
     Renderer.prototype.showFloatingActionButton = function (aIds, bCurrentState, aStates) {
-        if (bCurrentState) {
-            AppLifeCycleAI.shellElements().addShellModelForApplications("floatingActions", typeof aIds === "string" ? [aIds] : aIds);
-        } else {
-            this.oShellModel.addFloatingActionButton(typeof aIds === "string" ? [aIds] : aIds, false, aStates);
-        }
+        this._updateItemStates(aIds, bCurrentState, aStates, "floatingActions.items", Operation.Add);
     };
 
     /**
@@ -887,11 +858,54 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.showHeaderEndItem = function (aIds, bCurrentState, aStates) {
-        if (bCurrentState) {
-            AppLifeCycleAI.shellElements().addShellModelForApplications("headEndItems", typeof aIds === "string" ? [aIds] : aIds);
-        } else {
-            this.oShellModel.addHeaderEndItem(typeof aIds === "string" ? [aIds] : aIds, false, aStates);
+        this._updateItemStates(aIds, bCurrentState, aStates, "header.headEndItems", Operation.Add);
+    };
+
+    /**
+     * Sanitizes the given list of launchpad states by removing any invalid states.
+     * For undefined or empty lists, all valid launchpad states are returned.
+     *
+     * @param {Array<sap.ushell.renderer.Renderer.LaunchpadState | string> | undefined} vLaunchpadStates A list of string which might not adhere to the LaunchpadState enum or undefined.
+     * @returns {sap.ushell.renderer.Renderer.LaunchpadState[]} The sanitized list of LaunchpadStates.
+     *
+     * @since 1.127
+     * @private
+     */
+    Renderer.prototype._sanitizeStates = function (vLaunchpadStates) {
+        const aLaunchpadStates = Array.isArray(vLaunchpadStates) ? vLaunchpadStates : [];
+
+        const aFilteredLaunchpadStates = aLaunchpadStates
+            .filter((sLaunchpadState) => {
+                return sLaunchpadState !== undefined && sLaunchpadState !== null;
+            })
+            .filter((sLaunchpadState) => {
+                const bValidLaunchpadState = Object.values(this.LaunchpadState).includes(sLaunchpadState);
+
+                if (!bValidLaunchpadState) {
+                    throw new Error(`Invalid launchpad state: ${sLaunchpadState}`);
+                }
+                return bValidLaunchpadState;
+            });
+
+        if (aFilteredLaunchpadStates.length === 0) {
+            return Object.values(this.LaunchpadState);
         }
+
+        return aFilteredLaunchpadStates;
+    };
+
+    Renderer.prototype._updateItemStates = function (vIds, bCurrentState, vStates, sPath, sOperation) {
+        const aIds = Array.isArray(vIds) ? vIds : [vIds];
+        const aStates = this._sanitizeStates(vStates);
+
+        aIds.forEach((sId) => {
+            if (bCurrentState) {
+                StateManager.updateCurrentState(sPath, sOperation, sId);
+                return;
+            }
+
+            StateManager.updateBaseStates(aStates, sPath, sOperation, sId);
+        });
     };
 
     /**
@@ -909,19 +923,22 @@ sap.ui.define([
      * @param {boolean} bCurrentState If <code>true</code> then the visibility is set only to the current rendered shell state.<br>
      *   When the user navigates to another application (including the Home page) then the visibility flag is reset.<br>
      *   If <code>false</code> then set the visibility according to the states provided in the aState parameter.<br>
-     * @param {string[]} aStates (Valid only if bCurrentState is <code>false</code>)<br>
+     * @param {string[]} vStates (Valid only if bCurrentState is <code>false</code>)<br>
      *   A list of shell states (i.e. sap.ushell.renderer.Renderer.LaunchpadState) in which the header visibility flag should be set.<br>
      *   If no launchpad state is provided the visibility flag is set for all states.
      *   @see LaunchpadState
      * @since 1.38
      * @private
      */
-    Renderer.prototype.setHeaderVisibility = function (bVisible, bCurrentState, aStates) {
+    Renderer.prototype.setHeaderVisibility = function (bVisible, bCurrentState, vStates) {
+        const aStates = this._sanitizeStates(vStates);
+
         if (bCurrentState) {
-            AppLifeCycleAI.shellElements().setShellModelForApplications("headerVisible", bVisible);
-        } else {
-            this.oShellModel.setHeaderVisibility(bVisible, false, aStates);
+            StateManager.updateCurrentState("header.visible", Operation.Set, bVisible);
+            return;
         }
+
+        StateManager.updateBaseStates(aStates, "header.visible", Operation.Set, bVisible);
     };
 
     /**
@@ -953,11 +970,7 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.showSubHeader = function (aIds, bCurrentState, aStates) {
-        if (bCurrentState) {
-            AppLifeCycleAI.shellElements().addShellModelForApplications("subHeader", typeof aIds === "string" ? [aIds] : aIds);
-        } else {
-            this.oShellModel.addSubHeader(typeof aIds === "string" ? [aIds] : aIds, false, aStates);
-        }
+        this._updateItemStates(aIds, bCurrentState, aStates, "subHeader.items", Operation.Add);
     };
 
     /**
@@ -980,11 +993,7 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.showSignOutItem = function (bCurrentState, aStates) {
-        if (bCurrentState) {
-            AppLifeCycleAI.shellElements().addShellModelForApplications("actions", ["logoutBtn"], false);
-        } else {
-            this.oShellModel.showSignOutButton(bCurrentState, aStates);
-        }
+        this.showActionButton(["logoutBtn"], bCurrentState, aStates);
     };
 
     /**
@@ -1007,7 +1016,7 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.showSettingsItem = function (bCurrentState, aStates) {
-        this.oShellModel.showSettingsButton(bCurrentState, aStates);
+        this.showActionButton(["userSettingsBtn"], bCurrentState, aStates);
     };
 
     /**
@@ -1208,21 +1217,17 @@ sap.ui.define([
      * We do not recommend using it on a standard launchpad element, as this may interfere with the standard launchpad functionality.
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string[]} aIds the Ids of the sap.ushell.ui.shell.ShellHeadItem to remove.
+     * @param {string[]} vIds the Ids of the sap.ushell.ui.shell.ShellHeadItem to remove.
      * @param {boolean} bCurrentState if true, remove the current control only from the current rendered shell state.
-     * @param {string[]} aStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
+     * @param {string[]} vStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
      *   (Only valid if bCurrentState is set to false)
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is removed in all states.
      * @since 1.30
      * @private
      */
-    Renderer.prototype.hideHeaderItem = function (aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.removeHeaderItem([aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.removeHeaderItem(aIds, bCurrentState, aStates);
-        }
+    Renderer.prototype.hideHeaderItem = function (vIds, bCurrentState, vStates) {
+        this._updateItemStates(vIds, bCurrentState, vStates, "header.headItems", Operation.Remove);
     };
 
     /**
@@ -1231,7 +1236,7 @@ sap.ui.define([
      * We do not recommend using it on a standard launchpad element, as this may interfere with the standard launchpad functionality.
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string|string[]} vIds A single ID or an array of IDs to remove from the Tool Area.
+     * @param {string|string[]} aIds 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 every time the given states are active.
@@ -1242,11 +1247,8 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.removeToolAreaItem = function (vIds, bCurrentState, aStates) {
-        if (typeof vIds === "string") {
-            vIds = [vIds];
-        }
-        this.oShellModel.removeToolAreaItem(vIds, bCurrentState, aStates);
+    Renderer.prototype.removeToolAreaItem = function (aIds, bCurrentState, aStates) {
+        this._updateItemStates(aIds, bCurrentState, aStates, "toolArea.items", Operation.Remove);
     };
 
     /**
@@ -1262,11 +1264,7 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.removeRightFloatingContainerItem = function (aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.removeRightFloatingContainerItem([aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.removeRightFloatingContainerItem(aIds, bCurrentState, aStates);
-        }
+        this._updateItemStates(aIds, bCurrentState, aStates, "rightFloatingContainer.items", Operation.Remove);
     };
 
     /**
@@ -1276,20 +1274,16 @@ sap.ui.define([
      * We do not recommend using it on standard launchpad elements, as this may interfere with the standard launchpad functionality.
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string[]} aIds IDs of the button controls that should hidden.
+     * @param {string[]} vIds IDs of the button controls that should hidden.
      * @param {boolean} bCurrentState If true, removes the current control only from the current rendered shell state.
-     * @param {string[]} aStates A list of the launchpad states in which to hide the control. Valid only if bCurrentState is set to false.
+     * @param {string[]} vStates A list of the launchpad states in which to hide the control. Valid only if bCurrentState is set to false.
      *   @see sap.ushell.renderer.Renderer.LaunchpadState.
      *   If no launchpad state is provided, the content is hidden in all states.
      * @since 1.30
      * @private
      */
-    Renderer.prototype.hideActionButton = function (aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.removeActionButton([aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.removeActionButton(aIds, bCurrentState, aStates);
-        }
+    Renderer.prototype.hideActionButton = function (vIds, bCurrentState, vStates) {
+        this._updateItemStates(vIds, bCurrentState, vStates, "userActions.items", Operation.Remove);
     };
 
     /**
@@ -1299,21 +1293,17 @@ sap.ui.define([
      * We do not recommend using it on a standard launchpad element, as this may interfere with the standard launchpad functionality.
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string[]} aIds the Ids of the controls to remove.
+     * @param {string[]} vIds the Ids of the controls to remove.
      * @param {boolean} bCurrentState if true, remove the current control only from the current rendered shell state.
-     * @param {string[]} aStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
+     * @param {string[]} vStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
      *   (Only valid if bCurrentState is set to false)
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is removed in all states.
      * @since 1.30
      * @private
      */
-    Renderer.prototype.hideLeftPaneContent = function (aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.removeLeftPaneContent([aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.removeLeftPaneContent(aIds, bCurrentState, aStates);
-        }
+    Renderer.prototype.hideLeftPaneContent = function (vIds, bCurrentState, vStates) {
+        this._updateItemStates(vIds, bCurrentState, vStates, "sidePane.items", Operation.Remove);
     };
 
     /**
@@ -1323,9 +1313,9 @@ sap.ui.define([
      * We do not recommend using it on a standard launchpad element, as this may interfere with the standard launchpad functionality.
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string[]} aIds the Ids of the sap.ushell.ui.shell.ShellFloatingAction to remove.
+     * @param {string[]} vIds the Ids of the sap.ushell.ui.shell.ShellFloatingAction to remove.
      * @param {boolean} bCurrentState if true, remove the current control only from the current rendered shell state.
-     * @param {string[]} aStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
+     * @param {string[]} vStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
      *   (Only valid if bCurrentState is set to false)
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is removed in all states.
@@ -1333,12 +1323,8 @@ sap.ui.define([
      * @private
      * @deprecated since 1.52
      */
-    Renderer.prototype.hideFloatingActionButton = function (aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.removeFloatingActionButton([aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.removeFloatingActionButton(aIds, bCurrentState, aStates);
-        }
+    Renderer.prototype.hideFloatingActionButton = function (vIds, bCurrentState, vStates) {
+        this._updateItemStates(vIds, bCurrentState, vStates, "floatingActions.items", Operation.Remove);
     };
 
     /**
@@ -1348,21 +1334,17 @@ sap.ui.define([
      * We do not recommend using it on a standard launchpad element, as this may interfere with the standard launchpad functionality.
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string[]} aIds the Ids of the sap.ushell.ui.shell.ShellHeadItem to remove.
+     * @param {string[]} vIds the Ids of the sap.ushell.ui.shell.ShellHeadItem to remove.
      * @param {boolean} bCurrentState if true, remove the current control only from the current rendered shell state.
-     * @param {string[]} aStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
+     * @param {string[]} vStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
      *   (Only valid if bCurrentState is set to false)
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is removed in all states.
      * @since 1.30
      * @private
      */
-    Renderer.prototype.hideHeaderEndItem = function (aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.removeHeaderEndItem([aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.removeHeaderEndItem(aIds, bCurrentState, aStates);
-        }
+    Renderer.prototype.hideHeaderEndItem = function (vIds, bCurrentState, vStates) {
+        this._updateItemStates(vIds, bCurrentState, vStates, "header.headEndItems", Operation.Remove);
     };
 
     /**
@@ -1372,21 +1354,17 @@ sap.ui.define([
      * We do not recommend using it on a standard launchpad element, as this may interfere with the standard launchpad functionality.
      *
      * <br>Note: Was public with fiori2/Renderer
-     * @param {string[]} aIds the Ids of the controls to remove.
+     * @param {string[]} vIds the Ids of the controls to remove.
      * @param {boolean} bCurrentState if true, remove the current control only from the current rendered shell state.
-     * @param {string[]} aStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
+     * @param {string[]} vStates list of the sap.ushell.renderer.Renderer.LaunchpadState in which to remove the control.
      *   (Only valid if bCurrentState is set to false)
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is removed in all states.
      * @since 1.30
      * @private
      */
-    Renderer.prototype.hideSubHeader = function (aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.removeSubHeader([aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.removeSubHeader(aIds, bCurrentState, aStates);
-        }
+    Renderer.prototype.hideSubHeader = function (vIds, bCurrentState, vStates) {
+        this._updateItemStates(vIds, bCurrentState, vStates, "subHeader.items", Operation.Remove);
     };
 
     /**
@@ -1489,12 +1467,12 @@ sap.ui.define([
         }
         if (controlType) {
             var sControlResource = controlType.replace(/\./g, "/");
-            sap.ui.require([sControlResource],
-                function (ControlObject) {
+            sap.ui.require([sControlResource], function (ControlObject) {
                     oControlInstance = new ControlObject(oControlProperties);
+                    StateManager.addManagedControl(oControlInstance.getId(), !bCurrentState);
+
                     if (bIsVisible) {
                         that.showSubHeader(oControlInstance.getId(), bCurrentState, aStates);
-                        that.oShellModel.addElementToManagedQueue(oControlInstance);
                     }
                     oDeferred.resolve(oControlInstance);
                 });
@@ -1535,7 +1513,7 @@ sap.ui.define([
      * @param {boolean} bCurrentState If <code>true</code> then the new created control is added to the current rendered shell state.<br>
      *   When the user navigates to another application (including the Home page) then the control will be removed.<br>
      *   If <code>false</code> then add the control to the LaunchPadState itself.<br>
-     * @param {string[]} aStates (Valid only if bCurrentState is <code>false</code>)<br>
+     * @param {string[]} vStates (Valid only if bCurrentState is <code>false</code>)<br>
      *   A list of shell states (i.e. sap.ushell.renderer.Renderer.LaunchpadState) in which the control is added.<br>
      *   If no launchpad state is provided the control is added in all states.
      *   @see LaunchpadState
@@ -1544,7 +1522,9 @@ sap.ui.define([
      * @deprecated since 1.48. Please use {@link #addShellSubHeader} instead.
      * @private
      */
-    Renderer.prototype.addSubHeader = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
+    Renderer.prototype.addSubHeader = function (controlType, oControlProperties, bIsVisible, bCurrentState, vStates) {
+        const aStates = this._sanitizeStates(vStates);
+
         var sControlResource = controlType.replace(/\./g, "/");
         // Try to require the control in case it is already loaded
         var ControlObject = sap.ui.require(sControlResource);
@@ -1618,62 +1598,59 @@ sap.ui.define([
         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 ? AppLifeCycleAI.shellElements().getStateModelToUpdate() : this.oShellModel.getModelToUpdate();
-        var aStates = oParameters.aStates;
+        const {
+            controlType,
+            oControlProperties,
+            bIsVisible,
+            bCurrentState,
+            aStates
+        } = oParameters;
 
-        // If a control instance is already created - get it by its id
         if (oControlProperties) {
+            // If a control instance is already created - get it by its id
             oControlInstance = Element.getElementById(oControlProperties.id);
-        }
-
-        if (oControlInstance) {
-            oDeferred.resolve(oControlInstance);
-        }
-
-        if (controlType) {
-            if (controlType === "sap.m.Button") {
-                controlType = "sap.ushell.ui.launchpad.ActionItem";
-            }
-            var sControlResource = controlType.replace(/\./g, "/");
-            sap.ui.require([sControlResource], function (ControlClass) {
-                // change model
-                var oOrigShellModel;
-
-                if (bCurrentState) {
-                    oOrigShellModel = AppLifeCycleAI.shellElements().getStateModelToUpdate();
-                    AppLifeCycleAI.shellElements().setStateModelToUpdate(oModelToUpdate);
-                } else {
-                    oOrigShellModel = that.oShellModel.getModelToUpdate();
-                    that.oShellModel.setModelToUpdate(oModelToUpdate, true);
-                }
-
-                oControlInstance = oControlInstance || new ControlClass(oControlProperties);
+            if (oControlInstance) {
+                oDeferred.resolve(oControlInstance);
 
                 if (!oControlInstance.getActionType) {
-                    oControlInstance = new ControlClass(oControlProperties);
+                    delete oControlProperties.id;
+                    oControlInstance = new ActionItem(oControlProperties);
+
+                    StateManager.addManagedControl(oControlInstance.getId(), !bCurrentState);
                 }
 
                 if (bIsVisible) {
                     that.showActionButton(oControlInstance.getId(), bCurrentState, aStates);
                 }
 
-                if (bCurrentState) {
-                    AppLifeCycleAI.shellElements().setStateModelToUpdate(oOrigShellModel);
-                } else {
-                    that.oShellModel.setModelToUpdate(oOrigShellModel, false);
-                }
+                return oDeferred.promise();
+            }
+        }
 
-                oDeferred.resolve(oControlInstance);
-            });
-        } else {
-            var sNoControlTypeErrorMessage = "You must specify control type in order to create it";
+        if (!controlType) {
+            const sNoControlTypeErrorMessage = "You must specify control type in order to create it";
             Log.warning(sNoControlTypeErrorMessage);
             oDeferred.reject(sNoControlTypeErrorMessage);
+            return oDeferred.promise();
         }
+
+        const sControlType = controlType === "sap.m.Button" ? "sap.ushell.ui.launchpad.ActionItem" : controlType;
+        var sControlResource = sControlType.replace(/\./g, "/");
+        sap.ui.require([sControlResource], (ControlClass) => {
+            oControlInstance = new ControlClass(oControlProperties);
+
+            StateManager.addManagedControl(oControlInstance.getId(), !bCurrentState);
+
+            if (bIsVisible) {
+                that.showActionButton(oControlInstance.getId(), bCurrentState, aStates);
+            }
+
+            oDeferred.resolve(oControlInstance);
+        }, function () {
+            var sControlTypeErrorMessage = "The control type " + sControlType + " is not available.";
+            Log.error(sControlTypeErrorMessage);
+            oDeferred.reject(sControlTypeErrorMessage);
+        });
         return oDeferred.promise();
     };
 
@@ -1698,7 +1675,7 @@ sap.ui.define([
      *   (you can use showActionButton to display the control when needed).
      * @param {boolean} bCurrentState If true, add the current control only to the current rendered shell state.
      *   Once the user navigates to another app or back to the home page, this control will be removed.
-     * @param {string[]} aStates List of the launchpad states (sap.ushell.renderer.Renderer.LaunchpadState) in which to add the control.
+     * @param {string[]} vStates List of the launchpad states (sap.ushell.renderer.Renderer.LaunchpadState) in which to add the control.
      *   Valid only if bCurrentState is set to false.
      *   @see sap.ushell.renderer.Renderer.LaunchpadState
      *   If no launchpad state is provided, the content is added in all states.
@@ -1707,7 +1684,8 @@ sap.ui.define([
      * @deprecated since 1.48. Please use {@link #addUserAction} instead.
      * @private
      */
-    Renderer.prototype.addActionButton = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
+    Renderer.prototype.addActionButton = function (controlType, oControlProperties, bIsVisible, bCurrentState, vStates) {
+        const aStates = this._sanitizeStates(vStates);
         var bResourceLoadedAsObject = false;
 
         if (controlType === "sap.m.Button") {
@@ -1795,7 +1773,6 @@ sap.ui.define([
             if (oControlInstance) {
                 if (bIsVisible) {
                     that.showFloatingActionButton(oControlInstance.getId(), bCurrentState, aStates);
-                    that.oShellModel.addElementToManagedQueue(oControlInstance);
                 }
                 oDeferred.resolve(oControlInstance);
             }
@@ -1807,9 +1784,11 @@ sap.ui.define([
             sControlResource = "sap/m/Button";
         }
 
-        sap.ui.require([sControlResource],
-            function (ControlObject) {
+        sap.ui.require([sControlResource], function (ControlObject) {
                 oControlInstance = new ControlObject(oControlProperties);
+
+                StateManager.addManagedControl(oControlInstance.getId(), !bCurrentState);
+
                 if (bIsVisible) {
                     that.showFloatingActionButton(oControlInstance.getId(), bCurrentState, aStates);
                 }
@@ -1838,7 +1817,7 @@ sap.ui.define([
      * @param {boolean} bIsVisible Specify whether to display the control.
      * @param {boolean} bCurrentState If true, add the current control only to the current rendered shell state.
      *   Once the user navigates to another app or back to the Home page, this control will be removed.
-     * @param {string[]} aStates (only valid if bCurrentState is set to false) -
+     * @param {string[]} vStates (only valid if bCurrentState is set to false) -
      *   list of the sap.ushell.renderer.Renderer.LaunchpadState in which to add the control.
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is added in all states.
@@ -1847,7 +1826,8 @@ sap.ui.define([
      * @deprecated since 1.48. Please use {@link #addFloatingButton} instead.
      * @private
      */
-    Renderer.prototype.addFloatingActionButton = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
+    Renderer.prototype.addFloatingActionButton = function (controlType, oControlProperties, bIsVisible, bCurrentState, vStates) {
+        const aStates = this._sanitizeStates(vStates);
         var bResourceLoadedAsObject = false;
 
         if (!controlType) {
@@ -1948,11 +1928,12 @@ sap.ui.define([
 
         if (controlType) {
             var sControlResource = controlType.replace(/\./g, "/");
-            sap.ui.require([sControlResource],
-                function (ControlObject) {
+            sap.ui.require([sControlResource], function (ControlObject) {
                     oControlInstance = new ControlObject(oControlProperties);
+
+                    StateManager.addManagedControl(oControlInstance.getId(), !bCurrentState);
+
                     if (bIsVisible) {
-                        that.oShellModel.addElementToManagedQueue(oControlInstance);
                         that.showLeftPaneContent(oControlInstance.getId(), bCurrentState, aStates);
                     }
                     oDeferred.resolve(oControlInstance);
@@ -1982,7 +1963,7 @@ sap.ui.define([
      * @param {boolean} bIsVisible Specify whether to display the control.
      * @param {boolean} bCurrentState If true, add the current control only to the current rendered shell state.
      *   Once the user navigates to another app or back to the Home page, this control will be removed.
-     * @param {string[]} aStates (only valid if bCurrentState is set to false) -
+     * @param {string[]} vStates (only valid if bCurrentState is set to false) -
      *   list of the sap.ushell.renderer.Renderer.LaunchpadState in which to add the control.
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is added in all states.
@@ -1991,7 +1972,8 @@ sap.ui.define([
      * @deprecated since 1.48. Please use {@link #addSidePaneContent} instead.
      * @private
      */
-    Renderer.prototype.addLeftPaneContent = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
+    Renderer.prototype.addLeftPaneContent = function (controlType, oControlProperties, bIsVisible, bCurrentState, vStates) {
+        const aStates = this._sanitizeStates(vStates);
         var sControlResource = controlType.replace(/\./g, "/");
         // Try to require the control in case it is already loaded
         var ControlObject = sap.ui.require(sControlResource);
@@ -2057,7 +2039,7 @@ sap.ui.define([
      * @param {boolean} bCurrentState If <code>true</code> then the new created control is added to the current rendered shell state.<br>
      *   When the user navigates to a different state including a different application then the control will be removed.<br>
      *   If <code>false</code> then add the control to the LaunchPadState itself.<br>
-     * @param {string[]} aStates (Valid only if bCurrentState is <code>false</code>)<br>
+     * @param {string[]} vStates (Valid only if bCurrentState is <code>false</code>)<br>
      *   A list of shell states (i.e. sap.ushell.renderer.Renderer.LaunchpadState) in which the control is added.<br>
      *   If no launchpad state is provided the control is added in all states.
      *   @see LaunchpadState
@@ -2065,18 +2047,20 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.addHeaderItem = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
+    Renderer.prototype.addHeaderItem = function (controlType, oControlProperties, bIsVisible, bCurrentState, vStates) {
         // 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 types of the first two arguments
         if (typeof (arguments[0]) === "object" && typeof (arguments[1]) === "boolean") {
             oControlProperties = arguments[0];
             bIsVisible = arguments[1];
             bCurrentState = arguments[2];
-            aStates = arguments[3];
+            vStates = arguments[3];
         } else {
             Log.error("sap.ushell.renderer.Renderer: The parameter 'controlType' of the function 'addHeaderItem' is deprecated. Usage will be ignored!");
         }
 
+        const aStates = this._sanitizeStates(vStates);
+
         var oItem = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
             return new ShellHeadItem(oProperties);
         });
@@ -2111,7 +2095,7 @@ sap.ui.define([
      *   @see sap.ushell.ui.shell.RightFloatingContainerItem
      * @param {boolean} bIsVisible Specify whether to display the control.
      * @param {boolean} bCurrentState If true, add the current control only to the current rendered shell state.
-     * @param {string[]} aStates List of the sap.ushell.renderer.Renderer.LaunchpadState in which to add the control.
+     * @param {string[]} vStates List of the sap.ushell.renderer.Renderer.LaunchpadState in which to add the control.
      *   Only valid if bCurrentState is set to false.
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is added in all states.
@@ -2119,7 +2103,8 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.addRightFloatingContainerItem = function (oControlProperties, bIsVisible, bCurrentState, aStates) {
+    Renderer.prototype.addRightFloatingContainerItem = function (oControlProperties, bIsVisible, bCurrentState, vStates) {
+        const aStates = this._sanitizeStates(vStates);
         var oItem = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
             return new NotificationListItem(oProperties);
         });
@@ -2158,7 +2143,7 @@ sap.ui.define([
      * @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 every time the given states are active.
-     * @param {string[]} aStates (only valid if bCurrentState is set to <code>false</code>) -
+     * @param {string[]} vStates (only valid if bCurrentState is set to <code>false</code>) -
      *    An array of shell states (i.e. sap.ushell.renderer.Renderer.LaunchpadState) in which the controls are added.
      *    If no launchpad state is provided the items are added in all states.
      *    @see sap.ushell.renderer.Renderer.LaunchpadState.
@@ -2166,7 +2151,8 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.addToolAreaItem = function (oControlProperties, bIsVisible, bCurrentState, aStates) {
+    Renderer.prototype.addToolAreaItem = function (oControlProperties, bIsVisible, bCurrentState, vStates) {
+        const aStates = this._sanitizeStates(vStates);
         if (bIsVisible !== null) { // ExtensionService case: do not overwrite control properties;
             oControlProperties.visible = !!bIsVisible;
         }
@@ -2176,7 +2162,19 @@ sap.ui.define([
         };
         var oItem = this.createItem(oControlProperties, bCurrentState, fnCreate);
 
-        this.oShellModel.addToolAreaItem(oItem.getId(), !!bIsVisible, bCurrentState, aStates);
+        if (bIsVisible) {
+            this.showToolAreaItem([oItem.getId()], bCurrentState, aStates);
+
+            // turn on tool area visibility
+            if (bCurrentState) {
+                const sCurrentLaunchpadState = StateManager.getLaunchpadState();
+                this.showToolArea(sCurrentLaunchpadState, true);
+            } else {
+                aStates.forEach((sLaunchpadState) => {
+                    this.showToolArea(sLaunchpadState, true);
+                });
+            }
+        }
 
         return oItem;
     };
@@ -2230,7 +2228,7 @@ sap.ui.define([
      * @param {boolean} bIsVisible Specify whether to display the control.
      * @param {boolean} bCurrentState If true, add the current control only to the current rendered shell state.
      *   Once the user navigates to another app or back to the Home page, this control will be removed.
-     * @param {string[]} aStates (only valid if bCurrentState is set to false) -
+     * @param {string[]} vStates (only valid if bCurrentState is set to false) -
      *   list of the sap.ushell.renderer.Renderer.LaunchpadState in which to add the control.
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is added in all states.
@@ -2238,15 +2236,17 @@ sap.ui.define([
      * @since 1.30
      * @private
      */
-    Renderer.prototype.addHeaderEndItem = function (controlType, oControlProperties, bIsVisible, bCurrentState, aStates) {
+    Renderer.prototype.addHeaderEndItem = function (controlType, oControlProperties, bIsVisible, bCurrentState, vStates) {
         // 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 types of the first two arguments
         if (typeof (arguments[0]) === "object" && typeof (arguments[1]) === "boolean") {
             oControlProperties = arguments[0];
             bIsVisible = arguments[1];
             bCurrentState = arguments[2];
-            aStates = arguments[3];
+            vStates = arguments[3];
         }
+        const aStates = this._sanitizeStates(vStates);
+
         var oItem = this.createItem(oControlProperties, bCurrentState, function (oProperties) {
             return new ShellHeadItem(oProperties);
         });
@@ -2404,7 +2404,10 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.setLeftPaneVisibility = function (sLaunchpadState, bVisible) {
-        this.oShellModel.setLeftPaneVisibility(bVisible, false, [sLaunchpadState]);
+        if (!sLaunchpadState) {
+            sLaunchpadState = this.LaunchpadState.Home;
+        }
+        StateManager.updateBaseStates([sLaunchpadState], "sidePane.visible", Operation.Set, bVisible);
     };
 
     /**
@@ -2416,11 +2419,19 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.showToolArea = function (sLaunchpadState, bVisible) {
-        this.oShellModel.showShellItem("/toolAreaVisible", sLaunchpadState, bVisible);
+        if (!sLaunchpadState) {
+            sLaunchpadState = this.LaunchpadState.Home;
+        }
+        StateManager.updateBaseStates([sLaunchpadState], "toolArea.visible", Operation.Set, bVisible);
     };
 
+    /**
+     * Hides the header
+     * @param {boolean} bHiding Whether to hide the header
+     * @deprecated since 1.120. Functionality was discontinued.
+     */
     Renderer.prototype.setHeaderHiding = function (bHiding) {
-        return this.oShellModel.setHeaderHiding(bHiding);
+        Log.error("sap.ushell.Renderer.setHeaderHiding: Functionality was discontinued.");
     };
 
     /**
@@ -2451,7 +2462,7 @@ sap.ui.define([
      * @private
      */
     Renderer.prototype.setFloatingContainerContent = function (oControl, bCurrentState, aStates) {
-        this.shellCtrl.setFloatingContainerContent("floatingContainerContent", [oControl.getId()], bCurrentState, aStates);
+        this._updateItemStates([oControl.getId()], bCurrentState, aStates, "floatingContainer.items", Operation.Add);
     };
 
     /**
@@ -2524,13 +2535,15 @@ sap.ui.define([
 
     /*---------------Conditional----------------*/
 
-    Renderer.prototype.createTriggers = function (aTriggers, bCurrentState, aStates) {
-        this.oShellModel.createTriggers(aTriggers, bCurrentState, aStates);
+    Renderer.prototype.createTriggers = function (aTriggers, bCurrentState, vStates) {
+        Log.error("'createTriggers' was discontinued.");
     };
 
     /*---------------Generic--------------------*/
 
-    Renderer.prototype.convertButtonsToActions = function (aIds, bCurrentState, aStates) {
+    Renderer.prototype.convertButtonsToActions = function (aIds, bCurrentState, vStates) {
+        const aStates = this._sanitizeStates(vStates);
+
         var oProperties = {};
         var that = this;
         aIds.forEach(function (sId) {
@@ -2551,40 +2564,42 @@ sap.ui.define([
 
     Renderer.prototype.createItem = function (oControlProperties, bCurrentState, fnCreateItem) {
         // create the object
-        var oItem;
+        var oControl;
         if (oControlProperties && oControlProperties.id) {
-            oItem = Element.getElementById(oControlProperties.id);
+            oControl = Element.getElementById(oControlProperties.id);
         }
-        if (!oItem) {
-            oItem = fnCreateItem(oControlProperties);
-            if (bCurrentState) {
-                this.oShellModel.addElementToManagedQueue(oItem);
-            }
+        if (!oControl) {
+            oControl = fnCreateItem(oControlProperties);
+            StateManager.addManagedControl(oControl.getId(), !bCurrentState);
         }
 
-        return oItem;
+        return oControl;
     };
 
     /*------------Custom State Entry------------------------------*/
 
+    /**
+     * @deprecated since 1.120 Deprecated without successor.
+     * @private
+     */
     Renderer.prototype.addEntryInShellStates = function (sName, entrySuffix, fnAdd, fnRemove, oStateConfiguration) {
-        this.oShellModel.addEntryInShellStates(sName, entrySuffix, fnAdd, fnRemove, oStateConfiguration);
+        Log.error("'addEntryInShellStates' was deprecated and discontinued.");
     };
 
-    Renderer.prototype.removeCustomItems = function (sStateEntry, aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.removeCustomItems(sStateEntry, [aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.removeCustomItems(sStateEntry, aIds, bCurrentState, aStates);
-        }
+    /**
+     * @deprecated since 1.120 Deprecated without successor.
+     * @private
+     */
+    Renderer.prototype.removeCustomItems = function (sStateEntry, vIds, bCurrentState, vStates) {
+        Log.error("'removeCustomItems' was deprecated and discontinued.");
     };
 
-    Renderer.prototype.addCustomItems = function (sStateEntry, aIds, bCurrentState, aStates) {
-        if (typeof aIds === "string") {
-            this.oShellModel.addCustomItems(sStateEntry, [aIds], bCurrentState, aStates);
-        } else {
-            this.oShellModel.addCustomItems(sStateEntry, aIds, bCurrentState, aStates);
-        }
+    /**
+     * @deprecated since 1.120 Deprecated without successor.
+     * @private
+     */
+    Renderer.prototype.addCustomItems = function (sStateEntry, vIds, bCurrentState, vStates) {
+        Log.error("'addCustomItems' was deprecated and discontinued.");
     };
 
     /**
@@ -2753,11 +2768,12 @@ sap.ui.define([
      * @private
      * @since 1.108.0
      */
-    Renderer.prototype.destroyButton = function (aIds) {
-        if (!aIds) {
+    Renderer.prototype.destroyButton = function (vIds) {
+        if (!vIds) {
             return;
         }
-        aIds = typeof aIds === "string" ? [aIds] : aIds;
+        const aIds = Array.isArray(vIds) ? vIds : [vIds];
+
         aIds.forEach(function (sId) {
             var oButton = Element.getElementById(sId);
             if (oButton) {