flet-charts 0.70.0.dev6316__tar.gz → 0.70.0.dev6333__tar.gz

{flet_charts-0.70.0.dev6316/src/flet_charts.egg-info → flet_charts-0.70.0.dev6333}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-charts
-Version: 0.70.0.dev6316
+Version: 0.70.0.dev6333
 Summary: Interactive chart controls for Flet apps.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==0.70.0.dev6316
+Requires-Dist: flet==0.70.0.dev6333
 Dynamic: license-file
 
 # flet-charts
@@ -57,10 +57,11 @@ For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/
 
 ### Available charts
 
-- `BarChart`
-- `CandlestickChart`
-- `LineChart`
-- `MatplotlibChart`
-- `PieChart`
-- `PlotlyChart`
-- `ScatterChart`
+- [`BarChart`](https://docs.flet.dev/charts/bar_chart/)
+- [`CandlestickChart`](https://docs.flet.dev/charts/candlestick_chart/)
+- [`LineChart`](https://docs.flet.dev/charts/line_chart/)
+- [`MatplotlibChart`](https://docs.flet.dev/charts/matplotlib_chart/)
+- [`PieChart`](https://docs.flet.dev/charts/pie_chart/)
+- [`PlotlyChart`](https://docs.flet.dev/charts/plotly_chart/)
+- [`RadarChart`](https://docs.flet.dev/charts/radar_chart/)
+- [`ScatterChart`](https://docs.flet.dev/charts/scatter_chart/)

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/README.md

@@ -41,10 +41,11 @@ For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/
 
 ### Available charts
 
-- `BarChart`
-- `CandlestickChart`
-- `LineChart`
-- `MatplotlibChart`
-- `PieChart`
-- `PlotlyChart`
-- `ScatterChart`
+- [`BarChart`](https://docs.flet.dev/charts/bar_chart/)
+- [`CandlestickChart`](https://docs.flet.dev/charts/candlestick_chart/)
+- [`LineChart`](https://docs.flet.dev/charts/line_chart/)
+- [`MatplotlibChart`](https://docs.flet.dev/charts/matplotlib_chart/)
+- [`PieChart`](https://docs.flet.dev/charts/pie_chart/)
+- [`PlotlyChart`](https://docs.flet.dev/charts/plotly_chart/)
+- [`RadarChart`](https://docs.flet.dev/charts/radar_chart/)
+- [`ScatterChart`](https://docs.flet.dev/charts/scatter_chart/)

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-charts"
-version = "0.70.0.dev6316"
+version = "0.70.0.dev6333"
 description = "Interactive chart controls for Flet apps."
 readme = "README.md"
 authors = [{ name = "Flet contributors", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==0.70.0.dev6316",
+    "flet==0.70.0.dev6333",
 ]
 
 [project.urls]

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flet_charts/__init__.py

@@ -37,6 +37,13 @@ from flet_charts.matplotlib_chart_with_toolbar import MatplotlibChartWithToolbar
 from flet_charts.pie_chart import PieChart, PieChartEvent
 from flet_charts.pie_chart_section import PieChartSection
 from flet_charts.plotly_chart import PlotlyChart
+from flet_charts.radar_chart import (
+    RadarChart,
+    RadarChartEvent,
+    RadarChartTitle,
+    RadarShape,
+)
+from flet_charts.radar_data_set import RadarDataSet, RadarDataSetEntry
 from flet_charts.scatter_chart import (
     ScatterChart,
     ScatterChartEvent,
@@ -95,6 +102,12 @@ __all__ = [
     "PieChartEvent",
     "PieChartSection",
     "PlotlyChart",
+    "RadarChart",
+    "RadarChartEvent",
+    "RadarChartTitle",
+    "RadarDataSet",
+    "RadarDataSetEntry",
+    "RadarShape",
     "ScatterChart",
     "ScatterChartEvent",
     "ScatterChartSpot",

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flet_charts/bar_chart.py

@@ -180,7 +180,7 @@ class BarChart(ft.LayoutControl):
 
     group_alignment: ft.MainAxisAlignment = ft.MainAxisAlignment.SPACE_EVENLY
     """
-    A alignment of the bar [`groups`][..] within this chart.
+    The alignment of the bar [`groups`][..] within this chart.
 
     If set to [`MainAxisAlignment.CENTER`][flet.MainAxisAlignment.CENTER],
     the space between the `groups` can be specified using [`group_spacing`][..].

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flet_charts/candlestick_chart.py

@@ -17,12 +17,14 @@ __all__ = [
 class CandlestickChartTooltip:
     """Configuration of the tooltip for [`CandlestickChart`][(p).]s."""
 
-    bgcolor: ft.ColorValue = "#FF607D8B"
+    bgcolor: ft.ColorValue = "#FFFFECEF"
     """
     Background color applied to the tooltip bubble.
     """
 
-    border_radius: Optional[ft.BorderRadiusValue] = None
+    border_radius: ft.BorderRadiusValue = field(
+        default_factory=lambda: ft.BorderRadius.all(4)
+    )
     """
     Corner radius of the tooltip bubble.
     """
@@ -159,9 +161,10 @@ class CandlestickChart(ft.LayoutControl):
     Enables automatic tooltips and highlighting when hovering the chart.
     """
 
-    handle_built_in_touches: bool = True
+    show_tooltips_for_selected_spots_only: bool = False
     """
-    Allows the chart to manage tooltip visibility automatically.
+    Whether to permanently and only show the tooltips of spots with their
+    [`selected`][(p).CandlestickChartSpot.selected] property set to `True`.
     """
 
     long_press_duration: Optional[ft.DurationValue] = None
@@ -169,7 +172,7 @@ class CandlestickChart(ft.LayoutControl):
     The duration of a long press on the chart.
     """
 
-    touch_spot_threshold: Optional[ft.Number] = None
+    touch_spot_threshold: ft.Number = 4
     """
     The distance threshold to consider a touch near a candlestick.
     """

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flet_charts/matplotlib_chart.py

@@ -2,18 +2,22 @@ import asyncio
 import logging
 from dataclasses import dataclass, field
 from io import BytesIO
-from typing import Optional
+from typing import Any, Optional
 
 import flet as ft
 import flet.canvas as fc
 
+_MATPLOTLIB_IMPORT_ERROR: Optional[ImportError] = None
+
 try:
-    import matplotlib
-    from matplotlib.figure import Figure
-except ImportError as e:
-    raise Exception(
-        'Install "matplotlib" Python package to use MatplotlibChart control.'
-    ) from e
+    import matplotlib  # type: ignore[import]
+    from matplotlib.figure import Figure  # type: ignore[import]
+except ImportError as e:  # pragma: no cover - depends on optional dependency
+    matplotlib = None  # type: ignore[assignment]
+    Figure = Any  # type: ignore[assignment]
+    _MATPLOTLIB_IMPORT_ERROR = e
+else:
+    matplotlib.use("module://flet_charts.matplotlib_backends.backend_flet_agg")
 
 __all__ = [
     "MatplotlibChart",
@@ -23,8 +27,6 @@ __all__ = [
 
 logger = logging.getLogger("flet-charts.matplotlib")
 
-matplotlib.use("module://flet_charts.matplotlib_backends.backend_flet_agg")
-
 figure_cursors = {
     "default": None,
     "pointer": ft.MouseCursor.CLICK,
@@ -36,6 +38,13 @@ figure_cursors = {
 }
 
 
+def _require_matplotlib() -> None:
+    if matplotlib is None:
+        raise ModuleNotFoundError(
+            'Install "matplotlib" Python package to use MatplotlibChart control.'
+        ) from _MATPLOTLIB_IMPORT_ERROR
+
+
 @dataclass
 class MatplotlibChartMessageEvent(ft.Event["MatplotlibChart"]):
     message: str
@@ -86,6 +95,10 @@ class MatplotlibChart(ft.GestureDetector):
     Triggers when toolbar buttons status is updated.
     """
 
+    def init(self):
+        _require_matplotlib()
+        super().init()
+
     def build(self):
         self.mouse_cursor = ft.MouseCursor.WAIT
         self.__started = False
@@ -95,7 +108,7 @@ class MatplotlibChart(ft.GestureDetector):
 
         self.canvas = fc.Canvas(
             # resize_interval=10,
-            on_resize=self.on_canvas_resize,
+            on_resize=self._on_canvas_resize,
             expand=True,
         )
         self.keyboard_listener = ft.KeyboardListener(
@@ -246,29 +259,55 @@ class MatplotlibChart(ft.GestureDetector):
         )
 
     def will_unmount(self):
+        """
+        Called when the control is about to be removed from the page.
+        """
         self.figure.canvas.manager.remove_web_socket(self)
 
     def home(self):
+        """
+        Resets the view to the original state.
+        """
         logger.debug("home)")
         self.send_message({"type": "toolbar_button", "name": "home"})
 
     def back(self):
+        """
+        Goes back to the previous view.
+        """
         logger.debug("back()")
         self.send_message({"type": "toolbar_button", "name": "back"})
 
     def forward(self):
+        """
+        Goes forward to the next view.
+        """
         logger.debug("forward)")
         self.send_message({"type": "toolbar_button", "name": "forward"})
 
     def pan(self):
+        """
+        Activates the pan tool.
+        """
         logger.debug("pan()")
         self.send_message({"type": "toolbar_button", "name": "pan"})
 
     def zoom(self):
+        """
+        Activates the zoom tool.
+        """
         logger.debug("zoom()")
         self.send_message({"type": "toolbar_button", "name": "zoom"})
 
-    def download(self, format):
+    def download(self, format) -> bytes:
+        """
+        Downloads the current figure in the specified format.
+        Args:
+            format (str): The format to download the figure in (e.g., 'png',
+                'jpg', 'svg', etc.).
+        Returns:
+            bytes: The figure image in the specified format as a byte array.
+        """
         logger.debug(f"Download in format: {format}")
         buff = BytesIO()
         self.figure.savefig(buff, format=format, dpi=self.figure.dpi * self.__dpr)
@@ -347,23 +386,26 @@ class MatplotlibChart(ft.GestureDetector):
                     )
 
     def send_message(self, message):
+        """Sends a message to the figure's canvas manager."""
         logger.debug(f"send_message({message})")
         manager = self.figure.canvas.manager
         if manager is not None:
             manager.handle_json(message)
 
     def send_json(self, content):
+        """Sends a JSON message to the front end."""
         logger.debug(f"send_json: {content}")
         self._main_loop.call_soon_threadsafe(
             lambda: self._receive_queue.put_nowait((False, content))
         )
 
     def send_binary(self, blob):
+        """Sends a binary message to the front end."""
         self._main_loop.call_soon_threadsafe(
             lambda: self._receive_queue.put_nowait((True, blob))
         )
 
-    async def on_canvas_resize(self, e: fc.CanvasResizeEvent):
+    async def _on_canvas_resize(self, e: fc.CanvasResizeEvent):
         logger.debug(f"on_canvas_resize: {e.width}, {e.height}")
 
         if not self.__started:

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flet_charts/matplotlib_chart_with_toolbar.py

@@ -1,10 +1,17 @@
 from dataclasses import field
-
-from matplotlib.figure import Figure
+from typing import Any, Optional
 
 import flet as ft
 import flet_charts
 
+_MATPLOTLIB_IMPORT_ERROR: Optional[ImportError] = None
+
+try:
+    from matplotlib.figure import Figure  # type: ignore
+except ImportError as e:  # pragma: no cover - depends on optional dependency
+    Figure = Any  # type: ignore[assignment]
+    _MATPLOTLIB_IMPORT_ERROR = e
+
 _download_formats = [
     "eps",
     "jpeg",
@@ -19,6 +26,13 @@ _download_formats = [
 ]
 
 
+def _require_matplotlib() -> None:
+    if _MATPLOTLIB_IMPORT_ERROR is not None:
+        raise ModuleNotFoundError(
+            'Install "matplotlib" Python package to use MatplotlibChart control.'
+        ) from _MATPLOTLIB_IMPORT_ERROR
+
+
 @ft.control(kw_only=True, isolated=True)
 class MatplotlibChartWithToolbar(ft.Column):
     figure: Figure = field(metadata={"skip": True})
@@ -28,6 +42,7 @@ class MatplotlibChartWithToolbar(ft.Column):
     """
 
     def build(self):
+        _require_matplotlib()
         self.mpl = flet_charts.MatplotlibChart(
             figure=self.figure,
             expand=True,
@@ -63,7 +78,7 @@ class MatplotlibChartWithToolbar(ft.Column):
         self.msg = ft.Text()
         self.controls = [
             ft.Row(
-                [
+                controls=[
                     self.home_btn,
                     self.back_btn,
                     self.fwd_btn,

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flet_charts/plotly_chart.py

@@ -1,19 +1,28 @@
 import re
 import xml.etree.ElementTree as ET
 from dataclasses import field
+from typing import Any, Optional
 
 import flet as ft
 
+_PLOTLY_IMPORT_ERROR: Optional[ImportError] = None
+
 try:
     from plotly.graph_objects import Figure
-except ImportError as e:
-    raise Exception(
-        'Install "plotly" Python package to use PlotlyChart control.'
-    ) from e
+except ImportError as e:  # pragma: no cover - depends on optional dependency
+    Figure = Any  # type: ignore[assignment]
+    _PLOTLY_IMPORT_ERROR = e
 
 __all__ = ["PlotlyChart"]
 
 
+def _require_plotly() -> None:
+    if _PLOTLY_IMPORT_ERROR is not None:
+        raise ModuleNotFoundError(
+            'Install "plotly" Python package to use PlotlyChart control.'
+        ) from _PLOTLY_IMPORT_ERROR
+
+
 @ft.control(kw_only=True)
 class PlotlyChart(ft.Container):
     """
@@ -41,6 +50,7 @@ class PlotlyChart(ft.Container):
     """
 
     def init(self):
+        _require_plotly()
         self.alignment = ft.Alignment.CENTER
         self.__img = ft.Image(fit=ft.BoxFit.FILL)
         self.content = self.__img

flet_charts-0.70.0.dev6333/src/flet_charts/radar_chart.py

@@ -0,0 +1,214 @@
+from dataclasses import dataclass, field
+from enum import Enum
+from typing import Optional
+
+import flet as ft
+from flet_charts.radar_data_set import RadarDataSet
+from flet_charts.types import ChartEventType
+
+__all__ = ["RadarChart", "RadarChartEvent", "RadarChartTitle", "RadarShape"]
+
+
+class RadarShape(Enum):
+    """Shape of the radar grid and data polygons."""
+
+    CIRCLE = "circle"
+    """Draws radial circles for the grid and data outlines."""
+
+    POLYGON = "polygon"
+    """Draws straight-edged polygons for the grid and data outlines."""
+
+
+@ft.control("RadarChartTitle")
+class RadarChartTitle(ft.BaseControl):
+    """
+    Custom title configuration displayed around a [`RadarChart`][(p).].
+    """
+
+    text: str = ""
+    """
+    The text displayed for the title.
+    """
+
+    angle: ft.Number = 0
+    """
+    Rotation angle (in degrees) applied to the title.
+    """
+
+    position_percentage_offset: Optional[ft.Number] = None
+    """
+    Defines the relative distance of this title from the chart center.
+
+    - `0` draws this title near the inside edge of each section.
+    - `1` draws this title near the outside edge of each section.
+
+    Must be between `0` and `1` (inclusive), if set.
+
+    Note:
+        If set, it takes precedence over the parent
+        [`RadarChart.title_position_percentage_offset`][(p).] value.
+    """
+
+    text_spans: Optional[list[ft.TextSpan]] = None
+    """
+    Inline spans appended to the title.
+    """
+
+
+@dataclass
+class RadarChartEvent(ft.Event["RadarChart"]):
+    """
+    Event raised for interactions with a [`RadarChart`][(p).].
+    """
+
+    type: ChartEventType
+    """
+    The touch or pointer event that occurred.
+    """
+
+    data_set_index: Optional[int] = None
+    """
+    The index of the touched data set, if any.
+    """
+
+    entry_index: Optional[int] = None
+    """
+    The index of the touched radar entry, if any.
+    """
+
+    entry_value: Optional[ft.Number] = None
+    """
+    The value of the touched radar entry, if any.
+    """
+
+
+@ft.control("RadarChart")
+class RadarChart(ft.LayoutControl):
+    """
+    A radar chart made of multiple datasets.
+    """
+
+    data_sets: list[RadarDataSet] = field(default_factory=list)
+    """
+    A list of [`RadarDataSet`][(p).] controls rendered on the chart.
+    """
+
+    titles: list[RadarChartTitle] = field(default_factory=list)
+    """
+    The titles shown around this chart, matching the number of entries per set.
+    """
+
+    title_text_style: Optional[ft.TextStyle] = None
+    """
+    The text style applied to titles around this chart.
+    """
+
+    title_position_percentage_offset: ft.Number = 0.2
+    """
+    Defines the relative distance of titles from the chart center.
+
+    - `0` draws titles near the inside edge of each section.
+    - `1` draws titles near the outside edge of each section.
+
+    Must be between `0` and `1` (inclusive).
+
+    Raises:
+        ValueError: If set to a value less than `0` or greater than `1`.
+    """
+
+    radar_bgcolor: ft.ColorValue = ft.Colors.TRANSPARENT
+    """
+    The background color of the radar area.
+    """
+
+    radar_border_side: ft.BorderSide = field(
+        default_factory=lambda: ft.BorderSide(width=2.0)
+    )
+    """
+    The outline drawn around the radar area.
+    """
+
+    radar_shape: RadarShape = RadarShape.POLYGON
+    """
+    The shape of the radar area.
+    """
+
+    border: Optional[ft.Border] = None
+    """
+    The border drawn around this chart.
+    """
+
+    center_min_value: bool = False
+    """
+    Whether minimum entry values should be positioned at the center of this chart.
+    """
+
+    tick_count: ft.Number = 1
+    """
+    Number of tick rings drawn from the centre to the edge.
+
+    Must be greater than or equal to `1`.
+
+    Raises:
+        ValueError: If set to a value less than `1`.
+    """
+
+    ticks_text_style: Optional[ft.TextStyle] = None
+    """
+    The text style used to draw tick labels.
+    """
+
+    tick_border_side: ft.BorderSide = field(
+        default_factory=lambda: ft.BorderSide(width=2.0)
+    )
+    """
+    The style of the tick rings.
+    """
+
+    grid_border_side: ft.BorderSide = field(
+        default_factory=lambda: ft.BorderSide(width=2.0)
+    )
+    """
+    The style of the radar grid lines.
+    """
+
+    animation: ft.AnimationValue = field(
+        default_factory=lambda: ft.Animation(
+            duration=ft.Duration(milliseconds=150), curve=ft.AnimationCurve.LINEAR
+        )
+    )
+    """
+    Controls the implicit animation applied when updating this chart.
+    """
+
+    interactive: bool = True
+    """
+    Enables touch interactions and event notifications.
+    """
+
+    long_press_duration: Optional[ft.DurationValue] = None
+    """
+    The duration before a long-press event fires.
+    """
+
+    touch_spot_threshold: ft.Number = 10
+    """
+    The radius (in logical pixels) used to detect nearby entries for touches.
+    """
+
+    on_event: Optional[ft.EventHandler[RadarChartEvent]] = None
+    """
+    Called when the chart is interacted with.
+    """
+
+    def init(self):
+        super().init()
+        entries_lengths = {len(ds.entries) for ds in self.data_sets}
+        if len(entries_lengths) > 1:
+            raise ValueError(
+                "All data sets in the data_sets list must have equal number of entries"
+            )
+        if not (0 <= self.title_position_percentage_offset <= 1):
+            raise ValueError("title_position_percentage_offset must be between 0 and 1")
+        if self.tick_count is not None and self.tick_count < 1:
+            raise ValueError("tick_count must be greater than or equal to 1")

flet_charts-0.70.0.dev6333/src/flet_charts/radar_data_set.py

@@ -0,0 +1,66 @@
+from dataclasses import field
+from typing import Optional
+
+import flet as ft
+
+__all__ = ["RadarDataSet", "RadarDataSetEntry"]
+
+
+@ft.control("RadarDataSetEntry")
+class RadarDataSetEntry(ft.BaseControl):
+    """
+    A single data point rendered on a [`RadarChart`][(p).].
+    """
+
+    value: ft.Number
+    """
+    The numeric value drawn for this entry.
+    """
+
+
+@ft.control("RadarDataSet")
+class RadarDataSet(ft.BaseControl):
+    """
+    A collection of [`RadarDataSetEntry`][(p).] drawn as a filled radar shape.
+    """
+
+    entries: list[RadarDataSetEntry] = field(default_factory=list)
+    """
+    The data points that compose this set.
+    """
+
+    fill_color: ft.ColorValue = ft.Colors.CYAN
+    """
+    The color used to fill this dataset.
+    """
+
+    fill_gradient: Optional[ft.Gradient] = None
+    """
+    The gradient used to fill this dataset.
+
+    Takes precedence over [`fill_color`][..].
+    """
+
+    border_color: ft.ColorValue = ft.Colors.CYAN
+    """
+    The color of the dataset outline.
+    """
+
+    border_width: ft.Number = 2.0
+    """
+    The width of the dataset outline.
+    """
+
+    entry_radius: ft.Number = 5.0
+    """
+    The radius of each entry.
+    """
+
+    def init(self):
+        super().init()
+        entries_length = len(self.entries)
+        if entries_length != 0 and entries_length < 3:
+            raise ValueError(
+                f"entries can contain either 0 or at least 3 items, "
+                f"got {entries_length}"
+            )

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flet_charts/scatter_chart_spot.py

@@ -102,7 +102,7 @@ class ScatterChartSpot(ft.BaseControl):
 
     selected: bool = False
     """
-    TBD
+    Whether to treat this spot as selected.
     """
 
     tooltip: Union[ScatterChartSpotTooltip, str] = field(

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333/src/flet_charts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-charts
-Version: 0.70.0.dev6316
+Version: 0.70.0.dev6333
 Summary: Interactive chart controls for Flet apps.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==0.70.0.dev6316
+Requires-Dist: flet==0.70.0.dev6333
 Dynamic: license-file
 
 # flet-charts
@@ -57,10 +57,11 @@ For examples, see [these](https://github.com/flet-dev/flet/tree/main/sdk/python/
 
 ### Available charts
 
-- `BarChart`
-- `CandlestickChart`
-- `LineChart`
-- `MatplotlibChart`
-- `PieChart`
-- `PlotlyChart`
-- `ScatterChart`
+- [`BarChart`](https://docs.flet.dev/charts/bar_chart/)
+- [`CandlestickChart`](https://docs.flet.dev/charts/candlestick_chart/)
+- [`LineChart`](https://docs.flet.dev/charts/line_chart/)
+- [`MatplotlibChart`](https://docs.flet.dev/charts/matplotlib_chart/)
+- [`PieChart`](https://docs.flet.dev/charts/pie_chart/)
+- [`PlotlyChart`](https://docs.flet.dev/charts/plotly_chart/)
+- [`RadarChart`](https://docs.flet.dev/charts/radar_chart/)
+- [`ScatterChart`](https://docs.flet.dev/charts/scatter_chart/)

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flet_charts.egg-info/SOURCES.txt

@@ -17,6 +17,8 @@ src/flet_charts/matplotlib_chart_with_toolbar.py
 src/flet_charts/pie_chart.py
 src/flet_charts/pie_chart_section.py
 src/flet_charts/plotly_chart.py
+src/flet_charts/radar_chart.py
+src/flet_charts/radar_data_set.py
 src/flet_charts/scatter_chart.py
 src/flet_charts/scatter_chart_spot.py
 src/flet_charts/types.py
@@ -36,10 +38,12 @@ src/flutter/flet_charts/lib/src/candlestick_chart.dart
 src/flutter/flet_charts/lib/src/extension.dart
 src/flutter/flet_charts/lib/src/line_chart.dart
 src/flutter/flet_charts/lib/src/pie_chart.dart
+src/flutter/flet_charts/lib/src/radar_chart.dart
 src/flutter/flet_charts/lib/src/scatter_chart.dart
 src/flutter/flet_charts/lib/src/utils/bar_chart.dart
 src/flutter/flet_charts/lib/src/utils/candlestick_chart.dart
 src/flutter/flet_charts/lib/src/utils/charts.dart
 src/flutter/flet_charts/lib/src/utils/line_chart.dart
 src/flutter/flet_charts/lib/src/utils/pie_chart.dart
+src/flutter/flet_charts/lib/src/utils/radar_chart.dart
 src/flutter/flet_charts/lib/src/utils/scatter_chart.dart

flet_charts-0.70.0.dev6333/src/flet_charts.egg-info/requires.txt

@@ -0,0 +1 @@
+flet==0.70.0.dev6333

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flutter/flet_charts/lib/src/candlestick_chart.dart

@@ -37,9 +37,6 @@ class _CandlestickChartControlState extends State<CandlestickChartControl> {
     final bottomTitles = parseAxisTitles(widget.control.child("bottom_axis"));
 
     final interactive = widget.control.getBool("interactive", true)!;
-    final handleBuiltInTouches =
-        widget.control.getBool("handle_built_in_touches", true)!;
-    final touchSpotThreshold = widget.control.getDouble("touch_spot_threshold");
 
     final spotControls = widget.control.children("spots");
     final candlestickSpots = spotControls.map((spot) {
@@ -54,21 +51,12 @@ class _CandlestickChartControlState extends State<CandlestickChartControl> {
       );
     }).toList();
 
-    final selectedIndicators = spotControls
-        .asMap()
-        .entries
-        .where((entry) => entry.value.getBool("selected", false)!)
-        .map((entry) => entry.key)
-        .toList();
-
-    final showingIndicators =
-        (!interactive || !handleBuiltInTouches) ? selectedIndicators : <int>[];
-
     final candlestickTouchData = CandlestickTouchData(
       enabled: interactive && !widget.control.disabled,
-      handleBuiltInTouches: handleBuiltInTouches,
+      handleBuiltInTouches: !widget.control
+          .getBool("show_tooltips_for_selected_spots_only", false)!,
       longPressDuration: widget.control.getDuration("long_press_duration"),
-      touchSpotThreshold: touchSpotThreshold,
+      touchSpotThreshold: widget.control.getDouble("touch_spot_threshold", 4)!,
       touchTooltipData: parseCandlestickTouchTooltipData(
         context,
         widget.control,
@@ -112,7 +100,12 @@ class _CandlestickChartControlState extends State<CandlestickChartControl> {
             widget.control.get("vertical_grid_lines"),
             theme),
         candlestickTouchData: candlestickTouchData,
-        showingTooltipIndicators: showingIndicators,
+        showingTooltipIndicators: spotControls
+            .asMap()
+            .entries
+            .where((e) => e.value.getBool("selected", false)!)
+            .map((e) => e.key)
+            .toList(),
         rotationQuarterTurns:
             widget.control.getInt("rotation_quarter_turns", 0)!,
       ),

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flutter/flet_charts/lib/src/extension.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'bar_chart.dart';
 import 'candlestick_chart.dart';
 import 'line_chart.dart';
+import 'radar_chart.dart';
 import 'pie_chart.dart';
 import 'scatter_chart.dart';
 
@@ -17,6 +18,8 @@ class Extension extends FletExtension {
         return CandlestickChartControl(key: key, control: control);
       case "LineChart":
         return LineChartControl(key: key, control: control);
+      case "RadarChart":
+        return RadarChartControl(key: key, control: control);
       case "PieChart":
         return PieChartControl(key: key, control: control);
       case "ScatterChart":

flet_charts-0.70.0.dev6333/src/flutter/flet_charts/lib/src/radar_chart.dart

@@ -0,0 +1,104 @@
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flet/flet.dart';
+import 'package:flutter/material.dart';
+
+import 'utils/radar_chart.dart';
+
+class RadarChartControl extends StatefulWidget {
+  final Control control;
+
+  RadarChartControl({Key? key, required this.control})
+      : super(key: ValueKey("control_${control.id}"));
+
+  @override
+  State<RadarChartControl> createState() => _RadarChartControlState();
+}
+
+class _RadarChartControlState extends State<RadarChartControl> {
+  RadarChartEventData? _eventData;
+
+  @override
+  Widget build(BuildContext context) {
+    debugPrint("RadarChart build: ${widget.control.id}‚");
+
+    final theme = Theme.of(context);
+    final animation = widget.control.getAnimation(
+        "animation",
+        ImplicitAnimationDetails(
+            duration: const Duration(milliseconds: 150),
+            curve: Curves.linear))!;
+    final interactive = widget.control.getBool("interactive", true)! &&
+        !widget.control.disabled;
+    final border = widget.control.getBorder("border", theme);
+    final titleControls = widget.control.children("titles", visibleOnly: false);
+
+    final chart = RadarChart(
+      RadarChartData(
+        dataSets: widget.control
+            .children("data_sets")
+            .map((ds) => parseRadarDataSet(ds, theme, context))
+            .toList(),
+
+        // Radar and borders
+        radarBackgroundColor: widget.control
+            .getColor("radar_bgcolor", context, Colors.transparent)!,
+        radarBorderData: widget.control.getBorderSide(
+            "radar_border_side", theme,
+            defaultValue: const BorderSide(width: 2))!,
+        radarShape: parseRadarShape(
+            widget.control.get("radar_shape"), RadarShape.polygon)!,
+        borderData: FlBorderData(show: border != null, border: border),
+        gridBorderData: widget.control.getBorderSide("grid_border_side", theme,
+            defaultValue: const BorderSide(width: 2))!,
+
+        // Titles
+        titleTextStyle: widget.control.getTextStyle("title_text_style", theme),
+        titlePositionPercentageOffset:
+            widget.control.getDouble("title_position_percentage_offset", 0.2)!,
+        getTitle: titleControls.isNotEmpty
+            ? (int index, double angle) {
+                if (index >= titleControls.length) {
+                  return RadarChartTitle(text: '', angle: angle);
+                }
+                final ctrl = titleControls[index];
+                return parseRadarChartTitle(ctrl, theme, angle);
+              }
+            : null,
+
+        // Ticks
+        tickCount: widget.control.getInt("tick_count", 1)!,
+        ticksTextStyle: widget.control.getTextStyle("ticks_text_style", theme),
+        tickBorderData: widget.control.getBorderSide("tick_border_side", theme,
+            defaultValue: const BorderSide(width: 2))!,
+        isMinValueAtCenter: widget.control.getBool("center_min_value", false)!,
+
+        // Interaction
+        radarTouchData: RadarTouchData(
+          enabled: interactive,
+          longPressDuration: widget.control.getDuration("long_press_duration"),
+          touchSpotThreshold: widget.control.getDouble("touch_spot_threshold"),
+          touchCallback: (event, response) {
+            final eventData = RadarChartEventData.fromDetails(event, response);
+            if (eventData != _eventData) {
+              _eventData = eventData;
+              widget.control.triggerEvent("event", eventData.toMap());
+            }
+          },
+        ),
+      ),
+      duration: animation.duration,
+      curve: animation.curve,
+    );
+
+    return ConstrainedControl(
+        control: widget.control,
+        child: LayoutBuilder(
+            builder: (BuildContext context, BoxConstraints constraints) {
+          return (constraints.maxHeight == double.infinity)
+              ? ConstrainedBox(
+                  constraints: const BoxConstraints(maxHeight: 300),
+                  child: chart)
+              : chart;
+        }));
+  }
+}

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flutter/flet_charts/lib/src/utils/bar_chart.dart

@@ -38,11 +38,11 @@ class BarChartEventData extends Equatable {
   }
 
   Map<String, dynamic> toMap() => <String, dynamic>{
-    'type': eventType,
-    'group_index': groupIndex,
-    'rod_index': rodIndex,
-    'stack_item_index': stackItemIndex,
-  };
+        'type': eventType,
+        'group_index': groupIndex,
+        'rod_index': rodIndex,
+        'stack_item_index': stackItemIndex,
+      };
 
   @override
   List<Object?> get props => [eventType, groupIndex, rodIndex, stackItemIndex];
@@ -96,9 +96,8 @@ BarTouchTooltipData? parseBarTouchTooltipData(
       FLHorizontalAlignment.center,
     )!,
     getTooltipItem: (group, groupIndex, rod, rodIndex) {
-      var rod = control
-          .children("groups")[groupIndex]
-          .children("rods")[rodIndex];
+      var rod =
+          control.children("groups")[groupIndex].children("rods")[rodIndex];
       return parseBarTooltipItem(rod, context);
     },
   );
@@ -118,8 +117,7 @@ BarTooltipItem? parseBarTooltipItem(Control rod, BuildContext context) {
   )!;
   if (tooltipTextStyle.color == null) {
     tooltipTextStyle = tooltipTextStyle.copyWith(
-      color:
-          rod.getGradient("gradient", theme)?.colors.first ??
+      color: rod.getGradient("gradient", theme)?.colors.first ??
           rod.getColor("color", context, Colors.blueGrey)!,
     );
   }
@@ -194,8 +192,7 @@ BarChartRodData parseBarChartRodData(
       defaultValue: BorderSide.none,
     ),
     backDrawRodData: BackgroundBarChartRodData(
-      show:
-          (bgFromY != null ||
+      show: (bgFromY != null ||
           bgToY != null ||
           bgcolor != null ||
           backgroundGradient != null),
@@ -235,13 +232,10 @@ BarChartRodStackItem parseBarChartRodStackItem(
   );
 }
 
-BarChartAlignment? parseBarChartAlignment(
-  String? value, [
-  BarChartAlignment? defaultValue,
-]) {
+BarChartAlignment? parseBarChartAlignment(String? value,
+    [BarChartAlignment? defaultValue]) {
   if (value == null) return defaultValue;
   return BarChartAlignment.values.firstWhereOrNull(
-        (e) => e.name.toLowerCase() == value.toLowerCase(),
-      ) ??
+          (e) => e.name.toLowerCase() == value.toLowerCase()) ??
       defaultValue;
 }

{flet_charts-0.70.0.dev6316 → flet_charts-0.70.0.dev6333}/src/flutter/flet_charts/lib/src/utils/candlestick_chart.dart

@@ -39,24 +39,24 @@ CandlestickTouchTooltipData parseCandlestickTouchTooltipData(
   final theme = Theme.of(context);
 
   return CandlestickTouchTooltipData(
-    tooltipBorder:
-        parseBorderSide(tooltip["border_side"], theme, defaultValue: BorderSide.none)!,
+    tooltipBorder: parseBorderSide(tooltip["border_side"], theme,
+        defaultValue: BorderSide.none)!,
     rotateAngle: parseDouble(tooltip["rotation"], 0.0)!,
-    tooltipBorderRadius: parseBorderRadius(tooltip["border_radius"]),
-    tooltipPadding: parsePadding(
-        tooltip["padding"], const EdgeInsets.symmetric(horizontal: 16, vertical: 8))!,
+    tooltipBorderRadius:
+        parseBorderRadius(tooltip["border_radius"], BorderRadius.circular(4))!,
+    tooltipPadding: parsePadding(tooltip["padding"],
+        const EdgeInsets.symmetric(horizontal: 16, vertical: 8))!,
     tooltipHorizontalAlignment: parseFLHorizontalAlignment(
         tooltip["horizontal_alignment"], FLHorizontalAlignment.center)!,
     tooltipHorizontalOffset: parseDouble(tooltip["horizontal_offset"], 0)!,
     maxContentWidth: parseDouble(tooltip["max_width"], 120)!,
     fitInsideHorizontally:
         parseBool(tooltip["fit_inside_horizontally"], false)!,
-    fitInsideVertically:
-        parseBool(tooltip["fit_inside_vertically"], false)!,
+    fitInsideVertically: parseBool(tooltip["fit_inside_vertically"], false)!,
     showOnTopOfTheChartBoxArea:
         parseBool(tooltip["show_on_top_of_chart_box_area"], false)!,
-    getTooltipColor: (spot) => parseColor(
-        tooltip["bgcolor"], theme, const Color.fromRGBO(96, 125, 139, 1))!,
+    getTooltipColor: (spot) =>
+        parseColor(tooltip["bgcolor"], theme, const Color(0xFFFFECEF))!,
     getTooltipItems: (painter, touchedSpot, spotIndex) {
       if (spotIndex < 0 || spotIndex >= spotControls.length) {
         return null;
@@ -105,8 +105,9 @@ CandlestickTooltipItem? parseCandlestickTooltipItem(
     textStyle: textStyle,
     bottomMargin: parseDouble(tooltip["bottom_margin"], 8)!,
     textAlign: parseTextAlign(tooltip["text_align"], TextAlign.center)!,
-    textDirection:
-        parseBool(tooltip["rtl"], false)! ? TextDirection.rtl : TextDirection.ltr,
+    textDirection: parseBool(tooltip["rtl"], false)!
+        ? TextDirection.rtl
+        : TextDirection.ltr,
     children: tooltip["text_spans"] != null
         ? parseTextSpans(tooltip["text_spans"], theme, (s, eventName,
             [eventData]) {

flet_charts-0.70.0.dev6333/src/flutter/flet_charts/lib/src/utils/radar_chart.dart

@@ -0,0 +1,90 @@
+import 'package:collection/collection.dart';
+import 'package:equatable/equatable.dart';
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flet/flet.dart';
+import 'package:flutter/material.dart';
+
+import 'charts.dart';
+
+RadarShape? parseRadarShape(String? value, [RadarShape? defaultValue]) {
+  if (value == null) return defaultValue;
+  return RadarShape.values.firstWhereOrNull(
+          (e) => e.name.toLowerCase() == value.toLowerCase()) ??
+      defaultValue;
+}
+
+class RadarChartEventData extends Equatable {
+  final String eventType;
+  final int? dataSetIndex;
+  final int? entryIndex;
+  final double? entryValue;
+
+  const RadarChartEventData({
+    required this.eventType,
+    this.dataSetIndex,
+    this.entryIndex,
+    this.entryValue,
+  });
+
+  factory RadarChartEventData.fromDetails(
+      FlTouchEvent event, RadarTouchResponse? response) {
+    final touchedSpot = response?.touchedSpot;
+
+    return RadarChartEventData(
+      eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
+      dataSetIndex: touchedSpot?.touchedDataSetIndex,
+      entryIndex: touchedSpot?.touchedRadarEntryIndex,
+      entryValue: touchedSpot?.touchedRadarEntry.value,
+    );
+  }
+
+  Map<String, dynamic> toMap() => <String, dynamic>{
+        'type': eventType,
+        'data_set_index': dataSetIndex,
+        'entry_index': entryIndex,
+        'entry_value': entryValue,
+      };
+
+  @override
+  List<Object?> get props => [eventType, dataSetIndex, entryIndex, entryValue];
+}
+
+RadarDataSet parseRadarDataSet(
+    Control dataSet, ThemeData theme, BuildContext context) {
+  final fillColor = dataSet.getColor("fill_color", context, Colors.cyan)!;
+  final fillGradient = dataSet.getGradient("fill_gradient", theme);
+  final borderColor = dataSet.getColor("border_color", context, Colors.cyan)!;
+  final borderWidth = dataSet.getDouble("border_width", 2.0)!;
+  final entryRadius = dataSet.getDouble("entry_radius", 5.0)!;
+
+  final entries = dataSet
+      .children("entries")
+      .map((entry) => RadarEntry(value: entry.getDouble("value", 0)!))
+      .toList();
+
+  return RadarDataSet(
+    dataEntries: entries,
+    fillColor: fillColor,
+    fillGradient: fillGradient,
+    borderColor: borderColor,
+    borderWidth: borderWidth,
+    entryRadius: entryRadius,
+  );
+}
+
+RadarChartTitle parseRadarChartTitle(
+    Control title, ThemeData theme, double defaultAngle) {
+  final spansValue = title.get("text_spans");
+  final spans = spansValue != null
+      ? parseTextSpans(spansValue, theme, (control, eventName, [eventData]) {
+          control.triggerEvent(eventName, eventData);
+        })
+      : null;
+
+  return RadarChartTitle(
+    text: title.getString("text", "")!,
+    angle: title.getDouble("angle") ?? defaultAngle,
+    positionPercentageOffset: title.getDouble("position_percentage_offset"),
+    children: spans,
+  );
+}

flet_charts-0.70.0.dev6316/src/flet_charts.egg-info/requires.txt

@@ -1 +0,0 @@
-flet==0.70.0.dev6316