Fix/previous blank #886
Merged
Fix/previous blank #886
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
yuanyan
reviewed
Nov 18, 2021
…t prev and next of text node .
… the nextSibling and previousSibling text node so prev and next node require layout.
…xtSibling and previousSibling text node so prev and next node require layout.
wssgcg1213
reviewed
Dec 22, 2021
kraken/lib/src/rendering/text.dart
Outdated
| @@ -84,6 +154,10 @@ class RenderTextBox extends RenderBox | |||
| needsLayout = true; | |||
| } | |||
|
|
|||
| void markRenderParagraphLyout() { | |||
wssgcg1213
reviewed
Dec 22, 2021
kraken/lib/src/rendering/text.dart
Outdated
| @@ -136,6 +210,11 @@ class RenderTextBox extends RenderBox | |||
| maxHeight: double.infinity); | |||
| } | |||
|
|
|||
| // ' a b c \n' => ' a b c ' | |||
| String _collapseWhitespace(String string) { | |||
wssgcg1213
previously approved these changes
Dec 23, 2021
temper357
reviewed
Dec 23, 2021
kraken/lib/src/css/display.dart
Outdated
| renderBoxModel?.markNeedsLayout(); | ||
|
|
||
| // The display changes of the node may affect the whitespace of the nextSibling and previousSibling text node so prev and next node require layout. | ||
| if (renderBoxModel?.parent != null && renderBoxModel?.parent is RenderFlowLayout && renderBoxModel?.parentData is RenderLayoutParentData) { |
There was a problem hiding this comment.
这里已经判断了 parent 是否为 RenderFlowLayout，不需要重复判断 parentData 是否为 RenderLayoutParentData 了
temper357
reviewed
Dec 23, 2021
kraken/lib/src/css/display.dart
Outdated
|
|
||
| // The display changes of the node may affect the whitespace of the nextSibling and previousSibling text node so prev and next node require layout. | ||
| if (renderBoxModel?.parent != null && renderBoxModel?.parent is RenderFlowLayout && renderBoxModel?.parentData is RenderLayoutParentData) { | ||
| RenderLayoutParentData childParentData = renderBoxModel?.parentData as RenderLayoutParentData; |
There was a problem hiding this comment.
从语义上来讲直接用 parentData 命名好了，childParentData 感觉是当前 renderBoxModel 的 child
temper357
reviewed
Dec 23, 2021
kraken/lib/src/css/position.dart
Outdated
| @@ -99,6 +99,17 @@ mixin CSSPositionMixin on RenderStyle { | |||
| _markParentNeedsLayout(); | |||
| // Position change may affect transformed display | |||
| // https://www.w3.org/TR/css-display-3/#transformations | |||
|
|
|||
| // The position changes of the node may affect the whitespace of the nextSibling and previousSibling text node so prev and next node require layout. | |||
| if (renderBoxModel?.parent != null && renderBoxModel?.parent is RenderFlowLayout && renderBoxModel?.parentData is RenderLayoutParentData) { | |||
There was a problem hiding this comment.
这段给 textNode 标识的 needsLayout 的逻辑是通用的，可以抽离到 renderBoxModel 中
temper357
reviewed
Dec 23, 2021
kraken/lib/src/rendering/text.dart
Outdated
| return str.endsWith(WHITE_SPACE_CHAR) || str.endsWith(NEW_LINE_CHAR) || str.endsWith(RETURN_CHAR) || str.endsWith(TAB_CHAR); | ||
| } | ||
|
|
||
| String get data { |
There was a problem hiding this comment.
这个 data 应该只会给 _renderParagraph 内部使用不对外暴露，建议与 originData 对调一下，originData 改成 data，这个 data 改成辟如 _trimmedData 的私有变量
temper357
reviewed
Dec 23, 2021
kraken/lib/src/dom/node.dart
Outdated
| @mustCallSuper | ||
| void willDetachRenderer() { | ||
| // The node detach may affect the whitespace of the nextSibling and previousSibling text node so prev and next node require layout. | ||
| if (parentNode != null && parentNode?.renderer is RenderFlowLayout && renderer?.parentData is RenderLayoutParentData) { |
There was a problem hiding this comment.
这里也可以复用公共的 markAdjacentRenderParagraphNeedsLayout
temper357
approved these changes
Dec 23, 2021
wssgcg1213
approved these changes
Dec 23, 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.
close #740