(FE) Incorrect Integration of CodeMirror and Yorkie Resulting in Docu…

…ment Synchronization (#102) * Fix doc synchronization when grab multi cursor * Update env for docker-compose
yorkie-team · Jan 25, 2024 · 937c34f · 937c34f
1 parent 86d9c46
commit 937c34f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/backend/docker/docker-compose-full.yml b/backend/docker/docker-compose-full.yml
@@ -12,6 +12,9 @@ services:
             GITHUB_CALLBACK_URL: "<BACKEND_BASE_URL>/auth/login/github"
             JWT_AUTH_SECRET: "JWT_AUTH_SECRET"
             FRONTEND_BASE_URL: "FRONTEND_BASE_URL"
+            YORKIE_API_ADDR: "YORKIE_API_ADDR"
+            YORKIE_PROJECT_NAME: "YORKIE_PROJECT_NAME"
+            YORKIE_PROJECT_SECRET_KEY: "YORKIE_PROJECT_SECRET_KEY"
         ports:
             - "3000:3000"
         depends_on:

diff --git a/backend/docker/docker-compose.yml b/backend/docker/docker-compose.yml
@@ -5,12 +5,16 @@ services:
         build:
             context: ../
         environment:
+            # Environment variables need to be passed to the container
             DATABASE_URL: "DATABASE_URL"
             GITHUB_CLIENT_ID: "GITHUB_CLIENT_ID"
             GITHUB_CLIENT_SECRET: "GITHUB_CLIENT_SECRET"
             GITHUB_CALLBACK_URL: "<BACKEND_BASE_URL>/auth/login/github"
             JWT_AUTH_SECRET: "JWT_AUTH_SECRET"
             FRONTEND_BASE_URL: "FRONTEND_BASE_URL"
+            YORKIE_API_ADDR: "YORKIE_API_ADDR"
+            YORKIE_PROJECT_NAME: "YORKIE_PROJECT_NAME"
+            YORKIE_PROJECT_SECRET_KEY: "YORKIE_PROJECT_SECRET_KEY"
         ports:
             - "3000:3000"
         restart: unless-stopped
diff --git a/frontend/src/utils/yorkie/yorkieSync.ts b/frontend/src/utils/yorkie/yorkieSync.ts
@@ -83,13 +83,15 @@ class YorkieSyncPluginValue implements cmView.PluginValue {
 			return;
 		}
 
+		let adj = 0;
 		this._doc.update((root, presence) => {
 			update.changes.iterChanges((fromA, toA, _fromB, _toB, insert) => {
 				if (!root.content) {
 					root.content = new yorkie.Text();
 				}
 				const insertText = insert.sliceString(0, insert.length, "\n");
-				const updatedIndexRange = root.content.edit(fromA, toA, insertText);
+				const updatedIndexRange = root.content.edit(fromA + adj, toA + adj, insertText);
+				adj += insertText.length - (toA - fromA);
 				if (updatedIndexRange) {
 					presence.set({
 						selection: root.content.indexRangeToPosRange(updatedIndexRange),