Skip to content

Conversation

ndonkoHenri
Copy link
Contributor

@ndonkoHenri ndonkoHenri commented Aug 20, 2024

Summary by Sourcery

Refactor the Tooltip component to be a dataclass, enhancing its flexibility and integration across various components. This change allows tooltips to be specified as either a simple string or a more complex Tooltip instance, providing more customization options for developers.

New Features:

  • Introduce a new Tooltip dataclass to provide text labels for user interface elements, allowing for more structured and flexible tooltip configurations.

Enhancements:

  • Refactor the Tooltip implementation to use a dataclass, simplifying the code and improving maintainability.
  • Update various components to support the new Tooltip dataclass, allowing tooltips to be specified as either a string or a Tooltip instance.

Chores:

  • Remove the old Tooltip class implementation and associated test files, cleaning up deprecated code.

Copy link
Contributor

sourcery-ai bot commented Aug 20, 2024

Reviewer's Guide by Sourcery

This pull request significantly refactors the Tooltip implementation in the Flet framework. The main changes include converting the Tooltip class from a Control to a dataclass, updating its usage across various controls, and modifying the tooltip parsing and creation logic in Dart. These changes aim to make the Tooltip more flexible and easier to use within the Control.tooltip attribute.

File-Level Changes

Files Changes
sdk/python/packages/flet-core/src/flet_core/tooltip.py Converted Tooltip class from a Control to a dataclass with simplified attributes
sdk/python/packages/flet-core/src/flet_core/control.py Updated Control class to use the new Tooltip dataclass
packages/flet/lib/src/utils/tooltip.dart Added new utility functions for parsing and creating tooltips in Dart
sdk/python/packages/flet-core/src/flet_core/divider.py
sdk/python/packages/flet-core/src/flet_core/navigation_bar.py
sdk/python/packages/flet-core/src/flet_core/segmented_button.py
sdk/python/packages/flet-core/src/flet_core/video.py
sdk/python/packages/flet-core/src/flet_core/text_style.py
sdk/python/packages/flet-core/src/flet_core/animated_switcher.py
sdk/python/packages/flet-core/src/flet_core/card.py
sdk/python/packages/flet-core/src/flet_core/charts/bar_chart.py
sdk/python/packages/flet-core/src/flet_core/charts/line_chart.py
sdk/python/packages/flet-core/src/flet_core/charts/pie_chart.py
sdk/python/packages/flet-core/src/flet_core/checkbox.py
sdk/python/packages/flet-core/src/flet_core/chip.py
sdk/python/packages/flet-core/src/flet_core/circle_avatar.py
sdk/python/packages/flet-core/src/flet_core/constrained_control.py
sdk/python/packages/flet-core/src/flet_core/container.py
sdk/python/packages/flet-core/src/flet_core/cupertino_action_sheet.py
sdk/python/packages/flet-core/src/flet_core/cupertino_action_sheet_action.py
sdk/python/packages/flet-core/src/flet_core/cupertino_activity_indicator.py
sdk/python/packages/flet-core/src/flet_core/cupertino_button.py
sdk/python/packages/flet-core/src/flet_core/cupertino_checkbox.py
sdk/python/packages/flet-core/src/flet_core/cupertino_date_picker.py
sdk/python/packages/flet-core/src/flet_core/cupertino_filled_button.py
sdk/python/packages/flet-core/src/flet_core/cupertino_list_tile.py
sdk/python/packages/flet-core/src/flet_core/cupertino_picker.py
sdk/python/packages/flet-core/src/flet_core/cupertino_radio.py
sdk/python/packages/flet-core/src/flet_core/cupertino_segmented_button.py
sdk/python/packages/flet-core/src/flet_core/cupertino_slider.py
sdk/python/packages/flet-core/src/flet_core/cupertino_sliding_segmented_button.py
sdk/python/packages/flet-core/src/flet_core/cupertino_switch.py
sdk/python/packages/flet-core/src/flet_core/cupertino_textfield.py
sdk/python/packages/flet-core/src/flet_core/cupertino_timer_picker.py
sdk/python/packages/flet-core/src/flet_core/datatable.py
sdk/python/packages/flet-core/src/flet_core/date_picker.py
sdk/python/packages/flet-core/src/flet_core/dismissible.py
sdk/python/packages/flet-core/src/flet_core/dropdown.py
sdk/python/packages/flet-core/src/flet_core/elevated_button.py
sdk/python/packages/flet-core/src/flet_core/expansion_tile.py
sdk/python/packages/flet-core/src/flet_core/filled_button.py
sdk/python/packages/flet-core/src/flet_core/filled_tonal_button.py
sdk/python/packages/flet-core/src/flet_core/flet_app.py
sdk/python/packages/flet-core/src/flet_core/floating_action_button.py
sdk/python/packages/flet-core/src/flet_core/form_field_control.py
sdk/python/packages/flet-core/src/flet_core/icon.py
sdk/python/packages/flet-core/src/flet_core/icon_button.py
sdk/python/packages/flet-core/src/flet_core/image.py
sdk/python/packages/flet-core/src/flet_core/interactive_viewer.py
sdk/python/packages/flet-core/src/flet_core/list_tile.py
sdk/python/packages/flet-core/src/flet_core/lottie.py
sdk/python/packages/flet-core/src/flet_core/map/map.py
sdk/python/packages/flet-core/src/flet_core/markdown.py
sdk/python/packages/flet-core/src/flet_core/matplotlib_chart.py
sdk/python/packages/flet-core/src/flet_core/menu_item_button.py
sdk/python/packages/flet-core/src/flet_core/outlined_button.py
sdk/python/packages/flet-core/src/flet_core/pagelet.py
sdk/python/packages/flet-core/src/flet_core/placeholder.py
sdk/python/packages/flet-core/src/flet_core/plotly_chart.py
sdk/python/packages/flet-core/src/flet_core/popup_menu_button.py
sdk/python/packages/flet-core/src/flet_core/progress_bar.py
sdk/python/packages/flet-core/src/flet_core/progress_ring.py
sdk/python/packages/flet-core/src/flet_core/radio.py
sdk/python/packages/flet-core/src/flet_core/range_slider.py
sdk/python/packages/flet-core/src/flet_core/rive.py
sdk/python/packages/flet-core/src/flet_core/safe_area.py
sdk/python/packages/flet-core/src/flet_core/search_bar.py
sdk/python/packages/flet-core/src/flet_core/semantics.py
sdk/python/packages/flet-core/src/flet_core/shader_mask.py
sdk/python/packages/flet-core/src/flet_core/slider.py
sdk/python/packages/flet-core/src/flet_core/submenu_button.py
sdk/python/packages/flet-core/src/flet_core/switch.py
sdk/python/packages/flet-core/src/flet_core/text.py
sdk/python/packages/flet-core/src/flet_core/text_button.py
sdk/python/packages/flet-core/src/flet_core/textfield.py
sdk/python/packages/flet-core/src/flet_core/time_picker.py
sdk/python/packages/flet-core/src/flet_core/transparent_pointer.py
sdk/python/packages/flet-core/src/flet_core/webview.py
sdk/python/packages/flet-core/src/flet_core/window_drag_area.py
Modified tooltip-related imports and usage across various control files
sdk/python/packages/flet-core/src/flet_core/types.py
packages/flet/lib/src/utils/time.dart
Added Duration dataclass and related utility functions
packages/flet/lib/src/utils/box.dart Updated boxDecorationFromJSON function to handle new tooltip properties
packages/flet/lib/src/controls/create_control.dart
packages/flet/lib/src/controls/tooltip.dart
sdk/python/packages/flet-core/tests/test_tooltip.py
Removed old TooltipControl implementation

Tips
  • Trigger a new Sourcery review by commenting @sourcery-ai review on the pull request.
  • Continue your discussion with Sourcery by replying directly to review comments.
  • You can change your review settings at any time by accessing your dashboard:
    • Enable or disable the Sourcery-generated pull request summary or reviewer's guide;
    • Change the review language;
  • You can always contact us if you have any questions or feedback.

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @ndonkoHenri - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟡 General issues: 2 issues found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟡 Complexity: 2 issues found
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.

LONG_PRESS = "long_press"


@dataclass
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Consider adding documentation for the new Tooltip dataclass

The change to a dataclass is good, but it would be helpful to add a class-level docstring explaining the new structure and any breaking changes from the previous implementation.

Suggested change
@dataclass
@dataclass
class Tooltip:
"""
Tooltips provide text labels which help explain the function of a button or other user interface action.
This dataclass implementation replaces the previous Tooltip class.
It offers a more concise and type-safe way to create and manage tooltips.
"""

return tooltipFromJSON(j, widget, theme);
}

Tooltip? tooltipFromJSON(dynamic j, Widget widget, ThemeData theme) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Add documentation for the expected JSON structure

Please add a comment explaining the expected JSON structure for this function. This will help developers correctly format their tooltip data.

Suggested change
Tooltip? tooltipFromJSON(dynamic j, Widget widget, ThemeData theme) {
/// Converts a JSON object to a Tooltip widget.
/// Expected JSON structure:
/// {
/// "message": "Tooltip text",
/// "preferBelow": true,
/// "verticalOffset": 20.0
/// }
Tooltip? tooltipFromJSON(dynamic j, Widget widget, ThemeData theme) {

animate_offset: AnimationValue = None,
on_animation_end: OptionalEventCallable = None,
tooltip: Optional[str] = None,
tooltip: Optional[Union[str, Tooltip]] = None,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (complexity): Consider using a single type for the tooltip parameter.

The recent change to the tooltip parameter, switching from Optional[str] to Optional[Union[str, Tooltip]], introduces additional complexity. Handling multiple types increases the complexity of the code, as it requires additional logic to manage both str and Tooltip types. This can lead to more complex conditionals and type-checking, potentially increasing maintenance overhead. To simplify, consider using a single type for tooltip, or if Tooltip is necessary, ensure its usage is well-documented and justified. This will help maintain readability and ease of understanding for future developers.

AnimationValue = Optional[Union[bool, int, Animation]]


@dataclass
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (complexity): Consider using a single unit of time for duration values.

The introduction of the Duration class has increased the complexity of the code. It adds a new data structure with multiple fields, which can lead to confusion and potential misuse. The redundancy with existing time representations (like using integers for milliseconds) further complicates the code. To simplify, consider using a single unit of time (e.g., milliseconds) for all duration values and avoid introducing a new class unless necessary for additional functionality. This will reduce cognitive load and make the code easier to maintain.

@FeodorFitsner
Copy link
Contributor

FeodorFitsner commented Aug 23, 2024

Oh, well, could you merge main branch into this PR and resolve conflicts please?

# Conflicts:
#	packages/flet/lib/src/controls/tooltip.dart
#	sdk/python/packages/flet-core/src/flet_core/animated_switcher.py
#	sdk/python/packages/flet-core/src/flet_core/card.py
#	sdk/python/packages/flet-core/src/flet_core/charts/bar_chart.py
#	sdk/python/packages/flet-core/src/flet_core/charts/line_chart.py
#	sdk/python/packages/flet-core/src/flet_core/charts/pie_chart.py
#	sdk/python/packages/flet-core/src/flet_core/checkbox.py
#	sdk/python/packages/flet-core/src/flet_core/chip.py
#	sdk/python/packages/flet-core/src/flet_core/circle_avatar.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_action_sheet.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_action_sheet_action.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_activity_indicator.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_button.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_checkbox.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_date_picker.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_list_tile.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_picker.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_radio.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_segmented_button.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_slider.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_sliding_segmented_button.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_switch.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_textfield.py
#	sdk/python/packages/flet-core/src/flet_core/cupertino_timer_picker.py
#	sdk/python/packages/flet-core/src/flet_core/datatable.py
#	sdk/python/packages/flet-core/src/flet_core/dismissible.py
#	sdk/python/packages/flet-core/src/flet_core/dropdown.py
#	sdk/python/packages/flet-core/src/flet_core/elevated_button.py
#	sdk/python/packages/flet-core/src/flet_core/expansion_tile.py
#	sdk/python/packages/flet-core/src/flet_core/flet_app.py
#	sdk/python/packages/flet-core/src/flet_core/floating_action_button.py
#	sdk/python/packages/flet-core/src/flet_core/form_field_control.py
#	sdk/python/packages/flet-core/src/flet_core/icon.py
#	sdk/python/packages/flet-core/src/flet_core/icon_button.py
#	sdk/python/packages/flet-core/src/flet_core/image.py
#	sdk/python/packages/flet-core/src/flet_core/interactive_viewer.py
#	sdk/python/packages/flet-core/src/flet_core/list_tile.py
#	sdk/python/packages/flet-core/src/flet_core/lottie.py
#	sdk/python/packages/flet-core/src/flet_core/map/map.py
#	sdk/python/packages/flet-core/src/flet_core/markdown.py
#	sdk/python/packages/flet-core/src/flet_core/matplotlib_chart.py
#	sdk/python/packages/flet-core/src/flet_core/menu_item_button.py
#	sdk/python/packages/flet-core/src/flet_core/outlined_button.py
#	sdk/python/packages/flet-core/src/flet_core/pagelet.py
#	sdk/python/packages/flet-core/src/flet_core/placeholder.py
#	sdk/python/packages/flet-core/src/flet_core/plotly_chart.py
#	sdk/python/packages/flet-core/src/flet_core/popup_menu_button.py
#	sdk/python/packages/flet-core/src/flet_core/progress_bar.py
#	sdk/python/packages/flet-core/src/flet_core/progress_ring.py
#	sdk/python/packages/flet-core/src/flet_core/radio.py
#	sdk/python/packages/flet-core/src/flet_core/range_slider.py
#	sdk/python/packages/flet-core/src/flet_core/rive.py
#	sdk/python/packages/flet-core/src/flet_core/safe_area.py
#	sdk/python/packages/flet-core/src/flet_core/search_bar.py
#	sdk/python/packages/flet-core/src/flet_core/segmented_button.py
#	sdk/python/packages/flet-core/src/flet_core/semantics.py
#	sdk/python/packages/flet-core/src/flet_core/shader_mask.py
#	sdk/python/packages/flet-core/src/flet_core/slider.py
#	sdk/python/packages/flet-core/src/flet_core/submenu_button.py
#	sdk/python/packages/flet-core/src/flet_core/switch.py
#	sdk/python/packages/flet-core/src/flet_core/text.py
#	sdk/python/packages/flet-core/src/flet_core/text_button.py
#	sdk/python/packages/flet-core/src/flet_core/textfield.py
#	sdk/python/packages/flet-core/src/flet_core/tooltip.py
#	sdk/python/packages/flet-core/src/flet_core/transparent_pointer.py
#	sdk/python/packages/flet-core/src/flet_core/video.py
#	sdk/python/packages/flet-core/src/flet_core/webview.py
#	sdk/python/packages/flet-core/src/flet_core/window_drag_area.py
#	sdk/python/packages/flet-core/tests/test_tooltip.py
@FeodorFitsner FeodorFitsner merged commit edf1fb6 into main Aug 27, 2024
2 checks passed
@FeodorFitsner FeodorFitsner deleted the tooltip-as-dataclass branch August 27, 2024 04:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants