@@ -492,8 +492,11 @@ Image.memory(
492492 SceneLayout layout,
493493 Map <String , GoldenSceneScreenshot > goldenScreenshots,
494494 ) async {
495- final goldensAndGlobalKeys = Map <GoldenSceneScreenshot , GlobalKey >.fromEntries (
496- goldenScreenshots.entries.map ((entry) => MapEntry (entry.value, GlobalKey ())),
495+ final content = SceneLayoutContent (
496+ description: _sceneDescription,
497+ goldens: Map <GoldenSceneScreenshot , GlobalKey >.fromEntries (
498+ goldenScreenshots.entries.map ((entry) => MapEntry (entry.value, GlobalKey ())),
499+ ),
497500 );
498501
499502 // Layout the gallery scene with the new goldens, check the intrinsic size of the
@@ -503,13 +506,13 @@ Image.memory(
503506 // a corresponding `GlobalKey` already in the tree. Therefore, this layout pass inserts a
504507 // `GlobalKey` for every golden screenshot that we want to render.
505508 await tester.pumpWidgetAndAdjustWindow (
506- _buildGalleryLayout (tester, goldensAndGlobalKeys ),
509+ _buildGalleryLayout (tester, content ),
507510 );
508511
509512 // Use Flutter's `precacheImage()` mechanism to get each golden screenshot bitmap to
510513 // render in this widget test.
511514 await tester.runAsync (() async {
512- for (final entry in goldensAndGlobalKeys .entries) {
515+ for (final entry in content.goldens .entries) {
513516 await precacheImage (
514517 MemoryImage (entry.key.pngBytes),
515518 tester.element (find.byKey (entry.value)),
@@ -522,21 +525,21 @@ Image.memory(
522525 return GoldenSceneMetadata (
523526 description: _sceneDescription,
524527 images: [
525- for (final golden in goldensAndGlobalKeys .keys)
528+ for (final golden in content.goldens .keys)
526529 GoldenImageMetadata (
527530 id: golden.id,
528531 metadata: golden.metadata,
529- topLeft: (goldensAndGlobalKeys[golden] ! .currentContext ! . findRenderObject () as RenderBox )
530- .localToGlobal (Offset .zero),
531- size: goldensAndGlobalKeys [golden]! .currentContext! .size! ,
532+ topLeft:
533+ (content.goldens[golden] ! .currentContext ! . findRenderObject () as RenderBox ) .localToGlobal (Offset .zero),
534+ size: content.goldens [golden]! .currentContext! .size! ,
532535 ),
533536 ],
534537 );
535538 }
536539
537- Widget _buildGalleryLayout (WidgetTester tester, Map < GoldenSceneScreenshot , GlobalKey > candidatesAndGlobalKeys ) {
540+ Widget _buildGalleryLayout (WidgetTester tester, SceneLayoutContent content ) {
538541 return Builder (builder: (context) {
539- return _layout.build (tester, context, candidatesAndGlobalKeys );
542+ return _layout.build (tester, context, content );
540543 });
541544 }
542545
0 commit comments