@sapui5/sap.cux.home 1.142.0 → 1.142.2

package/src/sap/cux/home/changeHandler/SpacePageIconHandler.js

@@ -1,16 +1,16 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/ui/fl/changeHandler/condenser/Classification"], function (CondenserClassification) {
   "use strict";
 
-  function getContainer(control) {
-    return control.getItems().find(item => item.getMetadata().getName() === "sap.cux.home.NewsAndPagesContainer");
+  function getPageContainer(control) {
+    return control.getItems().find(item => item.getMetadata().getName() === "sap.cux.home.PagesContainer");
   }
   const SpacePageIconHandler = {
     applyChange: (change, control) => {
-      const container = getContainer(control);
+      const container = getPageContainer(control);
       container?.setIconPersonalizations(change.getContent());
       return true;
     },
@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/fl/changeHandler/condenser/Classification"], function (Co
       revertChange.forEach(changeContent => {
         changeContent.icon = changeContent.oldIcon;
       });
-      const container = getContainer(control);
+      const container = getPageContainer(control);
       container?.setIconPersonalizations(revertChange);
     },
     completeChangeContent: () => {

package/src/sap/cux/home/changeHandler/SpacePageIconHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpacePageIconHandler.js","names":["sap","ui","define","CondenserClassification","getContainer","control","getItems","find","item","getMetadata","getName","SpacePageIconHandler","applyChange","change","container","setIconPersonalizations","getContent","revertChange","forEach","changeContent","icon","oldIcon","completeChangeContent","getCondenserInfo","affectedControl","getSelector","classification","LastOneWins","uniqueKey","spaceId","pageId"],"sources":["SpacePageIconHandler.ts"],"sourcesContent":["/*!\n * SAP UI development toolkit for HTML5 (SAPUI5)\n *  * (c) Copyright 2009-2025 SAP SE. All rights reserved\n */\n\nimport Control from \"sap/ui/core/Control\";\nimport CondenserClassification from \"sap/ui/fl/changeHandler/condenser/Classification\";\nimport BaseLayout from \"../BaseLayout\";\nimport { IKeyUserChangeObject, ISpacePagePersonalization } from \"../interface/KeyUserInterface\";\nimport NewsAndPagesContainer from \"../NewsAndPagesContainer\";\n\nfunction getContainer(control: Control): NewsAndPagesContainer {\n\treturn (control as BaseLayout)\n\t\t.getItems()\n\t\t.find((item) => item.getMetadata().getName() === \"sap.cux.home.NewsAndPagesContainer\") as NewsAndPagesContainer;\n}\n\nconst SpacePageIconHandler = {\n\tapplyChange: (change: IKeyUserChangeObject, control: Control) => {\n\t\tconst container = getContainer(control);\n\t\tcontainer?.setIconPersonalizations(change.getContent());\n\t\treturn true;\n\t},\n\trevertChange: (change: IKeyUserChangeObject, control: Control) => {\n\t\tconst revertChange = change.getContent() as ISpacePagePersonalization[];\n\t\trevertChange.forEach((changeContent) => {\n\t\t\tchangeContent.icon = changeContent.oldIcon;\n\t\t});\n\t\tconst container = getContainer(control);\n\t\tcontainer?.setIconPersonalizations(revertChange);\n\t},\n\tcompleteChangeContent: () => {\n\t\treturn;\n\t},\n\tgetCondenserInfo: (change: IKeyUserChangeObject) => {\n\t\tconst changeContent = change.getContent() as ISpacePagePersonalization;\n\t\treturn {\n\t\t\taffectedControl: change.getSelector(),\n\t\t\tclassification: (CondenserClassification as { LastOneWins: string }).LastOneWins,\n\t\t\tuniqueKey: changeContent.spaceId + (changeContent.pageId || \"\") + \"_icon\"\n\t\t};\n\t}\n};\n\nexport default SpacePageIconHandler;\n"],"mappings":"AAAA;AACA;AACA;AACA;AAHAA,GAAA,CAAAC,EAAA,CAAAC,MAAA,iEAAAC,uBAAA;EAAA;;EAWA,SAASC,YAAYA,CAACC,OAAgB,EAAyB;IAC9D,OAAQA,OAAO,CACbC,QAAQ,CAAC,CAAC,CACVC,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACC,WAAW,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,KAAK,oCAAoC,CAAC;EACxF;EAEA,MAAMC,oBAAoB,GAAG;IAC5BC,WAAW,EAAEA,CAACC,MAA4B,EAAER,OAAgB,KAAK;MAChE,MAAMS,SAAS,GAAGV,YAAY,CAACC,OAAO,CAAC;MACvCS,SAAS,EAAEC,uBAAuB,CAACF,MAAM,CAACG,UAAU,CAAC,CAAC,CAAC;MACvD,OAAO,IAAI;IACZ,CAAC;IACDC,YAAY,EAAEA,CAACJ,MAA4B,EAAER,OAAgB,KAAK;MACjE,MAAMY,YAAY,GAAGJ,MAAM,CAACG,UAAU,CAAC,CAAgC;MACvEC,YAAY,CAACC,OAAO,CAAEC,aAAa,IAAK;QACvCA,aAAa,CAACC,IAAI,GAAGD,aAAa,CAACE,OAAO;MAC3C,CAAC,CAAC;MACF,MAAMP,SAAS,GAAGV,YAAY,CAACC,OAAO,CAAC;MACvCS,SAAS,EAAEC,uBAAuB,CAACE,YAAY,CAAC;IACjD,CAAC;IACDK,qBAAqB,EAAEA,CAAA,KAAM;MAC5B;IACD,CAAC;IACDC,gBAAgB,EAAGV,MAA4B,IAAK;MACnD,MAAMM,aAAa,GAAGN,MAAM,CAACG,UAAU,CAAC,CAA8B;MACtE,OAAO;QACNQ,eAAe,EAAEX,MAAM,CAACY,WAAW,CAAC,CAAC;QACrCC,cAAc,EAAGvB,uBAAuB,CAA6BwB,WAAW;QAChFC,SAAS,EAAET,aAAa,CAACU,OAAO,IAAIV,aAAa,CAACW,MAAM,IAAI,EAAE,CAAC,GAAG;MACnE,CAAC;IACF;EACD,CAAC;EAAC,OAEanB,oBAAoB;AAAA","ignoreList":[]}
+{"version":3,"file":"SpacePageIconHandler.js","names":["sap","ui","define","CondenserClassification","getPageContainer","control","getItems","find","item","getMetadata","getName","SpacePageIconHandler","applyChange","change","container","setIconPersonalizations","getContent","revertChange","forEach","changeContent","icon","oldIcon","completeChangeContent","getCondenserInfo","affectedControl","getSelector","classification","LastOneWins","uniqueKey","spaceId","pageId"],"sources":["SpacePageIconHandler.ts"],"sourcesContent":["/*!\n * SAP UI development toolkit for HTML5 (SAPUI5)\n *  * (c) Copyright 2009-2026 SAP SE. All rights reserved\n */\n\nimport Control from \"sap/ui/core/Control\";\nimport CondenserClassification from \"sap/ui/fl/changeHandler/condenser/Classification\";\nimport BaseLayout from \"../BaseLayout\";\nimport { IKeyUserChangeObject, ISpacePagePersonalization } from \"../interface/KeyUserInterface\";\nimport PagesContainer from \"../PagesContainer\";\n\nfunction getPageContainer(control: Control): PagesContainer {\n\treturn (control as BaseLayout)\n\t\t.getItems()\n\t\t.find((item) => item.getMetadata().getName() === \"sap.cux.home.PagesContainer\") as PagesContainer;\n}\n\nconst SpacePageIconHandler = {\n\tapplyChange: (change: IKeyUserChangeObject, control: Control) => {\n\t\tconst container = getPageContainer(control);\n\t\tcontainer?.setIconPersonalizations(change.getContent());\n\t\treturn true;\n\t},\n\trevertChange: (change: IKeyUserChangeObject, control: Control) => {\n\t\tconst revertChange = change.getContent() as ISpacePagePersonalization[];\n\t\trevertChange.forEach((changeContent) => {\n\t\t\tchangeContent.icon = changeContent.oldIcon;\n\t\t});\n\t\tconst container = getPageContainer(control);\n\t\tcontainer?.setIconPersonalizations(revertChange);\n\t},\n\tcompleteChangeContent: () => {\n\t\treturn;\n\t},\n\tgetCondenserInfo: (change: IKeyUserChangeObject) => {\n\t\tconst changeContent = change.getContent() as ISpacePagePersonalization;\n\t\treturn {\n\t\t\taffectedControl: change.getSelector(),\n\t\t\tclassification: (CondenserClassification as { LastOneWins: string }).LastOneWins,\n\t\t\tuniqueKey: changeContent.spaceId + (changeContent.pageId || \"\") + \"_icon\"\n\t\t};\n\t}\n};\n\nexport default SpacePageIconHandler;\n"],"mappings":"AAAA;AACA;AACA;AACA;AAHAA,GAAA,CAAAC,EAAA,CAAAC,MAAA,iEAAAC,uBAAA;EAAA;;EAWA,SAASC,gBAAgBA,CAACC,OAAgB,EAAkB;IAC3D,OAAQA,OAAO,CACbC,QAAQ,CAAC,CAAC,CACVC,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACC,WAAW,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,KAAK,6BAA6B,CAAC;EACjF;EAEA,MAAMC,oBAAoB,GAAG;IAC5BC,WAAW,EAAEA,CAACC,MAA4B,EAAER,OAAgB,KAAK;MAChE,MAAMS,SAAS,GAAGV,gBAAgB,CAACC,OAAO,CAAC;MAC3CS,SAAS,EAAEC,uBAAuB,CAACF,MAAM,CAACG,UAAU,CAAC,CAAC,CAAC;MACvD,OAAO,IAAI;IACZ,CAAC;IACDC,YAAY,EAAEA,CAACJ,MAA4B,EAAER,OAAgB,KAAK;MACjE,MAAMY,YAAY,GAAGJ,MAAM,CAACG,UAAU,CAAC,CAAgC;MACvEC,YAAY,CAACC,OAAO,CAAEC,aAAa,IAAK;QACvCA,aAAa,CAACC,IAAI,GAAGD,aAAa,CAACE,OAAO;MAC3C,CAAC,CAAC;MACF,MAAMP,SAAS,GAAGV,gBAAgB,CAACC,OAAO,CAAC;MAC3CS,SAAS,EAAEC,uBAAuB,CAACE,YAAY,CAAC;IACjD,CAAC;IACDK,qBAAqB,EAAEA,CAAA,KAAM;MAC5B;IACD,CAAC;IACDC,gBAAgB,EAAGV,MAA4B,IAAK;MACnD,MAAMM,aAAa,GAAGN,MAAM,CAACG,UAAU,CAAC,CAA8B;MACtE,OAAO;QACNQ,eAAe,EAAEX,MAAM,CAACY,WAAW,CAAC,CAAC;QACrCC,cAAc,EAAGvB,uBAAuB,CAA6BwB,WAAW;QAChFC,SAAS,EAAET,aAAa,CAACU,OAAO,IAAIV,aAAa,CAACW,MAAM,IAAI,EAAE,CAAC,GAAG;MACnE,CAAC;IACF;EACD,CAAC;EAAC,OAEanB,oBAAoB;AAAA","ignoreList":[]}

package/src/sap/cux/home/changeHandler/SpacePageIconHandler.ts

@@ -1,23 +1,23 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 
 import Control from "sap/ui/core/Control";
 import CondenserClassification from "sap/ui/fl/changeHandler/condenser/Classification";
 import BaseLayout from "../BaseLayout";
 import { IKeyUserChangeObject, ISpacePagePersonalization } from "../interface/KeyUserInterface";
-import NewsAndPagesContainer from "../NewsAndPagesContainer";
+import PagesContainer from "../PagesContainer";
 
-function getContainer(control: Control): NewsAndPagesContainer {
+function getPageContainer(control: Control): PagesContainer {
 	return (control as BaseLayout)
 		.getItems()
-		.find((item) => item.getMetadata().getName() === "sap.cux.home.NewsAndPagesContainer") as NewsAndPagesContainer;
+		.find((item) => item.getMetadata().getName() === "sap.cux.home.PagesContainer") as PagesContainer;
 }
 
 const SpacePageIconHandler = {
 	applyChange: (change: IKeyUserChangeObject, control: Control) => {
-		const container = getContainer(control);
+		const container = getPageContainer(control);
 		container?.setIconPersonalizations(change.getContent());
 		return true;
 	},
@@ -26,7 +26,7 @@ const SpacePageIconHandler = {
 		revertChange.forEach((changeContent) => {
 			changeContent.icon = changeContent.oldIcon;
 		});
-		const container = getContainer(control);
+		const container = getPageContainer(control);
 		container?.setIconPersonalizations(revertChange);
 	},
 	completeChangeContent: () => {

package/src/sap/cux/home/designtime/Layout.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/ui/core/Lib", "../changeHandler/LayoutHandler"], function (Lib, __LayoutHandler) {
   "use strict";

package/src/sap/cux/home/designtime/Layout.designtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"Layout.designtime.js","names":["sap","ui","define","Lib","__LayoutHandler","_interopRequireDefault","obj","__esModule","default","LayoutHandler","designtime","actions","remove","settings","icon","name","getResourceBundleFor","getText","isEnabled","handler","oWrapperControl","mPropertyBag","loadPersonalizationDialog","then","aChanges"],"sources":["Layout.designtime.ts"],"sourcesContent":["/*!\n * SAP UI development toolkit for HTML5 (SAPUI5)\n *  * (c) Copyright 2009-2025 SAP SE. All rights reserved\n */\n\nimport ResourceBundle from \"sap/base/i18n/ResourceBundle\";\nimport Control from \"sap/ui/core/Control\";\nimport Lib from \"sap/ui/core/Lib\";\nimport LayoutHandler from \"../changeHandler/LayoutHandler\";\n\nconst designtime = {\n\tactions: {\n\t\tremove: null,\n\t\tsettings: {\n\t\t\ticon: \"sap-icon://edit\",\n\t\t\tname: (Lib.getResourceBundleFor(\"sap.cux.home.i18n\") as ResourceBundle).getText(\"editCurrentPage\"),\n\t\t\tisEnabled: true,\n\t\t\thandler: (oWrapperControl: Control, mPropertyBag: Record<string, unknown>) => {\n\t\t\t\treturn LayoutHandler.loadPersonalizationDialog(oWrapperControl, mPropertyBag).then((aChanges) => {\n\t\t\t\t\treturn aChanges;\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\t}\n};\n\nexport default designtime;\n"],"mappings":"AAAA;AACA;AACA;AACA;AAHAA,GAAA,CAAAC,EAAA,CAAAC,MAAA,kEAAAC,GAAA,EAAAC,eAAA;EAAA;;EAAA,SAAAC,uBAAAC,GAAA;IAAA,OAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,CAAAE,OAAA,mBAAAF,GAAA,CAAAE,OAAA,GAAAF,GAAA;EAAA;EAAA,MAQOG,aAAa,GAAAJ,sBAAA,CAAAD,eAAA;EAEpB,MAAMM,UAAU,GAAG;IAClBC,OAAO,EAAE;MACRC,MAAM,EAAE,IAAI;MACZC,QAAQ,EAAE;QACTC,IAAI,EAAE,iBAAiB;QACvBC,IAAI,EAAGZ,GAAG,CAACa,oBAAoB,CAAC,mBAAmB,CAAC,CAAoBC,OAAO,CAAC,iBAAiB,CAAC;QAClGC,SAAS,EAAE,IAAI;QACfC,OAAO,EAAEA,CAACC,eAAwB,EAAEC,YAAqC,KAAK;UAC7E,OAAOZ,aAAa,CAACa,yBAAyB,CAACF,eAAe,EAAEC,YAAY,CAAC,CAACE,IAAI,CAAEC,QAAQ,IAAK;YAChG,OAAOA,QAAQ;UAChB,CAAC,CAAC;QACH;MACD;IACD;EACD,CAAC;EAAC,OAEad,UAAU;AAAA","ignoreList":[]}
+{"version":3,"file":"Layout.designtime.js","names":["sap","ui","define","Lib","__LayoutHandler","_interopRequireDefault","obj","__esModule","default","LayoutHandler","designtime","actions","remove","settings","icon","name","getResourceBundleFor","getText","isEnabled","handler","oWrapperControl","mPropertyBag","loadPersonalizationDialog","then","aChanges"],"sources":["Layout.designtime.ts"],"sourcesContent":["/*!\n * SAP UI development toolkit for HTML5 (SAPUI5)\n *  * (c) Copyright 2009-2026 SAP SE. All rights reserved\n */\n\nimport ResourceBundle from \"sap/base/i18n/ResourceBundle\";\nimport Control from \"sap/ui/core/Control\";\nimport Lib from \"sap/ui/core/Lib\";\nimport LayoutHandler from \"../changeHandler/LayoutHandler\";\n\nconst designtime = {\n\tactions: {\n\t\tremove: null,\n\t\tsettings: {\n\t\t\ticon: \"sap-icon://edit\",\n\t\t\tname: (Lib.getResourceBundleFor(\"sap.cux.home.i18n\") as ResourceBundle).getText(\"editCurrentPage\"),\n\t\t\tisEnabled: true,\n\t\t\thandler: (oWrapperControl: Control, mPropertyBag: Record<string, unknown>) => {\n\t\t\t\treturn LayoutHandler.loadPersonalizationDialog(oWrapperControl, mPropertyBag).then((aChanges) => {\n\t\t\t\t\treturn aChanges;\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\t}\n};\n\nexport default designtime;\n"],"mappings":"AAAA;AACA;AACA;AACA;AAHAA,GAAA,CAAAC,EAAA,CAAAC,MAAA,kEAAAC,GAAA,EAAAC,eAAA;EAAA;;EAAA,SAAAC,uBAAAC,GAAA;IAAA,OAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,CAAAE,OAAA,mBAAAF,GAAA,CAAAE,OAAA,GAAAF,GAAA;EAAA;EAAA,MAQOG,aAAa,GAAAJ,sBAAA,CAAAD,eAAA;EAEpB,MAAMM,UAAU,GAAG;IAClBC,OAAO,EAAE;MACRC,MAAM,EAAE,IAAI;MACZC,QAAQ,EAAE;QACTC,IAAI,EAAE,iBAAiB;QACvBC,IAAI,EAAGZ,GAAG,CAACa,oBAAoB,CAAC,mBAAmB,CAAC,CAAoBC,OAAO,CAAC,iBAAiB,CAAC;QAClGC,SAAS,EAAE,IAAI;QACfC,OAAO,EAAEA,CAACC,eAAwB,EAAEC,YAAqC,KAAK;UAC7E,OAAOZ,aAAa,CAACa,yBAAyB,CAACF,eAAe,EAAEC,YAAY,CAAC,CAACE,IAAI,CAAEC,QAAQ,IAAK;YAChG,OAAOA,QAAQ;UAChB,CAAC,CAAC;QACH;MACD;IACD;EACD,CAAC;EAAC,OAEad,UAAU;AAAA","ignoreList":[]}

package/src/sap/cux/home/designtime/Layout.designtime.ts

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 
 import ResourceBundle from "sap/base/i18n/ResourceBundle";

package/src/sap/cux/home/flexibility/BaseContainer.flexibility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseContainer.flexibility.d.ts","sourceRoot":"../../../../../..","sources":["src/sap/cux/home/flexibility/BaseContainer.flexibility.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,oDAAoD,CAAC;IAQpE,OAAO,aAAa,MAAM,4BAA4B,CAAC;IACvD,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;IAIzE,KAAK,MAAM;QACV,WAAW,gBAAgB;QAC3B,YAAY,iBAAiB;KAC7B;IAED,KAAK,aAAa,GAAG;QACpB,WAAW,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACpG,YAAY,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACrG,CAAC;IAEF,MAAM,mBAAmB,GACxB,YAAY,aAAa,EACzB,QAAQ,MAAM,EACd,QAAQ,cAAc,EACtB,SAAS,aAAa,EACtB,aAAa,MAAM,kBAOnB,CAAC;;;;;;2BAeK,aAAa;;;;;;2BAcb,aAAa;;;IA3BpB,wBA6BE;CAED"}
+{"version":3,"file":"BaseContainer.flexibility.d.ts","sourceRoot":"../../../../../..","sources":["src/sap/cux/home/flexibility/BaseContainer.flexibility.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,oDAAoD,CAAC;IAQpE,OAAO,aAAa,MAAM,4BAA4B,CAAC;IACvD,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;IAIzE,KAAK,MAAM;QACV,WAAW,gBAAgB;QAC3B,YAAY,iBAAiB;KAC7B;IAED,KAAK,aAAa,GAAG;QACpB,WAAW,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACpG,YAAY,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACrG,CAAC;IAEF,MAAM,mBAAmB,GACxB,YAAY,aAAa,EACzB,QAAQ,MAAM,EACd,QAAQ,cAAc,EACtB,SAAS,aAAa,EACtB,aAAa,MAAM,kBA6BnB,CAAC;;;;;;2BAeK,aAAa;;;;;;2BAcb,aAAa;;;IA3BpB,wBA6BE;CAED"}

package/src/sap/cux/home/flexibility/BaseContainer.flexibility.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/ui/fl/changeHandler/HideControl", "sap/ui/fl/changeHandler/UnhideControl", "./Layout.flexibility"], function (HideControl, UnHideControl, ___Layoutflexibility) {
   "use strict";
@@ -13,11 +13,38 @@ sap.ui.define(["sap/ui/fl/changeHandler/HideControl", "sap/ui/fl/changeHandler/U
   }(Action || {});
   const resetLayoutSections = function (changeType, action, change, control, propertyBag) {
     try {
-      const genericChange = changeType;
-      return Promise.resolve(genericChange[action](change, control, propertyBag)).then(function () {
+      function _temp3() {
         // Reset sections to update the layout
         control.getParent().resetSections?.();
-      });
+      }
+      const genericChange = changeType;
+      const layout = control.getParent();
+
+      // If the change does not have compositeId, apply the change to all containers with same compositeId
+      const _temp2 = function () {
+        if (!change.getContent?.()?.compositeId) {
+          const containers = layout.getItems().filter(item => control.getProperty("compositeId") !== undefined && item.getProperty("compositeId") === control.getProperty("compositeId"));
+
+          // in case no containers found with same compositeId, apply the change to the current container
+          const _temp = function () {
+            if (containers.length === 0) {
+              return Promise.resolve(genericChange[action](change, control, propertyBag)).then(function () {});
+            } else {
+              return Promise.resolve(Promise.all(containers.map(function (container) {
+                try {
+                  return Promise.resolve(genericChange[action](change, container, propertyBag));
+                } catch (e) {
+                  return Promise.reject(e);
+                }
+              }))).then(function () {});
+            }
+          }();
+          if (_temp && _temp.then) return _temp.then(function () {});
+        } else {
+          return Promise.resolve(genericChange[action](change, control, propertyBag)).then(function () {});
+        }
+      }();
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2));
     } catch (e) {
       return Promise.reject(e);
     }

package/src/sap/cux/home/flexibility/BaseContainer.flexibility.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseContainer.flexibility.js","names":["sap","ui","define","HideControl","UnHideControl","___Layoutflexibility","CHANGE_TYPES","Action","resetLayoutSections","changeType","action","change","control","propertyBag","genericChange","Promise","resolve","then","getParent","resetSections","e","reject","__exports","HIDE","layers","USER","changeHandler","applyChange","revertChange","UNHIDE"],"sources":["BaseContainer.flexibility.ts"],"sourcesContent":["/*!\n * SAP UI development toolkit for HTML5 (SAPUI5)\n *  * (c) Copyright 2009-2025 SAP SE. All rights reserved\n */\n\nimport HideControl from \"sap/ui/fl/changeHandler/HideControl\";\nimport UnHideControl from \"sap/ui/fl/changeHandler/UnhideControl\";\nimport BaseContainer from \"../BaseContainer\";\nimport { IKeyUserChange } from \"../interface/KeyUserInterface\";\nimport Layout from \"../Layout\";\nimport { CHANGE_TYPES } from \"./Layout.flexibility\";\n\nenum Action {\n\tapplyChange = \"applyChange\",\n\trevertChange = \"revertChange\"\n}\n\ntype ChangeHandler = {\n\tapplyChange: (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => Promise<void>;\n\trevertChange: (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => Promise<void>;\n};\n\nconst resetLayoutSections = async (\n\tchangeType: ChangeHandler,\n\taction: Action,\n\tchange: IKeyUserChange,\n\tcontrol: BaseContainer,\n\tpropertyBag: object\n) => {\n\tconst genericChange: ChangeHandler = changeType;\n\tawait genericChange[action](change, control, propertyBag);\n\n\t// Reset sections to update the layout\n\t(control.getParent() as Layout).resetSections?.();\n};\n\nexport default {\n\t[CHANGE_TYPES.HIDE]: {\n\t\tlayers: {\n\t\t\tUSER: true\n\t\t},\n\t\tchangeHandler: {\n\t\t\t...HideControl,\n\t\t\tapplyChange: async (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => {\n\t\t\t\tawait resetLayoutSections(HideControl as ChangeHandler, Action.applyChange, change, control, propertyBag);\n\t\t\t},\n\t\t\trevertChange: async (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => {\n\t\t\t\tawait resetLayoutSections(HideControl as ChangeHandler, Action.revertChange, change, control, propertyBag);\n\t\t\t}\n\t\t} as ChangeHandler\n\t},\n\t[CHANGE_TYPES.UNHIDE]: {\n\t\tlayers: {\n\t\t\tUSER: true\n\t\t},\n\t\tchangeHandler: {\n\t\t\t...UnHideControl,\n\t\t\tapplyChange: async (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => {\n\t\t\t\tawait resetLayoutSections(UnHideControl as ChangeHandler, Action.applyChange, change, control, propertyBag);\n\t\t\t},\n\t\t\trevertChange: async (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => {\n\t\t\t\tawait resetLayoutSections(UnHideControl as ChangeHandler, Action.revertChange, change, control, propertyBag);\n\t\t\t}\n\t\t} as ChangeHandler\n\t}\n};\n"],"mappings":"AAAA;AACA;AACA;AACA;AAHAA,GAAA,CAAAC,EAAA,CAAAC,MAAA,qHAAAC,WAAA,EAAAC,aAAA,EAAAC,oBAAA;EAAA;;EAAA,MAUSC,YAAY,GAAAD,oBAAA;EAAA,IAEhBE,MAAM,0BAANA,MAAM;IAANA,MAAM;IAANA,MAAM;IAAA,OAANA,MAAM;EAAA,EAANA,MAAM;EAUX,MAAMC,mBAAmB,YAAAA,CACxBC,UAAyB,EACzBC,MAAc,EACdC,MAAsB,EACtBC,OAAsB,EACtBC,WAAmB;IAAA,IACf;MACJ,MAAMC,aAA4B,GAAGL,UAAU;MAAC,OAAAM,OAAA,CAAAC,OAAA,CAC1CF,aAAa,CAACJ,MAAM,CAAC,CAACC,MAAM,EAAEC,OAAO,EAAEC,WAAW,CAAC,EAAAI,IAAA;QAEzD;QACCL,OAAO,CAACM,SAAS,CAAC,CAAC,CAAYC,aAAa,GAAG,CAAC;MAAC;IACnD,CAAC,QAAAC,CAAA;MAAA,OAAAL,OAAA,CAAAM,MAAA,CAAAD,CAAA;IAAA;EAAA;EAAC,IAAAE,SAAA,GAEa;IACd,CAAChB,YAAY,CAACiB,IAAI,GAAG;MACpBC,MAAM,EAAE;QACPC,IAAI,EAAE;MACP,CAAC;MACDC,aAAa,EAAE;QACd,GAAGvB,WAAW;QACdwB,WAAW,WAAAA,CAAShB,MAAsB,EAAEC,OAAsB,EAAEC,WAAmB;UAAA,IAAK;YAAA,OAAAE,OAAA,CAAAC,OAAA,CACrFR,mBAAmB,CAACL,WAAW,EAAmBI,MAAM,CAACoB,WAAW,EAAEhB,MAAM,EAAEC,OAAO,EAAEC,WAAW,CAAC,EAAAI,IAAA;UAC1G,CAAC,QAAAG,CAAA;YAAA,OAAAL,OAAA,CAAAM,MAAA,CAAAD,CAAA;UAAA;QAAA;QACDQ,YAAY,WAAAA,CAASjB,MAAsB,EAAEC,OAAsB,EAAEC,WAAmB;UAAA,IAAK;YAAA,OAAAE,OAAA,CAAAC,OAAA,CACtFR,mBAAmB,CAACL,WAAW,EAAmBI,MAAM,CAACqB,YAAY,EAAEjB,MAAM,EAAEC,OAAO,EAAEC,WAAW,CAAC,EAAAI,IAAA;UAC3G,CAAC,QAAAG,CAAA;YAAA,OAAAL,OAAA,CAAAM,MAAA,CAAAD,CAAA;UAAA;QAAA;MACF;IACD,CAAC;IACD,CAACd,YAAY,CAACuB,MAAM,GAAG;MACtBL,MAAM,EAAE;QACPC,IAAI,EAAE;MACP,CAAC;MACDC,aAAa,EAAE;QACd,GAAGtB,aAAa;QAChBuB,WAAW,WAAAA,CAAShB,MAAsB,EAAEC,OAAsB,EAAEC,WAAmB;UAAA,IAAK;YAAA,OAAAE,OAAA,CAAAC,OAAA,CACrFR,mBAAmB,CAACJ,aAAa,EAAmBG,MAAM,CAACoB,WAAW,EAAEhB,MAAM,EAAEC,OAAO,EAAEC,WAAW,CAAC,EAAAI,IAAA;UAC5G,CAAC,QAAAG,CAAA;YAAA,OAAAL,OAAA,CAAAM,MAAA,CAAAD,CAAA;UAAA;QAAA;QACDQ,YAAY,WAAAA,CAASjB,MAAsB,EAAEC,OAAsB,EAAEC,WAAmB;UAAA,IAAK;YAAA,OAAAE,OAAA,CAAAC,OAAA,CACtFR,mBAAmB,CAACJ,aAAa,EAAmBG,MAAM,CAACqB,YAAY,EAAEjB,MAAM,EAAEC,OAAO,EAAEC,WAAW,CAAC,EAAAI,IAAA;UAC7G,CAAC,QAAAG,CAAA;YAAA,OAAAL,OAAA,CAAAM,MAAA,CAAAD,CAAA;UAAA;QAAA;MACF;IACD;EACD,CAAC;EAAA,OAAAE,SAAA;AAAA","ignoreList":[]}
+{"version":3,"file":"BaseContainer.flexibility.js","names":["sap","ui","define","HideControl","UnHideControl","___Layoutflexibility","CHANGE_TYPES","Action","resetLayoutSections","changeType","action","change","control","propertyBag","_temp3","getParent","resetSections","genericChange","layout","_temp2","getContent","compositeId","containers","getItems","filter","item","getProperty","undefined","_temp","length","Promise","resolve","then","all","map","container","e","reject","__exports","HIDE","layers","USER","changeHandler","applyChange","revertChange","UNHIDE"],"sources":["BaseContainer.flexibility.ts"],"sourcesContent":["/*!\n * SAP UI development toolkit for HTML5 (SAPUI5)\n *  * (c) Copyright 2009-2026 SAP SE. All rights reserved\n */\n\nimport HideControl from \"sap/ui/fl/changeHandler/HideControl\";\nimport UnHideControl from \"sap/ui/fl/changeHandler/UnhideControl\";\nimport BaseContainer from \"../BaseContainer\";\nimport { IKeyUserChange } from \"../interface/KeyUserInterface\";\nimport Layout from \"../Layout\";\nimport { CHANGE_TYPES } from \"./Layout.flexibility\";\n\nenum Action {\n\tapplyChange = \"applyChange\",\n\trevertChange = \"revertChange\"\n}\n\ntype ChangeHandler = {\n\tapplyChange: (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => Promise<void>;\n\trevertChange: (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => Promise<void>;\n};\n\nconst resetLayoutSections = async (\n\tchangeType: ChangeHandler,\n\taction: Action,\n\tchange: IKeyUserChange,\n\tcontrol: BaseContainer,\n\tpropertyBag: object\n) => {\n\tconst genericChange: ChangeHandler = changeType;\n\tconst layout = control.getParent() as Layout;\n\n\t// If the change does not have compositeId, apply the change to all containers with same compositeId\n\tif (!change.getContent?.()?.compositeId) {\n\t\tconst containers = layout\n\t\t\t.getItems()\n\t\t\t.filter(\n\t\t\t\t(item) =>\n\t\t\t\t\tcontrol.getProperty(\"compositeId\") !== undefined &&\n\t\t\t\t\titem.getProperty(\"compositeId\") === control.getProperty(\"compositeId\")\n\t\t\t);\n\n\t\t// in case no containers found with same compositeId, apply the change to the current container\n\t\tif (containers.length === 0) {\n\t\t\tawait genericChange[action](change, control, propertyBag);\n\t\t} else {\n\t\t\tawait Promise.all(\n\t\t\t\tcontainers.map(async (container: BaseContainer) => await genericChange[action](change, container, propertyBag))\n\t\t\t);\n\t\t}\n\t} else {\n\t\tawait genericChange[action](change, control, propertyBag);\n\t}\n\n\t// Reset sections to update the layout\n\t(control.getParent() as Layout).resetSections?.();\n};\n\nexport default {\n\t[CHANGE_TYPES.HIDE]: {\n\t\tlayers: {\n\t\t\tUSER: true\n\t\t},\n\t\tchangeHandler: {\n\t\t\t...HideControl,\n\t\t\tapplyChange: async (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => {\n\t\t\t\tawait resetLayoutSections(HideControl as ChangeHandler, Action.applyChange, change, control, propertyBag);\n\t\t\t},\n\t\t\trevertChange: async (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => {\n\t\t\t\tawait resetLayoutSections(HideControl as ChangeHandler, Action.revertChange, change, control, propertyBag);\n\t\t\t}\n\t\t} as ChangeHandler\n\t},\n\t[CHANGE_TYPES.UNHIDE]: {\n\t\tlayers: {\n\t\t\tUSER: true\n\t\t},\n\t\tchangeHandler: {\n\t\t\t...UnHideControl,\n\t\t\tapplyChange: async (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => {\n\t\t\t\tawait resetLayoutSections(UnHideControl as ChangeHandler, Action.applyChange, change, control, propertyBag);\n\t\t\t},\n\t\t\trevertChange: async (change: IKeyUserChange, control: BaseContainer, propertyBag: object) => {\n\t\t\t\tawait resetLayoutSections(UnHideControl as ChangeHandler, Action.revertChange, change, control, propertyBag);\n\t\t\t}\n\t\t} as ChangeHandler\n\t}\n};\n"],"mappings":"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","ignoreList":[]}

package/src/sap/cux/home/flexibility/BaseContainer.flexibility.ts

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 
 import HideControl from "sap/ui/fl/changeHandler/HideControl";
@@ -28,7 +28,29 @@ const resetLayoutSections = async (
 	propertyBag: object
 ) => {
 	const genericChange: ChangeHandler = changeType;
-	await genericChange[action](change, control, propertyBag);
+	const layout = control.getParent() as Layout;
+
+	// If the change does not have compositeId, apply the change to all containers with same compositeId
+	if (!change.getContent?.()?.compositeId) {
+		const containers = layout
+			.getItems()
+			.filter(
+				(item) =>
+					control.getProperty("compositeId") !== undefined &&
+					item.getProperty("compositeId") === control.getProperty("compositeId")
+			);
+
+		// in case no containers found with same compositeId, apply the change to the current container
+		if (containers.length === 0) {
+			await genericChange[action](change, control, propertyBag);
+		} else {
+			await Promise.all(
+				containers.map(async (container: BaseContainer) => await genericChange[action](change, container, propertyBag))
+			);
+		}
+	} else {
+		await genericChange[action](change, control, propertyBag);
+	}
 
 	// Reset sections to update the layout
 	(control.getParent() as Layout).resetSections?.();

package/src/sap/cux/home/flexibility/Layout.flexibility.d.ts

@@ -1,4 +1,11 @@
 declare module "sap/cux/home/flexibility/Layout.flexibility" {
+    /*!
+     * SAP UI development toolkit for HTML5 (SAPUI5)
+     *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
+     */
+    import Control from "sap/ui/core/Control";
+    import { IContent, IKeyUserChangeObject } from "sap/cux/home/interface/KeyUserInterface";
+    import Layout from "sap/cux/home/Layout";
     export enum CHANGE_TYPES {
         HIDE = "hideControl",
         UNHIDE = "unhideControl",
@@ -15,17 +22,20 @@ declare module "sap/cux/home/flexibility/Layout.flexibility" {
             layers: {
                 USER: boolean;
             };
-            changeHandler: object;
+            changeHandler: {
+                completeChangeContent: (change: IKeyUserChangeObject, mSpecificChangeInfo: IContent, mPropertyBag: object) => Promise<void>;
+                applyChange: (oChange: IKeyUserChangeObject, oControl: Layout, mPropertyBag: object) => Promise<void>;
+            };
         };
         applySpaceColor: {
             layers: {
                 CUSTOMER: boolean;
             };
             changeHandler: {
-                applyChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => boolean;
-                revertChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => void;
+                applyChange: (change: IKeyUserChangeObject, control: Control) => boolean;
+                revertChange: (change: IKeyUserChangeObject, control: Control) => void;
                 completeChangeContent: () => void;
-                getCondenserInfo: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject) => {
+                getCondenserInfo: (change: IKeyUserChangeObject) => {
                     affectedControl: object;
                     classification: string;
                     uniqueKey: string;
@@ -37,10 +47,10 @@ declare module "sap/cux/home/flexibility/Layout.flexibility" {
                 CUSTOMER: boolean;
             };
             changeHandler: {
-                applyChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => boolean;
-                revertChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => void;
+                applyChange: (change: IKeyUserChangeObject, control: Control) => boolean;
+                revertChange: (change: IKeyUserChangeObject, control: Control) => void;
                 completeChangeContent: () => void;
-                getCondenserInfo: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject) => {
+                getCondenserInfo: (change: IKeyUserChangeObject) => {
                     affectedControl: object;
                     classification: string;
                     uniqueKey: string;
@@ -52,10 +62,10 @@ declare module "sap/cux/home/flexibility/Layout.flexibility" {
                 CUSTOMER: boolean;
             };
             changeHandler: {
-                applyChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => boolean;
-                revertChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => void;
+                applyChange: (change: IKeyUserChangeObject, control: Control) => boolean;
+                revertChange: (change: IKeyUserChangeObject, control: Control) => void;
                 completeChangeContent: () => void;
-                getCondenserInfo: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject) => {
+                getCondenserInfo: (change: IKeyUserChangeObject) => {
                     affectedControl: object;
                     classification: string;
                     uniqueKey: string;
@@ -67,10 +77,10 @@ declare module "sap/cux/home/flexibility/Layout.flexibility" {
                 CUSTOMER: boolean;
             };
             changeHandler: {
-                applyChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => boolean;
-                revertChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => void;
+                applyChange: (change: IKeyUserChangeObject, control: Control) => boolean;
+                revertChange: (change: IKeyUserChangeObject, control: Control) => void;
                 completeChangeContent: () => void;
-                getCondenserInfo: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject) => {
+                getCondenserInfo: (change: IKeyUserChangeObject) => {
                     affectedControl: object;
                     classification: string;
                     uniqueKey: string;
@@ -82,10 +92,10 @@ declare module "sap/cux/home/flexibility/Layout.flexibility" {
                 CUSTOMER: boolean;
             };
             changeHandler: {
-                applyChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => boolean;
-                revertChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => void;
+                applyChange: (change: IKeyUserChangeObject, control: Control) => boolean;
+                revertChange: (change: IKeyUserChangeObject, control: Control) => void;
                 completeChangeContent: () => void;
-                getCondenserInfo: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject) => {
+                getCondenserInfo: (change: IKeyUserChangeObject) => {
                     affectedControl: object;
                     classification: string;
                     uniqueKey: string;
@@ -97,10 +107,10 @@ declare module "sap/cux/home/flexibility/Layout.flexibility" {
                 CUSTOMER: boolean;
             };
             changeHandler: {
-                applyChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => boolean;
-                revertChange: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject, control: import("sap/ui/core/Control").default) => void;
+                applyChange: (change: IKeyUserChangeObject, control: Control) => boolean;
+                revertChange: (change: IKeyUserChangeObject, control: Control) => void;
                 completeChangeContent: () => void;
-                getCondenserInfo: (change: import("sap/cux/home/interface/KeyUserInterface").IKeyUserChangeObject) => {
+                getCondenserInfo: (change: IKeyUserChangeObject) => {
                     affectedControl: object;
                     classification: string;
                     uniqueKey: string;

package/src/sap/cux/home/flexibility/Layout.flexibility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layout.flexibility.d.ts","sourceRoot":"../../../../../..","sources":["src/sap/cux/home/flexibility/Layout.flexibility.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,6CAA6C,CAAC;IAY7D,MAAM,MAAM,YAAY;QACvB,IAAI,gBAAgB;QACpB,MAAM,kBAAkB;QACxB,IAAI,iBAAiB;QACrB,UAAU,mBAAmB;QAC7B,WAAW,oBAAoB;QAC/B,SAAS,kBAAkB;QAC3B,UAAU,mBAAmB;QAC7B,aAAa,sBAAsB;QACnC,oBAAoB,0BAA0B;KAC9C;;;;;;2BAOgC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IALvC,wBA2CE;CAED"}
+{"version":3,"file":"Layout.flexibility.d.ts","sourceRoot":"../../../../../..","sources":["src/sap/cux/home/flexibility/Layout.flexibility.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,6CAA6C,CAAC;IAC7D;;;OAGG;IAEH,OAAO,OAAO,MAAM,qBAAqB,CAAC;IAQ1C,OAAO,EAAiB,QAAQ,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;IACxG,OAAO,MAAM,MAAM,qBAAqB,CAAC;IAEzC,MAAM,MAAM,YAAY;QACvB,IAAI,gBAAgB;QACpB,MAAM,kBAAkB;QACxB,IAAI,iBAAiB;QACrB,UAAU,mBAAmB;QAC7B,WAAW,oBAAoB;QAC/B,SAAS,kBAAkB;QAC3B,UAAU,mBAAmB;QAC7B,aAAa,sBAAsB;QACnC,oBAAoB,0BAA0B;KAC9C;;;;;;;gDASwC,oBAAoB,uBAAuB,QAAQ,gBAAgB,MAAM;uCAalF,oBAAoB,YAAY,MAAM,gBAAgB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IApB5F,wBAsHE;CAED"}

package/src/sap/cux/home/flexibility/Layout.flexibility.js

@@ -1,8 +1,8 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "../changeHandler/NewsFeedVisibilityChange", "../changeHandler/SetNewsFeedUrl", "../changeHandler/SpacePageColorHandler", "../changeHandler/SpacePageIconHandler"], function (MoveControls, __newsFeedVisibilityChange, __setNewsFeedUrl, __spacePageColorHandler, __SpacePageIconHandler) {
+sap.ui.define(["sap/ui/core/Element", "sap/ui/fl/changeHandler/MoveControls", "../changeHandler/NewsFeedVisibilityChange", "../changeHandler/SetNewsFeedUrl", "../changeHandler/SpacePageColorHandler", "../changeHandler/SpacePageIconHandler"], function (Element, MoveControls, __newsFeedVisibilityChange, __setNewsFeedUrl, __spacePageColorHandler, __SpacePageIconHandler) {
   "use strict";
 
   function _interopRequireDefault(obj) {
@@ -29,7 +29,83 @@ sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "../changeHandler/NewsFee
       layers: {
         USER: true
       },
-      changeHandler: MoveControls
+      changeHandler: {
+        ...MoveControls,
+        completeChangeContent: function (change, mSpecificChangeInfo, mPropertyBag) {
+          try {
+            return Promise.resolve(Promise.resolve(MoveControls.completeChangeContent.apply(MoveControls, [change, mSpecificChangeInfo, mPropertyBag]))).then(function () {
+              const currentChange = change.getContent();
+              const movedElementId = mSpecificChangeInfo.movedElements[0].id;
+              const movedContainer = Element.getElementById(movedElementId);
+
+              //Add compositeId for new changes
+              change.setContent({
+                ...currentChange,
+                compositeId: movedContainer.getProperty("compositeId") || "",
+                movedElementId: movedElementId
+              });
+            });
+          } catch (e) {
+            return Promise.reject(e);
+          }
+        },
+        applyChange: function (oChange, oControl, mPropertyBag) {
+          try {
+            const control = oControl;
+            const controlItems = control.getItems();
+            const _temp = function () {
+              if ("compositeId" in oChange.getContent() === false) {
+                //create a condensed list with the items in control
+                const groupByCompositeId = controlItems => {
+                  const result = [];
+                  for (const item of controlItems) {
+                    const compositeId = item.getProperty("compositeId");
+                    const existingCompositeGroup = compositeId ? result.find(group => group.items[0].getProperty("compositeId") === compositeId) : undefined;
+                    if (existingCompositeGroup) {
+                      existingCompositeGroup.items.push(item);
+                    } else {
+                      result.push({
+                        key: item.getId(),
+                        items: [item]
+                      });
+                    }
+                  }
+                  return result;
+                };
+                //adjust the index of moved element in condensed list
+                const moveElementByIndex = (condensedList, movedKey, targetIndex) => {
+                  let movedIndex = condensedList.findIndex(group => group.key.includes(movedKey));
+                  if (movedIndex === -1) return condensedList; // key not found
+
+                  const [movedGroup] = condensedList.splice(movedIndex, 1);
+
+                  // Ensure targetIndex is within bounds
+                  const indexToInsert = Math.min(targetIndex, condensedList.length);
+                  condensedList.splice(indexToInsert, 0, movedGroup);
+                  return condensedList;
+                };
+                const condensedList = groupByCompositeId(controlItems);
+                const content = oChange.getContent();
+                const movedElementId = content?.movedElements[0].selector.id;
+                const adjustmentIndex = content?.movedElements[0].targetIndex;
+                //move the element in condensed list
+                const finalCondensedList = moveElementByIndex(condensedList, movedElementId, adjustmentIndex);
+                //now flatten the finalCondensedList
+                const flattenedArray = finalCondensedList.flatMap(group => group.items);
+                const finalTargetIndex = flattenedArray.findIndex(item => item.getId().includes(movedElementId));
+                if (finalTargetIndex !== -1) {
+                  flattenedArray.forEach(item => control.addAggregation("items", item));
+                }
+              } else {
+                return Promise.resolve(Promise.resolve(MoveControls.applyChange.apply(MoveControls, [oChange, oControl, mPropertyBag]))).then(function () {});
+              }
+            }();
+            return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+          } catch (e) {
+            return Promise.reject(e);
+          }
+        }
+      }
     },
     [CHANGE_TYPES.SPACE_COLOR]: {
       layers: {

package/src/sap/cux/home/flexibility/Layout.flexibility.js.map

@@ -1 +1 @@
-{"version":3,"file":"Layout.flexibility.js","names":["sap","ui","define","MoveControls","__newsFeedVisibilityChange","__setNewsFeedUrl","__spacePageColorHandler","__SpacePageIconHandler","_interopRequireDefault","obj","__esModule","default","newsFeedVisibilityChange","setNewsFeedUrl","spacePageColorHandler","SpacePageIconHandler","CHANGE_TYPES","__exports","MOVE","layers","USER","changeHandler","SPACE_COLOR","CUSTOMER","PAGE_COLOR","SPACE_ICON","PAGE_ICON","NEWS_FEED_URL","NEWS_FEED_VISIBILITY"],"sources":["Layout.flexibility.ts"],"sourcesContent":["/*!\n * SAP UI development toolkit for HTML5 (SAPUI5)\n *  * (c) Copyright 2009-2025 SAP SE. All rights reserved\n */\n\nimport MoveControls from \"sap/ui/fl/changeHandler/MoveControls\";\nimport newsFeedVisibilityChange from \"../changeHandler/NewsFeedVisibilityChange\";\nimport setNewsFeedUrl from \"../changeHandler/SetNewsFeedUrl\";\nimport spacePageColorHandler from \"../changeHandler/SpacePageColorHandler\";\nimport SpacePageIconHandler from \"../changeHandler/SpacePageIconHandler\";\n\nexport enum CHANGE_TYPES {\n\tHIDE = \"hideControl\",\n\tUNHIDE = \"unhideControl\",\n\tMOVE = \"moveControls\",\n\tPAGE_COLOR = \"applyPageColor\",\n\tSPACE_COLOR = \"applySpaceColor\",\n\tPAGE_ICON = \"applyPageIcon\",\n\tSPACE_ICON = \"applySpaceIcon\",\n\tNEWS_FEED_URL = \"changeNewsFeedURL\",\n\tNEWS_FEED_VISIBILITY = \"setNewsFeedVisibility\"\n}\n\nexport default {\n\t[CHANGE_TYPES.MOVE]: {\n\t\tlayers: {\n\t\t\tUSER: true\n\t\t},\n\t\tchangeHandler: MoveControls as object\n\t},\n\t[CHANGE_TYPES.SPACE_COLOR]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: spacePageColorHandler\n\t},\n\t[CHANGE_TYPES.PAGE_COLOR]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: spacePageColorHandler\n\t},\n\t[CHANGE_TYPES.SPACE_ICON]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: SpacePageIconHandler\n\t},\n\t[CHANGE_TYPES.PAGE_ICON]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: SpacePageIconHandler\n\t},\n\t[CHANGE_TYPES.NEWS_FEED_URL]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: setNewsFeedUrl\n\t},\n\t[CHANGE_TYPES.NEWS_FEED_VISIBILITY]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: newsFeedVisibilityChange\n\t}\n};\n"],"mappings":"AAAA;AACA;AACA;AACA;AAHAA,GAAA,CAAAC,EAAA,CAAAC,MAAA,wNAAAC,YAAA,EAAAC,0BAAA,EAAAC,gBAAA,EAAAC,uBAAA,EAAAC,sBAAA;EAAA;;EAAA,SAAAC,uBAAAC,GAAA;IAAA,OAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,CAAAE,OAAA,mBAAAF,GAAA,CAAAE,OAAA,GAAAF,GAAA;EAAA;EAAA,MAMOG,wBAAwB,GAAAJ,sBAAA,CAAAJ,0BAAA;EAAA,MACxBS,cAAc,GAAAL,sBAAA,CAAAH,gBAAA;EAAA,MACdS,qBAAqB,GAAAN,sBAAA,CAAAF,uBAAA;EAAA,MACrBS,oBAAoB,GAAAP,sBAAA,CAAAD,sBAAA;EAAA,IAEfS,YAAY,0BAAZA,YAAY;IAAZA,YAAY;IAAZA,YAAY;IAAZA,YAAY;IAAZA,YAAY;IAAZA,YAAY;IAAZA,YAAY;IAAZA,YAAY;IAAZA,YAAY;IAAZA,YAAY;IAAA,OAAZA,YAAY;EAAA,EAAZA,YAAY;EAAA,IAAAC,SAAA,GAYT;IACd,CAACD,YAAY,CAACE,IAAI,GAAG;MACpBC,MAAM,EAAE;QACPC,IAAI,EAAE;MACP,CAAC;MACDC,aAAa,EAAElB;IAChB,CAAC;IACD,CAACa,YAAY,CAACM,WAAW,GAAG;MAC3BH,MAAM,EAAE;QACPI,QAAQ,EAAE;MACX,CAAC;MACDF,aAAa,EAAEP;IAChB,CAAC;IACD,CAACE,YAAY,CAACQ,UAAU,GAAG;MAC1BL,MAAM,EAAE;QACPI,QAAQ,EAAE;MACX,CAAC;MACDF,aAAa,EAAEP;IAChB,CAAC;IACD,CAACE,YAAY,CAACS,UAAU,GAAG;MAC1BN,MAAM,EAAE;QACPI,QAAQ,EAAE;MACX,CAAC;MACDF,aAAa,EAAEN;IAChB,CAAC;IACD,CAACC,YAAY,CAACU,SAAS,GAAG;MACzBP,MAAM,EAAE;QACPI,QAAQ,EAAE;MACX,CAAC;MACDF,aAAa,EAAEN;IAChB,CAAC;IACD,CAACC,YAAY,CAACW,aAAa,GAAG;MAC7BR,MAAM,EAAE;QACPI,QAAQ,EAAE;MACX,CAAC;MACDF,aAAa,EAAER;IAChB,CAAC;IACD,CAACG,YAAY,CAACY,oBAAoB,GAAG;MACpCT,MAAM,EAAE;QACPI,QAAQ,EAAE;MACX,CAAC;MACDF,aAAa,EAAET;IAChB;EACD,CAAC;EAAAK,SAAA,CAAAD,YAAA,GAAAA,YAAA;EAAA,OAAAC,SAAA;AAAA","ignoreList":[]}
+{"version":3,"file":"Layout.flexibility.js","names":["sap","ui","define","Element","MoveControls","__newsFeedVisibilityChange","__setNewsFeedUrl","__spacePageColorHandler","__SpacePageIconHandler","_interopRequireDefault","obj","__esModule","default","newsFeedVisibilityChange","setNewsFeedUrl","spacePageColorHandler","SpacePageIconHandler","CHANGE_TYPES","__exports","MOVE","layers","USER","changeHandler","completeChangeContent","change","mSpecificChangeInfo","mPropertyBag","Promise","resolve","apply","then","currentChange","getContent","movedElementId","movedElements","id","movedContainer","getElementById","setContent","compositeId","getProperty","e","reject","applyChange","oChange","oControl","control","controlItems","getItems","_temp","groupByCompositeId","result","item","existingCompositeGroup","find","group","items","undefined","push","key","getId","moveElementByIndex","condensedList","movedKey","targetIndex","movedIndex","findIndex","includes","movedGroup","splice","indexToInsert","Math","min","length","content","selector","adjustmentIndex","finalCondensedList","flattenedArray","flatMap","finalTargetIndex","forEach","addAggregation","SPACE_COLOR","CUSTOMER","PAGE_COLOR","SPACE_ICON","PAGE_ICON","NEWS_FEED_URL","NEWS_FEED_VISIBILITY"],"sources":["Layout.flexibility.ts"],"sourcesContent":["/*!\n * SAP UI development toolkit for HTML5 (SAPUI5)\n *  * (c) Copyright 2009-2026 SAP SE. All rights reserved\n */\n\nimport Control from \"sap/ui/core/Control\";\nimport Element from \"sap/ui/core/Element\";\nimport MoveControls from \"sap/ui/fl/changeHandler/MoveControls\";\nimport BaseContainer from \"../BaseContainer\";\nimport newsFeedVisibilityChange from \"../changeHandler/NewsFeedVisibilityChange\";\nimport setNewsFeedUrl from \"../changeHandler/SetNewsFeedUrl\";\nimport spacePageColorHandler from \"../changeHandler/SpacePageColorHandler\";\nimport SpacePageIconHandler from \"../changeHandler/SpacePageIconHandler\";\nimport { ChangeContent, IContent, IKeyUserChangeObject } from \"../interface/KeyUserInterface\";\nimport Layout from \"../Layout\";\n\nexport enum CHANGE_TYPES {\n\tHIDE = \"hideControl\",\n\tUNHIDE = \"unhideControl\",\n\tMOVE = \"moveControls\",\n\tPAGE_COLOR = \"applyPageColor\",\n\tSPACE_COLOR = \"applySpaceColor\",\n\tPAGE_ICON = \"applyPageIcon\",\n\tSPACE_ICON = \"applySpaceIcon\",\n\tNEWS_FEED_URL = \"changeNewsFeedURL\",\n\tNEWS_FEED_VISIBILITY = \"setNewsFeedVisibility\"\n}\n\nexport default {\n\t[CHANGE_TYPES.MOVE]: {\n\t\tlayers: {\n\t\t\tUSER: true\n\t\t},\n\t\tchangeHandler: {\n\t\t\t...(MoveControls as object),\n\t\t\tcompleteChangeContent: async (change: IKeyUserChangeObject, mSpecificChangeInfo: IContent, mPropertyBag: object) => {\n\t\t\t\tawait Promise.resolve(MoveControls.completeChangeContent.apply(MoveControls, [change, mSpecificChangeInfo, mPropertyBag]));\n\t\t\t\tconst currentChange = change.getContent();\n\t\t\t\tconst movedElementId = mSpecificChangeInfo.movedElements[0].id;\n\t\t\t\tconst movedContainer = Element.getElementById(movedElementId) as Control;\n\n\t\t\t\t//Add compositeId for new changes\n\t\t\t\tchange.setContent({\n\t\t\t\t\t...currentChange,\n\t\t\t\t\tcompositeId: (movedContainer.getProperty(\"compositeId\") as string) || \"\",\n\t\t\t\t\tmovedElementId: movedElementId\n\t\t\t\t} as ChangeContent);\n\t\t\t},\n\t\t\tapplyChange: async (oChange: IKeyUserChangeObject, oControl: Layout, mPropertyBag: object) => {\n\t\t\t\tconst control = oControl;\n\t\t\t\tconst controlItems = control.getItems();\n\n\t\t\t\tif (\"compositeId\" in oChange.getContent() === false) {\n\t\t\t\t\t//create a condensed list with the items in control\n\t\t\t\t\tconst groupByCompositeId = (controlItems: BaseContainer[]) => {\n\t\t\t\t\t\tconst result: { key: string; items: BaseContainer[] }[] = [];\n\n\t\t\t\t\t\tfor (const item of controlItems) {\n\t\t\t\t\t\t\tconst compositeId = item.getProperty(\"compositeId\") as string;\n\n\t\t\t\t\t\t\tconst existingCompositeGroup = compositeId\n\t\t\t\t\t\t\t\t? result.find((group) => group.items[0].getProperty(\"compositeId\") === compositeId)\n\t\t\t\t\t\t\t\t: undefined;\n\n\t\t\t\t\t\t\tif (existingCompositeGroup) {\n\t\t\t\t\t\t\t\texistingCompositeGroup.items.push(item);\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tresult.push({ key: item.getId(), items: [item] });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\treturn result;\n\t\t\t\t\t};\n\t\t\t\t\t//adjust the index of moved element in condensed list\n\t\t\t\t\tconst moveElementByIndex = (\n\t\t\t\t\t\tcondensedList: { key: string; items: BaseContainer[] }[],\n\t\t\t\t\t\tmovedKey: string,\n\t\t\t\t\t\ttargetIndex: number\n\t\t\t\t\t) => {\n\t\t\t\t\t\tlet movedIndex = condensedList.findIndex((group) => group.key.includes(movedKey));\n\n\t\t\t\t\t\tif (movedIndex === -1) return condensedList; // key not found\n\n\t\t\t\t\t\tconst [movedGroup] = condensedList.splice(movedIndex, 1);\n\n\t\t\t\t\t\t// Ensure targetIndex is within bounds\n\t\t\t\t\t\tconst indexToInsert = Math.min(targetIndex, condensedList.length);\n\t\t\t\t\t\tcondensedList.splice(indexToInsert, 0, movedGroup);\n\n\t\t\t\t\t\treturn condensedList;\n\t\t\t\t\t};\n\n\t\t\t\t\tconst condensedList = groupByCompositeId(controlItems);\n\t\t\t\t\tconst content = oChange.getContent() as ChangeContent | undefined;\n\t\t\t\t\tconst movedElementId = content?.movedElements[0].selector.id as string;\n\t\t\t\t\tconst adjustmentIndex = content?.movedElements[0].targetIndex as number;\n\t\t\t\t\t//move the element in condensed list\n\t\t\t\t\tconst finalCondensedList = moveElementByIndex(condensedList, movedElementId, adjustmentIndex);\n\t\t\t\t\t//now flatten the finalCondensedList\n\t\t\t\t\tconst flattenedArray: BaseContainer[] = finalCondensedList.flatMap((group) => group.items);\n\t\t\t\t\tconst finalTargetIndex = flattenedArray.findIndex((item) => item.getId().includes(movedElementId));\n\t\t\t\t\tif (finalTargetIndex !== -1) {\n\t\t\t\t\t\tflattenedArray.forEach((item) => control.addAggregation(\"items\", item));\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tawait Promise.resolve(MoveControls.applyChange.apply(MoveControls, [oChange, oControl, mPropertyBag]));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t},\n\t[CHANGE_TYPES.SPACE_COLOR]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: spacePageColorHandler\n\t},\n\t[CHANGE_TYPES.PAGE_COLOR]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: spacePageColorHandler\n\t},\n\t[CHANGE_TYPES.SPACE_ICON]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: SpacePageIconHandler\n\t},\n\t[CHANGE_TYPES.PAGE_ICON]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: SpacePageIconHandler\n\t},\n\t[CHANGE_TYPES.NEWS_FEED_URL]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: setNewsFeedUrl\n\t},\n\t[CHANGE_TYPES.NEWS_FEED_VISIBILITY]: {\n\t\tlayers: {\n\t\t\tCUSTOMER: true\n\t\t},\n\t\tchangeHandler: newsFeedVisibilityChange\n\t}\n};\n"],"mappings":"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","ignoreList":[]}

package/src/sap/cux/home/flexibility/Layout.flexibility.ts

@@ -1,13 +1,18 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *  * (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 
+import Control from "sap/ui/core/Control";
+import Element from "sap/ui/core/Element";
 import MoveControls from "sap/ui/fl/changeHandler/MoveControls";
+import BaseContainer from "../BaseContainer";
 import newsFeedVisibilityChange from "../changeHandler/NewsFeedVisibilityChange";
 import setNewsFeedUrl from "../changeHandler/SetNewsFeedUrl";
 import spacePageColorHandler from "../changeHandler/SpacePageColorHandler";
 import SpacePageIconHandler from "../changeHandler/SpacePageIconHandler";
+import { ChangeContent, IContent, IKeyUserChangeObject } from "../interface/KeyUserInterface";
+import Layout from "../Layout";
 
 export enum CHANGE_TYPES {
 	HIDE = "hideControl",
@@ -26,7 +31,82 @@ export default {
 		layers: {
 			USER: true
 		},
-		changeHandler: MoveControls as object
+		changeHandler: {
+			...(MoveControls as object),
+			completeChangeContent: async (change: IKeyUserChangeObject, mSpecificChangeInfo: IContent, mPropertyBag: object) => {
+				await Promise.resolve(MoveControls.completeChangeContent.apply(MoveControls, [change, mSpecificChangeInfo, mPropertyBag]));
+				const currentChange = change.getContent();
+				const movedElementId = mSpecificChangeInfo.movedElements[0].id;
+				const movedContainer = Element.getElementById(movedElementId) as Control;
+
+				//Add compositeId for new changes
+				change.setContent({
+					...currentChange,
+					compositeId: (movedContainer.getProperty("compositeId") as string) || "",
+					movedElementId: movedElementId
+				} as ChangeContent);
+			},
+			applyChange: async (oChange: IKeyUserChangeObject, oControl: Layout, mPropertyBag: object) => {
+				const control = oControl;
+				const controlItems = control.getItems();
+
+				if ("compositeId" in oChange.getContent() === false) {
+					//create a condensed list with the items in control
+					const groupByCompositeId = (controlItems: BaseContainer[]) => {
+						const result: { key: string; items: BaseContainer[] }[] = [];
+
+						for (const item of controlItems) {
+							const compositeId = item.getProperty("compositeId") as string;
+
+							const existingCompositeGroup = compositeId
+								? result.find((group) => group.items[0].getProperty("compositeId") === compositeId)
+								: undefined;
+
+							if (existingCompositeGroup) {
+								existingCompositeGroup.items.push(item);
+							} else {
+								result.push({ key: item.getId(), items: [item] });
+							}
+						}
+
+						return result;
+					};
+					//adjust the index of moved element in condensed list
+					const moveElementByIndex = (
+						condensedList: { key: string; items: BaseContainer[] }[],
+						movedKey: string,
+						targetIndex: number
+					) => {
+						let movedIndex = condensedList.findIndex((group) => group.key.includes(movedKey));
+
+						if (movedIndex === -1) return condensedList; // key not found
+
+						const [movedGroup] = condensedList.splice(movedIndex, 1);
+
+						// Ensure targetIndex is within bounds
+						const indexToInsert = Math.min(targetIndex, condensedList.length);
+						condensedList.splice(indexToInsert, 0, movedGroup);
+
+						return condensedList;
+					};
+
+					const condensedList = groupByCompositeId(controlItems);
+					const content = oChange.getContent() as ChangeContent | undefined;
+					const movedElementId = content?.movedElements[0].selector.id as string;
+					const adjustmentIndex = content?.movedElements[0].targetIndex as number;
+					//move the element in condensed list
+					const finalCondensedList = moveElementByIndex(condensedList, movedElementId, adjustmentIndex);
+					//now flatten the finalCondensedList
+					const flattenedArray: BaseContainer[] = finalCondensedList.flatMap((group) => group.items);
+					const finalTargetIndex = flattenedArray.findIndex((item) => item.getId().includes(movedElementId));
+					if (finalTargetIndex !== -1) {
+						flattenedArray.forEach((item) => control.addAggregation("items", item));
+					}
+				} else {
+					await Promise.resolve(MoveControls.applyChange.apply(MoveControls, [oChange, oControl, mPropertyBag]));
+				}
+			}
+		}
 	},
 	[CHANGE_TYPES.SPACE_COLOR]: {
 		layers: {