Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-29 00:20:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

web: fix crash on viewing a merge conflict

Browse Source
This commit is contained in:
Abdullah Atta
2023-06-17 16:36:51 +05:00
committed by Abdullah Atta
parent 8d2c0762db
commit cdbca8ac22
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/web/src/components/diff-viewer/content-toggle.jsx
View File

@@ -66,7 +66,8 @@ function ContentToggle(props) {
sx={{
fontSize: "subBody",
color: "fontTertiary",
alignItems: "center"
alignItems: "center",
fontFamily: "body"
}}
>
{label} | {getFormattedDate(dateEdited)}

4
apps/web/src/components/diff-viewer/index.jsx
View File

@@ -238,7 +238,7 @@ function DiffViewer(props) {
}}
>
<Editor
content={htmlDiff.before}
content={() => htmlDiff.before}
nonce={0}
options={{ readonly: true, headless: true }}
/>
@@ -282,7 +282,7 @@ function DiffViewer(props) {
<ScrollSyncPane>
<Flex sx={{ px: 2, overflow: "auto" }}>
<Editor
content={htmlDiff.after}
content={() => htmlDiff.after}
nonce={0}
options={{ readonly: true, headless: true }}
/>