Skip to content

Commit d969b13

Browse files
Merge pull request #1189 from NemethNorbert/LPS-206518
fix: Exchange flipping and style evaluation order to avoid css flicker #1188
2 parents 65d4d81 + 468d207 commit d969b13

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

maintenance/projects/senna/src/app/App.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,8 @@ class App extends EventEmitter {
483483
this.extractParams(route, path)
484484
);
485485
})
486-
.then(() => nextScreen.evaluateStyles(this.surfaces))
487486
.then(() => nextScreen.flip(this.surfaces))
487+
.then(() => nextScreen.evaluateStyles(this.surfaces))
488488
.then(() => nextScreen.evaluateScripts(this.surfaces))
489489
.then(() => this.maybeUpdateScrollPositionState_())
490490
.then(() => this.syncScrollPositionSyncThenAsync_())

maintenance/projects/senna/test/app/App.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1656,15 +1656,15 @@ describe('App', function () {
16561656
this.app.navigate('/path2').then(() => {
16571657
var lifecycleOrder = [
16581658
StubScreen.prototype.load,
1659-
StubScreen.prototype.evaluateStyles,
16601659
StubScreen.prototype.flip,
1660+
StubScreen.prototype.evaluateStyles,
16611661
StubScreen.prototype.evaluateScripts,
16621662
StubScreen.prototype.activate,
16631663
StubScreen.prototype.beforeDeactivate,
16641664
StubScreen2.prototype.load,
16651665
StubScreen.prototype.deactivate,
1666-
StubScreen2.prototype.evaluateStyles,
16671666
StubScreen2.prototype.flip,
1667+
StubScreen2.prototype.evaluateStyles,
16681668
StubScreen2.prototype.evaluateScripts,
16691669
StubScreen2.prototype.activate,
16701670
StubScreen.prototype.disposeInternal,

0 commit comments

Comments
 (0)