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

[stable27] Fade out user cursor labels after five seconds of inactivity #4591

Merged
merged 3 commits into from
Jul 28, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #4336

mejo- and others added 2 commits July 28, 2023 06:56
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 <[email protected]>
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 <[email protected]>
@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 27.0.2 milestone Jul 28, 2023
@cypress
Copy link

cypress bot commented Jul 28, 2023

1 flaky tests on run #11356 ↗︎

0 145 2 0 Flakiness 1

Details:

[stable27] Fade out user cursor labels after five seconds of inactivity
Project: Text Commit: 6a244428c1
Status: Passed Duration: 08:10 💡
Started: Jul 28, 2023 10:36 AM Ended: Jul 28, 2023 10:45 AM
Flakiness  cypress/e2e/sync.spec.js • 1 flaky test

View Output Video

Test Artifacts
Sync > passes the doc content from one session to the next Output Screenshots

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

@mejo-
Copy link
Member

mejo- commented Jul 28, 2023

/compile

Signed-off-by: nextcloud-command <[email protected]>
@mejo- mejo- merged commit 9fd56e0 into stable27 Jul 28, 2023
32 checks passed
@mejo- mejo- deleted the backport/4336/stable27 branch July 28, 2023 10:47
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