Fix PieChartEvent.type on web

packages/flet/lib/src/controls/piechart.dart

@@ -15,15 +15,38 @@ import '../utils/borders.dart';
 import '../utils/text.dart';
 import 'create_control.dart';
 
+const eventMap = {
+  "FlPointerEnterEvent": "pointerEnter",
+  "FlPointerExitEvent": "pointerExit",
+  "FlPointerHoverEvent": "pointerHover",
+  "FlPanCancelEvent": "panCancel",
+  "FlPanDownEvent": "panDown",
+  "FlPanEndEvent": "panEnd",
+  "FlPanStartEvent": "panStart",
+  "FlPanUpdateEvent": "panUpdate",
+  "FlLongPressEnd": "longPressEnd",
+  "FlLongPressMoveUpdate": "longPressMoveUpdate",
+  "FlLongPressStart": "longPressStart",
+  "FlTapCancelEvent": "tapCancel",
+  "FlTapDownEvent": "tapDown",
+  "FlTapUpEvent": "tapUp",
+};
+
 class PieChartEventData extends Equatable {
   final String eventType;
   final int? sectionIndex;
+  final Offset? localPosition;
 
-  const PieChartEventData(
-      {required this.eventType, required this.sectionIndex});
+  const PieChartEventData({required this.eventType,
+    required this.sectionIndex,
+    this.localPosition});
 
-  Map<String, dynamic> toJson() =>
-      <String, dynamic>{'type': eventType, 'section_index': sectionIndex};
+  Map<String, dynamic> toJson() => <String, dynamic>{
+        'type': eventType,
+        'section_index': sectionIndex,
+        "lx": localPosition?.dx,
+        "ly": localPosition?.dy
+      };
 
   @override
   List<Object?> get props => [eventType, sectionIndex];
@@ -118,20 +141,18 @@ class _PieChartControlState extends State<PieChartControl> {
               pieTouchData: PieTouchData(
                 enabled: true,
                 touchCallback: widget.control.attrBool("onChartEvent", false)!
-                    ? (evt, resp) {
-                        var eventData = resp != null &&
-                                resp.touchedSection != null
-                            ? PieChartEventData(
-                                eventType: evt.runtimeType
-                                    .toString()
-                                    .substring(2), // remove "Fl"
-                                sectionIndex:
-                                    resp.touchedSection!.touchedSectionIndex)
-                            : PieChartEventData(
-                                eventType: evt.runtimeType
-                                    .toString()
-                                    .substring(2), // remove "Fl"
-                                sectionIndex: null);
+                    ? (FlTouchEvent evt, PieTouchResponse? resp) {
+                        var type = evt.toString();
+                        var eventData = PieChartEventData(
+                          // grab the event type found in between '' quotes
+                          eventType: eventMap[type.substring(
+                                  type.indexOf("'") + 1,
+                                  type.lastIndexOf("'"))] ??
+                              "undefined",
+                          sectionIndex:
+                              resp?.touchedSection?.touchedSectionIndex,
+                          localPosition: evt.localPosition,
+                        );
                         if (eventData != _eventData) {
                           _eventData = eventData;
                           debugPrint(

sdk/python/packages/flet-core/src/flet_core/charts/pie_chart.py

@@ -1,4 +1,5 @@
 import json
+from enum import Enum
 from typing import Any, List, Optional, Union, Callable
 
 from flet_core.charts.pie_chart_section import PieChartSection
@@ -176,11 +177,31 @@ def on_chart_event(self, handler: Optional[Callable[["PieChartEvent"], None]]):
         self._set_attr("onChartEvent", True if handler is not None else None)
 
 
+class PieChartEventType(Enum):
+    POINTER_ENTER = "pointerEnter"
+    POINTER_EXIT = "pointerExit"
+    POINTER_HOVER = "pointerHover"
+    PAN_CANCEL = "panCancel"
+    PAN_DOWN = "panDown"
+    PAN_END = "panEnd"
+    PAN_START = "panStart"
+    PAN_UPDATE = "panUpdate"
+    LONG_PRESS_END = "longPressEnd"
+    LONG_PRESS_MOVE_UPDATE = "longPressMoveUpdate"
+    LONG_PRESS_START = "longPressStart"
+    TAP_CANCEL = "tapCancel"
+    TAP_DOWN = "tapDown"
+    TAP_UP = "tapUp"
+    UNDEFINED = "undefined"
+
+
 class PieChartEvent(ControlEvent):
     def __init__(self, e: ControlEvent):
         super().__init__(e.target, e.name, e.data, e.control, e.page)
         d = json.loads(e.data)
-        self.type: str = d.get("type")
-        self.section_index: int = d.get("section_index")
-        # self.radius: float = d.get("radius")
-        # self.angle: float = d.get("angle")
+        self.type: PieChartEventType = PieChartEventType(d.get("type"))
+        self.section_index: int = d["section_index"]
+        self.local_x: Optional[float] = d.get("lx")
+        self.local_y: Optional[float] = d.get("ly")
+        # self.radius: float = d["radius"]
+        # self.angle: float = d["angle"]

sdk/python/packages/flet-core/src/flet_core/scrollable_control.py

@@ -136,6 +136,3 @@ def __init__(self, e: ControlEvent):
         self.direction: Optional[str] = d.get("dir")
         self.overscroll: Optional[float] = d.get("os")
         self.velocity: Optional[float] = d.get("v")
-
-    def __str__(self):
-        return f"{self.event_type}: pixels={self.pixels}, min_scroll_extent={self.min_scroll_extent}, max_scroll_extent={self.max_scroll_extent}, viewport_dimension={self.viewport_dimension}, scroll_delta={self.scroll_delta}, direction={self.direction}, overscroll={self.overscroll}, velocity={self.velocity}"

sdk/python/packages/flet-core/src/flet_core/theme.py

@@ -710,4 +710,6 @@ class Theme:
     text_theme: Optional[TextTheme] = field(default=None)
     time_picker_theme: Optional[TimePickerTheme] = field(default=None)
     tooltip_theme: Optional[TooltipTheme] = field(default=None)
-    visual_density: ThemeVisualDensity = field(default=ThemeVisualDensity.STANDARD)
+    visual_density: Union[VisualDensity, ThemeVisualDensity] = field(
+        default=VisualDensity.STANDARD
+    )