-
Notifications
You must be signed in to change notification settings - Fork 584
feat!: make Tooltip a dataclass which can be used in Control.tooltip
#3837
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
35207ec
initial commit
ndonkoHenri 7882f98
update typing in affected files
ndonkoHenri eaaa664
fix failing test: test.datatable.test_datatable_instance_no_attrs_set
ndonkoHenri 60c9531
introduce TooltipValue
ndonkoHenri a32b8a9
Merge branch 'refs/heads/main' into tooltip-as-dataclass
ndonkoHenri 1f4d59b
cleanup
ndonkoHenri File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import 'dart:convert'; | ||
|
|
||
| import '../models/control.dart'; | ||
| import 'numbers.dart'; | ||
|
|
||
| Duration? parseDuration(Control control, String propName, | ||
| [Duration? defaultValue]) { | ||
| var v = control.attrString(propName, null); | ||
| if (v == null) { | ||
| return null; | ||
| } | ||
|
|
||
| final j1 = json.decode(v); | ||
| return durationFromJSON(j1); | ||
| } | ||
|
|
||
| Duration? durationFromJSON(dynamic json) { | ||
| if (json == null) { | ||
| return null; | ||
| } | ||
| if (json is int || json is double) { | ||
| return Duration(milliseconds: parseInt(json, 0)!); | ||
| } | ||
| return Duration( | ||
| days: parseInt(json["days"], 0)!, | ||
| hours: parseInt(json["hours"], 0)!, | ||
| minutes: parseInt(json["minutes"], 0)!, | ||
| seconds: parseInt(json["seconds"], 0)!, | ||
| milliseconds: parseInt(json["milliseconds"], 0)!, | ||
| microseconds: parseInt(json["microseconds"], 0)!); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| import 'dart:convert'; | ||
|
|
||
| import 'package:collection/collection.dart'; | ||
| import 'package:flutter/material.dart'; | ||
|
|
||
| import '../models/control.dart'; | ||
| import 'borders.dart'; | ||
| import 'box.dart'; | ||
| import 'colors.dart'; | ||
| import 'edge_insets.dart'; | ||
| import 'gradient.dart'; | ||
| import 'images.dart'; | ||
| import 'numbers.dart'; | ||
| import 'others.dart'; | ||
| import 'text.dart'; | ||
| import 'time.dart'; | ||
|
|
||
| TooltipTriggerMode? parseTooltipTriggerMode(String? value, | ||
| [TooltipTriggerMode? defaultValue]) { | ||
| if (value == null) { | ||
| return defaultValue; | ||
| } | ||
| return TooltipTriggerMode.values.firstWhereOrNull( | ||
| (e) => e.name.toLowerCase() == value.toLowerCase()) ?? | ||
| defaultValue; | ||
| } | ||
|
|
||
| Tooltip? parseTooltip( | ||
| Control control, String propName, Widget widget, ThemeData theme) { | ||
| var v = control.attrString(propName, null); | ||
| if (v == null) { | ||
| return null; | ||
| } | ||
| final j = json.decode(v); | ||
| return tooltipFromJSON(j, widget, theme); | ||
| } | ||
|
|
||
| Tooltip? tooltipFromJSON(dynamic j, Widget widget, ThemeData theme) { | ||
| if (j == null) { | ||
| return null; | ||
| } else if (j is String) { | ||
| return Tooltip( | ||
| message: j, | ||
| padding: const EdgeInsets.all(4.0), | ||
| waitDuration: const Duration(milliseconds: 800), | ||
| child: widget, | ||
| ); | ||
| } | ||
| var decoration = boxDecorationFromDetails( | ||
| gradient: gradientFromJSON(theme, j["gradient"]), | ||
| border: borderFromJSON(theme, j["border"]), | ||
| borderRadius: borderRadiusFromJSON(j["border_radius"]), | ||
| shape: parseBoxShape(j["shape"]), | ||
| color: parseColor(theme, j["bgcolor"]), | ||
| blendMode: parseBlendMode(j["blend_mode"]), | ||
| boxShadow: boxShadowsFromJSON(theme, j["box_shadow"]), | ||
| image: decorationImageFromJSON( | ||
| theme, j["image"], null), // TODO: pass correct pageArgs | ||
| ); | ||
| return Tooltip( | ||
| message: j["message"], | ||
| enableFeedback: parseBool(j["enable_feedback"]), | ||
| enableTapToDismiss: parseBool(j["enable_tap_to_dismiss"], true)!, | ||
| excludeFromSemantics: parseBool(j["exclude_from_semantics"]), | ||
| height: parseDouble(j["height"]), | ||
| exitDuration: durationFromJSON(j["exit_duration"]), | ||
| preferBelow: parseBool(j["prefer_below"]), | ||
| padding: edgeInsetsFromJson(j["padding"]), | ||
| decoration: decoration, | ||
| textStyle: textStyleFromJson(theme, j["text_style"]), | ||
| verticalOffset: parseDouble(j["vertical_offset"]), | ||
| margin: edgeInsetsFromJson(j["margin"]), | ||
| textAlign: parseTextAlign(j["text_align"]), | ||
| showDuration: durationFromJSON(j["show_duration"]), | ||
| waitDuration: durationFromJSON(j["wait_duration"]), | ||
| triggerMode: parseTooltipTriggerMode(j["trigger_mode"]), | ||
| child: widget, | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.