Added TextStyle for the Text control (#2270)

* add TextStyle for Text

* fix

* add theme_style

* fix types

* fix types

* change to _before_build_command()

* fix

Author: 50Bytes-dev

package/lib/src/controls/text.dart

@@ -17,11 +17,12 @@ class TextControl extends StatelessWidget {
   final Control control;
   final bool parentDisabled;
 
-  const TextControl(
-      {super.key,
-      required this.parent,
-      required this.control,
-      required this.parentDisabled});
+  const TextControl({
+    super.key,
+    required this.parent,
+    required this.control,
+    required this.parentDisabled,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -34,16 +35,39 @@ class TextControl extends StatelessWidget {
           bool disabled = control.isDisabled || parentDisabled;
 
           String text = control.attrString("value", "")!;
-          List<InlineSpan>? spans = parseTextSpans(Theme.of(context), viewModel,
-              disabled, FletAppServices.of(context).server);
+          List<InlineSpan>? spans = parseTextSpans(
+            Theme.of(context),
+            viewModel,
+            disabled,
+            FletAppServices.of(context).server,
+          );
           String? semanticsLabel = control.attrString("semanticsLabel");
           bool noWrap = control.attrBool("noWrap", false)!;
           int? maxLines = control.attrInt("maxLines");
 
           TextStyle? style;
-          var styleName = control.attrString("style", null);
+          var styleNameOrData = control.attrString("style", null);
+          if (styleNameOrData != null) {
+            style = getTextStyle(context, styleNameOrData);
+          }
+          if (style == null && styleNameOrData != null) {
+            try {
+              style = parseTextStyle(Theme.of(context), control, "style");
+            } on FormatException catch (_) {
+              style = null;
+            }
+          }
+
+          TextStyle? themeStyle;
+          var styleName = control.attrString("theme_style", null);
           if (styleName != null) {
-            style = getTextStyle(context, styleName);
+            themeStyle = getTextStyle(context, styleName);
+          }
+
+          if (style == null && themeStyle != null) {
+            style = themeStyle;
+          } else if (style != null && themeStyle != null) {
+            style = themeStyle.merge(style);
           }
 
           var fontWeight = control.attrString("weight", "")!;
@@ -57,8 +81,12 @@ class TextControl extends StatelessWidget {
           style = (style ?? const TextStyle()).copyWith(
               fontSize: control.attrDouble("size", null),
               fontWeight: getFontWeight(fontWeight),
-              fontStyle:
-                  control.attrBool("italic", false)! ? FontStyle.italic : null,
+              fontStyle: control.attrBool(
+                "italic",
+                false,
+              )!
+                  ? FontStyle.italic
+                  : null,
               fontFamily: control.attrString("fontFamily"),
               fontVariations: variations,
               color: HexColor.fromString(

package/lib/src/utils/text.dart

@@ -181,6 +181,7 @@ TextStyle textStyleFromJson(ThemeData theme, Map<String, dynamic> json) {
           : null,
       fontFamily: json["font_family"],
       fontVariations: variations,
+      height: json["height"] != null ? parseDouble(json["height"]) : null,
       decoration:
           decorations.isNotEmpty ? TextDecoration.combine(decorations) : null,
       decorationStyle: json["decoration_style"] != null

sdk/python/packages/flet-core/src/flet_core/text.py

@@ -1,10 +1,12 @@
+import dataclasses
 from enum import Enum
 from typing import Any, List, Optional, Union
 
 from flet_core.constrained_control import ConstrainedControl
 from flet_core.control import OptionalNumber
 from flet_core.ref import Ref
 from flet_core.text_span import TextSpan
+from flet_core.text_style import TextStyle
 from flet_core.types import (
     AnimationValue,
     FontWeight,
@@ -137,7 +139,8 @@ def __init__(
         size: OptionalNumber = None,
         weight: Optional[FontWeight] = None,
         italic: Optional[bool] = None,
-        style: Optional[TextThemeStyle] = None,
+        style: Optional[Union[TextThemeStyle, TextStyle]] = None,
+        theme_style: Optional[TextThemeStyle] = None,
         max_lines: Optional[int] = None,
         overflow: TextOverflow = TextOverflow.NONE,
         selectable: Optional[bool] = None,
@@ -185,6 +188,7 @@ def __init__(
         self.italic = italic
         self.no_wrap = no_wrap
         self.style = style
+        self.theme_style = theme_style
         self.max_lines = max_lines
         self.overflow = overflow
         self.selectable = selectable
@@ -199,6 +203,11 @@ def _get_children(self):
         children = []
         children.extend(self.__spans)
         return children
+    
+    def _before_build_command(self):
+        super()._before_build_command()
+        if dataclasses.is_dataclass(self.__style):
+            self._set_attr_json("style", self.__style)
 
     # value
     @property
@@ -270,20 +279,36 @@ def __set_weight(self, value: FontWeightString):
 
     # style
     @property
-    def style(self) -> Optional[TextThemeStyle]:
+    def style(self) -> Optional[Union[TextThemeStyle, TextStyle, TextThemeStyleString]]:
         return self.__style
 
     @style.setter
-    def style(self, value: Optional[TextThemeStyle]):
+    def style(self, value: Optional[Union[TextThemeStyle, TextStyle, TextThemeStyleString]]):
         self.__style = value
         if isinstance(value, TextThemeStyle):
             self._set_attr("style", value.value)
         else:
             self.__set_style(value)
 
-    def __set_style(self, value: Optional[TextThemeStyleString]):
+    def __set_style(self, value: Optional[Union[TextStyle, TextThemeStyleString]]):
         self._set_attr("style", value)
 
+    # theme_style
+    @property
+    def theme_style(self) -> Optional[Union[TextThemeStyle, TextThemeStyleString]]:
+        return self.__theme_style
+
+    @theme_style.setter
+    def theme_style(self, value: Optional[Union[TextThemeStyle, TextThemeStyleString]]):
+        self.__theme_style = value
+        if isinstance(value, TextThemeStyle):
+            self._set_attr("theme_style", value.value)
+        else:
+            self.__set_theme_style(value)
+
+    def __set_theme_style(self, value: Optional[TextThemeStyleString]):
+        self._set_attr("theme_style", value)
+
     # italic
     @property
     def italic(self) -> Optional[bool]:

sdk/python/packages/flet-core/src/flet_core/text_style.py

@@ -27,6 +27,7 @@ class TextDecorationStyle(Enum):
 @dataclasses.dataclass
 class TextStyle:
     size: Union[None, int, float] = field(default=None)
+    height: Union[None, int, float] = field(default=None)
     weight: Optional[FontWeight] = field(default=None)
     italic: Optional[bool] = field(default=None)
     decoration: Optional[TextDecoration] = field(default=None)