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

[stable25] Don't apply author annotations when in composition #3395

Merged
merged 2 commits into from
Nov 9, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Nov 9, 2022

  • ⚠️ This backport had conflicts and is incomplete

backport of #3350

When typing dead keys (like diacritics), the browser is in composition
mode[1] until the accompanioning character is typed. This breaks author
annotations.

We have to hold back the transaction when in composition and only apply
it afterwards, as suggested at [2]. So check for `view.composing` before
applying the transaction.

Fixes: #2871

[1] https://w3c.github.io/uievents/#events-compositionevents
[2] https://discuss.prosemirror.net/t/plugins-and-characters-with-a-diacritic/2674/3

Signed-off-by: Jonas <jonas@freesources.org>
@backportbot-nextcloud backportbot-nextcloud bot added the bug Something isn't working label Nov 9, 2022
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25.0.2 milestone Nov 9, 2022
@max-nextcloud
Copy link
Collaborator

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@cypress
Copy link

cypress bot commented Nov 9, 2022



Test summary

97 0 0 0Flakiness 3


Run details

Project Text
Status Passed
Commit 0ba86d9 ℹ️
Started Nov 9, 2022 7:31 AM
Ended Nov 9, 2022 7:37 AM
Duration 05:50 💡
OS Linux Ubuntu - 20.04
Browser Electron 106

View run in Cypress Dashboard ➡️


Flakiness

sections.spec.js Flakiness
1 Content Sections > Heading anchors > Anchor scrolls into view
links.spec.js Flakiness
1 test link marks > link preview > shows a link preview
mentions.spec.js Flakiness
1 Test mentioning users > Type @ and see the user list

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

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.

backported code looks good and i checked locally it fixes the issue.

@max-nextcloud max-nextcloud merged commit 7f50399 into stable25 Nov 9, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/3350/stable25 branch November 9, 2022 08:09
@blizzz blizzz mentioned this pull request Nov 21, 2022
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants