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

Fix bug in ButtonStyle.lerp(), in _LerpSides (#78051)

Browse Source
This commit is contained in:
Hans Muller 2021-03-15 14:31:46 -07:00 committed by GitHub
parent 4f569fb326
commit f3725d0a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,7 +475,7 @@ class _LerpSides implements MaterialStateProperty<BorderSide?> {
if (resolvedA == null) if (resolvedA == null)
return BorderSide.lerp(BorderSide(width: 0, color: resolvedB!.color.withAlpha(0)), resolvedB, t); return BorderSide.lerp(BorderSide(width: 0, color: resolvedB!.color.withAlpha(0)), resolvedB, t);
if (resolvedB == null) if (resolvedB == null)
return BorderSide.lerp(BorderSide(width: 0, color: resolvedA.color.withAlpha(0)), resolvedA, t); return BorderSide.lerp(resolvedA, BorderSide(width: 0, color: resolvedA.color.withAlpha(0)), t);
return BorderSide.lerp(resolvedA, resolvedB, t); return BorderSide.lerp(resolvedA, resolvedB, t);
} }
} }

34
packages/flutter/test/material/button_style_test.dart
View File

@ -151,4 +151,38 @@ void main() {
style.merge(const ButtonStyle()) style.merge(const ButtonStyle())
); );
}); });
test('ButtonStyle.lerp BorderSide', () {
// This is regression test for https://github.com/flutter/flutter/pull/78051
expect(ButtonStyle.lerp(null, null, 0), null);
expect(ButtonStyle.lerp(null, null, 0.5), null);
expect(ButtonStyle.lerp(null, null, 1), null);
const BorderSide blackSide = BorderSide(width: 1, color: Color(0xFF000000));
const BorderSide whiteSide = BorderSide(width: 1, color: Color(0xFFFFFFFF));
const BorderSide emptyBlackSide = BorderSide(width: 0, color: Color(0x00000000));
final ButtonStyle blackStyle = ButtonStyle(side: MaterialStateProperty.all<BorderSide>(blackSide));
final ButtonStyle whiteStyle = ButtonStyle(side: MaterialStateProperty.all<BorderSide>(whiteSide));
// MaterialState.all<Foo>(value) properties resolve to value
// for any set of MaterialStates.
const Set<MaterialState> states = <MaterialState>{ };
expect(ButtonStyle.lerp(blackStyle, blackStyle, 0)?.side?.resolve(states), blackSide);
expect(ButtonStyle.lerp(blackStyle, blackStyle, 0.5)?.side?.resolve(states), blackSide);
expect(ButtonStyle.lerp(blackStyle, blackStyle, 1)?.side?.resolve(states), blackSide);
expect(ButtonStyle.lerp(blackStyle, null, 0)?.side?.resolve(states), blackSide);
expect(ButtonStyle.lerp(blackStyle, null, 0.5)?.side?.resolve(states), BorderSide.lerp(blackSide, emptyBlackSide, 0.5));
expect(ButtonStyle.lerp(blackStyle, null, 1)?.side?.resolve(states), emptyBlackSide);
expect(ButtonStyle.lerp(null, blackStyle, 0)?.side?.resolve(states), emptyBlackSide);
expect(ButtonStyle.lerp(null, blackStyle, 0.5)?.side?.resolve(states), BorderSide.lerp(emptyBlackSide, blackSide, 0.5));
expect(ButtonStyle.lerp(null, blackStyle, 1)?.side?.resolve(states), blackSide);
expect(ButtonStyle.lerp(blackStyle, whiteStyle, 0)?.side?.resolve(states), blackSide);
expect(ButtonStyle.lerp(blackStyle, whiteStyle, 0.5)?.side?.resolve(states), BorderSide.lerp(blackSide, whiteSide, 0.5));
expect(ButtonStyle.lerp(blackStyle, whiteStyle, 1)?.side?.resolve(states), whiteSide);
});
} }