From fbc4e9bcc5feaa037864a5beb6b40f4cb630330b Mon Sep 17 00:00:00 2001
From: Michael Goderbauer <goderbauer@google.com>
Date: Thu, 12 Aug 2021 16:12:06 -0700
Subject: [PATCH] Revert "Update MaterialScrollBehavior.buildScrollbar for
 horizontal axes (#87740)" (#88129)

---
 packages/flutter/lib/src/material/app.dart      | 15 +++------------
 packages/flutter/lib/src/material/tabs.dart     | 17 +++++++----------
 .../flutter/test/material/scrollbar_test.dart   | 16 ----------------
 3 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/packages/flutter/lib/src/material/app.dart b/packages/flutter/lib/src/material/app.dart
index f018128d315..49405e4afbc 100644
--- a/packages/flutter/lib/src/material/app.dart
+++ b/packages/flutter/lib/src/material/app.dart
@@ -693,13 +693,8 @@ class MaterialApp extends StatefulWidget {
 /// [GlowingOverscrollIndicator] to [Scrollable] descendants when executing on
 /// [TargetPlatform.android] and [TargetPlatform.fuchsia].
 ///
-/// The [buildScrollbar] function is called by the [Scrollable] to wrap with a
-/// [Scrollbar] when appropriate. On all platforms, when the Scrollable [Axis] is
-/// [Axis.horizontal], an always visible Scrollbar will be applied. This is
-/// because horizontal [ScrollView]s have lower discoverability as scrollable
-/// content. When the Axis is [Axis.vertical] a Scrollbar is applied on
-/// desktop platforms. In this vertical case, [Scrollbar.isAlwaysShown] is not
-/// set and will defer to the inherited [ScrollbarTheme].
+/// When using the desktop platform, if the [Scrollable] widget scrolls in the
+/// [Axis.vertical], a [Scrollbar] is applied.
 ///
 /// See also:
 ///
@@ -721,11 +716,7 @@ class MaterialScrollBehavior extends ScrollBehavior {
     // the base class as well.
     switch (axisDirectionToAxis(details.direction)) {
       case Axis.horizontal:
-        return Scrollbar(
-          isAlwaysShown: true,
-          controller: details.controller,
-          child: child,
-        );
+        return child;
       case Axis.vertical:
         switch (getPlatform(context)) {
           case TargetPlatform.linux:
diff --git a/packages/flutter/lib/src/material/tabs.dart b/packages/flutter/lib/src/material/tabs.dart
index c3b9f3ba850..c0d8dcbc113 100644
--- a/packages/flutter/lib/src/material/tabs.dart
+++ b/packages/flutter/lib/src/material/tabs.dart
@@ -1308,16 +1308,13 @@ class _TabBarState extends State<TabBar> {
 
     if (widget.isScrollable) {
       _scrollController ??= _TabBarScrollController(this);
-      tabBar = ScrollConfiguration(
-        behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false),
-        child: SingleChildScrollView(
-          dragStartBehavior: widget.dragStartBehavior,
-          scrollDirection: Axis.horizontal,
-          controller: _scrollController,
-          padding: widget.padding,
-          physics: widget.physics,
-          child: tabBar,
-        ),
+      tabBar = SingleChildScrollView(
+        dragStartBehavior: widget.dragStartBehavior,
+        scrollDirection: Axis.horizontal,
+        controller: _scrollController,
+        padding: widget.padding,
+        physics: widget.physics,
+        child: tabBar,
       );
     } else if (widget.padding != null) {
       tabBar = Padding(
diff --git a/packages/flutter/test/material/scrollbar_test.dart b/packages/flutter/test/material/scrollbar_test.dart
index eaa664dff0f..3bdfd1261e8 100644
--- a/packages/flutter/test/material/scrollbar_test.dart
+++ b/packages/flutter/test/material/scrollbar_test.dart
@@ -1557,20 +1557,4 @@ void main() {
         ),
     );
   });
-
-  testWidgets('MaterialScrollBehavior applies always shown Scrollbar to horizontal scrollables', (WidgetTester tester) async {
-    final ScrollController controller = ScrollController();
-    await tester.pumpWidget(MaterialApp(
-      home: SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        controller: controller,
-        child: const SizedBox(
-          width: 4000.0,
-          height: 4000.0,
-        ),
-      ),
-    ));
-    await tester.pumpAndSettle();
-    expect(find.byType(Scrollbar), paints..rect());
-  });
 }