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.

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

improve updateAttributes #5738

Merged
merged 11 commits into from
Nov 4, 2024
Merged

Conversation

silenius
Copy link
Contributor

@silenius silenius commented Oct 17, 2024

Changes Overview

Currently updateAttributes updates attributes of all nodes (or marks) of specified typeOrName to new values.
It works well, except with nested nodes of the same type. This is because the implementation uses node.nodesBetween which return all nodes in the selection range but also nodes that cover it (and which are outside the selection range).

This is a second attempt (first was in #5154 ) to fix this. The first version was broken (#5254) because it didn't handled range selection properly.

Implementation Approach

We first check if we have a selection range or if the selection is empty. If the selection is empty we simply loops over all nodes returned by nodesBetween and we keep the last one which match typeOrName.
If we have a selection range we also have to keep track of the last node which match typeOrName because it could be outside the (from, to) selection range, for example with:

<div class="flex">
  <article>
    <p>foo</p>
    <p>bar</p>
  </article>
</div>

if the user text select 'ooba' and that we updateAttributes of an article typeOrName we must be sure that the <article> node is included.

If the selection range is empty we also update nodes, but we check that it is in the selection range.

Checklist

  • I have created a changeset for this PR if necessary.
  • My changes do not break the library.
  • I have added tests where applicable.
  • I have followed the project guidelines.
  • I have fixed any lint issues.

Related Issues

#3545 #4466 #5154

Copy link

changeset-bot bot commented Oct 17, 2024

🦋 Changeset detected

Latest commit: ed382b9

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 54 packages
Name Type
@tiptap/core Patch
@tiptap/extension-blockquote Patch
@tiptap/extension-bold Patch
@tiptap/extension-bubble-menu Patch
@tiptap/extension-bullet-list Patch
@tiptap/extension-character-count Patch
@tiptap/extension-code-block-lowlight Patch
@tiptap/extension-code-block Patch
@tiptap/extension-code Patch
@tiptap/extension-collaboration-cursor Patch
@tiptap/extension-collaboration Patch
@tiptap/extension-color Patch
@tiptap/extension-document Patch
@tiptap/extension-dropcursor Patch
@tiptap/extension-floating-menu Patch
@tiptap/extension-focus Patch
@tiptap/extension-font-family Patch
@tiptap/extension-gapcursor Patch
@tiptap/extension-hard-break Patch
@tiptap/extension-heading Patch
@tiptap/extension-highlight Patch
@tiptap/extension-history Patch
@tiptap/extension-horizontal-rule Patch
@tiptap/extension-image Patch
@tiptap/extension-italic Patch
@tiptap/extension-link Patch
@tiptap/extension-list-item Patch
@tiptap/extension-list-keymap Patch
@tiptap/extension-mention Patch
@tiptap/extension-ordered-list Patch
@tiptap/extension-paragraph Patch
@tiptap/extension-placeholder Patch
@tiptap/extension-strike Patch
@tiptap/extension-subscript Patch
@tiptap/extension-superscript Patch
@tiptap/extension-table-cell Patch
@tiptap/extension-table-header Patch
@tiptap/extension-table-row Patch
@tiptap/extension-table Patch
@tiptap/extension-task-item Patch
@tiptap/extension-task-list Patch
@tiptap/extension-text-align Patch
@tiptap/extension-text-style Patch
@tiptap/extension-text Patch
@tiptap/extension-typography Patch
@tiptap/extension-underline Patch
@tiptap/extension-youtube Patch
@tiptap/html Patch
@tiptap/pm Patch
@tiptap/react Patch
@tiptap/starter-kit Patch
@tiptap/suggestion Patch
@tiptap/vue-2 Patch
@tiptap/vue-3 Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@silenius silenius marked this pull request as draft October 17, 2024 13:26
Copy link

netlify bot commented Oct 17, 2024

Deploy Preview for tiptap-embed ready!

Name Link
🔨 Latest commit ed382b9
🔍 Latest deploy log https://app.netlify.com/sites/tiptap-embed/deploys/67289c14f4b1c80008f301fb
😎 Deploy Preview https://deploy-preview-5738--tiptap-embed.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@silenius silenius marked this pull request as ready for review October 18, 2024 13:24
@silenius
Copy link
Contributor Author

there is a single test failing .. but I don't know why

@silenius silenius changed the title [draft] improve updateAttributes improve updateAttributes Oct 18, 2024
@nperez0111
Copy link
Contributor

Sorry @silenius if you update your branch now it should work. Our branch did not have passing tests

@silenius
Copy link
Contributor Author

✔️

Copy link
Contributor

@nperez0111 nperez0111 left a comment

Choose a reason for hiding this comment

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

Thanks @silenius for your contribution, I hope we've got it this time!

@nperez0111 nperez0111 merged commit c50eb4b into ueberdosis:develop Nov 4, 2024
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants