Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(paragraph): migrate preview options to decorations #6425

Merged
merged 13 commits into from
Sep 19, 2024
Merged

fix(paragraph): migrate preview options to decorations #6425

merged 13 commits into from
Sep 19, 2024

Conversation

mejo-
Copy link
Member

@mejo- mejo- commented Sep 18, 2024 •
edited
Loading

📝 Summary

🏁 Checklist

  • Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
  • Sign-off message is added to all commits
  • Tests (unit, integration and/or end-to-end) passing and the changes are covered with tests

max-nextcloud and others added 6 commits September 18, 2024 13:09
@max-nextcloud @mejo-
enh: add extractLinkParagraphs
28c3e0a 
Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud @mejo-
refactor(test): reuse link string
899886c 
Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud @mejo-
enh(preview): include previews in list of link paragraphs
4ab1cf8 
Render the preview options as a decoration for previews too.

Signed-off-by: Max <max@nextcloud.com>
@mejo-
feat(previewOptions): Migrate preview options to prosemirror decorations
2cb1c54 
Fixes: #6185

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(preview): Remove PreviewOptions from Paragraph and Preview
339dd63 
Signed-off-by: Jonas <jonas@freesources.org>
@max-nextcloud @mejo-
enh(preview): add nodeSize in decoration data structure
c76b6c0 
Required for implementing `deleteNode` like tiptap does it:
https://github.com/ueberdosis/tiptap/blob/develop/packages/core/src/NodeView.ts#L305

Signed-off-by: Max <max@nextcloud.com>
@mejo- mejo- force-pushed the fix/paragraph-node-view-to-decorations branch from 9a078ec to 93d545f Compare September 18, 2024 11:09
max-nextcloud
max-nextcloud approved these changes Sep 18, 2024
View reviewed changes
Copy link
Collaborator

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a minor nitpick.

cypress/e2e/nodes/PreviewOptions.spec.js Outdated Show resolved Hide resolved
@max-nextcloud
Copy link
Collaborator

Oh... did you manage to fix that function that checked if the decorations can be mapped or need to be recomputed?

@mejo- mejo- force-pushed the fix/paragraph-node-view-to-decorations branch from 56ab0e9 to 7628e9f Compare September 18, 2024 16:23
@mejo-
Copy link
Member Author

mejo- commented Sep 18, 2024

/backport to stable30

@mejo-
Copy link
Member Author

mejo- commented Sep 18, 2024

/backport to stable29

max-nextcloud and others added 7 commits September 18, 2024 18:27
@max-nextcloud @mejo-
fix(preview): use deleteRange to remove the node
c635659 
Compute the range based on offset and nodeSize.

Signed-off-by: Max <max@nextcloud.com>
@mejo-
fix(preview): Fix alignment of preview options
1f40784 
- center align options for text links
- top align options for preview links

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(paragraph): get rid of superfluous ParagraphView component
c5fa33c 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(preview): Don't let preview options container overlay paragraph
36d7954 
Otherwise the overlay container would catch all the click events.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(preview): Fix some linting issues
a7d121f 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
test(cy): Fix selectors for paragraphs in cypress tests
ae77d20 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(preview): Further improvements
5d61e84 
* Don't calculate preview options decorations in readonly editor
* Check for changed nodeSize when checking for decoration changes
* Rename `editor` to `$editor` in vue compontent, it's not reactive

Signed-off-by: Jonas <jonas@freesources.org>
@mejo- mejo- force-pushed the fix/paragraph-node-view-to-decorations branch from 7628e9f to 5d61e84 Compare September 18, 2024 16:32
@mejo- mejo- merged commit b2c45a9 into main Sep 19, 2024
59 of 61 checks passed
@mejo- mejo- deleted the fix/paragraph-node-view-to-decorations branch September 19, 2024 14:41
This was referenced Sep 19, 2024
Merged
Merged
@blizzz blizzz mentioned this pull request Oct 8, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@max-nextcloud max-nextcloud max-nextcloud approved these changes

Assignees

@mejo- mejo-

@max-nextcloud max-nextcloud

Labels
2. developing
Projects