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.

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

Jump to bottom

Fix comment indicators in follow mode #4781

Merged
merged 9 commits into from
Jan 23, 2024
Merged

Fix comment indicators in follow mode #4781

merged 9 commits into from
Jan 23, 2024

Conversation

ruggi
Copy link
Contributor

@ruggi ruggi commented Jan 22, 2024 •
edited
Loading

Fix #4780

Problem:

Multiplayer cursors move jankily and "detached" from the rest of the canvas while following another user.
Also, trying to pan the canvas while following another user is effectively disabled but results in a very bad canvas jitter.

Fix:

  1. Disable the canvas pan at all while in follow mode (note: we could also use this as a point where we stop the following, but for now I don't want to introduce new behaviors as part of this fix PR)
  2. The cursors need to move along with the canvas, so moved them inside a CanvasOffsetWrapper.
Before After
https://github.com/concrete-utopia/utopia/assets/1081051/895a1483-86cb-4aea-8a56-32690b96190f https://github.com/concrete-utopia/utopia/assets/1081051/d9e9aec0-018d-449c-bebf-c661b1201249

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 22, 2024 •
edited
Loading

Try me

@ruggi ruggi changed the title Fix/follow pan Fix comment indicators in follow mode Jan 22, 2024
@relativeci RelativeCI
Copy link

relativeci bot commented Jan 22, 2024 •
edited
Loading

Job #10013: Bundle Size — 62.35MiB (~-0.01%).

f3c23cb(current) vs 8f5e3ac master#10012(baseline)

Warning

Bundle contains 66 duplicate packages – View duplicate packages

Bundle metrics  Change 1 change Improvement 1 improvement
                 Current
Job #10013		      Baseline
Job #10012
Improvement  Initial JS 45.54MiB(~-0.01%) 45.54MiB
No change  Initial CSS 0B 0B
No change  Cache Invalidation 19.9% 19.9%
No change  Chunks 26 26
No change  Assets 30 30
No change  Modules 4393 4393
No change  Duplicate Modules 474 474
No change  Duplicate Code 30.74% 30.74%
No change  Packages 462 462
No change  Duplicate Packages 65 65
Bundle size by type  Change 1 change Improvement 1 improvement
                 Current
Job #10013		      Baseline
Job #10012
Improvement  JS 62.34MiB (~-0.01%) 62.34MiB
Not changed  HTML 11.54KiB 11.54KiB

View job #10013 report View fix/follow-pan branch activity View project dashboard

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 22, 2024 •
edited
Loading

Performance test results:
(Chart1)
(Chart2)

@github-actions GitHub Actions
Copy link
Contributor

Performance test results:

@github-actions GitHub Actions
Copy link
Contributor

Performance test results:

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

Performance test results:

@github-actions GitHub Actions
Copy link
Contributor

Performance test results:

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

Performance test results:

@github-actions GitHub Actions
Copy link
Contributor

Performance test results:

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

Performance test results:

@ruggi
Merge branch 'master' into fix/follow-pan
f3c23cb 
# Conflicts:
#	editor/src/components/canvas/controls/comment-indicator.tsx
@ruggi ruggi merged commit 5a20c6f into master Jan 23, 2024
12 checks passed
@ruggi ruggi deleted the fix/follow-pan branch January 23, 2024 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bkrmendy bkrmendy bkrmendy approved these changes

@seanparsons seanparsons seanparsons approved these changes

@gbalint gbalint gbalint approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Smooth out janky cursors in follow mode
5 participants
@ruggi @gbalint @seanparsons @bkrmendy @ruggishop