From bd5fa306357880b8e8e5f73718f45c1eb68c1403 Mon Sep 17 00:00:00 2001 From: ndonkoHenri Date: Mon, 9 Dec 2024 02:25:08 +0100 Subject: [PATCH 1/2] `BorderSideStrokeAlign` should inherit from float --- sdk/python/packages/flet/src/flet/core/border.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/python/packages/flet/src/flet/core/border.py b/sdk/python/packages/flet/src/flet/core/border.py index 3f01866e5..74d20c218 100644 --- a/sdk/python/packages/flet/src/flet/core/border.py +++ b/sdk/python/packages/flet/src/flet/core/border.py @@ -1,11 +1,11 @@ -from dataclasses import dataclass, field +from dataclasses import dataclass from enum import Enum from typing import Optional, Union from flet.core.types import ColorValue, OptionalNumber -class BorderSideStrokeAlign(Enum): +class BorderSideStrokeAlign(float, Enum): INSIDE = -1.0 CENTER = 0.0 OUTSIDE = 1.0 @@ -14,16 +14,16 @@ class BorderSideStrokeAlign(Enum): @dataclass class BorderSide: width: OptionalNumber - color: Optional[ColorValue] = field(default=None) - stroke_align: Union[BorderSideStrokeAlign, OptionalNumber] = field(default=None) + color: Optional[ColorValue] = None + stroke_align: Union[BorderSideStrokeAlign, OptionalNumber] = None @dataclass class Border: - top: Optional[BorderSide] = field(default=None) - right: Optional[BorderSide] = field(default=None) - bottom: Optional[BorderSide] = field(default=None) - left: Optional[BorderSide] = field(default=None) + top: Optional[BorderSide] = None + right: Optional[BorderSide] = None + bottom: Optional[BorderSide] = None + left: Optional[BorderSide] = None def all(width: Optional[float] = None, color: Optional[ColorValue] = None) -> Border: From 7e3564bd24bc8e83f62d8fd0850ab8e9089ed076 Mon Sep 17 00:00:00 2001 From: ndonkoHenri Date: Mon, 9 Dec 2024 02:26:31 +0100 Subject: [PATCH 2/2] properly parse `Chip.border_side` --- sdk/python/packages/flet/src/flet/core/chip.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/python/packages/flet/src/flet/core/chip.py b/sdk/python/packages/flet/src/flet/core/chip.py index 6d6a5626b..8a909277e 100644 --- a/sdk/python/packages/flet/src/flet/core/chip.py +++ b/sdk/python/packages/flet/src/flet/core/chip.py @@ -210,6 +210,7 @@ def before_update(self): self._set_attr_json("labelStyle", self.__label_style) self._set_attr_json("padding", self.__padding) self._set_attr_json("shape", self.__shape) + self._set_attr_json("borderSide", self.__border_side) self._set_attr_json("color", self.__color, wrap_attr_dict=True) def _get_children(self):