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
Reland "Fix Chip.shape
's side is not used when provided in Material 3"
#133856
Reland "Fix Chip.shape
's side is not used when provided in Material 3"
#133856
Conversation
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.
LGTM
} | ||
// If the side is not provided and the shape's side is not [BorderSide.none], | ||
// then the shape's side is used. Otherwise, the default side is used. | ||
return resolvedShape.side != BorderSide.none |
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.
So if I want to specify a shape with no border, then I need to specify both the shape
and the side
(as BorderSide.none) because specifying a shape with BorderSide.none
will cause us to use the default side. I guess that's OK, since the OutlinedBorder classes use BorderSide.none
by default. It's a little confusing. A separate PR that clarified this in the API doc might help.
auto label is removed for flutter/flutter/133856, due to - The status or check suite Google testing has failed. Please fix the issues identified (or deflake) before re-applying this label. |
This PR is failing the SuperEditor presubmit test. On the face of it, it doesn't seem related to the change here.
|
Thanks! I will try running this with |
eb664db
to
243bccf
Compare
This indeed looks like an outside issue. I see this failure in other PRs. |
blocked by #134043 |
Hopefully to be unblocked by flutter/tests#294 |
8d5e040
to
0652eb2
Compare
The current list of 5000 failures appear to be unrelated to this PR. Checking with the Flutter rollers ... |
0652eb2
to
a46fc18
Compare
…4870) Manual roll Flutter from 685ce14b2d0f to aea4552acdc7 (64 revisions) Manual roll requested by dit@google.com flutter/flutter@685ce14...aea4552 2023-09-07 andrewrkolos@gmail.com add --exit flag to dev/devicelab/bin/test_runner.dart (flutter/flutter#134165) 2023-09-07 andrewrkolos@gmail.com fix `--exit` flag in dev/devicelab/bin/run.dart (flutter/flutter#134162) 2023-09-07 engine-flutter-autoroll@skia.org Roll Packages from e7d812c to 22d4754 (9 revisions) (flutter/flutter#134232) 2023-09-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from 71bea01d3abe to f0b718e28779 (2 revisions) (flutter/flutter#134231) 2023-09-07 polinach@google.com DropdownRoutePage should dispose the created ScrollController. (flutter/flutter#133941) 2023-09-07 sokolovskyi.konstantin@gmail.com Cover some test/widgets tests with leak tracking (flutter/flutter#133803) 2023-09-07 polinach@google.com SearchDelegate should dispose resources. (flutter/flutter#133948) 2023-09-07 matheus@btor.com.br Fixed [NavigationRailDestination]'s label opacity while disabled not being coherent with the icon (flutter/flutter#132345) 2023-09-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from 558136a1ccbf to 71bea01d3abe (2 revisions) (flutter/flutter#134216) 2023-09-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5a45ecd24aa3 to 558136a1ccbf (1 revision) (flutter/flutter#134206) 2023-09-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from d864ae68db3c to 5a45ecd24aa3 (1 revision) (flutter/flutter#134201) 2023-09-07 tessertaha@gmail.com Fix `TabBar` doesn't use `labelStyle` & `unselectedLabelStyle` color (flutter/flutter#133989) 2023-09-07 tessertaha@gmail.com Fix `DataTable`'s `headingTextStyle` & `dataTextStyle` are not merged with default text style (flutter/flutter#134138) 2023-09-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from 187c5b3c5f71 to d864ae68db3c (2 revisions) (flutter/flutter#134199) 2023-09-07 tessertaha@gmail.com Reland "Fix `Chip.shape`'s side is not used when provided in Material 3" (flutter/flutter#133856) 2023-09-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from 75437a3bd002 to 187c5b3c5f71 (1 revision) (flutter/flutter#134193) 2023-09-07 engine-flutter-autoroll@skia.org Manual roll Flutter Engine from 2c69d05dfafb to 75437a3bd002 (15 revisions) (flutter/flutter#134188) 2023-09-07 zanderso@users.noreply.github.com Revert "Roll Flutter Engine from 2c69d05dfafb to fa14d337449b (6 revisions)" (flutter/flutter#134183) 2023-09-06 49699333+dependabot[bot]@users.noreply.github.com Bump actions/upload-artifact from 3.1.2 to 3.1.3 (flutter/flutter#134173) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 2c69d05dfafb to fa14d337449b (6 revisions) (flutter/flutter#134169) 2023-09-06 polinach@google.com DraggableScrollableActuator should dispose notifier. (flutter/flutter#133917) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from b04c2a378302 to 2c69d05dfafb (3 revisions) (flutter/flutter#134164) 2023-09-06 polinach@google.com Clean the fixed TODOs. (flutter/flutter#133859) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 839051596b1d to b04c2a378302 (7 revisions) (flutter/flutter#134158) 2023-09-06 737941+loic-sharma@users.noreply.github.com [Windows Arm64] Also use Windows 11 for Devicelab tests (flutter/flutter#134082) 2023-09-06 70351342+burakJs@users.noreply.github.com Fix `subtitleTextStyle.color` isn't applied to the `ListTile.subtitle` in Material 2 (flutter/flutter#133422) 2023-09-06 pateltirth454@gmail.com Add `CheckedPopupMenuItem.onTap` callback (flutter/flutter#134000) 2023-09-06 polinach@google.com MinimumTextContrastGuideline should dispose image. (flutter/flutter#133861) 2023-09-06 christopherfujino@gmail.com [flutter_tools] Fix "FormatException: Invalid date format" during version freshness check (flutter/flutter#134088) 2023-09-06 polinach@google.com Fix not disposed items in Cupertino app and route. (flutter/flutter#134085) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from a5e7fa6bf81a to 839051596b1d (2 revisions) (flutter/flutter#134140) 2023-09-06 polinach@google.com _DropdownMenuState should dispose TextEditingController. (flutter/flutter#133914) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5253a33096d1 to a5e7fa6bf81a (1 revision) (flutter/flutter#134137) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from c7fd088291e2 to 5253a33096d1 (1 revision) (flutter/flutter#134135) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 3d9989f1e155 to c7fd088291e2 (1 revision) (flutter/flutter#134132) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from bace539bb654 to 3d9989f1e155 (3 revisions) (flutter/flutter#134128) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9344685efbc3 to bace539bb654 (1 revision) (flutter/flutter#134104) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 0c8c1647dcd0 to 9344685efbc3 (1 revision) (flutter/flutter#134103) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 0c663258fd09 to 0c8c1647dcd0 (1 revision) (flutter/flutter#134100) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 8bacc3b38707 to 0c663258fd09 (3 revisions) (flutter/flutter#134096) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 590349006d23 to 8bacc3b38707 (5 revisions) (flutter/flutter#134089) 2023-09-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5b2cc9d9b8fe to 590349006d23 (2 revisions) (flutter/flutter#134081) 2023-09-05 engine-flutter-autoroll@skia.org Roll Flutter Engine from 98b036ae708e to 5b2cc9d9b8fe (2 revisions) (flutter/flutter#134080) 2023-09-05 engine-flutter-autoroll@skia.org Roll Flutter Engine from f4975e04f35e to 98b036ae708e (3 revisions) (flutter/flutter#134077) ...
…xplain default values for Material 3 (#134298) fixes [Update chip docs for Material 3 defaults.](#134296) Addresses a [comment](#133856 (comment)) from @HansMuller as well
(#139572) I would like to request an update to the document to resolve confusion. I actually modified the code by applying priority as in the comment in [#139572](#139572) as shown below, but I thought that if 'OutlinedBorder' was used for 'shape', the default value of side for 'OutlinedBorder' was also the developer's intention. ``` OutlinedBorder _getShape(ThemeData theme, ChipThemeData chipTheme, ChipThemeData chipDefaults) { final BorderSide? resolvedSide = MaterialStateProperty.resolveAs<BorderSide?>(widget.side, materialStates) ?? MaterialStateProperty.resolveAs<BorderSide?>(chipTheme.side, materialStates); final BorderSide? resolvedShapeSide = MaterialStateProperty.resolveAs<BorderSide?>(widget.shape?.side, materialStates) ?? MaterialStateProperty.resolveAs<BorderSide?>(chipTheme.shape?.side, materialStates); final OutlinedBorder resolvedShape = MaterialStateProperty.resolveAs<OutlinedBorder?>(widget.shape, materialStates) ?? MaterialStateProperty.resolveAs<OutlinedBorder?>( chipTheme.shape, materialStates) ?? MaterialStateProperty.resolveAs<OutlinedBorder?>(chipDefaults.shape, materialStates) // TODO(tahatesser): Remove this fallback when Material 2 is deprecated. ?? const StadiumBorder(); // If the side is provided, shape uses the provided side. if (resolvedSide != null) { return resolvedShape.copyWith(side: resolvedSide); } if (resolvedShapeSide != null) { return resolvedShape.copyWith(side: resolvedShapeSide); } // If the side is not provided // then the shape's side is used. Otherwise, the default side is used. return resolvedShape.copyWith(side: chipDefaults.side); } ``` (in `chip.dart`) However, (#133856) PR seems to be intended to ignore this and use the aspect of `chipDefault.side` even if the developer specifies `shape.side` as [Border.none] without explicitly applying `side` . This is probably because the default value of OutlinedBorder is [Border.none]. I think this is an area that can cause enough confusion, but there are a lot of things that need to be modified to reduce confusion through code changes, and the impact on existing code is likely to be significant. I also confirmed that this is not accurately explained in the API Docs. So rather than modifying the code, I decided to add additional explanation to the `shape` comment. If the results are different from what you intended or the updated content is strange, please review. �
(flutter#139572) I would like to request an update to the document to resolve confusion. I actually modified the code by applying priority as in the comment in [flutter#139572](flutter#139572) as shown below, but I thought that if 'OutlinedBorder' was used for 'shape', the default value of side for 'OutlinedBorder' was also the developer's intention. ``` OutlinedBorder _getShape(ThemeData theme, ChipThemeData chipTheme, ChipThemeData chipDefaults) { final BorderSide? resolvedSide = MaterialStateProperty.resolveAs<BorderSide?>(widget.side, materialStates) ?? MaterialStateProperty.resolveAs<BorderSide?>(chipTheme.side, materialStates); final BorderSide? resolvedShapeSide = MaterialStateProperty.resolveAs<BorderSide?>(widget.shape?.side, materialStates) ?? MaterialStateProperty.resolveAs<BorderSide?>(chipTheme.shape?.side, materialStates); final OutlinedBorder resolvedShape = MaterialStateProperty.resolveAs<OutlinedBorder?>(widget.shape, materialStates) ?? MaterialStateProperty.resolveAs<OutlinedBorder?>( chipTheme.shape, materialStates) ?? MaterialStateProperty.resolveAs<OutlinedBorder?>(chipDefaults.shape, materialStates) // TODO(tahatesser): Remove this fallback when Material 2 is deprecated. ?? const StadiumBorder(); // If the side is provided, shape uses the provided side. if (resolvedSide != null) { return resolvedShape.copyWith(side: resolvedSide); } if (resolvedShapeSide != null) { return resolvedShape.copyWith(side: resolvedShapeSide); } // If the side is not provided // then the shape's side is used. Otherwise, the default side is used. return resolvedShape.copyWith(side: chipDefaults.side); } ``` (in `chip.dart`) However, (flutter#133856) PR seems to be intended to ignore this and use the aspect of `chipDefault.side` even if the developer specifies `shape.side` as [Border.none] without explicitly applying `side` . This is probably because the default value of OutlinedBorder is [Border.none]. I think this is an area that can cause enough confusion, but there are a lot of things that need to be modified to reduce confusion through code changes, and the impact on existing code is likely to be significant. I also confirmed that this is not accurately explained in the API Docs. So rather than modifying the code, I decided to add additional explanation to the `shape` comment. If the results are different from what you intended or the updated content is strange, please review. �
fixes Chip border side color not working in Material3
Relands #132941 with an updated fix and a regression test.
expand to view the code sample
Pre-launch Checklist
///
).If you need help, consider asking for advice on the #hackers-new channel on Discord.