A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: highlight changes in diff viewer
Abdullah Atta5b79fbd7b5de
diff --git a/apps/web/src/components/diff-viewer/index.tsx b/apps/web/src/components/diff-viewer/index.tsxindex 2e37ba4b1..1c40d10f3 100644--- a/apps/web/src/components/diff-viewer/index.tsx+++ b/apps/web/src/components/diff-viewer/index.tsx@@ -32,7 +32,7 @@ import { Editor } from "../editor";import { ContentItem, Note } from "@notesnook/core";import { UnlockView } from "../unlock";import { getFormattedDate } from "@notesnook/common";-import { useEditorManager } from "../editor/manager";+import { diff } from "diffblazer";type DiffViewerProps = { session: ConflictedEditorSession };function DiffViewer(props: DiffViewerProps) {@@ -44,12 +44,6 @@ function DiffViewer(props: DiffViewerProps) {const [conflictedContent, setConflictedContent] = useState(content.conflicted);- const editor = useEditorManager((store) => store.editors[content.id]?.editor);- const conflictedEditor = useEditorManager((store) =>- conflictedContent- ? store.editors[`${conflictedContent.id}-conflicted`]?.editor- : undefined- );useLayoutEffect(() => {setConflictedContent((c) => {@@ -290,7 +284,11 @@ function DiffViewer(props: DiffViewerProps) {<Editorid={`${conflictedContent.id}-conflicted`}session={session}- content={() => conflictedContent.data}+ content={() =>+ content.locked+ ? conflictedContent.data+ : diff(content.data, conflictedContent.data)+ }nonce={conflictedContent.dateEdited}options={{ readonly: true, headless: true }}/>