-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
fix: edit link will break the text styles #7863
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
Draft
asjqkkkk
wants to merge
5
commits into
AppFlowy-IO:main
Choose a base branch
from
asjqkkkk:fix/desktop/link
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ea1e0f7
fix: edit link will break the text styles
asjqkkkk f75d061
Merge branch 'main' into fix/desktop/link
asjqkkkk 4651316
fix: remove key error
asjqkkkk 5709b94
Merge branch 'main' into fix/desktop/link
asjqkkkk 14447f6
Merge branch 'main' into fix/desktop/link
asjqkkkk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -8,33 +8,66 @@ extension LinkExtension on EditorState { | |||||
if (node == null) { | ||||||
return; | ||||||
} | ||||||
final attributes = _getAttribute(node, selection); | ||||||
attributes[BuiltInAttributeKey.href] = null; | ||||||
attributes[kIsPageLink] = null; | ||||||
final index = selection.normalized.startIndex; | ||||||
final length = selection.length; | ||||||
final transaction = this.transaction | ||||||
..formatText( | ||||||
node, | ||||||
index, | ||||||
length, | ||||||
{ | ||||||
BuiltInAttributeKey.href: null, | ||||||
kIsPageLink: null, | ||||||
}, | ||||||
); | ||||||
..formatText(node, index, length, attributes); | ||||||
apply(transaction); | ||||||
} | ||||||
|
||||||
void applyLink(Selection selection, LinkInfo info) { | ||||||
final node = getNodeAtPath(selection.start.path); | ||||||
if (node == null) return; | ||||||
final transaction = this.transaction; | ||||||
final attributes = _getAttribute(node, selection); | ||||||
attributes.addAll(info.toAttribute()); | ||||||
final linkName = info.name.isEmpty ? info.link : info.name; | ||||||
transaction.replaceText( | ||||||
node, | ||||||
selection.startIndex, | ||||||
selection.length, | ||||||
linkName, | ||||||
attributes: info.toAttribute(), | ||||||
attributes: attributes, | ||||||
); | ||||||
apply(transaction); | ||||||
} | ||||||
|
||||||
void removeAndReplaceLink( | ||||||
Selection selection, | ||||||
String text, | ||||||
) { | ||||||
final node = getNodeAtPath(selection.end.path); | ||||||
if (node == null) { | ||||||
return; | ||||||
} | ||||||
final attributes = _getAttribute(node, selection); | ||||||
attributes[BuiltInAttributeKey.href] = null; | ||||||
attributes[kIsPageLink] = null; | ||||||
final index = selection.normalized.startIndex; | ||||||
final length = selection.length; | ||||||
final transaction = this.transaction | ||||||
..replaceText(node, index, length, text, attributes: attributes); | ||||||
apply(transaction); | ||||||
} | ||||||
|
||||||
Attributes _getAttribute(Node node, Selection selection) { | ||||||
Attributes attributes = {}; | ||||||
final ops = node.delta?.whereType<TextInsert>() ?? []; | ||||||
final startOffset = selection.start.offset; | ||||||
var start = 0; | ||||||
for (final op in ops) { | ||||||
if (start > startOffset) break; | ||||||
final length = op.length; | ||||||
if (start + length > startOffset) { | ||||||
attributes = op.attributes ?? {}; | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. suggestion (bug_risk): Consider cloning the attributes to avoid unintended mutation. Since _getAttribute returns op.attributes by reference, removing keys will mutate shared state. Clone the map first (e.g., with Map.from) before modifying.
Suggested change
|
||||||
break; | ||||||
} | ||||||
start += length; | ||||||
} | ||||||
|
||||||
return attributes; | ||||||
} | ||||||
} |
This file contains hidden or 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
Oops, something went wrong.
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.
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.
I think we're not getting all the attributes from the selection. For example:
Before:
http://appflowy.io <- (add one more o here)
After:
http://appflowy.ioo The result should be ioo without extra formatting.
We have a slice attributes function that gets the attributes based on the index.
appflowyEditorSliceAttributes
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.
yes, the logic about getting Attributes is not correct, I need to adjust it