[PR #4937] [MERGED] feat: initial version for collab document #6541

New issue

Closed

opened 2026-03-23 22:23:40 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 22:23:40 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/4937
Author: @LucasXu0
Created: 3/19/2024
Status: ✅ Merged
Merged: 3/21/2024
Merged by: @LucasXu0

Base: main ← Head: collab_doc

📝 Commits (8)

befa3d0 feat: initial version for collab document
94e4277 feat: show sync indicator
f401ef8 Merge branch 'main' into collab_doc
2942403 feat: add sync document feature flag
8c67da3 fix: rust ci
7cac0da chore: remove unused code
fe758b3 Merge branch 'main' into collab_doc
b64f661 chore: update doc_bloc.dart

📊 Changes

19 files changed (+429 additions, -74 deletions)

View changed files

📝 frontend/appflowy_flutter/lib/mobile/application/mobile_router.dart (+3 -3)
📝 frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart (+9 -1)
📝 frontend/appflowy_flutter/lib/mobile/presentation/editor/mobile_editor_screen.dart (+2 -2)
➕ frontend/appflowy_flutter/lib/plugins/document/application/collab_document_adapter.dart (+135 -0)
📝 frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart (+25 -27)
📝 frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dart (+8 -0)
➕ frontend/appflowy_flutter/lib/plugins/document/application/doc_sync_bloc.dart (+101 -0)
📝 frontend/appflowy_flutter/lib/plugins/document/application/document_data_pb_extension.dart (+7 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/document.dart (+18 -4)
📝 frontend/appflowy_flutter/lib/plugins/document/document_page.dart (+0 -17)
➕ frontend/appflowy_flutter/lib/plugins/document/presentation/document_sync_indicator.dart (+66 -0)
📝 frontend/appflowy_flutter/lib/shared/feature_flags.dart (+8 -0)
📝 frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart (+4 -4)
📝 frontend/appflowy_flutter/lib/user/application/auth/device_id.dart (+5 -5)
📝 frontend/appflowy_flutter/lib/util/json_print.dart (+2 -0)
📝 frontend/resources/translations/en.json (+5 -0)
📝 frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs (+7 -3)
📝 frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs (+7 -3)
📝 frontend/rust-lib/flowy-document/src/entities.rs (+17 -4)

📄 Description

Feature Preview

An initial version of the collaboration document does not support cursor sync and cursor transform.

https://github.com/AppFlowy-IO/AppFlowy/assets/11863087/71cc1d72-6634-4200-9987-c7b535283dde

Sync State

No network connected

Synced

Syncing

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/4937 **Author:** [@LucasXu0](https://github.com/LucasXu0) **Created:** 3/19/2024 **Status:** ✅ Merged **Merged:** 3/21/2024 **Merged by:** [@LucasXu0](https://github.com/LucasXu0) **Base:** `main` ← **Head:** `collab_doc` --- ### 📝 Commits (8) - [`befa3d0`](https://github.com/AppFlowy-IO/AppFlowy/commit/befa3d034b2ac5de8d190fae06d5cf4d050848e9) feat: initial version for collab document - [`94e4277`](https://github.com/AppFlowy-IO/AppFlowy/commit/94e4277bb94087208a2a99f4cd212f688384b538) feat: show sync indicator - [`f401ef8`](https://github.com/AppFlowy-IO/AppFlowy/commit/f401ef89f59edccfbcb593df9851fe68d9204430) Merge branch 'main' into collab_doc - [`2942403`](https://github.com/AppFlowy-IO/AppFlowy/commit/29424037e23e5ef15ff7e4527931d01f4adc6283) feat: add sync document feature flag - [`8c67da3`](https://github.com/AppFlowy-IO/AppFlowy/commit/8c67da3512e3348ad9e12a710f7e70fe7c950091) fix: rust ci - [`7cac0da`](https://github.com/AppFlowy-IO/AppFlowy/commit/7cac0daa8be2648a46e853495229e33fa9f31c29) chore: remove unused code - [`fe758b3`](https://github.com/AppFlowy-IO/AppFlowy/commit/fe758b313b809d2fea413b73c41ebae9f85fba6d) Merge branch 'main' into collab_doc - [`b64f661`](https://github.com/AppFlowy-IO/AppFlowy/commit/b64f6612b90959265d5c0ecf4e8fe48e0c011c02) chore: update doc_bloc.dart ### 📊 Changes **19 files changed** (+429 additions, -74 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/lib/mobile/application/mobile_router.dart` (+3 -3) 📝 `frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart` (+9 -1) 📝 `frontend/appflowy_flutter/lib/mobile/presentation/editor/mobile_editor_screen.dart` (+2 -2) ➕ `frontend/appflowy_flutter/lib/plugins/document/application/collab_document_adapter.dart` (+135 -0) 📝 `frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart` (+25 -27) 📝 `frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dart` (+8 -0) ➕ `frontend/appflowy_flutter/lib/plugins/document/application/doc_sync_bloc.dart` (+101 -0) 📝 `frontend/appflowy_flutter/lib/plugins/document/application/document_data_pb_extension.dart` (+7 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/document.dart` (+18 -4) 📝 `frontend/appflowy_flutter/lib/plugins/document/document_page.dart` (+0 -17) ➕ `frontend/appflowy_flutter/lib/plugins/document/presentation/document_sync_indicator.dart` (+66 -0) 📝 `frontend/appflowy_flutter/lib/shared/feature_flags.dart` (+8 -0) 📝 `frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart` (+4 -4) 📝 `frontend/appflowy_flutter/lib/user/application/auth/device_id.dart` (+5 -5) 📝 `frontend/appflowy_flutter/lib/util/json_print.dart` (+2 -0) 📝 `frontend/resources/translations/en.json` (+5 -0) 📝 `frontend/rust-lib/event-integration/tests/document/af_cloud_test/edit_test.rs` (+7 -3) 📝 `frontend/rust-lib/event-integration/tests/document/supabase_test/edit_test.rs` (+7 -3) 📝 `frontend/rust-lib/flowy-document/src/entities.rs` (+17 -4) </details> ### 📄 Description   ### Feature Preview An initial version of the collaboration document does not support cursor sync and cursor transform. https://github.com/AppFlowy-IO/AppFlowy/assets/11863087/71cc1d72-6634-4200-9987-c7b535283dde **Sync State** - No network connected <img width="238" alt="Screenshot 2024-03-19 at 22 51 08" src="https://github.com/AppFlowy-IO/AppFlowy/assets/11863087/f8c525b1-2d94-4489-b7fc-f70150654c08"> - Synced <img width="232" alt="Screenshot 2024-03-19 at 22 36 06" src="https://github.com/AppFlowy-IO/AppFlowy/assets/11863087/fb106041-f74c-4f8c-9c91-a9584e027be2"> - Syncing <img width="236" alt="Screenshot 2024-03-19 at 22 34 10" src="https://github.com/AppFlowy-IO/AppFlowy/assets/11863087/e7fb2147-9051-4766-8e5a-9f02150288ce">  ---  #### PR Checklist - [x] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [ ] I've listed at least one issue that this PR fixes in the description above. - [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [ ] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>