flet-charts 0.2.0.dev35__tar.gz → 0.2.0.dev40__tar.gz

{flet_charts-0.2.0.dev35/src/flet_charts.egg-info → flet_charts-0.2.0.dev40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-charts
-Version: 0.2.0.dev35
+Version: 0.2.0.dev40
 Summary: A Flet extension for creating interactive charts and graphs.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flet-charts"
-version = "0.2.0.dev35"
+version = "0.2.0.dev40"
 description = "A Flet extension for creating interactive charts and graphs."
 readme = "README.md"
 authors = [{ name = "Flet contributors", email = "hello@flet.dev" }]

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flet_charts/bar_chart.py

@@ -88,6 +88,48 @@ class BarChartTooltip:
     Controls showing tooltip on top or bottom, default is auto.
     """
 
+    def copy_with(
+        self,
+        *,
+        bgcolor: Optional[ft.ColorValue] = None,
+        border_radius: Optional[ft.BorderRadiusValue] = None,
+        margin: Optional[ft.Number] = None,
+        padding: Optional[ft.PaddingValue] = None,
+        max_width: Optional[ft.Number] = None,
+        rotate_angle: Optional[ft.Number] = None,
+        horizontal_offset: Optional[ft.Number] = None,
+        border_side: Optional[ft.BorderSide] = None,
+        fit_inside_horizontally: Optional[bool] = None,
+        fit_inside_vertically: Optional[bool] = None,
+        direction: Optional[BarChartTooltipDirection] = None,
+    ) -> "BarChartTooltip":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return BarChartTooltip(
+            bgcolor=bgcolor if bgcolor is not None else self.bgcolor,
+            border_radius=border_radius
+            if border_radius is not None
+            else self.border_radius,
+            margin=margin if margin is not None else self.margin,
+            padding=padding if padding is not None else self.padding,
+            max_width=max_width if max_width is not None else self.max_width,
+            rotate_angle=rotate_angle
+            if rotate_angle is not None
+            else self.rotate_angle,
+            horizontal_offset=horizontal_offset
+            if horizontal_offset is not None
+            else self.horizontal_offset,
+            border_side=border_side if border_side is not None else self.border_side,
+            fit_inside_horizontally=fit_inside_horizontally
+            if fit_inside_horizontally is not None
+            else self.fit_inside_horizontally,
+            fit_inside_vertically=fit_inside_vertically
+            if fit_inside_vertically is not None
+            else self.fit_inside_vertically,
+            direction=direction if direction is not None else self.direction,
+        )
+
 
 @dataclass
 class BarChartEvent(ft.Event["BarChart"]):
@@ -137,9 +179,6 @@ class BarChart(ft.ConstrainedControl):
     )
     """
     Controls chart implicit animation.
-
-    Value is of [`AnimationValue`](https://flet.dev/docs/reference/types/animationvalue)
-    type.
     """
 
     interactive: bool = True

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flet_charts/bar_chart_rod.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Optional
+from typing import Optional, Union
 
 import flet as ft
 
@@ -22,6 +22,26 @@ class BarChartRodTooltip(ChartDataPointTooltip):
     When `None`, defaults to [`BarChartRod.to_y`][(p).].
     """
 
+    def copy_with(
+        self,
+        *,
+        text: Optional[str] = None,
+        text_style: Optional[ft.TextStyle] = None,
+        text_align: Optional[ft.TextAlign] = None,
+        text_spans: Optional[list[ft.TextSpan]] = None,
+    ) -> "BarChartRodTooltip":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return BarChartRodTooltip(
+            text=text if text is not None else self.text,
+            text_style=text_style if text_style is not None else self.text_style,
+            text_align=text_align if text_align is not None else self.text_align,
+            text_spans=text_spans.copy()
+            if text_spans is not None
+            else (self.text_spans.copy() if self.text_spans is not None else None),
+        )
+
 
 @ft.control("BarChartRod")
 class BarChartRod(ft.BaseControl):
@@ -94,7 +114,9 @@ class BarChartRod(ft.BaseControl):
     [`BarChart.interactive`][(p).] is set to `False`.
     """
 
-    tooltip: BarChartRodTooltip = field(default_factory=lambda: BarChartRodTooltip())
+    tooltip: Union[BarChartRodTooltip, str] = field(
+        default_factory=lambda: BarChartRodTooltip()
+    )
     """
     The rod's tooltip configuration for this rod.
     """
@@ -103,3 +125,11 @@ class BarChartRod(ft.BaseControl):
     """
     Whether a tooltip should be shown on top of hovered bar.
     """
+
+    def before_update(self):
+        super().before_update()
+        self._internals["tooltip"] = (
+            BarChartRodTooltip(text=self.tooltip)
+            if isinstance(self.tooltip, str)
+            else self.tooltip
+        )

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flet_charts/line_chart.py

@@ -27,6 +27,20 @@ class LineChartEventSpot:
     The line's point index or `-1` if no point was hovered.
     """
 
+    def copy_with(
+        self,
+        *,
+        bar_index: Optional[int] = None,
+        spot_index: Optional[int] = None,
+    ) -> "LineChartEventSpot":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return LineChartEventSpot(
+            bar_index=bar_index if bar_index is not None else self.bar_index,
+            spot_index=spot_index if spot_index is not None else self.spot_index,
+        )
+
 
 @dataclass
 class LineChartEvent(ft.Event["LineChart"]):
@@ -102,6 +116,50 @@ class LineChartTooltip:
     Whether to force the tooltip container to top of the line.
     """
 
+    def copy_with(
+        self,
+        *,
+        bgcolor: Optional[ft.ColorValue] = None,
+        border_radius: Optional[ft.BorderRadiusValue] = None,
+        margin: Optional[ft.Number] = None,
+        padding: Optional[ft.PaddingValue] = None,
+        max_width: Optional[ft.Number] = None,
+        rotate_angle: Optional[ft.Number] = None,
+        horizontal_offset: Optional[ft.Number] = None,
+        border_side: Optional[ft.BorderSide] = None,
+        fit_inside_horizontally: Optional[bool] = None,
+        fit_inside_vertically: Optional[bool] = None,
+        show_on_top_of_chart_box_area: Optional[bool] = None,
+    ) -> "LineChartTooltip":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return LineChartTooltip(
+            bgcolor=bgcolor if bgcolor is not None else self.bgcolor,
+            border_radius=border_radius
+            if border_radius is not None
+            else self.border_radius,
+            margin=margin if margin is not None else self.margin,
+            padding=padding if padding is not None else self.padding,
+            max_width=max_width if max_width is not None else self.max_width,
+            rotate_angle=rotate_angle
+            if rotate_angle is not None
+            else self.rotate_angle,
+            horizontal_offset=horizontal_offset
+            if horizontal_offset is not None
+            else self.horizontal_offset,
+            border_side=border_side if border_side is not None else self.border_side,
+            fit_inside_horizontally=fit_inside_horizontally
+            if fit_inside_horizontally is not None
+            else self.fit_inside_horizontally,
+            fit_inside_vertically=fit_inside_vertically
+            if fit_inside_vertically is not None
+            else self.fit_inside_vertically,
+            show_on_top_of_chart_box_area=show_on_top_of_chart_box_area
+            if show_on_top_of_chart_box_area is not None
+            else self.show_on_top_of_chart_box_area,
+        )
+
 
 @ft.control("LineChart")
 class LineChart(ft.ConstrainedControl):

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flet_charts/line_chart_data_point.py

@@ -19,6 +19,26 @@ class LineChartDataPointTooltip(ChartDataPointTooltip):
     When `None`, defaults to [`LineChartDataPoint.y`][(p).].
     """
 
+    def copy_with(
+        self,
+        *,
+        text: Optional[str] = None,
+        text_style: Optional[ft.TextStyle] = None,
+        text_align: Optional[ft.TextAlign] = None,
+        text_spans: Optional[list[ft.TextSpan]] = None,
+    ) -> "LineChartDataPointTooltip":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return LineChartDataPointTooltip(
+            text=text if text is not None else self.text,
+            text_style=text_style if text_style is not None else self.text_style,
+            text_align=text_align if text_align is not None else self.text_align,
+            text_spans=text_spans.copy()
+            if text_spans is not None
+            else (self.text_spans.copy() if self.text_spans is not None else None),
+        )
+
 
 @ft.control("LineChartDataPoint")
 class LineChartDataPoint(ft.BaseControl):
@@ -69,7 +89,7 @@ class LineChartDataPoint(ft.BaseControl):
     specify line style to draw.
     """
 
-    tooltip: LineChartDataPointTooltip = field(
+    tooltip: Union[LineChartDataPointTooltip, str] = field(
         default_factory=lambda: LineChartDataPointTooltip()
     )
     """
@@ -80,3 +100,11 @@ class LineChartDataPoint(ft.BaseControl):
     """
     Whether the [`tooltip`][..] should be shown when this data point is hovered over.
     """
+
+    def before_update(self):
+        super().before_update()
+        self._internals["tooltip"] = (
+            LineChartDataPointTooltip(text=self.tooltip)
+            if isinstance(self.tooltip, str)
+            else self.tooltip
+        )

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flet_charts/matplotlib_chart.py

@@ -21,7 +21,8 @@ class MatplotlibChart(ft.Container):
     Displays a [Matplotlib](https://matplotlib.org/) chart.
 
     Warning:
-        This control requires the [`matplotlib`](https://matplotlib.org/) Python package to be installed.
+        This control requires the [`matplotlib`](https://matplotlib.org/)
+        Python package to be installed.
 
         See this [installation guide](index.md#installation) for more information.
     """

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flet_charts/scatter_chart.py

@@ -64,6 +64,48 @@ class ScatterChartTooltip:
     Forces the tooltip to shift vertically inside the chart, if overflow happens.
     """
 
+    def copy_with(
+        self,
+        *,
+        bgcolor: Optional[ft.ColorValue] = None,
+        border_radius: Optional[ft.BorderRadiusValue] = None,
+        padding: Optional[ft.PaddingValue] = None,
+        max_width: Optional[ft.Number] = None,
+        rotate_angle: Optional[ft.Number] = None,
+        horizontal_offset: Optional[ft.Number] = None,
+        horizontal_alignment: Optional[ChartHorizontalAlignment] = None,
+        border_side: Optional[ft.BorderSide] = None,
+        fit_inside_horizontally: Optional[bool] = None,
+        fit_inside_vertically: Optional[bool] = None,
+    ) -> "ScatterChartTooltip":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return ScatterChartTooltip(
+            bgcolor=bgcolor if bgcolor is not None else self.bgcolor,
+            border_radius=border_radius
+            if border_radius is not None
+            else self.border_radius,
+            padding=padding if padding is not None else self.padding,
+            max_width=max_width if max_width is not None else self.max_width,
+            rotate_angle=rotate_angle
+            if rotate_angle is not None
+            else self.rotate_angle,
+            horizontal_offset=horizontal_offset
+            if horizontal_offset is not None
+            else self.horizontal_offset,
+            horizontal_alignment=horizontal_alignment
+            if horizontal_alignment is not None
+            else self.horizontal_alignment,
+            border_side=border_side if border_side is not None else self.border_side,
+            fit_inside_horizontally=fit_inside_horizontally
+            if fit_inside_horizontally is not None
+            else self.fit_inside_horizontally,
+            fit_inside_vertically=fit_inside_vertically
+            if fit_inside_vertically is not None
+            else self.fit_inside_vertically,
+        )
+
 
 @dataclass
 class ScatterChartEvent(ft.Event["ScatterChart"]):

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flet_charts/scatter_chart_spot.py

@@ -21,6 +21,26 @@ class ScatterChartSpotTooltip(ChartDataPointTooltip):
     When `None`, defaults to [`ScatterChartSpot.y`][(p).].
     """
 
+    def copy_with(
+        self,
+        *,
+        text: Optional[str] = None,
+        text_style: Optional[ft.TextStyle] = None,
+        text_align: Optional[ft.TextAlign] = None,
+        text_spans: Optional[list[ft.TextSpan]] = None,
+    ) -> "ScatterChartSpotTooltip":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return ScatterChartSpotTooltip(
+            text=text if text is not None else self.text,
+            text_style=text_style if text_style is not None else self.text_style,
+            text_align=text_align if text_align is not None else self.text_align,
+            text_spans=text_spans.copy()
+            if text_spans is not None
+            else (self.text_spans.copy() if self.text_spans is not None else None),
+        )
+
 
 @ft.control("ScatterChartSpot")
 class ScatterChartSpot(ft.BaseControl):
@@ -75,7 +95,7 @@ class ScatterChartSpot(ft.BaseControl):
     TBD
     """
 
-    tooltip: ScatterChartSpotTooltip = field(
+    tooltip: Union[ScatterChartSpotTooltip, str] = field(
         default_factory=lambda: ScatterChartSpotTooltip()
     )
     """
@@ -101,3 +121,11 @@ class ScatterChartSpot(ft.BaseControl):
     """
     TBD
     """
+
+    def before_update(self):
+        super().before_update()
+        self._internals["tooltip"] = (
+            ScatterChartSpotTooltip(text=self.tooltip)
+            if isinstance(self.tooltip, str)
+            else self.tooltip
+        )

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flet_charts/types.py

@@ -45,6 +45,26 @@ class ChartGridLines:
     followed by blank spaces 10 pixels long. By default, a solid line is drawn.
     """
 
+    def copy_with(
+        self,
+        *,
+        interval: Optional[ft.Number] = None,
+        color: Optional[ft.ColorValue] = None,
+        width: Optional[ft.Number] = None,
+        dash_pattern: Optional[list[int]] = None,
+    ) -> "ChartGridLines":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return ChartGridLines(
+            interval=interval if interval is not None else self.interval,
+            color=color if color is not None else self.color,
+            width=width if width is not None else self.width,
+            dash_pattern=dash_pattern.copy()
+            if dash_pattern is not None
+            else (self.dash_pattern.copy() if self.dash_pattern is not None else None),
+        )
+
 
 @dataclass
 class ChartPointShape:
@@ -88,6 +108,28 @@ class ChartCirclePoint(ChartPointShape):
     def __post_init__(self):
         self._type = "ChartCirclePoint"
 
+    def copy_with(
+        self,
+        *,
+        color: Optional[ft.ColorValue] = None,
+        radius: Optional[ft.Number] = None,
+        stroke_color: Optional[ft.ColorValue] = None,
+        stroke_width: Optional[ft.Number] = None,
+    ) -> "ChartCirclePoint":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return ChartCirclePoint(
+            color=color if color is not None else self.color,
+            radius=radius if radius is not None else self.radius,
+            stroke_color=stroke_color
+            if stroke_color is not None
+            else self.stroke_color,
+            stroke_width=stroke_width
+            if stroke_width is not None
+            else self.stroke_width,
+        )
+
 
 @dataclass
 class ChartSquarePoint(ChartPointShape):
@@ -116,6 +158,28 @@ class ChartSquarePoint(ChartPointShape):
     def __post_init__(self):
         self._type = "ChartSquarePoint"
 
+    def copy_with(
+        self,
+        *,
+        color: Optional[ft.ColorValue] = None,
+        size: Optional[ft.Number] = None,
+        stroke_color: Optional[ft.ColorValue] = None,
+        stroke_width: Optional[ft.Number] = None,
+    ) -> "ChartSquarePoint":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return ChartSquarePoint(
+            color=color if color is not None else self.color,
+            size=size if size is not None else self.size,
+            stroke_color=stroke_color
+            if stroke_color is not None
+            else self.stroke_color,
+            stroke_width=stroke_width
+            if stroke_width is not None
+            else self.stroke_width,
+        )
+
 
 @dataclass
 class ChartCrossPoint(ChartPointShape):
@@ -140,6 +204,22 @@ class ChartCrossPoint(ChartPointShape):
     def __post_init__(self):
         self._type = "ChartCrossPoint"
 
+    def copy_with(
+        self,
+        *,
+        color: Optional[ft.ColorValue] = None,
+        size: Optional[ft.Number] = None,
+        width: Optional[ft.Number] = None,
+    ) -> "ChartCrossPoint":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return ChartCrossPoint(
+            color=color if color is not None else self.color,
+            size=size if size is not None else self.size,
+            width=width if width is not None else self.width,
+        )
+
 
 @dataclass
 class ChartPointLine:
@@ -160,6 +240,26 @@ class ChartPointLine:
     The line's dash pattern.
     """
 
+    def copy_with(
+        self,
+        *,
+        color: Optional[ft.ColorValue] = None,
+        width: Optional[ft.Number] = None,
+        dash_pattern: Optional[list[int]] = None,
+    ) -> "ChartPointLine":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return ChartPointLine(
+            color=color if color is not None else self.color,
+            width=width if width is not None else self.width,
+            dash_pattern=dash_pattern.copy()
+            if dash_pattern is not None
+            else self.dash_pattern.copy()
+            if self.dash_pattern is not None
+            else None,
+        )
+
 
 class ChartEventType(Enum):
     """The type of event that occurred on the chart."""
@@ -270,6 +370,28 @@ class ChartDataPointTooltip:
     Additional text spans to show on a tooltip.
     """
 
+    def copy_with(
+        self,
+        *,
+        text: Optional[str] = None,
+        text_style: Optional[ft.TextStyle] = None,
+        text_align: Optional[ft.TextAlign] = None,
+        text_spans: Optional[list[ft.TextSpan]] = None,
+    ) -> "ChartDataPointTooltip":
+        """
+        Returns a copy of this object with the specified properties overridden.
+        """
+        return ChartDataPointTooltip(
+            text=text if text is not None else self.text,
+            text_style=text_style if text_style is not None else self.text_style,
+            text_align=text_align if text_align is not None else self.text_align,
+            text_spans=text_spans.copy()
+            if text_spans is not None
+            else self.text_spans.copy()
+            if self.text_spans is not None
+            else None,
+        )
+
 
 class ChartHorizontalAlignment(Enum):
     """Defines an element's horizontal alignment to given point."""

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40/src/flet_charts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-charts
-Version: 0.2.0.dev35
+Version: 0.2.0.dev40
 Summary: A Flet extension for creating interactive charts and graphs.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flutter/flet_charts/lib/src/utils/bar_chart.dart

@@ -84,9 +84,10 @@ BarTouchTooltipData? parseBarTouchTooltipData(
 BarTooltipItem? parseBarTooltipItem(Control rod, BuildContext context) {
   if (!rod.getBool("show_tooltip", true)!) return null;
 
-  final theme = Theme.of(context);
+  var tooltip = rod.internals?["tooltip"];
+  if (tooltip == null) return null;
 
-  var tooltip = rod.get("tooltip");
+  final theme = Theme.of(context);
   var tooltipTextStyle =
       parseTextStyle(tooltip["text_style"], theme, const TextStyle())!;
   if (tooltipTextStyle.color == null) {

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flutter/flet_charts/lib/src/utils/line_chart.dart

@@ -52,9 +52,10 @@ LineTooltipItem? parseLineTooltipItem(
     Control dataPoint, LineBarSpot spot, BuildContext context) {
   if (!dataPoint.getBool("show_tooltip", true)!) return null;
 
-  final theme = Theme.of(context);
+  var tooltip = dataPoint.internals?["tooltip"];
+  if (tooltip == null) return null;
 
-  var tooltip = dataPoint.get("tooltip");
+  final theme = Theme.of(context);
   var style = parseTextStyle(tooltip["text_style"], theme, const TextStyle())!;
   if (style.color == null) {
     style = style.copyWith(

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flutter/flet_charts/lib/src/utils/scatter_chart.dart

@@ -65,9 +65,10 @@ ScatterTooltipItem? parseScatterTooltipItem(
     Control dataPoint, ScatterSpot spot, BuildContext context) {
   if (!dataPoint.getBool("show_tooltip", true)!) return null;
 
-  final theme = Theme.of(context);
+  var tooltip = dataPoint.internals?["tooltip"];
+  if (tooltip == null) return null;
 
-  var tooltip = dataPoint.get("tooltip");
+  final theme = Theme.of(context);
   var style = parseTextStyle(tooltip["text_style"], theme, const TextStyle())!;
   if (style.color == null) {
     style = style.copyWith(color: spot.dotPainter.mainColor);

{flet_charts-0.2.0.dev35 → flet_charts-0.2.0.dev40}/src/flutter/flet_charts/pubspec.lock

@@ -134,7 +134,7 @@ packages:
     description:
       path: "packages/flet"
       ref: main
-      resolved-ref: cf8823c5d766ea7866480986aa3ee871f4091e78
+      resolved-ref: b2dda6915487cf7147995f4f86a2490da355bcd6
       url: "https://github.com/flet-dev/flet.git"
     source: git
     version: "0.70.0"