Enable marks overlap #2
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
added 2 commits
June 16, 2022 14:45
This is inspired from this PL: yjs#52
ronnyroeller
approved these changes
Jun 17, 2022
There was a problem hiding this comment.
LGTM (pls drop the commit to create the release from this PR: 39f1f48) This makes it easier to reapply the commit later on.
Should I keep the version 1.2.2 ? |
Since you already created 1.2.3-0 in npmjs -> Pick a higher version number. Otherwise you will have issues importing the new build. |
IdrissMahjoubi
force-pushed
the
enable-marks-overlap
branch
from
d25a05e
to
bdea062
Compare
|
@ronnyroeller check commits please? Does this look good? |
|
Just remove this line from the commit, and you are good to go for the PR: bdea062#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519R3 |
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.
In Collab editing
SyncPlugindoes not allow for overlapping marks with the same type and different attributes (like prosemirror does).This PR allows for overlapping marks to be shared via
SyncPlugin.This PR is a copy of https://github.com/YousefED/y-prosemirror/tree/overlapping-marks (can't merge it directly for version compatibility reasons).
Fixes: https://github.com/orgs/Collaborne/projects/14
Current missing parts"
yjs#52 (comment)