@sapui5/sap.fe.core 1.141.2 → 1.142.1

package/src/sap/fe/core/rootView/Fcl.controller.ts

@@ -19,6 +19,7 @@ import IllustratedMessage from "sap/m/IllustratedMessage";
 import Page from "sap/m/Page";
 import type Event from "sap/ui/base/Event";
 
+import PromiseKeeper from "sap/fe/core/helpers/PromiseKeeper";
 import type { ManagedObject$ModelContextChangeEventParameters } from "sap/ui/base/ManagedObject";
 import type Control from "sap/ui/core/Control";
 import type View from "sap/ui/core/mvc/View";
@@ -119,7 +120,12 @@ class FclController extends BaseController {
 
 	private sCurrentRouteName?: string;
 
-	private sCurrentArguments?: { noPreservationCache?: boolean; bIsStickyMode?: boolean; ["?query"]?: { layout?: string } };
+	private sCurrentArguments?: {
+		noPreservationCache?: boolean;
+		bIsStickyMode?: boolean;
+		isHiddenDraftEnabled?: boolean;
+		["?query"]?: { layout?: string };
+	};
 
 	private sPreviousLayout?: keyof typeof LayoutType;
 
@@ -141,6 +147,8 @@ class FclController extends BaseController {
 
 	private fclStateCache!: Promise<FCLState>;
 
+	private _currentPromise?: PromiseKeeper<void>;
+
 	onInit(): void {
 		super.onInit();
 		this._internalInit();
@@ -534,9 +542,13 @@ class FclController extends BaseController {
 			this._oRouterProxy.navTo(this.sCurrentRouteName, this.sCurrentArguments);
 		}
 
-		const oView = this.getRightmostView();
-		if (oView) {
-			this.computeTitleHierarchy(oView);
+		const rightmostView = this.getRightmostView();
+		if (rightmostView) {
+			if (bIsNavigationArrow === false) {
+				// The state can be changed by window resizing, so we need to update the visibility of FCL buttons
+				this.updateUIStateForView(rightmostView, rightmostView.getController()._routing.getFCLLevel());
+			}
+			this.computeTitleHierarchy(rightmostView);
 		}
 	}
 
@@ -640,7 +652,8 @@ class FclController extends BaseController {
 		return bSaveAndCancelButtonVisible;
 	}
 
-	updateUIStateForView(oView: FEView, FCLLevel: number): void {
+	async updateUIStateForView(oView: FEView, FCLLevel: number): Promise<void> {
+		await this._currentPromise?.promise;
 		const oUIState = this.getHelper().getCurrentUIState(),
 			oFclColName = ["beginColumn", "midColumn", "endColumn"],
 			sLayout = this.getFclControl().getLayout();
@@ -734,7 +747,16 @@ class FclController extends BaseController {
 
 			// Update the layout of the FlexibleColumnLayout.
 			if (sLayout) {
-				this.getFclControl().setLayout(sLayout);
+				this._currentPromise = new PromiseKeeper();
+				if (this.getAppComponent().delayFcl) {
+					setTimeout(() => {
+						this.getFclControl().setLayout(sLayout);
+						this._currentPromise?.resolve();
+					}, 0);
+				} else {
+					this.getFclControl().setLayout(sLayout);
+					this._currentPromise?.resolve();
+				}
 			}
 		}
 	}