Skip to content
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.

Sign up for GitHub

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

When toolbar item is clicked, first pop the route and then call its callback - Fixes #346 #381

Merged
merged 2 commits into from
Mar 3, 2023
Merged

When toolbar item is clicked, first pop the route and then call its callback - Fixes #346 #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
772e5ad
fix: when a toolbar item is clicked, remove route first and then call…
whiplashoo Mar 3, 2023
e440e47
chore: update version and changelog
whiplashoo Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## [1.12.2]
* Fixed a bug where clicking on a overflowed toolbar item with a navigation callback wouldn't work ([#346](https://github.com/GroovinChip/macos_ui/issues/346)).

## [1.12.1+1]
* Fixed a typo in the December abbreviation displayed in the `MacosDatePicker`.

Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ packages:
path: ".."
relative: true
source: path
version: "1.12.1+1"
version: "1.12.2"
matcher:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion lib/src/layout/toolbar/toolbar_overflow_menu_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ class _ToolbarOverflowMenuItemState extends State<ToolbarOverflowMenuItem> {
}

void _handleOnTap() {
widget.onPressed?.call();
Navigator.pop(context);
widget.onPressed?.call();
}

bool get _isHighlighted => _isHovered || widget.isSelected == true;
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: macos_ui
description: Flutter widgets and themes implementing the current macOS design language.
version: 1.12.1+1
version: 1.12.2
homepage: "https://macosui.dev"
repository: "https://github.com/GroovinChip/macos_ui"

Expand Down