flet 0.70.0.dev5774__py3-none-any.whl → 0.70.0.dev5835__py3-none-any.whl

flet/controls/base_control.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, Union
 
 from flet.controls.context import _context_page, context
 from flet.controls.control_event import ControlEvent, get_event_field_type
-from flet.controls.control_id import ControlId
+from flet.controls.id_counter import ControlId
 from flet.controls.keys import KeyValue
 from flet.controls.ref import Ref
 from flet.utils.from_dict import from_dict
@@ -119,7 +119,6 @@ class BaseControl:
     """
     Arbitrary data of any type.
     """
-
     key: Optional[KeyValue] = None
 
     ref: InitVar[Optional[Ref["BaseControl"]]] = None
@@ -173,18 +172,21 @@ class BaseControl:
         return parent_ref() if parent_ref else None
 
     @property
-    def page(self) -> Optional[Union["Page", "BasePage"]]:
+    def page(self) -> Union["Page", "BasePage"]:
         """
         The page to which this control belongs to.
         """
-        from .page import BasePage, Page
+        from .page import Page
 
         parent = self
         while parent:
-            if isinstance(parent, (Page, BasePage)):
+            if isinstance(parent, (Page)):
                 return parent
             parent = parent.parent
-        return None
+        raise RuntimeError(
+            f"{self.__class__.__qualname__}({self._i}) "
+            "Control must be added to the page first"
+        )
 
     def is_isolated(self):
         return hasattr(self, "_isolated") and self._isolated
@@ -209,15 +211,25 @@ class BaseControl:
         """
         pass
 
+    def _before_update_safe(self):
+        frozen = getattr(self, "_frozen", None)
+        if frozen is not None:
+            del self._frozen
+
+        self.before_update()
+
+        if frozen is not None:
+            self._frozen = frozen
+
     def before_event(self, e: ControlEvent):
         return True
 
     def did_mount(self):
-        controls_log.debug(f"{self._c}({self._i}).did_mount")
+        controls_log.debug(f"{self}.did_mount()")
         pass
 
     def will_unmount(self):
-        controls_log.debug(f"{self._c}({self._i}).will_unmount")
+        controls_log.debug(f"{self}.will_unmount()")
         pass
 
     # public methods
@@ -239,7 +251,7 @@ class BaseControl:
             f"{self.__class__.__qualname__} Control must be added to the page first"
         )
 
-        return await self.page.get_session().invoke_method(
+        return await self.page.session.invoke_method(
             self._i, method_name, arguments, timeout
         )
 
@@ -271,11 +283,13 @@ class BaseControl:
             _context_page.set(self.page)
             context.reset_auto_update()
 
+            controls_log.debug(f"Trigger event {self}.{field_name} {e}")
+
             assert self.page, (
                 "Control must be added to a page before triggering events. "
                 "Use page.add(control) or add it to a parent control that's on a page."
             )
-            session = self.page.get_session()
+            session = self.page.session
 
             # Handle async and sync event handlers accordingly
             event_handler = getattr(self, field_name)
@@ -310,3 +324,13 @@ class BaseControl:
                     event_handler(e)
 
             await session.after_event(session.index.get(self._i))
+
+    def _migrate_state(self, other: "BaseControl"):
+        if not isinstance(other, BaseControl):
+            return
+        self._i = other._i
+        if self.data is None:
+            self.data = other.data
+
+    def __str__(self):
+        return f"{self._c}({self._i} - {id(self)})"

flet/controls/base_page.py

@@ -159,33 +159,32 @@ class BasePage(AdaptiveControl):
     reported by the framework.
     """
 
-    width: Optional[Number] = None
+    title: Optional[str] = None
+    """
+    Page or window title.
     """
-    Page width in logical pixels.
 
-    Note:
-        - This property is read-only.
-        - To get or set the full window height including window chrome (e.g.,
-            title bar and borders) when running a Flet app on desktop,
-            use the [`width`][flet.Window.] property of
-            [`Page.window`][flet.] instead.
+    enable_screenshots: bool = False
+    """
+    Enable taking screenshots of the entire page with `take_screenshot` method.
     """
 
-    height: Optional[Number] = None
+    on_resize: Optional[EventHandler["PageResizeEvent"]] = None
     """
-    Page height in logical pixels.
+    Called when a user resizes a browser or native OS window containing Flet app, for
+    example:
 
-    Note:
-        - This property is read-only.
-        - To get or set the full window height including window chrome (e.g.,
-            title bar and borders) when running a Flet app on desktop,
-            use the [`height`][flet.Window.] property of
-            [`Page.window`][flet.] instead.
+    ```python
+    def page_resize(e):
+        print("New page size:", page.window.width, page.window_height)
+
+    page.on_resize = page_resize
+    ```
     """
 
-    title: Optional[str] = None
+    on_media_change: Optional[EventHandler[PageMediaData]] = None
     """
-    Page or window title.
+    Called when `media` has changed.
     """
 
     media: PageMediaData = field(
@@ -197,30 +196,35 @@ class BasePage(AdaptiveControl):
         )
     )
     """
-    Represents the environmental metrics of a page or window.
-    """
+    The current environmental metrics of the page or window.
 
-    enable_screenshots: bool = False
-    """
-    Enable taking screenshots of the entire page with `take_screenshot` method.
+    This data is updated whenever the platform window or layout changes,
+    such as when rotating a device, resizing a browser window, or adjusting
+    system UI elements like the keyboard or safe areas.
     """
 
-    on_resize: Optional[EventHandler["PageResizeEvent"]] = None
+    width: Optional[Number] = None
     """
-    Called when a user resizes a browser or native OS window containing Flet app, for
-    example:
-
-    ```python
-    def page_resize(e):
-        print("New page size:", page.window.width, page.window_height)
+    Page width in logical pixels.
 
-    page.on_resize = page_resize
-    ```
+    Note:
+        - This property is read-only.
+        - To get or set the full window height including window chrome (e.g.,
+            title bar and borders) when running a Flet app on desktop,
+            use the [`width`][flet.Window.width] property of
+            [`Page.window`][flet.Page.window] instead.
     """
 
-    on_media_change: Optional[EventHandler[PageMediaData]] = None
+    height: Optional[Number] = None
     """
-    Called when `media` has changed.
+    Page height in logical pixels.
+
+    Note:
+        - This property is read-only.
+        - To get or set the full window height including window chrome (e.g.,
+            title bar and borders) when running a Flet app on desktop,
+            use the [`height`][flet.Window.height] property of
+            [`Page.window`][flet.Page.window] instead.
     """
 
     _overlay: "Overlay" = field(default_factory=lambda: Overlay())
@@ -492,29 +496,29 @@ class BasePage(AdaptiveControl):
 
     # horizontal_alignment
     @property
-    def horizontal_alignment(self) -> Optional[CrossAxisAlignment]:
+    def horizontal_alignment(self) -> CrossAxisAlignment:
         return self.__default_view().horizontal_alignment
 
     @horizontal_alignment.setter
-    def horizontal_alignment(self, value: Optional[CrossAxisAlignment]):
+    def horizontal_alignment(self, value: CrossAxisAlignment):
         self.__default_view().horizontal_alignment = value
 
     # vertical_alignment
     @property
-    def vertical_alignment(self) -> Optional[MainAxisAlignment]:
+    def vertical_alignment(self) -> MainAxisAlignment:
         return self.__default_view().vertical_alignment
 
     @vertical_alignment.setter
-    def vertical_alignment(self, value: Optional[MainAxisAlignment]):
+    def vertical_alignment(self, value: MainAxisAlignment):
         self.__default_view().vertical_alignment = value
 
     # spacing
     @property
-    def spacing(self) -> Optional[Number]:
+    def spacing(self) -> Number:
         return self.__default_view().spacing
 
     @spacing.setter
-    def spacing(self, value: Optional[Number]):
+    def spacing(self, value: Number):
         self.__default_view().spacing = value
 
     # padding

flet/controls/context.py

@@ -13,6 +13,9 @@ class Context:
     Context instance is accessed via [`flet.context`][flet.context].
     """
 
+    def __init__(self) -> None:
+        self.__components_mode = False
+
     @property
     def page(self) -> "Page":
         """
@@ -95,6 +98,21 @@ class Context:
         """
         _update_behavior_context_var.get()._auto_update_enabled = False
 
+    def enable_components_mode(self):
+        """
+        Enables components mode in the current context.
+        """
+        self.__components_mode = True
+
+    def is_components_mode(self) -> bool:
+        """
+        Returns whether the current context is in components mode.
+
+        Returns:
+            `True` if in components mode, `False` otherwise.
+        """
+        return self.__components_mode
+
     def auto_update_enabled(self) -> bool:
         """
         Returns whether auto-update is enabled in the current context.
@@ -102,7 +120,10 @@ class Context:
         Returns:
             `True` if auto-update is enabled, `False` otherwise.
         """
-        return _update_behavior_context_var.get()._auto_update_enabled
+        return (
+            not self.__components_mode
+            and _update_behavior_context_var.get()._auto_update_enabled
+        )
 
     def reset_auto_update(self):
         """

flet/controls/control.py

@@ -15,6 +15,10 @@ class Control(BaseControl):
     Base class for controls.
 
     Not meant to be used directly.
+
+    Raises:
+        ValueError: If [`opacity`][(c).] is not between `0.0` and `1.0` inclusive.
+        ValueError: If [`expand`][(c).] is not None and not of type `bool` or `int`.
     """
 
     expand: Optional[Union[bool, int]] = None
@@ -132,12 +136,14 @@ class Control(BaseControl):
 
     def before_update(self):
         super().before_update()
-        assert 0.0 <= self.opacity <= 1.0, (
-            f"opacity must be between 0.0 and 1.0 inclusive, got {self.opacity}"
-        )
-        assert self.expand is None or isinstance(self.expand, (bool, int)), (
-            f"expand must be of type bool or int, got {type(self.expand)}"
-        )
+        if not (0.0 <= self.opacity <= 1.0):
+            raise ValueError(
+                f"opacity must be between 0.0 and 1.0 inclusive, got {self.opacity}"
+            )
+        if self.expand is not None and not isinstance(self.expand, (bool, int)):
+            raise ValueError(
+                f"expand must be of type bool or int, got {type(self.expand)}"
+            )
 
     def clean(self) -> None:
         raise Exception("Deprecated!")

flet/controls/control_event.py

@@ -32,14 +32,17 @@ __all__ = [
 
 def get_event_field_type(control: Any, field_name: str):
     frame = inspect.currentframe().f_back
-    globalns = sys.modules[control.__class__.__module__].__dict__
     localns = frame.f_globals.copy()
     localns.update(frame.f_locals)
 
     merged_annotations = {}
+    annotation_modules = {}
 
     for cls in control.__class__.__mro__:
         annotations = getattr(cls, "__annotations__", {})
+        module = sys.modules.get(cls.__module__)
+        module_dict = module.__dict__ if module else {}
+
         for name, annotation in annotations.items():
             if get_origin(annotation) is InitVar or str(annotation).startswith(
                 "dataclasses.InitVar"
@@ -47,12 +50,25 @@ def get_event_field_type(control: Any, field_name: str):
                 continue  # Skip InitVar
             if name not in merged_annotations:
                 merged_annotations[name] = annotation
+                annotation_modules[name] = module_dict
 
     if field_name not in merged_annotations:
         return None
 
     annotation = merged_annotations[field_name]
 
+    globalns = {}
+    current_module = sys.modules.get(control.__class__.__module__)
+    if current_module:
+        globalns.update(current_module.__dict__)
+
+    owner_module_dict = annotation_modules.get(field_name)
+    if owner_module_dict:
+        for key, value in owner_module_dict.items():
+            globalns.setdefault(key, value)
+
+    globalns.setdefault("__builtins__", __builtins__)
+
     try:
         # Resolve forward refs manually
         if isinstance(annotation, ForwardRef):
@@ -80,7 +96,8 @@ class Event(Generic[EventControlType]):
     control: EventControlType = field(repr=False)
 
     @property
-    def page(self) -> Optional[Union["Page", "BasePage"]]:
+    def page(self) -> Union["Page", "BasePage"]:
+        assert self.control.page
         return self.control.page
 
     @property

flet/controls/core/animated_switcher.py

@@ -22,7 +22,7 @@ class AnimatedSwitcher(LayoutControl):
     Used to switch between controls with an animation.
 
     Raises:
-        AssertionError: The [`content`][(c).] must be provided and visible.
+        ValueError: If [`content`][(c).] is not visible.
     """
 
     content: Control
@@ -60,4 +60,5 @@ class AnimatedSwitcher(LayoutControl):
 
     def before_update(self):
         super().before_update()
-        assert self.content.visible, "content must be visible"
+        if not self.content.visible:
+            raise ValueError("content must be visible")

flet/controls/core/autofill_group.py

@@ -3,7 +3,7 @@ from enum import Enum
 from flet.controls.base_control import control
 from flet.controls.control import Control
 
-__all__ = ["AutofillGroup", "AutofillHint", "AutofillGroupDisposeAction"]
+__all__ = ["AutofillGroup", "AutofillGroupDisposeAction", "AutofillHint"]
 
 
 class AutofillHint(Enum):
@@ -84,6 +84,9 @@ class AutofillGroupDisposeAction(Enum):
 class AutofillGroup(Control):
     """
     Used to group autofill controls together.
+
+    Raises:
+        ValueError: If [`content`][(c).] is not visible.
     """
 
     content: Control
@@ -99,4 +102,5 @@ class AutofillGroup(Control):
 
     def before_update(self):
         super().before_update()
-        assert self.content.visible, "content must be visible"
+        if not self.content.visible:
+            raise ValueError("content must be visible")

flet/controls/core/column.py

@@ -65,6 +65,11 @@ class Column(LayoutControl, ScrollableControl, AdaptiveControl):
     is `True`.
     """
 
+    intrinsic_width: bool = False
+    """
+    If `True`, the Column will be as wide as the widest child control.
+    """
+
     def init(self):
         super().init()
         self._internals["host_expanded"] = True

flet/controls/core/dismissible.py

@@ -46,9 +46,9 @@ class Dismissible(LayoutControl, AdaptiveControl):
     over the specified [`resize_duration`][(c).].
 
     Raises:
-        AssertionError: If the [`content`][(c).] is not visible.
-        AssertionError: If the [`secondary_background`][(c).] is specified but the
-            [`background`][(c).] is not specified/visible.
+        ValueError: If the [`content`][(c).] is not visible.
+        ValueError: If the [`secondary_background`][(c).] is provided and visible
+            but the [`background`][(c).] is not provided and visible.
     """
 
     content: Control
@@ -155,13 +155,15 @@ class Dismissible(LayoutControl, AdaptiveControl):
 
     def before_update(self):
         super().before_update()
-        assert self.content.visible, "content must be visible"
-        assert not (
-            self.secondary_background and self.secondary_background.visible
-        ) or (self.background and self.background.visible), (
-            "secondary_background can only be specified if background is also "
-            "specified/visible"
-        )
+        if not self.content.visible:
+            raise ValueError("content must be visible")
+        if (self.secondary_background and self.secondary_background.visible) and not (
+            self.background and self.background.visible
+        ):
+            raise ValueError(
+                "secondary_background can only be specified if background is also "
+                "specified/visible"
+            )
 
     async def confirm_dismiss(self, dismiss: bool):
         await self._invoke_method("confirm_dismiss", {"dismiss": dismiss})

flet/controls/core/drag_target.py

@@ -1,9 +1,10 @@
-from dataclasses import dataclass
-from typing import Optional
+from dataclasses import dataclass, field
+from typing import Optional, cast
 
 from flet.controls.base_control import control
 from flet.controls.control import Control
 from flet.controls.control_event import Event, EventHandler
+from flet.controls.core.draggable import Draggable
 from flet.controls.transform import Offset
 
 __all__ = [
@@ -15,14 +16,22 @@ __all__ = [
 
 
 @dataclass
-class DragWillAcceptEvent(Event["DragTarget"]):
+class DragEventBase(Event["DragTarget"]):
+    src_id: Optional[int]
+    src: Draggable = field(init=False)
+
+    def __post_init__(self):
+        if self.src_id is not None:
+            self.src = cast(Draggable, self.page.get_control(self.src_id))
+
+
+@dataclass
+class DragWillAcceptEvent(DragEventBase):
     accept: bool
-    src_id: int
 
 
 @dataclass
-class DragTargetEvent(Event["DragTarget"]):
-    src_id: int
+class DragTargetEvent(DragEventBase):
     x: float
     y: float
 
@@ -32,8 +41,8 @@ class DragTargetEvent(Event["DragTarget"]):
 
 
 @dataclass
-class DragTargetLeaveEvent(Event["DragTarget"]):
-    src_id: Optional[int]
+class DragTargetLeaveEvent(DragEventBase):
+    pass
 
 
 @control("DragTarget")
@@ -50,7 +59,7 @@ class DragTarget(Control):
     asked to accept the `Draggable`'s data.
 
     Raises:
-        AssertionError: If [`content`][(c).] is not visible.
+        ValueError: If [`content`][(c).] is not visible.
     """
 
     content: Control
@@ -92,4 +101,5 @@ class DragTarget(Control):
 
     def before_update(self):
         super().before_update()
-        assert self.content.visible, "content must be visible"
+        if not self.content.visible:
+            raise ValueError("content must be visible")

flet/controls/core/draggable.py

@@ -19,8 +19,8 @@ class Draggable(Control):
     given the opportunity to complete drag-and-drop flow.
 
     Raises:
-        AssertionError: If [`content`][(c).] is not visible.
-        AssertionError: If [`max_simultaneous_drags`][(c).] is set to a negative value.
+        ValueError: If [`content`][(c).] is not visible.
+        ValueError: If [`max_simultaneous_drags`][(c).] is set to a negative value.
     """
 
     content: Control
@@ -101,10 +101,10 @@ class Draggable(Control):
 
     def before_update(self):
         super().before_update()
-        assert self.content.visible, "content must be visible"
-        assert self.max_simultaneous_drags is None or (
-            self.max_simultaneous_drags >= 0
-        ), (
-            f"max_simultaneous_drags must be greater than or equal to 0, "
-            f"got {self.max_simultaneous_drags}"
-        )
+        if not self.content.visible:
+            raise ValueError("content must be visible")
+        if self.max_simultaneous_drags is not None and self.max_simultaneous_drags < 0:
+            raise ValueError(
+                f"max_simultaneous_drags must be greater than or equal to 0, "
+                f"got {self.max_simultaneous_drags}"
+            )

flet/controls/core/icon.py

@@ -17,9 +17,9 @@ class Icon(LayoutControl):
     parameters such as stroke weight, fill level, and shadows.
 
     Raises:
-        AssertionError: If [`fill`][(c).] is less than `0.0` or greater than `1.0`.
-        AssertionError: If [`weight`][(c).] is less than or equal to `0.0`.
-        AssertionError: If [`optical_size`][(c).] is less than or equal to `0.0`.
+        ValueError: If [`fill`][(c).] is less than `0.0` or greater than `1.0`.
+        ValueError: If [`weight`][(c).] is less than or equal to `0.0`.
+        ValueError: If [`optical_size`][(c).] is less than or equal to `0.0`.
     """
 
     icon: IconData
@@ -110,12 +110,16 @@ class Icon(LayoutControl):
 
     def before_update(self):
         super().before_update()
-        assert self.fill is None or (0.0 <= self.fill <= 1.0), (
-            f"fill must be between 0.0 and 1.0 inclusive, got {self.fill}"
-        )
-        assert self.weight is None or (self.weight > 0.0), (
-            f"weight must be strictly greater than 0.0, got {self.weight}"
-        )
-        assert self.optical_size is None or (self.optical_size > 0.0), (
-            f"optical_size must be strictly greater than 0.0, got {self.optical_size}"
-        )
+        if self.fill is not None and not (0.0 <= self.fill <= 1.0):
+            raise ValueError(
+                f"fill must be between 0.0 and 1.0 inclusive, got {self.fill}"
+            )
+        if self.weight is not None and self.weight <= 0.0:
+            raise ValueError(
+                f"weight must be strictly greater than 0.0, got {self.weight}"
+            )
+        if self.optical_size is not None and self.optical_size <= 0.0:
+            raise ValueError(
+                f"optical_size must be strictly greater than 0.0, "
+                f"got {self.optical_size}"
+            )

flet/controls/core/interactive_viewer.py

@@ -23,11 +23,11 @@ class InteractiveViewer(LayoutControl):
     Allows you to pan, zoom, and rotate its [`content`][(c).].
 
     Raises:
-        AssertionError: If [`content`][(c).] is not visible.
-        AssertionError: If [`min_scale`][(c).] is not greater than `0`.
-        AssertionError: If [`max_scale`][(c).] is not greater than `0`.
-        AssertionError: If [`max_scale`][(c).] is less than `min_scale`.
-        AssertionError: If [`interaction_end_friction_coefficient`][(c).] is not
+        ValueError: If [`content`][(c).] is not visible.
+        ValueError: If [`min_scale`][(c).] is not greater than `0`.
+        ValueError: If [`max_scale`][(c).] is not greater than `0`.
+        ValueError: If [`max_scale`][(c).] is less than `min_scale`.
+        ValueError: If [`interaction_end_friction_coefficient`][(c).] is not
             greater than `0`.
     """
 
@@ -130,24 +130,25 @@ class InteractiveViewer(LayoutControl):
 
     def before_update(self):
         super().before_update()
-        assert self.content.visible, "content must be visible"
-        assert self.min_scale > 0, (
-            f"min_scale must be greater than 0, got {self.min_scale}"
-        )
-        assert self.max_scale > 0, (
-            f"max_scale must be greater than 0, got {self.max_scale}"
-        )
-        assert self.max_scale >= self.min_scale, (
-            "max_scale must be greater than or equal to min_scale, "
-            f"got max_scale={self.max_scale}, min_scale={self.min_scale}"
-        )
-        assert (
-            self.interaction_end_friction_coefficient is None
-            or self.interaction_end_friction_coefficient > 0
-        ), (
-            "interaction_end_friction_coefficient must be greater than 0, "
-            f"got {self.interaction_end_friction_coefficient}"
-        )
+        if not self.content.visible:
+            raise ValueError("content must be visible")
+        if self.min_scale <= 0:
+            raise ValueError(f"min_scale must be greater than 0, got {self.min_scale}")
+        if self.max_scale <= 0:
+            raise ValueError(f"max_scale must be greater than 0, got {self.max_scale}")
+        if self.max_scale < self.min_scale:
+            raise ValueError(
+                "max_scale must be greater than or equal to min_scale, "
+                f"got max_scale={self.max_scale}, min_scale={self.min_scale}"
+            )
+        if (
+            self.interaction_end_friction_coefficient is not None
+            and self.interaction_end_friction_coefficient <= 0
+        ):
+            raise ValueError(
+                "interaction_end_friction_coefficient must be greater than 0, "
+                f"got {self.interaction_end_friction_coefficient}"
+            )
 
     async def reset(self, animation_duration: Optional[DurationValue] = None):
         await self._invoke_method(