Allow partial theme and other JSON prop updates

Fix #77

sdk/python/flet/alert_dialog.py

@@ -55,6 +55,22 @@ def __init__(
     def _get_control_name(self):
         return "alertdialog"
 
+    def _before_build_command(self):
+        value = self.__actions_padding
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr_json("actionsPadding", value)
+
+        value = self.__content_padding
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr_json("contentPadding", value)
+
+        value = self.__title_padding
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr_json("titlePadding", value)
+
     def _get_children(self):
         children = []
         if self.__title:
@@ -106,9 +122,6 @@ def title_padding(self):
     @beartype
     def title_padding(self, value: PaddingValue):
         self.__title_padding = value
-        if value and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("titlePadding", value)
 
     # content
     @property
@@ -128,9 +141,6 @@ def content_padding(self):
     @beartype
     def content_padding(self, value: PaddingValue):
         self.__content_padding = value
-        if value and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("contentPadding", value)
 
     # actions
     @property
@@ -150,9 +160,6 @@ def actions_padding(self):
     @beartype
     def actions_padding(self, value: PaddingValue):
         self.__actions_padding = value
-        if value and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("actionsPadding", value)
 
     # actions_alignment
     @property

sdk/python/flet/banner.py

@@ -51,6 +51,17 @@ def __init__(
     def _get_control_name(self):
         return "banner"
 
+    def _before_build_command(self):
+        value = self.__content_padding
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr_json("contentPadding", value)
+
+        value = self.__leading_padding
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr_json("leadingPadding", value)
+
     def _get_children(self):
         children = []
         if self.__leading:
@@ -102,9 +113,6 @@ def leading_padding(self):
     @beartype
     def leading_padding(self, value: PaddingValue):
         self.__leading_padding = value
-        if value and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("leadingPadding", value)
 
     # content
     @property
@@ -124,9 +132,6 @@ def content_padding(self):
     @beartype
     def content_padding(self, value: PaddingValue):
         self.__content_padding = value
-        if value and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("contentPadding", value)
 
     # actions
     @property

sdk/python/flet/card.py

@@ -55,6 +55,12 @@ def __init__(
     def _get_control_name(self):
         return "card"
 
+    def _before_build_command(self):
+        value = self.__margin
+        if value != None and isinstance(value, (int, float)):
+            value = margin.all(value)
+        self._set_attr_json("margin", value)
+
     def _get_children(self):
         children = []
         if self.__content != None:
@@ -71,9 +77,6 @@ def margin(self):
     @beartype
     def margin(self, value: MarginValue):
         self.__margin = value
-        if value != None and isinstance(value, (int, float)):
-            value = margin.all(value)
-        self._set_attr_json("margin", value)
 
     # elevation
     @property

sdk/python/flet/container.py

@@ -81,6 +81,26 @@ def __init__(
     def _get_control_name(self):
         return "container"
 
+    def _before_build_command(self):
+        value = self.__border_radius
+        if value and isinstance(value, (int, float)):
+            value = border_radius.all(value)
+        self._set_attr_json("borderRadius", value)
+
+        self._set_attr_json("border", self.__border)
+
+        value = self.__margin
+        if value != None and isinstance(value, (int, float)):
+            value = margin.all(value)
+        self._set_attr_json("margin", value)
+
+        value = self.__padding
+        if value != None and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr_json("padding", value)
+
+        self._set_attr_json("alignment", self.__alignment)
+
     def _get_children(self):
         children = []
         if self.__content != None:
@@ -97,7 +117,6 @@ def alignment(self):
     @beartype
     def alignment(self, value: Optional[Alignment]):
         self.__alignment = value
-        self._set_attr_json("alignment", value)
 
     # padding
     @property
@@ -108,9 +127,6 @@ def padding(self):
     @beartype
     def padding(self, value: PaddingValue):
         self.__padding = value
-        if value != None and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("padding", value)
 
     # margin
     @property
@@ -121,9 +137,6 @@ def margin(self):
     @beartype
     def margin(self, value: MarginValue):
         self.__margin = value
-        if value != None and isinstance(value, (int, float)):
-            value = margin.all(value)
-        self._set_attr_json("margin", value)
 
     # bgcolor
     @property
@@ -143,7 +156,6 @@ def border(self):
     @beartype
     def border(self, value: Optional[Border]):
         self.__border = value
-        self._set_attr_json("border", value)
 
     # border_radius
     @property
@@ -154,9 +166,6 @@ def border_radius(self):
     @beartype
     def border_radius(self, value: BorderRadiusValue):
         self.__border_radius = value
-        if value and isinstance(value, (int, float)):
-            value = border_radius.all(value)
-        self._set_attr_json("borderRadius", value)
 
     # content
     @property

sdk/python/flet/control.py

@@ -92,6 +92,9 @@ def _is_isolated(self):
     def _build(self):
         pass
 
+    def _before_build_command(self):
+        pass
+
     def did_mount(self):
         pass
 
@@ -160,11 +163,16 @@ def _set_attr_internal(self, name, value, dirty=True):
             self.__attrs[name] = (value, dirty)
 
     def _set_attr_json(self, name, value):
-        self._set_attr(
-            name,
+        ov = self._get_attr(name)
+        nv = self._convert_attr_json(value)
+        if ov != nv:
+            self._set_attr(name, nv)
+
+    def _convert_attr_json(self, value):
+        return (
             json.dumps(value, cls=EmbedJsonEncoder, separators=(",", ":"))
             if value
-            else None,
+            else None
         )
 
     # event_handlers
@@ -414,6 +422,8 @@ def _build_command(self, update=False):
         if update and not self.__uid:
             return command
 
+        self._before_build_command()
+
         for attrName in sorted(self.__attrs):
             attrName = attrName.lower()
             dirty = self.__attrs[attrName][1]

sdk/python/flet/form_field_control.py

@@ -105,6 +105,17 @@ def __init__(
         self.suffix_icon = suffix_icon
         self.suffix_text = suffix_text
 
+    def _before_build_command(self):
+        value = self.__border_radius
+        if value and isinstance(value, (int, float)):
+            value = border_radius.all(value)
+        self._set_attr_json("borderRadius", value)
+
+        value = self.__content_padding
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr_json("contentPadding", value)
+
     def _get_children(self):
         children = []
         if self.__prefix:
@@ -180,9 +191,6 @@ def border_radius(self):
     @beartype
     def border_radius(self, value: BorderRadiusValue):
         self.__border_radius = value
-        if value and isinstance(value, (int, float)):
-            value = border_radius.all(value)
-        self._set_attr_json("borderRadius", value)
 
     # border_width
     @property
@@ -249,9 +257,6 @@ def content_padding(self):
     @beartype
     def content_padding(self, value: PaddingValue):
         self.__content_padding = value
-        if value and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("contentPadding", value)
 
     # filled
     @property

sdk/python/flet/grid_view.py

@@ -64,6 +64,12 @@ def __init__(
     def _get_control_name(self):
         return "gridview"
 
+    def _before_build_command(self):
+        v = self.__padding
+        if v != None and isinstance(v, (int, float)):
+            v = padding.all(v)
+        self._set_attr_json("padding", v)
+
     def _get_children(self):
         return self.__controls
 
@@ -140,9 +146,6 @@ def padding(self):
     @beartype
     def padding(self, value: PaddingValue):
         self.__padding = value
-        if value != None and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("padding", value)
 
     # controls
     @property

sdk/python/flet/image.py

@@ -1,3 +1,4 @@
+from sys import version
 from typing import Optional, Union
 
 from beartype import beartype
@@ -62,6 +63,12 @@ def __init__(
     def _get_control_name(self):
         return "image"
 
+    def _before_build_command(self):
+        v = self.__border_radius
+        if v and isinstance(v, (int, float)):
+            v = border_radius.all(v)
+        self._set_attr_json("borderRadius", v)
+
     # src
     @property
     def src(self):
@@ -120,6 +127,3 @@ def border_radius(self):
     @beartype
     def border_radius(self, value: BorderRadiusValue):
         self.__border_radius = value
-        if value and isinstance(value, (int, float)):
-            value = border_radius.all(value)
-        self._set_attr_json("borderRadius", value)

sdk/python/flet/list_tile.py

@@ -1,3 +1,4 @@
+from marshal import version
 from typing import Optional, Union
 
 from beartype import beartype
@@ -70,6 +71,12 @@ def __init__(
     def _get_control_name(self):
         return "listtile"
 
+    def _before_build_command(self):
+        v = self.__content_padding
+        if v and isinstance(v, (int, float)):
+            v = padding.all(v)
+        self._set_attr_json("contentPadding", v)
+
     def _get_children(self):
         children = []
         if self.__leading:
@@ -95,9 +102,6 @@ def content_padding(self):
     @beartype
     def content_padding(self, value: PaddingValue):
         self.__content_padding = value
-        if value and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("contentPadding", value)
 
     # leading
     @property

sdk/python/flet/list_view.py

@@ -64,6 +64,12 @@ def __init__(
     def _get_control_name(self):
         return "listview"
 
+    def _before_build_command(self):
+        v = self.__padding
+        if v != None and isinstance(v, (int, float)):
+            v = padding.all(v)
+        self._set_attr_json("padding", v)
+
     def _get_children(self):
         return self.__controls
 
@@ -130,9 +136,6 @@ def padding(self):
     @beartype
     def padding(self, value: PaddingValue):
         self.__padding = value
-        if value != None and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("padding", value)
 
     # controls
     @property

sdk/python/flet/navigation_rail.py

@@ -43,6 +43,12 @@ def __init__(
     def _get_control_name(self):
         return "navigationraildestination"
 
+    def _before_build_command(self):
+        v = self.__padding
+        if v != None and isinstance(v, (int, float)):
+            v = padding.all(v)
+        self._set_attr_json("padding", v)
+
     def _get_children(self):
         children = []
         if self.__label_content:
@@ -124,9 +130,6 @@ def padding(self):
     @beartype
     def padding(self, value: PaddingValue):
         self.__padding = value
-        if value != None and isinstance(value, (int, float)):
-            value = padding.all(value)
-        self._set_attr_json("padding", value)
 
 
 class NavigationRail(ConstrainedControl):