Merge remote-tracking branch 'tneotia/feature/scroll-physics' into everything

erickok · erickok · commit 974933e12e97 · 2021-11-29T09:10:46.000+01:00
diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
@@ -221,7 +221,8 @@ class SelectableHtml extends StatelessWidget {
     this.shrinkWrap = false,
     this.style = const {},
     this.tagsList = const [],
-    this.selectionControls
+    this.selectionControls,
+    this.scrollPhysics,
   }) : document = null,
         assert(data != null),
         _anchorKey = anchorKey ?? GlobalKey(),
@@ -237,7 +238,8 @@ class SelectableHtml extends StatelessWidget {
     this.shrinkWrap = false,
     this.style = const {},
     this.tagsList = const [],
-    this.selectionControls
+    this.selectionControls,
+    this.scrollPhysics,
   }) : data = null,
         assert(document != null),
         _anchorKey = anchorKey ?? GlobalKey(),
@@ -276,6 +278,9 @@ class SelectableHtml extends StatelessWidget {
   /// options
   final TextSelectionControls? selectionControls;
 
+  /// Allows you to override the default scrollPhysics for [SelectableText.rich]
+  final ScrollPhysics? scrollPhysics;
+
   static List<String> get tags => new List<String>.from(SELECTABLE_ELEMENTS);
 
   @override
@@ -302,6 +307,7 @@ class SelectableHtml extends StatelessWidget {
         tagsList: tagsList.isEmpty ? SelectableHtml.tags : tagsList,
         navigationDelegateForIframe: null,
         selectionControls: selectionControls,
+        scrollPhysics: scrollPhysics,
       ),
     );
   }
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -59,6 +59,7 @@ class HtmlParser extends StatelessWidget {
   final NavigationDelegate? navigationDelegateForIframe;
   final OnTap? _onAnchorTap;
   final TextSelectionControls? selectionControls;
+  final ScrollPhysics? scrollPhysics;
 
   HtmlParser({
     required this.key,
@@ -76,7 +77,8 @@ class HtmlParser extends StatelessWidget {
     required this.imageRenders,
     required this.tagsList,
     required this.navigationDelegateForIframe,
-    this.selectionControls
+    this.selectionControls,
+    this.scrollPhysics,
   })  : this._onAnchorTap = onAnchorTap != null
           ? onAnchorTap
           : key != null
@@ -128,6 +130,7 @@ class HtmlParser extends StatelessWidget {
           style: cleanedTree.style,
         ),
         selectionControls: selectionControls,
+        scrollPhysics: scrollPhysics,
       );
     }
     return StyledText(
@@ -1073,6 +1076,7 @@ class StyledText extends StatelessWidget {
   final AnchorKey? key;
   final bool _selectable;
   final TextSelectionControls? selectionControls;
+  final ScrollPhysics? scrollPhysics;
 
   const StyledText({
     required this.textSpan,
@@ -1081,6 +1085,7 @@ class StyledText extends StatelessWidget {
     required this.renderContext,
     this.key,
     this.selectionControls,
+    this.scrollPhysics,
   }) : _selectable = false,
         super(key: key);
 
@@ -1090,7 +1095,8 @@ class StyledText extends StatelessWidget {
     this.textScaleFactor = 1.0,
     required this.renderContext,
     this.key,
-    this.selectionControls
+    this.selectionControls,
+    this.scrollPhysics,
   }) : textSpan = textSpan,
         _selectable = true,
         super(key: key);
@@ -1106,6 +1112,7 @@ class StyledText extends StatelessWidget {
         textScaleFactor: textScaleFactor,
         maxLines: style.maxLines,
         selectionControls: selectionControls,
+        scrollPhysics: scrollPhysics,
       );
     }
     return SizedBox(
