From 64ae77f7d16ad8dd0cde104c4f9b5884b270bd0d Mon Sep 17 00:00:00 2001
From: Kate Lovett <katelovett@google.com>
Date: Fri, 27 Oct 2023 15:35:55 -0500
Subject: [PATCH] [two_dimensional_scrollables] Fix pinned row painting when
 one axis is reversed (#5187)

Fixes https://github.com/flutter/flutter/issues/136897

There are a bunch of changes out for TableView right now, so I will update the changelog/pubspec when I have a better idea of which ones are landing before this.
---
 .../two_dimensional_scrollables/CHANGELOG.md  |   4 ++
 .../lib/src/table_view/table.dart             |   2 +-
 .../single-reversed.pinned.painting.png       | Bin 0 -> 4868 bytes
 .../test/table_view/table_test.dart           |  54 +++++++++++++++++-
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 packages/two_dimensional_scrollables/test/table_view/goldens/single-reversed.pinned.painting.png

diff --git a/packages/two_dimensional_scrollables/CHANGELOG.md b/packages/two_dimensional_scrollables/CHANGELOG.md
index 0a76c0b187e3..3a35f1e9c514 100644
--- a/packages/two_dimensional_scrollables/CHANGELOG.md
+++ b/packages/two_dimensional_scrollables/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Fixes bug where having one reversed axis caused incorrect painting of a pinned row.
+
 ## 0.0.4
 
 * Adds TableSpanPadding, TableSpan.padding, and TableSpanDecoration.consumeSpanPadding.
diff --git a/packages/two_dimensional_scrollables/lib/src/table_view/table.dart b/packages/two_dimensional_scrollables/lib/src/table_view/table.dart
index b6e249c2e026..d94bbfe325b5 100644
--- a/packages/two_dimensional_scrollables/lib/src/table_view/table.dart
+++ b/packages/two_dimensional_scrollables/lib/src/table_view/table.dart
@@ -803,7 +803,7 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
           axisDirectionIsReversed(horizontalAxisDirection)
               ? 0.0
               : _pinnedColumnsExtent,
-          axisDirectionIsReversed(horizontalAxisDirection)
+          axisDirectionIsReversed(verticalAxisDirection)
               ? viewportDimension.height - _pinnedRowsExtent
               : 0.0,
           viewportDimension.width - _pinnedColumnsExtent,
diff --git a/packages/two_dimensional_scrollables/test/table_view/goldens/single-reversed.pinned.painting.png b/packages/two_dimensional_scrollables/test/table_view/goldens/single-reversed.pinned.painting.png
new file mode 100644
index 0000000000000000000000000000000000000000..a89a27353c148f83a667094f6a545146ef5116f6
GIT binary patch
literal 4868
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

literal 0
HcmV?d00001

diff --git a/packages/two_dimensional_scrollables/test/table_view/table_test.dart b/packages/two_dimensional_scrollables/test/table_view/table_test.dart
index 5dd5da3eb5bc..1440a45582e8 100644
--- a/packages/two_dimensional_scrollables/test/table_view/table_test.dart
+++ b/packages/two_dimensional_scrollables/test/table_view/table_test.dart
@@ -1368,7 +1368,8 @@ void main() {
       // TODO(Piinks): Rewrite this to remove golden files from this repo when
       //  mock_canvas is public - https://github.com/flutter/flutter/pull/131631
       //  * foreground, background, and precedence per mainAxis
-      final TableView tableView = TableView.builder(
+      // Both reversed - Regression test for https://github.com/flutter/flutter/issues/135386
+      TableView tableView = TableView.builder(
         verticalDetails: const ScrollableDetails.vertical(reverse: true),
         horizontalDetails: const ScrollableDetails.horizontal(reverse: true),
         rowCount: 2,
@@ -1418,6 +1419,57 @@ void main() {
         matchesGoldenFile('goldens/reversed.pinned.painting.png'),
         skip: !runGoldens,
       );
+
+      // Only one axis reversed - Regression test for https://github.com/flutter/flutter/issues/136897
+      tableView = TableView.builder(
+        horizontalDetails: const ScrollableDetails.horizontal(reverse: true),
+        rowCount: 2,
+        pinnedRowCount: 1,
+        columnCount: 2,
+        pinnedColumnCount: 1,
+        columnBuilder: (int index) => TableSpan(
+          extent: const FixedTableSpanExtent(200.0),
+          foregroundDecoration: const TableSpanDecoration(
+            border: TableSpanBorder(
+              trailing: BorderSide(
+                color: Colors.orange,
+                width: 3,
+              ),
+            ),
+          ),
+          backgroundDecoration: TableSpanDecoration(
+            color: index.isEven ? Colors.red : null,
+          ),
+        ),
+        rowBuilder: (int index) => TableSpan(
+          extent: const FixedTableSpanExtent(200.0),
+          foregroundDecoration: const TableSpanDecoration(
+            border: TableSpanBorder(
+              leading: BorderSide(
+                color: Colors.green,
+                width: 3,
+              ),
+            ),
+          ),
+          backgroundDecoration: TableSpanDecoration(
+            color: index.isOdd ? Colors.blue : null,
+          ),
+        ),
+        cellBuilder: (_, TableVicinity vicinity) {
+          return const SizedBox.square(
+            dimension: 200,
+            child: Center(child: FlutterLogo()),
+          );
+        },
+      );
+
+      await tester.pumpWidget(MaterialApp(home: tableView));
+      await tester.pumpAndSettle();
+      await expectLater(
+        find.byType(TableView),
+        matchesGoldenFile('goldens/single-reversed.pinned.painting.png'),
+        skip: !runGoldens,
+      );
     });
 
     testWidgets('mouse handling', (WidgetTester tester) async {