Merge pull request #1189 from NemethNorbert/LPS-206518

fix: Exchange flipping and style evaluation order to avoid css flicker #1188
liferay · Jan 25, 2024 · d969b13 · d969b13
2 parents 65d4d81 + 468d207
commit d969b13
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/maintenance/projects/senna/src/app/App.js b/maintenance/projects/senna/src/app/App.js
@@ -483,8 +483,8 @@ class App extends EventEmitter {
 					this.extractParams(route, path)
 				);
 			})
-			.then(() => nextScreen.evaluateStyles(this.surfaces))
 			.then(() => nextScreen.flip(this.surfaces))
+			.then(() => nextScreen.evaluateStyles(this.surfaces))
 			.then(() => nextScreen.evaluateScripts(this.surfaces))
 			.then(() => this.maybeUpdateScrollPositionState_())
 			.then(() => this.syncScrollPositionSyncThenAsync_())

diff --git a/maintenance/projects/senna/test/app/App.js b/maintenance/projects/senna/test/app/App.js
@@ -1656,15 +1656,15 @@ describe('App', function () {
 			this.app.navigate('/path2').then(() => {
 				var lifecycleOrder = [
 					StubScreen.prototype.load,
-					StubScreen.prototype.evaluateStyles,
 					StubScreen.prototype.flip,
+					StubScreen.prototype.evaluateStyles,
 					StubScreen.prototype.evaluateScripts,
 					StubScreen.prototype.activate,
 					StubScreen.prototype.beforeDeactivate,
 					StubScreen2.prototype.load,
 					StubScreen.prototype.deactivate,
-					StubScreen2.prototype.evaluateStyles,
 					StubScreen2.prototype.flip,
+					StubScreen2.prototype.evaluateStyles,
 					StubScreen2.prototype.evaluateScripts,
 					StubScreen2.prototype.activate,
 					StubScreen.prototype.disposeInternal,