Add rtl property to other controls (#2582)

* _directionality * rtl * Column.rtl * Container.rtl * Row.rtl * ResponsiveRow.rtl * Control.rtl * Inherit Control.rtl
flet-dev · Feb 9, 2024 · 946a2fd · 946a2fd
1 parent bf7ea14
commit 946a2fd
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 17 deletions.
diff --git a/package/lib/src/controls/create_control.dart b/package/lib/src/controls/create_control.dart
@@ -910,8 +910,12 @@ Widget constrainedControl(
                       _rotatedControl(
                           context,
                           _sizedControl(
-                              _tooltip(
-                                  _opacity(context, widget, parent, control),
+                              _directionality(
+                                  _tooltip(
+                                      _opacity(
+                                          context, widget, parent, control),
+                                      parent,
+                                      control),
                                   parent,
                                   control),
                               parent,
@@ -1131,7 +1135,6 @@ Widget _expandable(Widget widget, Control? parent, Control control) {
       (parent.type == "view" ||
           parent.type == "column" ||
           parent.type == "row")) {
-    //debugPrint("Expandable ${control.id}");
     int? expand = control.attrInt("expand");
     var expandLoose = control.attrBool("expandLoose");
     return expand != null
@@ -1142,3 +1145,10 @@ Widget _expandable(Widget widget, Control? parent, Control control) {
   }
   return widget;
 }
+
+Widget _directionality(Widget widget, Control? parent, Control control) {
+  bool rtl = control.attrBool("rtl", false)!;
+  return rtl
+      ? Directionality(textDirection: TextDirection.rtl, child: widget)
+      : widget;
+}
diff --git a/package/lib/src/controls/textfield.dart b/package/lib/src/controls/textfield.dart
@@ -210,7 +210,6 @@ class _TextFieldControlState extends State<TextFieldControl>
       double? textVerticalAlign =
           widget.control.attrDouble("textVerticalAlign");
 
-      bool rtl = widget.control.attrBool("rtl", false)!;
       bool autocorrect = widget.control.attrBool("autocorrect", true)!;
       bool enableSuggestions =
           widget.control.attrBool("enableSuggestions", true)!;
@@ -247,7 +246,6 @@ class _TextFieldControlState extends State<TextFieldControl>
           textAlignVertical: textVerticalAlign != null
               ? TextAlignVertical(y: textVerticalAlign)
               : null,
-          textDirection: rtl ? TextDirection.rtl : null,
           cursorHeight: widget.control.attrDouble("cursorHeight"),
           cursorWidth: widget.control.attrDouble("cursorWidth") ?? 2.0,
           cursorRadius: parseRadius(widget.control, "cursorRadius"),

diff --git a/sdk/python/packages/flet-core/src/flet_core/column.py b/sdk/python/packages/flet-core/src/flet_core/column.py
@@ -84,6 +84,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
         #
         # ScrollableControl specific
         #
@@ -133,6 +134,7 @@ def __init__(
             visible=visible,
             disabled=disabled,
             data=data,
+            rtl=rtl,
         )
 
         ScrollableControl.__init__(

diff --git a/sdk/python/packages/flet-core/src/flet_core/constrained_control.py b/sdk/python/packages/flet-core/src/flet_core/constrained_control.py
@@ -23,6 +23,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
         #
         # ConstrainedControl specific
         #
@@ -56,6 +57,7 @@ def __init__(
             visible=visible,
             disabled=disabled,
             data=data,
+            rtl=rtl,
         )
 
         self.key = key

diff --git a/sdk/python/packages/flet-core/src/flet_core/container.py b/sdk/python/packages/flet-core/src/flet_core/container.py
@@ -92,6 +92,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
         #
         # Specific
         #
@@ -157,6 +158,7 @@ def __init__(
             visible=visible,
             disabled=disabled,
             data=data,
+            rtl=rtl,
         )
 
         AdaptiveControl.__init__(self, adaptive=adaptive)

diff --git a/sdk/python/packages/flet-core/src/flet_core/control.py b/sdk/python/packages/flet-core/src/flet_core/control.py
@@ -32,6 +32,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
     ):
         super().__init__()
         self.__page: Optional[Page] = None
@@ -45,6 +46,7 @@ def __init__(
         self.opacity = opacity
         self.tooltip = tooltip
         self.visible = visible
+        self.rtl = rtl
         self.disabled = disabled
         self.__data: Any = None
         self.data = data
@@ -225,6 +227,15 @@ def expand_loose(self) -> Optional[bool]:
     def expand_loose(self, value: Optional[bool]):
         self._set_attr("expandLoose", value)
 
+    # rtl
+    @property
+    def rtl(self) -> Optional[bool]:
+        return self._get_attr("rtl", data_type="bool", def_value=False)
+
+    @rtl.setter
+    def rtl(self, value: Optional[bool]):
+        self._set_attr("rtl", value)
+
     # col
     @property
     def col(self) -> Optional[ResponsiveNumber]:

diff --git a/sdk/python/packages/flet-core/src/flet_core/form_field_control.py b/sdk/python/packages/flet-core/src/flet_core/form_field_control.py
@@ -60,6 +60,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
         #
         # FormField specific
         #
@@ -128,6 +129,7 @@ def __init__(
             visible=visible,
             disabled=disabled,
             data=data,
+            rtl=rtl,
         )
 
         self.text_size = text_size

diff --git a/sdk/python/packages/flet-core/src/flet_core/responsive_row.py b/sdk/python/packages/flet-core/src/flet_core/responsive_row.py
@@ -78,6 +78,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
         #
         # Row specific
         #
@@ -119,6 +120,7 @@ def __init__(
             visible=visible,
             disabled=disabled,
             data=data,
+            rtl=rtl,
         )
 
         AdaptiveControl.__init__(self, adaptive=adaptive)

diff --git a/sdk/python/packages/flet-core/src/flet_core/row.py b/sdk/python/packages/flet-core/src/flet_core/row.py
@@ -87,6 +87,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
         #
         # ScrollableControl specific
         #
@@ -136,6 +137,7 @@ def __init__(
             visible=visible,
             disabled=disabled,
             data=data,
+            rtl=rtl,
         )
 
         ScrollableControl.__init__(

diff --git a/sdk/python/packages/flet-core/src/flet_core/text.py b/sdk/python/packages/flet-core/src/flet_core/text.py
@@ -113,6 +113,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
         #
         # text-specific
         #
@@ -161,6 +162,7 @@ def __init__(
             visible=visible,
             disabled=disabled,
             data=data,
+            rtl=rtl,
         )
 
         self.value = value

diff --git a/sdk/python/packages/flet-core/src/flet_core/textfield.py b/sdk/python/packages/flet-core/src/flet_core/textfield.py
@@ -1,9 +1,10 @@
 import dataclasses
-import time
 from dataclasses import field
 from enum import Enum
 from typing import Any, Optional, Union
 
+import time
+
 from flet_core.adaptive_control import AdaptiveControl
 from flet_core.control import Control, OptionalNumber
 from flet_core.form_field_control import FormFieldControl, InputBorder
@@ -138,6 +139,7 @@ def __init__(
         visible: Optional[bool] = None,
         disabled: Optional[bool] = None,
         data: Any = None,
+        rtl: Optional[bool] = None,
         #
         # FormField specific
         #
@@ -182,7 +184,6 @@ def __init__(
         value: Optional[str] = None,
         adaptive: Optional[bool] = None,
         keyboard_type: Optional[KeyboardType] = None,
-        rtl: Optional[bool] = None,
         multiline: Optional[bool] = None,
         min_lines: Optional[int] = None,
         max_lines: Optional[int] = None,
@@ -235,6 +236,7 @@ def __init__(
             visible=visible,
             disabled=disabled,
             data=data,
+            rtl=rtl,
             #
             # FormField
             #
@@ -281,7 +283,6 @@ def __init__(
         self.text_style = text_style
         self.keyboard_type = keyboard_type
         self.text_align = text_align
-        self.rtl = rtl
         self.multiline = multiline
         self.min_lines = min_lines
         self.max_lines = max_lines
@@ -362,15 +363,6 @@ def text_align(self, value: TextAlign):
             "textAlign", value.value if isinstance(value, TextAlign) else value
         )
 
-    # rtl
-    @property
-    def rtl(self) -> Optional[bool]:
-        return self._get_attr("rtl", data_type="bool", def_value=False)
-
-    @rtl.setter
-    def rtl(self, value: Optional[bool]):
-        self._set_attr("rtl", value)
-
     # multiline
     @property
     def multiline(self) -> Optional[bool]: