expand_loose property for Control and all controls that have `expan…

…d` property (#2561) * check for expandLoose in create_control.dart * expand_loose property for Control, ConstrainedControl, Container * expand_loose property for controls up to FloatingActionButton * expand_loose property for controls up to ShaderMask * expand_loose property for all controls that have expand property * removed a comment
flet-dev · Feb 5, 2024 · a9cbed4 · a9cbed4
1 parent f46f407
commit a9cbed4
Show file tree

Hide file tree

Showing 74 changed files with 176 additions and 16 deletions.
diff --git a/package/lib/src/controls/create_control.dart b/package/lib/src/controls/create_control.dart
@@ -1125,7 +1125,12 @@ Widget _expandable(Widget widget, Control? parent, Control control) {
           parent.type == "row")) {
     //debugPrint("Expandable ${control.id}");
     int? expand = control.attrInt("expand");
-    return expand != null ? Expanded(flex: expand, child: widget) : widget;
+    var expandLoose = control.attrBool("expandLoose");
+    return expand != null
+        ? (expandLoose == true)
+            ? Flexible(flex: expand, child: widget)
+            : Expanded(flex: expand, child: widget)
+        : widget;
   }
   return widget;
 }
diff --git a/sdk/python/packages/flet-core/src/flet_core/animated_switcher.py b/sdk/python/packages/flet-core/src/flet_core/animated_switcher.py
@@ -88,6 +88,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -124,6 +125,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/bottom_app_bar.py b/sdk/python/packages/flet-core/src/flet_core/bottom_app_bar.py
@@ -1,18 +1,18 @@
-from typing import List, Optional, Union, Any
+from typing import Any, List, Optional, Union
 
 from flet_core.constrained_control import ConstrainedControl
 from flet_core.control import Control, OptionalNumber
 from flet_core.ref import Ref
 from flet_core.types import (
+    AnimationValue,
     ClipBehavior,
     ClipBehaviorString,
+    NotchShape,
+    OffsetValue,
+    PaddingValue,
     ResponsiveNumber,
     RotateValue,
     ScaleValue,
-    OffsetValue,
-    PaddingValue,
-    AnimationValue,
-    NotchShape,
 )
 
 
@@ -36,6 +36,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -74,6 +75,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/canvas/canvas.py b/sdk/python/packages/flet-core/src/flet_core/canvas/canvas.py
@@ -29,6 +29,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -61,6 +62,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/card.py b/sdk/python/packages/flet-core/src/flet_core/card.py
@@ -69,6 +69,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -112,6 +113,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/charts/bar_chart.py b/sdk/python/packages/flet-core/src/flet_core/charts/bar_chart.py
@@ -31,6 +31,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -68,7 +69,6 @@ def __init__(
         max_y: OptionalNumber = None,
         on_chart_event=None,
     ):
-
         ConstrainedControl.__init__(
             self,
             ref=ref,
@@ -79,6 +79,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/charts/line_chart.py b/sdk/python/packages/flet-core/src/flet_core/charts/line_chart.py
@@ -31,6 +31,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -72,7 +73,6 @@ def __init__(
         max_y: OptionalNumber = None,
         on_chart_event=None,
     ):
-
         ConstrainedControl.__init__(
             self,
             ref=ref,
@@ -83,6 +83,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/charts/pie_chart.py b/sdk/python/packages/flet-core/src/flet_core/charts/pie_chart.py
@@ -28,6 +28,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -55,7 +56,6 @@ def __init__(
         animate: AnimationValue = None,
         on_chart_event=None,
     ):
-
         ConstrainedControl.__init__(
             self,
             ref=ref,
@@ -66,6 +66,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/checkbox.py b/sdk/python/packages/flet-core/src/flet_core/checkbox.py
@@ -61,6 +61,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -108,6 +109,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/chip.py b/sdk/python/packages/flet-core/src/flet_core/chip.py
@@ -1,20 +1,19 @@
 from typing import Any, Optional, Union
 
+from flet_core.buttons import OutlinedBorder
 from flet_core.constrained_control import ConstrainedControl
 from flet_core.control import Control, OptionalNumber
 from flet_core.ref import Ref
+from flet_core.text_style import TextStyle
 from flet_core.types import (
     AnimationValue,
     OffsetValue,
+    PaddingValue,
     ResponsiveNumber,
     RotateValue,
     ScaleValue,
-    PaddingValue,
 )
 
-from flet_core.text_style import TextStyle
-from flet_core.buttons import OutlinedBorder
-
 
 class Chip(ConstrainedControl):
     """
@@ -73,6 +72,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -129,6 +129,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/circle_avatar.py b/sdk/python/packages/flet-core/src/flet_core/circle_avatar.py
@@ -79,6 +79,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -119,6 +120,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/column.py b/sdk/python/packages/flet-core/src/flet_core/column.py
@@ -67,6 +67,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -115,6 +116,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

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
@@ -16,6 +16,7 @@ def __init__(
         self,
         ref: Optional[Ref] = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         tooltip: Optional[str] = None,
@@ -48,6 +49,7 @@ def __init__(
             self,
             ref=ref,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/packages/flet-core/src/flet_core/container.py b/sdk/python/packages/flet-core/src/flet_core/container.py
@@ -74,6 +74,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -138,6 +139,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/control.py b/sdk/python/packages/flet-core/src/flet_core/control.py
@@ -25,6 +25,7 @@ def __init__(
         self,
         ref: Optional[Ref] = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         tooltip: Optional[str] = None,
@@ -39,6 +40,7 @@ def __init__(
         self._id = None
         self.__uid: Optional[str] = None
         self.expand = expand
+        self.expand_loose = expand_loose
         self.col = col
         self.opacity = opacity
         self.tooltip = tooltip
@@ -211,6 +213,15 @@ def expand(self, value: Union[None, bool, int]):
             value = 1
         self._set_attr("expand", value if value else None)
 
+    # expand_loose
+    @property
+    def expand_loose(self) -> Optional[bool]:
+        return self._get_attr("expandLoose", data_type="bool", def_value=False)
+
+    @expand_loose.setter
+    def expand_loose(self, value: Optional[bool]):
+        self._set_attr("expandLoose", value)
+
     # col
     @property
     def col(self) -> Optional[ResponsiveNumber]:

diff --git a/sdk/python/packages/flet-core/src/flet_core/cupertino_button.py b/sdk/python/packages/flet-core/src/flet_core/cupertino_button.py
@@ -50,6 +50,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -79,6 +80,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/cupertino_checkbox.py b/sdk/python/packages/flet-core/src/flet_core/cupertino_checkbox.py
@@ -49,6 +49,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -93,6 +94,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/cupertino_list_tile.py b/sdk/python/packages/flet-core/src/flet_core/cupertino_list_tile.py
@@ -60,6 +60,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -107,6 +108,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,

diff --git a/sdk/python/packages/flet-core/src/flet_core/cupertino_navigation_bar.py b/sdk/python/packages/flet-core/src/flet_core/cupertino_navigation_bar.py
@@ -63,6 +63,7 @@ def __init__(
         right: OptionalNumber = None,
         bottom: OptionalNumber = None,
         expand: Union[None, bool, int] = None,
+        expand_loose: Optional[bool] = None,
         col: Optional[ResponsiveNumber] = None,
         opacity: OptionalNumber = None,
         rotate: RotateValue = None,
@@ -101,6 +102,7 @@ def __init__(
             right=right,
             bottom=bottom,
             expand=expand,
+            expand_loose=expand_loose,
             col=col,
             opacity=opacity,
             rotate=rotate,