fix: Corrected accessibility text scaling

Sub6Resources · Sub6Resources · commit 15cb05e4eba2 · 2023-05-16T09:57:49.000-06:00
diff --git a/lib/src/css_box_widget.dart b/lib/src/css_box_widget.dart
@@ -12,6 +12,7 @@ class CssBoxWidget extends StatelessWidget {
     this.textDirection,
     this.childIsReplaced = false,
     this.shrinkWrap = false,
+    this.top = false,
   });
 
   /// Generates a CSSBoxWidget that contains a list of InlineSpan children.
@@ -22,6 +23,7 @@ class CssBoxWidget extends StatelessWidget {
     this.textDirection,
     this.childIsReplaced = false,
     this.shrinkWrap = false,
+    this.top = false,
   }) : child = _generateWidgetChild(children, style);
 
   /// The child to be rendered within the CSS Box.
@@ -45,6 +47,9 @@ class CssBoxWidget extends StatelessWidget {
   /// necessarily take up the full available width unless necessary
   final bool shrinkWrap;
 
+  /// For the root widget, so textScaleFactor, etc are only applied once
+  final bool top;
+
   @override
   Widget build(BuildContext context) {
     final markerBox = style.listStylePosition == ListStylePosition.outside
@@ -70,7 +75,12 @@ class CssBoxWidget extends StatelessWidget {
           ),
           width: _shouldExpandToFillBlock() ? double.infinity : null,
           padding: style.padding ?? EdgeInsets.zero,
-          child: child,
+          child: top
+              ? child
+              : MediaQuery(
+                  data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+                  child: child,
+                ),
         ),
         if (markerBox != null) Text.rich(markerBox),
       ],
@@ -93,8 +103,8 @@ class CssBoxWidget extends StatelessWidget {
       }
     }
 
-    return RichText(
-      text: TextSpan(
+    return Text.rich(
+      TextSpan(
         style: style.generateTextStyle(),
         children: children,
       ),
diff --git a/lib/src/html_parser.dart b/lib/src/html_parser.dart
@@ -181,6 +181,7 @@ class _HtmlParserState extends State<HtmlParser> {
       //TODO can we have buildTree return a list of InlineSpans rather than a single one.
       children: [buildTree()],
       shrinkWrap: widget.shrinkWrap,
+      top: true,
     );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ class _HtmlParserState extends State<HtmlParser> {`
`181`	`181`	`//TODO can we have buildTree return a list of InlineSpans rather than a single one.`
`182`	`182`	`children: [buildTree()],`
`183`	`183`	`shrinkWrap: widget.shrinkWrap,`
	`184`	`+ top: true,`
`184`	`185`	`);`
`185`	`186`	`}`
`186`	`187`