bring style properties to the root of TextSpecUtility (#516)

Co-authored-by: Leo Farias <[email protected]>

packages/mix/lib/src/attributes/text_style/text_style_dto.dart

@@ -66,7 +66,6 @@ base class TextStyleData extends Dto<TextStyle>
   final TextDecoration? decoration;
   final ColorDto? decorationColor;
   final TextDecorationStyle? decorationStyle;
-  final Locale? locale;
   final String? debugLabel;
   final double? height;
   final Paint? foreground;
@@ -93,7 +92,6 @@ base class TextStyleData extends Dto<TextStyle>
     this.foreground,
     this.height,
     this.letterSpacing,
-    this.locale,
     this.shadows,
     this.textBaseline,
     this.wordSpacing,
@@ -120,7 +118,6 @@ base class TextStyleData extends Dto<TextStyle>
     properties.addUsingDefault('foreground', foreground);
     properties.addUsingDefault('height', height);
     properties.addUsingDefault('letterSpacing', letterSpacing);
-    properties.addUsingDefault('locale', locale);
     properties.addUsingDefault('shadows', shadows);
     properties.addUsingDefault('textBaseline', textBaseline);
     properties.addUsingDefault('wordSpacing', wordSpacing);
@@ -156,7 +153,6 @@ final class TextStyleDto extends Dto<TextStyle>
     ColorDto? decorationColor,
     TextDecorationStyle? decorationStyle,
     List<FontVariation>? fontVariations,
-    Locale? locale,
     double? height,
     Paint? foreground,
     Paint? background,
@@ -184,7 +180,6 @@ final class TextStyleDto extends Dto<TextStyle>
         foreground: foreground,
         height: height,
         letterSpacing: letterSpacing,
-        locale: locale,
         shadows: shadows,
         textBaseline: textBaseline,
         wordSpacing: wordSpacing,
@@ -260,7 +255,6 @@ extension TextStyleExt on TextStyle {
         foreground: foreground,
         height: height,
         letterSpacing: letterSpacing,
-        locale: locale,
         shadows: shadows?.map((e) => e.toDto()).toList(),
         textBaseline: textBaseline,
         wordSpacing: wordSpacing,

packages/mix/lib/src/attributes/text_style/text_style_util.dart

@@ -59,8 +59,6 @@ final class TextStyleUtility<T extends Attribute>
 
   T fontFeatures(List<FontFeature> v) => call(fontFeatures: v);
 
-  T locale(Locale v) => call(locale: v);
-
   T debugLabel(String v) => call(debugLabel: v);
 
   T decorationThickness(double v) => call(decorationThickness: v);
@@ -84,7 +82,6 @@ final class TextStyleUtility<T extends Attribute>
     List<FontFeature>? fontFeatures,
     TextDecoration? decoration,
     TextDecorationStyle? decorationStyle,
-    Locale? locale,
     String? debugLabel,
     List<String>? fontFamilyFallback,
     Paint? foreground,
@@ -112,7 +109,6 @@ final class TextStyleUtility<T extends Attribute>
       background: background,
       decorationThickness: decorationThickness,
       fontFamilyFallback: fontFamilyFallback,
-      locale: locale,
       debugLabel: debugLabel,
       height: height,
       fontFamily: fontFamily,
@@ -139,7 +135,6 @@ final class TextStyleUtility<T extends Attribute>
     Paint? background,
     double? decorationThickness,
     List<String>? fontFamilyFallback,
-    Locale? locale,
     String? debugLabel,
     double? height,
     String? fontFamily,
@@ -160,7 +155,6 @@ final class TextStyleUtility<T extends Attribute>
       decorationColor: decorationColor,
       decorationStyle: decorationStyle,
       fontVariations: fontVariations,
-      locale: locale,
       height: height,
       foreground: foreground,
       background: background,

packages/mix/lib/src/specs/text/text_spec.dart

@@ -26,6 +26,33 @@ import 'text_widget.dart';
 
 part 'text_spec.g.dart';
 
+const _style = MixableUtility(
+  type: TextStyle,
+  properties: [
+    (path: 'color', alias: 'color'),
+    (path: 'fontFamily', alias: 'fontFamily'),
+    (path: 'fontWeight', alias: 'fontWeight'),
+    (path: 'fontStyle', alias: 'fontStyle'),
+    (path: 'fontSize', alias: 'fontSize'),
+    (path: 'letterSpacing', alias: 'letterSpacing'),
+    (path: 'wordSpacing', alias: 'wordSpacing'),
+    (path: 'textBaseline', alias: 'textBaseline'),
+    (path: 'backgroundColor', alias: 'backgroundColor'),
+    (path: 'shadows', alias: 'shadows'),
+    (path: 'fontFeatures', alias: 'fontFeatures'),
+    (path: 'fontVariations', alias: 'fontVariations'),
+    (path: 'decoration', alias: 'decoration'),
+    (path: 'decorationColor', alias: 'decorationColor'),
+    (path: 'decorationStyle', alias: 'decorationStyle'),
+    (path: 'debugLabel', alias: 'debugLabel'),
+    (path: 'height', alias: 'height'),
+    (path: 'foreground', alias: 'foreground'),
+    (path: 'background', alias: 'background'),
+    (path: 'decorationThickness', alias: 'decorationThickness'),
+    (path: 'fontFamilyFallback', alias: 'fontFamilyFallback'),
+  ],
+);
+
 @MixableSpec()
 final class TextSpec extends Spec<TextSpec> with _$TextSpec, Diagnosticable {
   final TextOverflow? overflow;
@@ -34,6 +61,8 @@ final class TextSpec extends Spec<TextSpec> with _$TextSpec, Diagnosticable {
   final int? maxLines;
   final TextWidthBasis? textWidthBasis;
   final TextScaler? textScaler;
+
+  @MixableProperty(utilities: [_style])
   final TextStyle? style;
   final TextDirection? textDirection;
   final bool? softWrap;

packages/mix/test/src/attributes/text_style/text_style_dto_test.dart

@@ -27,7 +27,6 @@ void main() {
         decoration: TextDecoration.underline,
         decorationColor: Colors.blue.toDto(),
         decorationStyle: TextDecorationStyle.dashed,
-        locale: const Locale('en', 'US'),
         height: 2.0,
       );
 
@@ -45,7 +44,6 @@ void main() {
         decoration: TextDecoration.lineThrough,
         decorationColor: Colors.red.toDto(),
         decorationStyle: TextDecorationStyle.dotted,
-        locale: const Locale('en', 'US'),
         height: 3.0,
       );
 
@@ -62,7 +60,6 @@ void main() {
       expect(merged.letterSpacing, 2.0);
       expect(merged.wordSpacing, 3.0);
       expect(merged.height, 3.0);
-      expect(merged.locale, const Locale('en', 'US'));
       expect(merged.textBaseline, TextBaseline.alphabetic);
     });
     test('resolve returns correct TextStyle with specific values', () {
@@ -80,7 +77,6 @@ void main() {
         decoration: TextDecoration.underline,
         decorationColor: Colors.blue.toDto(),
         decorationStyle: TextDecorationStyle.dashed,
-        locale: const Locale('en', 'US'),
         height: 2.0,
       );
       final textStyle = attr.resolve(EmptyMixData);
@@ -95,7 +91,6 @@ void main() {
       expect(textStyle.letterSpacing, 1.0);
       expect(textStyle.wordSpacing, 2.0);
       expect(textStyle.height, 2.0);
-      expect(textStyle.locale, const Locale('en', 'US'));
       expect(textStyle.textBaseline, TextBaseline.ideographic);
 
       return const Placeholder();

packages/mix/test/src/attributes/text_style/text_style_util_test.dart

@@ -24,7 +24,6 @@ void main() {
         fontWeight: FontWeight.bold,
         height: 2.0,
         letterSpacing: 1.0,
-        locale: const Locale('en', 'US'),
         shadows: [
           const Shadow(
             color: Colors.black,
@@ -70,7 +69,6 @@ void main() {
       expect(resolvedValue.fontVariations, [const FontVariation('wght', 900)]);
 
       expect(resolvedValue.debugLabel, 'debugLabel');
-      expect(resolvedValue.locale, const Locale('en', 'US'));
       expect(resolvedValue.height, 2.0);
       expect(resolvedWithPaint.foreground, yellowPaint);
       expect(resolvedWithPaint.background, purplePaint);