Size Change: -1.45 kB (-0.02%)

Total Size: 6.84 MB

_{compressed-size-action}

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: chriszarate <czarate@git.wordpress.org>
Co-authored-by: ingeniumed <ingeniumed@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: stokesman <presstoke@git.wordpress.org>
Co-authored-by: alecgeatches <alecgeatches@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

There are two items still left to fix:

• Update the verbiage of the text shown based on the feedback from @dabowman.
• Fix an error about useSelect returning different values when a metabox plugin is in use

index.js:33 The `useSelect` hook returns different values when called with the same state and parameters.
This can lead to unnecessary re-renders and performance issues if not fixed.

Non-equal value keys: core/post-meta

This is an existing bug looks like as it can be replicated on trunk as well. I'll open up a separate issue for this.

This is an existing bug looks like as it can be replicated on trunk as well. I'll open up a separate issue for this.

See #74571, though I think it may not have a dedicated issue.

Note: The post locked modal doesn't show up when the same user is logged into two separate tabs with RTC disabled due to the changes in this branch. It mirrors the same behaviour as when RTC isn't enabled on trunk, and we are in single editing mode.

FYI @chriszarate

Updated screenshots using verbiage from @dabowman.

In testing I noticed a handful of issues when combined together:

• There's a few-second gap after a post is "taken over" before the prior editor sees a dialog box.
• It appears that any work done during that gap is lost.
• If a user returns to a post and takes it back over, neither user's new content is in the post.

Here's a reproduction:

1. Enable the "Yoast SEO" plugin.
2. Have user A make a draft post and save.
3. Have user B join that post, taking it over, and make some content changes.
4. Go back to user A's tab and continue to add content. In testing this took anywhere from 3 to 10 seconds to show a dialog for user A.
5. Note the dialog's text that "your changes up to this moment have been saved."
6. As user A, exit the post and re-enter. Note that there's an autosave notification at the top of the page, but it can't be accessed because of the modal.
7. When the dialog appears, click "Take over".
8. When the page loads again, note that the autosave notification is gone, as well as user A and user B's added content.
9. View revisions for the post and note that user A's content has not been saved.
10. Note that the changes from user B are also not present in user A's screen. They are available via user B's revisions, but not part of the loaded document.

I'm not sure this is a show-stopper because we're talking about a relatively short window, but it does seem like something between step 6 and 8 is removing user A's autosave which should have their unsaved content. Also on step 10 I'd expect to see at least user B's changes, but both sets of changes are removed.

The collaboration tests are not passing here in CI and locally for me, but they seem to be passing via claude and for anyone else who tries this branch. I'm going to close this PR, cherry pick each commit to a brand new independent branch, and open a new PR to see if the issue repeats itself.

I'll reference this PR in that PR.

I have re-opened this PR - #75939.

It's probably a merge conflict resolution gone wrong.

You can also do the following to avoid context loss on the PRs, if the branch is actually corrupt:

• Create a temp branch.
• Cherry-pick commits.
• Run the tests to make sure everything is working as before.
• Delete the old branch and rename the temp branch using the old branch's name.
• Force push on GitHub.

We should update the labels on the new PR

Done :)