fix(Android): Differentiate between new and preloaded screens in ScreenStack #3062

kmichalikk · 2025-07-23T06:39:59Z

Description

Closes #3004.

When onUpdate is issued for ScreenStack, we have no way of knowing whether the screen that is on top with state=2 was already on top or was preloaded with state=0, so we need to store this information somehow, i.e in a list.

Changes

Added preloadedWrappers list to ScreenStack class and update it at the end of each onUpdate.

Test code and steps to reproduce

See Test3004

maciekstosio · 2025-07-23T08:18:11Z

I wonder how this solution relates to #2945

kmichalikk · 2025-07-23T08:24:53Z

Looks like both solve the same problem and work with the examples. The flag is less elegant but more local, and the second one might break something else.

kligarski · 2025-07-24T07:08:34Z

android/src/main/java/com/swmansion/rnscreens/ScreenStack.kt

@@ -148,7 +149,7 @@ class ScreenStack(
        var shouldUseOpenAnimation = true
        var stackAnimation: StackAnimation? = null

-        val newTopAlreadyInStack = stack.contains(newTop)
+        val newTopAlreadyInStack = stack.contains(newTop) && !preloadedWrappers.contains(newTop)


Maybe we should add a comment explaining new semantics of newTopAlreadyInStack.

kligarski · 2025-07-24T07:26:37Z

android/src/main/java/com/swmansion/rnscreens/ScreenStack.kt

+            preloadedWrappers = screenWrappers
+                .asSequence()
+                .filter { it.screen.activityState == Screen.ActivityState.INACTIVE }
+                .toList()


I'm not sure here if all screens with inactive state are preloaded. Please add a comment abot this assumption here.

kligarski · 2025-07-24T07:30:11Z

apps/src/tests/Test3004b.tsx

+    flexDirection: 'column',
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: 'rgba(0.2, 0.2, 0.4, 0.3)'


Where possible, you can use colors from apps/src/shared/styling/Colors.ts

kligarski · 2025-07-24T07:38:56Z

apps/src/tests/index.ts

+export { default as Test3004a } from './Test3004a';
+export { default as Test3004b } from './Test3004b';


These test names won't work with current sorting logic in example app. You can try using 3004.1 & 3004.2 or use issue number and PR number.

kligarski · 2025-07-25T07:31:24Z

android/src/main/java/com/swmansion/rnscreens/Screen.kt

@@ -303,6 +304,7 @@ class Screen(
    }

    fun setActivityState(activityState: ActivityState) {
+        Log.d("RNScreens", "Activity state updated to %s".format(activityState.toString()))


Remember to remove logs and redundant imports. Applies also to ScreenStack.kt

kligarski · 2025-07-25T07:32:50Z

apps/App.tsx

+  return <Example />;
+  // return <Test.Test3004_1 />;


Better to leave this file as it was if Example app does not work properly without Reanimated/GestureHandler.

kligarski · 2025-07-25T07:35:43Z

android/src/main/java/com/swmansion/rnscreens/ScreenStack.kt

@@ -148,7 +150,8 @@ class ScreenStack(
        var shouldUseOpenAnimation = true
        var stackAnimation: StackAnimation? = null

-        val newTopAlreadyInStack = stack.contains(newTop)
+        // We don't count preloaded screen as "already in stack"


I'd consider adding more details why this is the case. You can also link to this PR if you think it would help.

maciekstosio

Rest seems good

maciekstosio · 2025-07-25T08:31:14Z

apps/src/tests/Test3004_2.tsx

+}
+
+function Modal({ navigation }: StackNavigationProp) {
+  return (<View style={{


Small nitpick, wouldn't it be more readable to move parentheses to separate like in *_1 example?

kligarski · 2025-07-28T11:27:49Z

android/src/main/java/com/swmansion/rnscreens/ScreenStack.kt

@@ -150,7 +149,8 @@ class ScreenStack(
        var shouldUseOpenAnimation = true
        var stackAnimation: StackAnimation? = null

-        // We don't count preloaded screen as "already in stack"
+        // We don't count preloaded screen as "already in stack" up until it appears with state == ON_TOP


Suggested change

// We don't count preloaded screen as "already in stack" up until it appears with state == ON_TOP

// We don't count preloaded screen as "already in stack" until it appears with state == ON_TOP

kmichalikk force-pushed the @kmichalikk/activity-state-wrong-animation-3004 branch from 400fef5 to a8f818a Compare July 23, 2025 07:00

kmichalikk requested a review from kkafar July 23, 2025 07:05

kmichalikk changed the title ~~fix(Android): Add isBeingActivated flag to differentiate between new and preloaded screens~~ fix(Android): Differentiate between new and preloaded screens in ScreenStack Jul 24, 2025

kmichalikk requested review from WoLewicki and kligarski July 24, 2025 05:47

kligarski reviewed Jul 24, 2025

View reviewed changes

kligarski reviewed Jul 25, 2025

View reviewed changes

maciekstosio approved these changes Jul 25, 2025

View reviewed changes

kmichalikk requested a review from kligarski July 25, 2025 08:40

t0maboro approved these changes Jul 25, 2025

View reviewed changes

kmichalikk added 3 commits July 28, 2025 13:29

Add isBeingActivated flag to Screen & detect preloaded screens

87723c0

Reset isBeingActivated, add more tests

7014402

Remove the flag in favor of private array of preloaded screens

f698d6e

kligarski approved these changes Jul 28, 2025

View reviewed changes

kmichalikk added 4 commits July 28, 2025 13:29

Add comments for new code, use color palette

b6f3edd

Leave on test app, remove logs, add comments

f5cfe15

Format components in test

184255b

Fix english in comment

f15955e

kmichalikk force-pushed the @kmichalikk/activity-state-wrong-animation-3004 branch from ac1f77e to f15955e Compare July 28, 2025 11:48

kmichalikk requested a review from kligarski July 28, 2025 11:48

kligarski approved these changes Jul 28, 2025

View reviewed changes

kmichalikk merged commit 233ddd8 into main Jul 28, 2025
2 of 3 checks passed

kmichalikk deleted the @kmichalikk/activity-state-wrong-animation-3004 branch July 28, 2025 11:55

maciekstosio mentioned this pull request Jul 30, 2025

fix(Android): closing animation on preloaded screen #2945

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(Android): Differentiate between new and preloaded screens in ScreenStack #3062

fix(Android): Differentiate between new and preloaded screens in ScreenStack #3062

Uh oh!

kmichalikk commented Jul 23, 2025 •

edited

Loading

Uh oh!

maciekstosio commented Jul 23, 2025

Uh oh!

kmichalikk commented Jul 23, 2025

Uh oh!

kligarski Jul 24, 2025

Uh oh!

kligarski Jul 24, 2025

Uh oh!

kligarski Jul 24, 2025

Uh oh!

kligarski Jul 24, 2025

Uh oh!

kligarski Jul 25, 2025

Uh oh!

kligarski Jul 25, 2025

Uh oh!

kligarski Jul 25, 2025

Uh oh!

maciekstosio left a comment

Uh oh!

maciekstosio Jul 25, 2025

Uh oh!

kligarski Jul 28, 2025

Uh oh!

Uh oh!

Uh oh!

		export { default as Test3004a } from './Test3004a';
		export { default as Test3004b } from './Test3004b';

	// We don't count preloaded screen as "already in stack" up until it appears with state == ON_TOP
	// We don't count preloaded screen as "already in stack" until it appears with state == ON_TOP

Uh oh!

fix(Android): Differentiate between new and preloaded screens in ScreenStack #3062

fix(Android): Differentiate between new and preloaded screens in ScreenStack #3062

Uh oh!

Conversation

kmichalikk commented Jul 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changes

Test code and steps to reproduce

Uh oh!

maciekstosio commented Jul 23, 2025

Uh oh!

kmichalikk commented Jul 23, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

maciekstosio left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

kmichalikk commented Jul 23, 2025 •

edited

Loading