Skip to content

[stable24] Don't apply author annotations when in composition #3396

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

Merged
max-nextcloud merged 2 commits into from
Nov 9, 2022
Merged

[stable24] Don't apply author annotations when in composition #3396

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c284733
Don't apply author annotations when in composition
mejo- Nov 2, 2022
f5f2eb0
Compile assets
nextcloud-command Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Don't apply author annotations when in composition 
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 <[email protected]>
  • Loading branch information
@mejo- @backportbot-nextcloud
mejo- authored and backportbot-nextcloud[bot] committed Nov 9, 2022
commit c28473387d224130debeec6b78226133e4beaa99
12 changes: 10 additions & 2 deletions src/extensions/UserColor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,16 @@ const UserColor = Extension.create({
},

addProseMirrorPlugins() {
let viewReference = null
return [
new Plugin({
clientID: this.options.clientID,
color: this.options.color,
name: this.options.name,
view: (editorView) => {
viewReference = editorView
return {}
},
state: {
init(_, instance) {
return {
Expand All @@ -63,8 +68,11 @@ const UserColor = Extension.create({
// we have an undefined client id for own transactions
tr.setMeta('clientID', tr.steps.map(i => this.spec.clientID))
}
tracked = tracked.applyTransform(tr)
tState = tracked
// Don't apply transaction when in composition (Github issue #2871)
if (!viewReference.composing) {
tracked = tracked.applyTransform(tr)
tState = tracked
}
}
decos = tState.blameMap
.map(span => {
Expand Down