fix: main axis auto size not including margin #702
Merged
Conversation
This file contains 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
temper357
changed the title
temper357
requested review from
yuanyan,
andycall,
answershuto and
wssgcg1213
yuanyan
approved these changes
Sep 24, 2021
cnryb
reviewed
Sep 26, 2021
| @@ -1818,6 +1818,16 @@ class RenderFlexLayout extends RenderLayoutBox { | |||
| ? child.autoMinWidth | |||
| : child.autoMinHeight; | |||
| } | |||
| // Should add main axis margin of child to the main axis auto size of parent. | |||
| if (child is RenderBoxModel) { | |||
There was a problem hiding this comment.
看起来 child 不太可能既是 RenderTextBox 又是 RenderBoxModel ，所以这里使用 else if 应该会更好
cnryb
reviewed
Sep 26, 2021
| @@ -1174,6 +1174,12 @@ class RenderFlowLayout extends RenderLayoutBox { | |||
| if (runChild is RenderTextBox) { | |||
| runChildMainSize = runChild.autoMinWidth; | |||
| } | |||
| // Should add horizontal margin of child to the main axis auto size of parent. | |||
| if (runChild is RenderBoxModel) { | |||
answershuto
approved these changes
Sep 26, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #689
修复 flex-grow/flex-shrink 存在时计算 flex item size 时因 automatic minimum size 未包含 margin 导致 flex item 宽度计算偏小。