-
Notifications
You must be signed in to change notification settings - Fork 3.9k
[material_ui] Port flutter/flutter #189157 "Fix TabBar assertion to allow indicatorWeight: 0 with a themed indicator"
#12696
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
Open
Massinissa-Mouhoub
wants to merge
1
commit into
flutter:main
Choose a base branch
from
Massinissa-Mouhoub:port-189157
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+125
−5
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1066,8 +1066,7 @@ class TabBar extends StatefulWidget implements PreferredSizeWidget { | |
| this.tabAlignment, | ||
| this.textScaler, | ||
| this.indicatorAnimation, | ||
| }) : _isPrimary = true, | ||
| assert(indicator != null || (indicatorWeight > 0.0)); | ||
| }) : _isPrimary = true; | ||
|
|
||
| /// Creates a Material Design secondary tab bar. | ||
| /// | ||
|
|
@@ -1128,8 +1127,7 @@ class TabBar extends StatefulWidget implements PreferredSizeWidget { | |
| this.tabAlignment, | ||
| this.textScaler, | ||
| this.indicatorAnimation, | ||
| }) : _isPrimary = false, | ||
| assert(indicator != null || (indicatorWeight > 0.0)); | ||
| }) : _isPrimary = false; | ||
|
|
||
| /// Typically a list of two or more [Tab] widgets. | ||
| /// | ||
|
|
@@ -1185,7 +1183,8 @@ class TabBar extends StatefulWidget implements PreferredSizeWidget { | |
| /// If [ThemeData.useMaterial3] is false, the default value is 2.0. | ||
| /// | ||
| /// If [indicator] is specified or provided from [TabBarThemeData], | ||
| /// this property is ignored. | ||
| /// this property is ignored. Otherwise, when drawing the default underline | ||
| /// indicator, the value of this parameter must be greater than zero. | ||
| final double indicatorWeight; | ||
|
|
||
| /// The padding for the indicator. | ||
|
|
@@ -1644,6 +1643,24 @@ class _TabBarState extends State<TabBar> { | |
| if (tabBarTheme.indicator != null) { | ||
| return tabBarTheme.indicator!; | ||
| } | ||
| assert(() { | ||
| if (widget.indicatorWeight <= 0.0) { | ||
| throw FlutterError.fromParts(<DiagnosticsNode>[ | ||
| ErrorSummary('Invalid indicatorWeight for TabBar.'), | ||
| ErrorDescription( | ||
| 'The indicatorWeight must be greater than zero when the TabBar ' | ||
| 'draws its default underline indicator, that is when no indicator ' | ||
| 'is provided by the TabBar or the TabBarTheme.', | ||
| ), | ||
|
Comment on lines
+1650
to
+1654
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For consistency with the rest of the error message (such as the ErrorDescription(
'The indicatorWeight must be greater than zero when the TabBar '
'draws its default underline indicator, that is when no indicator '
'is provided by the TabBar or the TabBarThemeData.',
), |
||
| ErrorHint( | ||
| 'To fix this, set indicatorWeight to a value greater than zero, ' | ||
| 'or provide an indicator with the TabBar.indicator or ' | ||
| 'TabBarThemeData.indicator property.', | ||
| ), | ||
| ]); | ||
| } | ||
| return true; | ||
| }()); | ||
|
|
||
| Color color = widget.indicatorColor ?? tabBarTheme.indicatorColor ?? _defaults.indicatorColor!; | ||
| // ThemeData tries to avoid this by having indicatorColor avoid being the | ||
|
|
||
3 changes: 3 additions & 0 deletions
3
packages/material_ui/pending_changelogs/change_2026_08_30_tab_bar_indicator_weight.yaml
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,3 @@ | ||
| changelog: | | ||
| - Allows `TabBar.indicatorWeight` of 0 when the indicator is supplied by `TabBarThemeData`. | ||
| version: patch |
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
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.
Using
!(widget.indicatorWeight > 0.0)instead ofwidget.indicatorWeight <= 0.0is more robust because it also correctly handlesdouble.nanvalues, ensuring that any invalid weight triggers the assertion rather than potentially causing silent rendering issues or secondary errors later.