V1.9.1 hotfix

LongCatIsLooong · goderbauer · commit 68587a091636 · 2019-10-22T14:25:23.000-07:00
This fixes the issue described in #40239: * Restore offstage and ticker mode after hero pop and the from hero is null (#40306)
diff --git a/packages/flutter/lib/src/widgets/heroes.dart b/packages/flutter/lib/src/widgets/heroes.dart
@@ -359,7 +359,8 @@ class _HeroState extends State<Hero> {
   }
 
   // When `keepPlaceholder` is true, the placeholder will continue to be shown
-  // after the flight ends.
+  // after the flight ends. Otherwise the child of the Hero will become visible
+  // and its TickerMode will be re-enabled.
   void endFlight({ bool keepPlaceholder = false }) {
     if (!keepPlaceholder) {
       ensurePlaceholderIsHidden();
@@ -828,6 +829,13 @@ class HeroController extends NavigatorObserver {
         _flights[tag].abort();
       }
     }
+
+    // If the from hero is gone, the flight won't start and the to hero needs to
+    // be put on stage again.
+    for (Object tag in toHeroes.keys) {
+      if (fromHeroes[tag] == null)
+        toHeroes[tag].ensurePlaceholderIsHidden();
+    }
   }
 
   void _handleFlightEnded(_HeroFlight flight) {
diff --git a/packages/flutter/test/widgets/heroes_test.dart b/packages/flutter/test/widgets/heroes_test.dart
@@ -2255,4 +2255,54 @@ Future<void> main() async {
       moreOrLessEquals(tester.getTopLeft(find.text('1')).dx, epsilon: 0.01)
     );
   });
+
+  // Regression test for https://github.com/flutter/flutter/issues/40239.
+  testWidgets(
+    'In a pop transition, when fromHero is null, the to hero should eventually become visible',
+    (WidgetTester tester) async {
+      final GlobalKey<NavigatorState> navigatorKey = GlobalKey();
+      StateSetter setState;
+      bool shouldDisplayHero = true;
+      await tester.pumpWidget(
+        CupertinoApp(
+          navigatorKey: navigatorKey,
+          home: Hero(
+            tag: navigatorKey,
+            child: const Placeholder(),
+          ),
+        ),
+      );
+
+      final CupertinoPageRoute<void> route2 = CupertinoPageRoute<void>(
+        builder: (BuildContext context) {
+          return CupertinoPageScaffold(
+            child: StatefulBuilder(
+              builder: (BuildContext context, StateSetter setter) {
+                setState = setter;
+                return shouldDisplayHero
+                  ? Hero(tag: navigatorKey, child: const Text('text'))
+                  : const SizedBox();
+              },
+            ),
+          );
+        },
+      );
+
+      navigatorKey.currentState.push(route2);
+      await tester.pumpAndSettle();
+
+      expect(find.text('text'), findsOneWidget);
+      expect(find.byType(Placeholder), findsNothing);
+
+      setState(() { shouldDisplayHero = false; });
+      await tester.pumpAndSettle();
+
+      expect(find.text('text'), findsNothing);
+
+      navigatorKey.currentState.pop();
+      await tester.pumpAndSettle();
+
+      expect(find.byType(Placeholder), findsOneWidget);
+    },
+  );
 }

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,8 @@ class _HeroState extends State<Hero> {`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	// When `keepPlaceholder` is true, the placeholder will continue to be shown
`362`		`- // after the flight ends.`
	`362`	`+ // after the flight ends. Otherwise the child of the Hero will become visible`
	`363`	`+ // and its TickerMode will be re-enabled.`
`363`	`364`	`void endFlight({ bool keepPlaceholder = false }) {`
`364`	`365`	`if (!keepPlaceholder) {`
`365`	`366`	`ensurePlaceholderIsHidden();`
`@@ -828,6 +829,13 @@ class HeroController extends NavigatorObserver {`
`828`	`829`	`_flights[tag].abort();`
`829`	`830`	`}`
`830`	`831`	`}`
	`832`	`+`
	`833`	`+ // If the from hero is gone, the flight won't start and the to hero needs to`
	`834`	`+ // be put on stage again.`
	`835`	`+ for (Object tag in toHeroes.keys) {`
	`836`	`+ if (fromHeroes[tag] == null)`
	`837`	`+ toHeroes[tag].ensurePlaceholderIsHidden();`
	`838`	`+ }`
`831`	`839`	`}`
`832`	`840`
`833`	`841`	`void _handleFlightEnded(_HeroFlight flight) {`