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

Collaborative editing history #545

Merged
merged 10 commits into from
Sep 13, 2023
Merged

Collaborative editing history #545

merged 10 commits into from
Sep 13, 2023

Conversation

nonumpa
Copy link
Member

@nonumpa nonumpa commented Aug 9, 2023 •
edited
Loading

Changes

  • Add CollabHistory component to display history in modalview
  • Refactor CollabEditor: use use-prosemirror to create ProseMirror editor view
    • HocuspocusProvider connects server onTranscribe and destroys(disconnects) when Editor unmount
    • Make sure Editor and CollabHistory are created after provider synced, or ProseMirror editor may create with a wrong state
    • Update ydoc user mapping with a json string contains id and name
    • Note: there's another ProseMirror reactjs plugin react-prosemirror, but it require reactjs>=17
    • Implement GetYdoc query and Ydoc model rumors-api#316

Snapshot

螢幕擷取畫面 2023-08-09 210930

@coveralls
Copy link

coveralls commented Aug 9, 2023 •
edited
Loading

Coverage Status

coverage: 76.218%. remained the same when pulling a09b2e9 on feature/collab-version into 802dc59 on master.

@nonumpa nonumpa force-pushed the feature/collab-version branch 2 times, most recently from 407819e to f234c17 Compare August 9, 2023 17:20
@nonumpa nonumpa changed the title Collaborative editing version Collaborative editing history Aug 9, 2023
@nonumpa nonumpa requested review from MrOrz and bil4444 August 9, 2023 17:34
@nonumpa nonumpa marked this pull request as ready for review August 9, 2023 17:35
nonumpa added 4 commits August 10, 2023 09:40
@nonumpa
feat(collab): add CollabHistory component to display history in modal…
f718882 
…view
@nonumpa
refactor(CollabEditor): use use-prosemirror to create ProseMirror edi…
693d55d 
…tor view

- HocuspocusProvider connects server onTranscribe and destroys(disconnects) when `Editor` unmount
- Make sure `Editor` and `CollabHistory` create after provider synced, or ProseMirror editor may create with a wrong state
- Update user mapping with a json string contains id and name
@nonumpa
chore(i18n): add translation
9294e2d
@nonumpa
chore(i18n): update typo
9a28a41
@nonumpa nonumpa force-pushed the feature/collab-version branch from f234c17 to 040a523 Compare August 10, 2023 01:41
@nonumpa nonumpa force-pushed the feature/collab-version branch from 040a523 to cbe347e Compare September 7, 2023 03:54
@nonumpa nonumpa force-pushed the feature/collab-version branch from cbe347e to 23fb1a5 Compare September 7, 2023 04:52
johnson-liang
johnson-liang reviewed Sep 13, 2023
View reviewed changes
components/Collaborate/CollabEditor.js Outdated Show resolved Hide resolved
components/Collaborate/CollabHistory.js Outdated Show resolved Hide resolved
@nonumpa
refactor(CollabEditor): get ydoc versions in CollabHistory when modal…
a09b2e9 
… opened

- Fix when no snapshots user can edit document in CollabHistory
- Add no histories translation
@MrOrz MrOrz merged commit 63c03a7 into master Sep 13, 2023
6 checks passed
@MrOrz MrOrz deleted the feature/collab-version branch September 13, 2023 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnson-liang johnson-liang johnson-liang left review comments

@MrOrz MrOrz MrOrz approved these changes

@bil4444 bil4444 Awaiting requested review from bil4444

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

Successfully merging this pull request may close these issues.
4 participants
@nonumpa @coveralls @MrOrz @johnson-liang