From e9865aab96779eb0c757f8d45306fc42234aa0c1 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sat, 1 Oct 2022 12:13:02 +0200
Subject: [PATCH] mosaic animation fix

---
 .../common/grid/sections/mosaic/section_layout_builder.dart    | 3 ++-
 lib/widgets/common/grid/sections/section_layout_builder.dart   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/widgets/common/grid/sections/mosaic/section_layout_builder.dart b/lib/widgets/common/grid/sections/mosaic/section_layout_builder.dart
index 5383dab0b..a5ee06951 100644
--- a/lib/widgets/common/grid/sections/mosaic/section_layout_builder.dart
+++ b/lib/widgets/common/grid/sections/mosaic/section_layout_builder.dart
@@ -103,10 +103,11 @@ class MosaicSectionLayoutBuilder<T> extends SectionLayoutBuilder<T> {
         final textDirection = Directionality.of(context);
         final sectionChildIndex = listIndex - sectionFirstIndex;
         final row = sectionChildIndex == 0 ? null : rows[sectionChildIndex - 1];
+        final sectionGridIndex = row != null ? (sectionChildIndex + 1) * columnCount + row.firstIndex : sectionChildIndex * columnCount;
         return buildSectionWidget(
           context: context,
           section: section,
-          sectionGridIndex: listIndex * columnCount,
+          sectionGridIndex: sectionGridIndex,
           sectionChildIndex: sectionChildIndex,
           itemIndexRange: () => row == null ? const Tuple2(0, 0) : Tuple2(row.firstIndex, row.lastIndex + 1),
           sectionKey: sectionKey,
diff --git a/lib/widgets/common/grid/sections/section_layout_builder.dart b/lib/widgets/common/grid/sections/section_layout_builder.dart
index 5706b5643..bf24d7fba 100644
--- a/lib/widgets/common/grid/sections/section_layout_builder.dart
+++ b/lib/widgets/common/grid/sections/section_layout_builder.dart
@@ -85,7 +85,7 @@ abstract class SectionLayoutBuilder<T> {
     final durations = context.watch<DurationsData>();
     return AnimationConfiguration.staggeredGrid(
       position: index,
-      columnCount: columnCount,
+      columnCount: tileLayout == TileLayout.mosaic ? columnCount * 2 : columnCount,
       duration: durations.staggeredAnimation,
       delay: tileAnimationDelay,
       child: SlideAnimation(