fix: respect default and last direction on new line and indent #482
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
fix to use previous or parent direction when the editor default direction is auto. in that case use the calculated text direction of previous or parent node.
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #482 +/- ##
==========================================
- Coverage 80.80% 80.45% -0.36%
==========================================
Files 281 281
Lines 11635 11763 +128
==========================================
+ Hits 9402 9464 +62
- Misses 2233 2299 +66
☔ View full report in Codecov by Sentry. |
LucasXu0
reviewed
Sep 20, 2023
Comment on lines
106
to
121
| TextDirection? _getDirectionFromPreviousOrParentNode( | ||
| Node node, | ||
| String? defaultTextDirection, | ||
| ) { | ||
| TextDirection? prevOrParentNodeDirection; | ||
| if (node.previous != null) { | ||
| prevOrParentNodeDirection = | ||
| _getDirectionFromNode(node.previous!, defaultTextDirection); | ||
| } | ||
| if (node.parent != null && prevOrParentNodeDirection == null) { | ||
| prevOrParentNodeDirection = | ||
| _getDirectionFromNode(node.parent!, defaultTextDirection); | ||
| } | ||
|
|
||
| return prevOrParentNodeDirection; | ||
| } |
There was a problem hiding this comment.
Suggested change
| TextDirection? _getDirectionFromPreviousOrParentNode( | |
| Node node, | |
| String? defaultTextDirection, | |
| ) { | |
| TextDirection? prevOrParentNodeDirection; | |
| if (node.previous != null) { | |
| prevOrParentNodeDirection = | |
| _getDirectionFromNode(node.previous!, defaultTextDirection); | |
| } | |
| if (node.parent != null && prevOrParentNodeDirection == null) { | |
| prevOrParentNodeDirection = | |
| _getDirectionFromNode(node.parent!, defaultTextDirection); | |
| } | |
| return prevOrParentNodeDirection; | |
| } | |
| TextDirection? _getDirectionFromPreviousOrParentNode( | |
| Node node, | |
| String? defaultTextDirection, | |
| ) { | |
| if (node.previous != null) { | |
| return _getDirectionFromNode(node.previous!, defaultTextDirection); | |
| } | |
| if (node.parent != null) { | |
| return _getDirectionFromNode(node.parent!, defaultTextDirection); | |
| } | |
| return null; | |
| } |
Comment on lines
98
to
103
| final direction = _determineTextDirection(text); | ||
| if (direction != null) { | ||
| return direction; | ||
| } | ||
|
|
||
| return defaultTextDirection?.toTextDirection() ?? layoutDirection; |
There was a problem hiding this comment.
Suggested change
| final direction = _determineTextDirection(text); | |
| if (direction != null) { | |
| return direction; | |
| } | |
| return defaultTextDirection?.toTextDirection() ?? layoutDirection; | |
| return _determineTextDirection(text) ?? | |
| defaultTextDirection?.toTextDirection() ?? | |
| layoutDirection; |
Comment on lines
123
to
140
| TextDirection? _getDirectionFromNode(Node node, String? defaultTextDirection) { | ||
| String? nodeDirection; | ||
| if (defaultTextDirection == blockComponentTextDirectionAuto) { | ||
| nodeDirection = blockComponentTextDirectionAuto; | ||
| } | ||
|
|
||
| nodeDirection = node.direction(nodeDirection); | ||
|
|
||
| if (nodeDirection != null) { | ||
| if (nodeDirection == blockComponentTextDirectionAuto) { | ||
| return node.selectable?.textDirection(); | ||
| } else { | ||
| return nodeDirection.toTextDirection(); | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } |
There was a problem hiding this comment.
Suggested change
| TextDirection? _getDirectionFromNode(Node node, String? defaultTextDirection) { | |
| String? nodeDirection; | |
| if (defaultTextDirection == blockComponentTextDirectionAuto) { | |
| nodeDirection = blockComponentTextDirectionAuto; | |
| } | |
| nodeDirection = node.direction(nodeDirection); | |
| if (nodeDirection != null) { | |
| if (nodeDirection == blockComponentTextDirectionAuto) { | |
| return node.selectable?.textDirection(); | |
| } else { | |
| return nodeDirection.toTextDirection(); | |
| } | |
| } | |
| return null; | |
| } | |
| TextDirection? _getDirectionFromNode(Node node, String? defaultTextDirection) { | |
| final nodeDirection = node.direction( | |
| defaultTextDirection == blockComponentTextDirectionAuto | |
| ? blockComponentTextDirectionAuto | |
| : null, | |
| ); | |
| if (nodeDirection == blockComponentTextDirectionAuto) { | |
| return node.selectable?.textDirection(); | |
| } else { | |
| return nodeDirection?.toTextDirection(); | |
| } | |
| } |
Comment on lines
154
to
157
| extension on Node { | ||
| String? direction(String? defaultDirection) { | ||
| return (attributes[blockComponentTextDirection] as String?) ?? | ||
| defaultDirection; |
There was a problem hiding this comment.
Suggested change
| extension on Node { | |
| String? direction(String? defaultDirection) { | |
| return (attributes[blockComponentTextDirection] as String?) ?? | |
| defaultDirection; | |
| extension on Node { | |
| String? direction(String? defaultDirection) => | |
| attributes[blockComponentTextDirection] as String? ?? defaultDirection; |
zoli
commented
Sep 20, 2023
| final firstChild = node.children.first; | ||
| final currentState = | ||
| firstChild.key.currentState as BlockComponentTextDirectionMixin?; | ||
| if (currentState != null) { |
There was a problem hiding this comment.
Isn't there a case when the currentState is null and we still want to do the calculation?
last direction is optional parameter.
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.
No description provided.