fix: Fix issue with font scaling introduced in 3.0.0-alpha.6 (#1173)

Sub6Resources · web-flow · commit c75e0dfb1be6 · 2022-10-21T11:54:14.000-06:00
diff --git a/lib/src/css_box_widget.dart b/lib/src/css_box_widget.dart
@@ -103,16 +103,15 @@ class CssBoxWidget extends StatelessWidget {
       }
     }
 
-    return Text.rich(
-      TextSpan(
+    return RichText(
+      text: TextSpan(
         style: style.generateTextStyle(),
         children: children,
       ),
-      style: style.generateTextStyle(),
-      textAlign: style.textAlign,
+      textAlign: style.textAlign ?? TextAlign.start,
       textDirection: style.direction,
       maxLines: style.maxLines,
-      overflow: style.textOverflow,
+      overflow: style.textOverflow ?? TextOverflow.clip,
     );
   }
 
diff --git a/lib/src/style/fontsize.dart b/lib/src/style/fontsize.dart
@@ -5,11 +5,7 @@ class FontSize extends LengthOrPercent {
 
   // These values are calculated based off of the default (`medium`)
   // being 14px.
-  //
-  // TODO(Sub6Resources): This seems to override Flutter's accessibility text scaling.
-  //
-  // Negative values are computed during parsing to be a percentage of
-  // the parent style's font size.
+  // TODO calculate from https://w3c.github.io/csswg-drafts/css-fonts-3/#absolute-size-value
   static final xxSmall = FontSize(7.875);
   static final xSmall = FontSize(8.75);
   static final small = FontSize(11.375);

Original file line number	Diff line number	Diff line change
`@@ -103,16 +103,15 @@ class CssBoxWidget extends StatelessWidget {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`- return Text.rich(`
`107`		`- TextSpan(`
	`106`	`+ return RichText(`
	`107`	`+ text: TextSpan(`
`108`	`108`	`style: style.generateTextStyle(),`
`109`	`109`	`children: children,`
`110`	`110`	`),`
`111`		`- style: style.generateTextStyle(),`
`112`		`- textAlign: style.textAlign,`
	`111`	`+ textAlign: style.textAlign ?? TextAlign.start,`
`113`	`112`	`textDirection: style.direction,`
`114`	`113`	`maxLines: style.maxLines,`
`115`		`- overflow: style.textOverflow,`
	`114`	`+ overflow: style.textOverflow ?? TextOverflow.clip,`
`116`	`115`	`);`
`117`	`116`	`}`
`118`	`117`