firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Material] Remove inherit: false on default TextStyle in bottom navigation bar (#32727)

Browse Source
This commit is contained in:
MH Johnson 2019-05-15 10:30:41 -04:00 committed by GitHub
parent 30fed3a05d
commit da0a3a275a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/material/bottom_navigation_bar.dart
View File

@ -778,7 +778,7 @@ class _BottomNavigationBarState extends State<BottomNavigationBar> with TickerPr
// If the given [TextStyle] has a non-null `fontSize`, it should be used. // If the given [TextStyle] has a non-null `fontSize`, it should be used.
// Otherwise, the [selectedFontSize] parameter should be used. // Otherwise, the [selectedFontSize] parameter should be used.
static TextStyle _effectiveTextStyle(TextStyle textStyle, double fontSize) { static TextStyle _effectiveTextStyle(TextStyle textStyle, double fontSize) {
textStyle ??= const TextStyle(inherit: false); textStyle ??= const TextStyle();
// Prefer the font size on textStyle if present. // Prefer the font size on textStyle if present.
return textStyle.fontSize == null ? textStyle.copyWith(fontSize: fontSize) : textStyle; return textStyle.fontSize == null ? textStyle.copyWith(fontSize: fontSize) : textStyle;
} }

4
packages/flutter/test/material/bottom_navigation_bar_test.dart
View File

@ -106,10 +106,10 @@ void main() {
final TextStyle unselectedIcon = _iconStyle(tester, Icons.access_alarm); final TextStyle unselectedIcon = _iconStyle(tester, Icons.access_alarm);
expect(selectedFontStyle.color, equals(primaryColor)); expect(selectedFontStyle.color, equals(primaryColor));
expect(selectedFontStyle.fontSize, selectedFontSize); expect(selectedFontStyle.fontSize, selectedFontSize);
expect(selectedFontStyle.fontWeight, isNull); expect(selectedFontStyle.fontWeight, equals(FontWeight.w400));
expect(selectedFontStyle.height, isNull); expect(selectedFontStyle.height, isNull);
expect(unselectedFontStyle.color, equals(captionColor)); expect(unselectedFontStyle.color, equals(captionColor));
expect(unselectedFontStyle.fontWeight, isNull); expect(unselectedFontStyle.fontWeight, equals(FontWeight.w400));
expect(unselectedFontStyle.height, isNull); expect(unselectedFontStyle.height, isNull);
// Unselected label has a font size of 14 but is scaled down to be font size 12. // Unselected label has a font size of 14 but is scaled down to be font size 12.
expect( expect(