Skip to content

Conversation

@backportbot-nextcloud
Copy link

Backport of #4336

mejo- and others added 2 commits July 28, 2023 10:26
Implementation details:
* Add a custom CollaborationCursor Tiptap extension
* Add CSS to fade out the cursor label after some time.
* Listen for Yjs updates.
  - If it's a doc change by ourself, update the timestamp of own user in
    awareness state.
  - If it's a remote awareness update, add back the CSS class to the
    corresponding cursor.
  - Wait 50ms before showing the cursor in the DOM to account for cases
    where the cursor gets re-rendered by y-prosemirror.

Fixes: #4126

Signed-off-by: Jonas <jonas@freesources.org>
Document changes trigger awareness updates.
Wait before sending them in a push request so they can be combined.

Also make use of prosemirrors transactions to detect own changes
instead of listening to yjs updates.

Signed-off-by: Max <max@nextcloud.com>
@backportbot-nextcloud backportbot-nextcloud bot added the bug Something isn't working label Jul 28, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 26.0.5 milestone Jul 28, 2023
@max-nextcloud
Copy link
Collaborator

/compile

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

cypress bot commented Jul 28, 2023

1 flaky tests on run #11364 ↗︎

0 148 2 0 Flakiness 1

Details:

[stable26] Fade out user cursor labels after five seconds of inactivity
Project: Text Commit: ffbcf88437
Status: Passed Duration: 08:01 💡
Started: Jul 28, 2023 11:15 AM Ended: Jul 28, 2023 11:23 AM
Flakiness  cypress/e2e/share.spec.js • 1 flaky test

View Output Video

Test Artifacts
Open test.md in viewer > Share a file with download disabled shows an error Output Screenshots

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@mejo- mejo- merged commit 6964ef4 into stable26 Jul 28, 2023
@mejo- mejo- deleted the backport/4336/stable26 branch July 28, 2023 11:31
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.

4 participants