diff --git a/.appveyor.yml b/.appveyor.yml index c4f271b46..1a3dbecad 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,7 +10,7 @@ skip_commits: environment: python_stack: python 3.12 - FLUTTER_VERSION: 3.27.4 + FLUTTER_VERSION: 3.29.0 GITHUB_TOKEN: secure: 9SKIwc3VSfYJ5IChvNR74hQprJ0DRmcV9pPX+8KyE6IXIdfMsX6ikeUmMhJGRu3ztkZaF45jmU7Xn/6tauXQXhDBxK1N8kFHFSAnq6LjUXyhS0TZKX/H+jDozBeVbCXp TWINE_USERNAME: __token__ diff --git a/client/.fvmrc b/client/.fvmrc index c2783c697..4cfa3d5f2 100644 --- a/client/.fvmrc +++ b/client/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.27.4" + "flutter": "3.29.0" } \ No newline at end of file diff --git a/client/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/client/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 300cdaf5c..16d4c22e3 100644 --- a/client/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/client/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -48,6 +48,7 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + enableGPUValidationMode = "1" allowLocationSimulation = "YES"> diff --git a/client/pubspec.lock b/client/pubspec.lock index a94dfdd55..648534153 100644 --- a/client/pubspec.lock +++ b/client/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" audioplayers: dependency: transitive description: @@ -85,18 +85,18 @@ packages: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -117,18 +117,18 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" cross_file: dependency: transitive description: @@ -213,10 +213,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -229,10 +229,10 @@ packages: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" file_picker: dependency: transitive description: @@ -263,7 +263,7 @@ packages: path: "../packages/flet" relative: true source: path - version: "0.27.5" + version: "0.27.6" flet_ads: dependency: "direct main" description: @@ -610,18 +610,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -682,10 +682,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -770,10 +770,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mgrs_dart: dependency: transitive description: @@ -802,10 +802,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: @@ -922,10 +922,10 @@ packages: dependency: transitive description: name: platform - sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -946,10 +946,10 @@ packages: dependency: transitive description: name: process - sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" + sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "5.0.3" proj4dart: dependency: transitive description: @@ -1215,10 +1215,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -1231,26 +1231,26 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" sync_http: dependency: transitive description: @@ -1271,18 +1271,18 @@ packages: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" torch_light: dependency: transitive description: @@ -1439,10 +1439,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" volume_controller: dependency: transitive description: @@ -1596,5 +1596,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.24.0" diff --git a/packages/flet/lib/src/controls/create_control.dart b/packages/flet/lib/src/controls/create_control.dart index 2c8bb8843..9fa29c568 100644 --- a/packages/flet/lib/src/controls/create_control.dart +++ b/packages/flet/lib/src/controls/create_control.dart @@ -94,6 +94,7 @@ import 'progress_ring.dart'; import 'radio.dart'; import 'radio_group.dart'; import 'range_slider.dart'; +import 'reorderable_draggable.dart'; import 'reorderable_list_view.dart'; import 'responsive_row.dart'; import 'row.dart'; @@ -718,6 +719,15 @@ Widget createWidget( parentDisabled: parentDisabled, parentAdaptive: parentAdaptive, backend: backend); + case "reorderabledraggable": + return ReorderableDraggableControl( + key: key, + parent: parent, + control: controlView.control, + children: controlView.children, + parentDisabled: parentDisabled, + parentAdaptive: parentAdaptive, + ); case "gridview": return GridViewControl( key: key, diff --git a/packages/flet/lib/src/controls/reorderable_draggable.dart b/packages/flet/lib/src/controls/reorderable_draggable.dart new file mode 100644 index 000000000..c55562f0e --- /dev/null +++ b/packages/flet/lib/src/controls/reorderable_draggable.dart @@ -0,0 +1,49 @@ +import 'package:flutter/material.dart'; + +import '../models/control.dart'; +import 'create_control.dart'; +import 'error.dart'; + +class ReorderableDraggableControl extends StatefulWidget { + final Control? parent; + final Control control; + final bool parentDisabled; + final List children; + final bool? parentAdaptive; + + const ReorderableDraggableControl( + {super.key, + this.parent, + required this.control, + required this.children, + required this.parentDisabled, + required this.parentAdaptive}); + + @override + State createState() => _ListViewControlState(); +} + +class _ListViewControlState extends State { + @override + Widget build(BuildContext context) { + debugPrint("ReorderableDraggableControl build: ${widget.control.id}"); + + bool? adaptive = + widget.control.attrBool("adaptive") ?? widget.parentAdaptive; + + var index = widget.control.attrInt("index"); + if (index == null) { + return const ErrorControl("ReorderableDraggable.index is invalid"); + } + var content = widget.children.where((c) => c.isVisible).firstOrNull; + if (content == null) { + return const ErrorControl( + "ReorderableDraggable.content must be set and visible"); + } + + return ReorderableDragStartListener( + index: index, + child: createControl(widget.control, content.id, widget.parentDisabled, + parentAdaptive: adaptive)); + } +} diff --git a/packages/flet/lib/src/controls/reorderable_list_view.dart b/packages/flet/lib/src/controls/reorderable_list_view.dart index 9bed6ebd0..750bd1cec 100644 --- a/packages/flet/lib/src/controls/reorderable_list_view.dart +++ b/packages/flet/lib/src/controls/reorderable_list_view.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import '../flet_control_backend.dart'; import '../models/control.dart'; import '../utils/edge_insets.dart'; +import '../utils/mouse.dart'; import '../utils/others.dart'; import 'create_control.dart'; import 'scroll_notification_control.dart'; @@ -48,7 +49,7 @@ class _ListViewControlState extends State { @override Widget build(BuildContext context) { - debugPrint("ListViewControl build: ${widget.control.id}"); + debugPrint("ReorderableDraggableControl build: ${widget.control.id}"); bool disabled = widget.control.isDisabled || widget.parentDisabled; bool? adaptive = @@ -63,7 +64,11 @@ class _ListViewControlState extends State { widget.control.attrBool("firstItemPrototype", false)!; var padding = parseEdgeInsets(widget.control, "padding"); var reverse = widget.control.attrBool("reverse", false)!; + var showDefaultDragHandles = + widget.control.attrBool("showDefaultDragHandles", true)!; var anchor = widget.control.attrDouble("anchor", 0.0)!; + var mouseCursor = + parseMouseCursor(widget.control.attrString("mouseCursor")); var clipBehavior = parseClip(widget.control.attrString("clipBehavior"), Clip.hardEdge)!; List ctrls = widget.children @@ -124,11 +129,13 @@ class _ListViewControlState extends State { clipBehavior: clipBehavior, reverse: reverse, cacheExtent: cacheExtent, + buildDefaultDragHandles: showDefaultDragHandles, scrollDirection: scrollDirection, shrinkWrap: shrinkWrap, padding: padding, itemCount: ctrls.length, itemExtent: itemExtent, + mouseCursor: mouseCursor, anchor: anchor, header: header, footer: footer, @@ -148,6 +155,7 @@ class _ListViewControlState extends State { cacheExtent: cacheExtent, reverse: reverse, clipBehavior: clipBehavior, + buildDefaultDragHandles: showDefaultDragHandles, scrollDirection: scrollDirection, shrinkWrap: shrinkWrap, padding: padding, @@ -155,6 +163,7 @@ class _ListViewControlState extends State { header: header, footer: footer, itemExtent: itemExtent, + mouseCursor: mouseCursor, prototypeItem: prototypeItem, autoScrollerVelocityScalar: autoScrollerVelocityScalar, onReorder: onReorder, diff --git a/sdk/python/packages/flet-cli/src/flet_cli/commands/build.py b/sdk/python/packages/flet-cli/src/flet_cli/commands/build.py index b2f328271..790d8a6e1 100644 --- a/sdk/python/packages/flet-cli/src/flet_cli/commands/build.py +++ b/sdk/python/packages/flet-cli/src/flet_cli/commands/build.py @@ -5,7 +5,6 @@ import re import shutil import sys -import time from pathlib import Path from typing import Optional, cast @@ -36,7 +35,7 @@ PYODIDE_ROOT_URL = "https://cdn.jsdelivr.net/pyodide/v0.27.2/full" DEFAULT_TEMPLATE_URL = "gh:flet-dev/flet-build-template" -MINIMAL_FLUTTER_VERSION = version.Version("3.27.4") +MINIMAL_FLUTTER_VERSION = version.Version("3.29.0") no_rich_output = get_bool_env_var("FLET_CLI_NO_RICH_OUTPUT") @@ -1145,7 +1144,9 @@ def setup_template_data(self): "target_arch": ( target_arch if isinstance(target_arch, list) - else [target_arch] if isinstance(target_arch, str) else [] + else [target_arch] + if isinstance(target_arch, str) + else [] ), "info_plist": info_plist, "macos_entitlements": macos_entitlements, diff --git a/sdk/python/packages/flet/src/flet/__init__.py b/sdk/python/packages/flet/src/flet/__init__.py index 8df93d480..f64de2822 100644 --- a/sdk/python/packages/flet/src/flet/__init__.py +++ b/sdk/python/packages/flet/src/flet/__init__.py @@ -24,6 +24,7 @@ from flet.core.animated_switcher import AnimatedSwitcher, AnimatedSwitcherTransition from flet.core.animation import Animation, AnimationCurve from flet.core.app_bar import AppBar +from flet.core.reorderable_draggable import ReorderableDraggable from flet.core.audio import ( Audio, AudioDurationChangeEvent, diff --git a/sdk/python/packages/flet/src/flet/core/reorderable_draggable.py b/sdk/python/packages/flet/src/flet/core/reorderable_draggable.py new file mode 100644 index 000000000..c32c67a8e --- /dev/null +++ b/sdk/python/packages/flet/src/flet/core/reorderable_draggable.py @@ -0,0 +1,117 @@ +from typing import Any, Optional, Union + +from flet.core.adaptive_control import AdaptiveControl +from flet.core.animation import AnimationValue +from flet.core.badge import BadgeValue +from flet.core.constrained_control import ConstrainedControl +from flet.core.control import Control, OptionalNumber +from flet.core.ref import Ref +from flet.core.tooltip import TooltipValue +from flet.core.types import ( + OffsetValue, + OptionalControlEventCallable, + PaddingValue, + ResponsiveNumber, + RotateValue, + ScaleValue, +) + + +class ReorderableDraggable(ConstrainedControl, AdaptiveControl): + def __init__( + self, + index: int, + content: Control, + # + # ConstrainedControl + # + ref: Optional[Ref] = None, + key: Optional[str] = None, + width: OptionalNumber = None, + height: OptionalNumber = None, + expand: Union[None, bool, int] = None, + expand_loose: Optional[bool] = None, + col: Optional[ResponsiveNumber] = None, + opacity: OptionalNumber = None, + rotate: Optional[RotateValue] = None, + scale: Optional[ScaleValue] = None, + offset: Optional[OffsetValue] = None, + aspect_ratio: OptionalNumber = None, + animate_opacity: Optional[AnimationValue] = None, + animate_size: Optional[AnimationValue] = None, + animate_position: Optional[AnimationValue] = None, + animate_rotation: Optional[AnimationValue] = None, + animate_scale: Optional[AnimationValue] = None, + animate_offset: Optional[AnimationValue] = None, + on_animation_end: OptionalControlEventCallable = None, + tooltip: Optional[TooltipValue] = None, + visible: Optional[bool] = None, + disabled: Optional[bool] = None, + data: Any = None, + rtl: Optional[bool] = None, + # + # Adaptive + # + adaptive: Optional[bool] = None, + ): + ConstrainedControl.__init__( + self, + ref=ref, + key=key, + width=width, + height=height, + expand=expand, + expand_loose=expand_loose, + col=col, + opacity=opacity, + rotate=rotate, + scale=scale, + offset=offset, + aspect_ratio=aspect_ratio, + animate_opacity=animate_opacity, + animate_size=animate_size, + animate_position=animate_position, + animate_rotation=animate_rotation, + animate_scale=animate_scale, + animate_offset=animate_offset, + on_animation_end=on_animation_end, + tooltip=tooltip, + visible=visible, + disabled=disabled, + data=data, + rtl=rtl, + ) + + AdaptiveControl.__init__(self, adaptive=adaptive) + + self.content = content + self.index = index + + def _get_control_name(self): + return "reorderabledraggable" + + def before_update(self): + super().before_update() + assert self.__content.visible, "content must be visible" + + def _get_children(self): + self.__content._set_attr_internal("n", "content") + return [self.__content] + + # index + @property + def index(self) -> int: + return self._get_attr("index", data_type="int") + + @index.setter + def index(self, value: int): + self._set_attr("index", value) + + # content + @property + def content(self) -> Control: + return self.__content + + @content.setter + def content(self, value: Control): + self.__content = value diff --git a/sdk/python/packages/flet/src/flet/core/reorderable_list_view.py b/sdk/python/packages/flet/src/flet/core/reorderable_list_view.py index 80d7fab85..040e049ae 100644 --- a/sdk/python/packages/flet/src/flet/core/reorderable_list_view.py +++ b/sdk/python/packages/flet/src/flet/core/reorderable_list_view.py @@ -17,6 +17,7 @@ ResponsiveNumber, RotateValue, ScaleValue, + MouseCursor, ) @@ -38,56 +39,58 @@ class ReorderableListView(ListView): """ def __init__( - self, - controls: Optional[Sequence[Control]] = None, - horizontal: Optional[bool] = None, - item_extent: OptionalNumber = None, - first_item_prototype: Optional[bool] = None, - padding: PaddingValue = None, - clip_behavior: Optional[ClipBehavior] = None, - cache_extent: OptionalNumber = None, - anchor: OptionalNumber = None, - auto_scroller_velocity_scalar: OptionalNumber = None, - header: Optional[Control] = None, - footer: Optional[Control] = None, - build_controls_on_demand: Optional[bool] = None, - on_reorder: OptionalEventCallable[OnReorderEvent] = None, - on_reorder_start: OptionalEventCallable[OnReorderEvent] = None, - on_reorder_end: OptionalEventCallable[OnReorderEvent] = None, - # - # ScrollableControl - # - auto_scroll: Optional[bool] = None, - reverse: Optional[bool] = None, - on_scroll_interval: OptionalNumber = None, - on_scroll: OptionalEventCallable[OnScrollEvent] = None, - ref: Optional[Ref] = None, - key: Optional[str] = None, - width: OptionalNumber = None, - height: OptionalNumber = None, - left: OptionalNumber = None, - top: OptionalNumber = None, - 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, - scale: ScaleValue = None, - offset: OffsetValue = None, - aspect_ratio: OptionalNumber = None, - animate_opacity: Optional[AnimationValue] = None, - animate_size: Optional[AnimationValue] = None, - animate_position: Optional[AnimationValue] = None, - animate_rotation: Optional[AnimationValue] = None, - animate_scale: Optional[AnimationValue] = None, - animate_offset: Optional[AnimationValue] = None, - on_animation_end: OptionalControlEventCallable = None, - visible: Optional[bool] = None, - disabled: Optional[bool] = None, - data: Any = None, - adaptive: Optional[bool] = None, + self, + controls: Optional[Sequence[Control]] = None, + horizontal: Optional[bool] = None, + item_extent: OptionalNumber = None, + first_item_prototype: Optional[bool] = None, + padding: PaddingValue = None, + clip_behavior: Optional[ClipBehavior] = None, + cache_extent: OptionalNumber = None, + anchor: OptionalNumber = None, + auto_scroller_velocity_scalar: OptionalNumber = None, + header: Optional[Control] = None, + footer: Optional[Control] = None, + build_controls_on_demand: Optional[bool] = None, + show_default_drag_handles: Optional[bool] = None, + mouse_cursor: Optional[MouseCursor] = None, + on_reorder: OptionalEventCallable[OnReorderEvent] = None, + on_reorder_start: OptionalEventCallable[OnReorderEvent] = None, + on_reorder_end: OptionalEventCallable[OnReorderEvent] = None, + # + # ScrollableControl + # + auto_scroll: Optional[bool] = None, + reverse: Optional[bool] = None, + on_scroll_interval: OptionalNumber = None, + on_scroll: OptionalEventCallable[OnScrollEvent] = None, + ref: Optional[Ref] = None, + key: Optional[str] = None, + width: OptionalNumber = None, + height: OptionalNumber = None, + left: OptionalNumber = None, + top: OptionalNumber = None, + 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, + scale: ScaleValue = None, + offset: OffsetValue = None, + aspect_ratio: OptionalNumber = None, + animate_opacity: Optional[AnimationValue] = None, + animate_size: Optional[AnimationValue] = None, + animate_position: Optional[AnimationValue] = None, + animate_rotation: Optional[AnimationValue] = None, + animate_scale: Optional[AnimationValue] = None, + animate_offset: Optional[AnimationValue] = None, + on_animation_end: OptionalControlEventCallable = None, + visible: Optional[bool] = None, + disabled: Optional[bool] = None, + data: Any = None, + adaptive: Optional[bool] = None, ): ListView.__init__( self, @@ -145,6 +148,8 @@ def __init__( self.on_reorder = on_reorder self.anchor = anchor self.auto_scroller_velocity_scalar = auto_scroller_velocity_scalar + self.show_default_drag_handles = show_default_drag_handles + self.mouse_cursor = mouse_cursor self.on_reorder_start = on_reorder_start self.on_reorder_end = on_reorder_end @@ -200,6 +205,27 @@ def footer(self) -> Optional[Control]: def footer(self, value: Optional[Control]): self.__footer = value + # show_default_drag_handles + @property + def show_default_drag_handles(self) -> Optional[bool]: + return self._get_attr( + "showDefaultDragHandles", data_type="bool", def_value=True + ) + + @show_default_drag_handles.setter + def show_default_drag_handles(self, value: Optional[bool]): + self._set_attr("showDefaultDragHandles", value) + + # mouse_cursor + @property + def mouse_cursor(self) -> Optional[MouseCursor]: + return self.__mouse_cursor + + @mouse_cursor.setter + def mouse_cursor(self, value: Optional[MouseCursor]): + self.__mouse_cursor = value + self._set_enum_attr("mouseCursor", value, MouseCursor) + # on_reorder @property def on_reorder(self) -> OptionalEventCallable[OnReorderEvent]: diff --git a/sdk/python/packages/flet/src/flet/core/types.py b/sdk/python/packages/flet/src/flet/core/types.py index e4b18da6d..a43cbcef0 100644 --- a/sdk/python/packages/flet/src/flet/core/types.py +++ b/sdk/python/packages/flet/src/flet/core/types.py @@ -1,19 +1,7 @@ from dataclasses import dataclass from datetime import date, datetime -from enum import Enum, EnumMeta -from typing import ( - TYPE_CHECKING, - Any, - Callable, - Dict, - List, - Optional, - Protocol, - Tuple, - TypeVar, - Union, -) -from warnings import warn +from enum import Enum +from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, TypeVar, Union from flet.core.border_radius import BorderRadius from flet.core.colors import Colors, colors