Fix duplicate text selection issue (#345)

yorkie-team · Sep 13, 2024 · 5d681e0 · 5d681e0
1 parent 34a52c3
commit 5d681e0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -37,6 +37,7 @@
 		"@sentry/react": "^7.99.0",
 		"@swc/helpers": "^0.5.3",
 		"@tanstack/react-query": "^5.17.15",
+		"@uiw/codemirror-extensions-basic-setup": "^4.23.2",
 		"@uiw/codemirror-theme-xcode": "^4.21.21",
 		"@uiw/codemirror-themes": "^4.21.21",
 		"@uiw/react-markdown-preview": "^5.0.7",

diff --git a/frontend/src/components/editor/Editor.tsx b/frontend/src/components/editor/Editor.tsx
@@ -2,8 +2,9 @@ import { markdown } from "@codemirror/lang-markdown";
 import { EditorState } from "@codemirror/state";
 import { keymap } from "@codemirror/view";
 import { Vim, vim } from "@replit/codemirror-vim";
+import { basicSetup } from "@uiw/codemirror-extensions-basic-setup";
 import { xcodeDark, xcodeLight } from "@uiw/codemirror-theme-xcode";
-import { basicSetup, EditorView } from "codemirror";
+import { EditorView } from "codemirror";
 import { useCallback, useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { ScrollSyncPane } from "react-scroll-sync";
@@ -73,7 +74,7 @@ function Editor(props: EditorProps) {
 			doc: editorStore.doc.getRoot().content?.toString() ?? "",
 			extensions: [
 				keymap.of(setKeymapConfig()),
-				basicSetup,
+				basicSetup({ highlightSelectionMatches: false }),
 				markdown(),
 				configStore.codeKey === CodeKeyType.VIM ? vim() : [],
 				themeMode == "light" ? xcodeLight : xcodeDark,