Skip to content

TagSpaces is an offline, open source, document manager with tagging support

chore: small improvements for the markdown editor

Ilian Sapundshiev86f246a0b2f0
diff --git a/src/renderer/components/EditDescription.tsx b/src/renderer/components/EditDescription.tsx
index 6788e691c..c5a6ff7c1 100644
--- a/src/renderer/components/EditDescription.tsx
+++ b/src/renderer/components/EditDescription.tsx
@@ -78,17 +78,11 @@ function EditDescription() {
overflowY: 'auto',
}}
>
- <style>
- {`.descriptionEditor .milkdown .ProseMirror {
- padding: 10px 30px 10px 80px;
- }
- .descriptionEditor .prose a {
- color: ${theme.palette.primary.main};
- }
- .descriptionEditor .prose img {
- max-width: 99%;
- }`}
- </style>
+ <style>{`
+ .descriptionEditor .milkdown .ProseMirror { padding: 10px 30px 10px 80px; }
+ .descriptionEditor .milkdown .ProseMirror a { color: ${theme.palette.primary.main}; }
+ .descriptionEditor .milkdown .ProseMirror img { max-width: 99%; }
+ `}</style>
<MilkdownProvider>
<DescriptionMdEditor ref={fileDescriptionRef} />
</MilkdownProvider>
diff --git a/src/renderer/components/chat/ChatView.tsx b/src/renderer/components/chat/ChatView.tsx
index 676683916..eaaff4f55 100644
--- a/src/renderer/components/chat/ChatView.tsx
+++ b/src/renderer/components/chat/ChatView.tsx
@@ -273,19 +273,11 @@ function ChatView() {
}}
ref={milkdownDivRef}
>
- <style>
- {`
- #chatMD .milkdown .ProseMirror {
- padding: 10px;
- }
- #chatMD .milkdown .ProseMirror a {
- color: ${theme.palette.primary.main};
- }
- #chatMD .milkdown .ProseMirror img {
- max-width: 99%;
- }
- `}
- </style>
+ <style>{`
+ #chatMD .milkdown .ProseMirror { padding: 10px; }
+ #chatMD .milkdown .ProseMirror a { color: ${theme.palette.primary.main}; }
+ #chatMD .milkdown .ProseMirror img { max-width: 99%; }
+ `}</style>
<MilkdownProvider>
<ChatMdEditor
showCurrent={isLoading.current}
diff --git a/src/renderer/components/md/DescriptionMdEditor.tsx b/src/renderer/components/md/DescriptionMdEditor.tsx
index f78ed6174..17421f0fc 100644
--- a/src/renderer/components/md/DescriptionMdEditor.tsx
+++ b/src/renderer/components/md/DescriptionMdEditor.tsx
@@ -15,22 +15,22 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
-import React, { useRef, forwardRef, useEffect } from 'react';
-import { Milkdown, useEditor } from '@milkdown/react';
+import { Crepe } from '@milkdown/crepe';
import { EditorStatus, commandsCtx } from '@milkdown/kit/core';
-import { getMarkdown, $useKeymap, $command } from '@milkdown/kit/utils';
+import { $command, $useKeymap, getMarkdown } from '@milkdown/kit/utils';
+import { Milkdown, useEditor } from '@milkdown/react';
import { replaceAll } from '@milkdown/utils';
-import { Crepe } from '@milkdown/crepe';
+import { forwardRef, useEffect, useRef } from 'react';
-import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
-import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
-import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
-import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
-import { createCrepeEditor } from '-/components/md/utils';
import { CrepeRef, useCrepeHandler } from '-/components/md/useCrepeHandler';
+import { createCrepeEditor } from '-/components/md/utils';
+import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
+import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
+import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
+import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
+import { Pro } from '-/pro';
import useFirstRender from '-/utils/useFirstRender';
import { useTranslation } from 'react-i18next';
-import { Pro } from '-/pro';
interface CrepeMdEditorProps {
//onChange?: (markdown: string, prevMarkdown: string) => void;
@@ -41,7 +41,7 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>(
(props, ref) => {
const { onFocus } = props;
const { t } = useTranslation();
- const { currentDirectoryPath } = useDirectoryContentContext();
+ const { currentDirectory } = useDirectoryContentContext();
const { metaActions } = useEditedEntryMetaContext();
const {
saveDescription,
@@ -72,7 +72,7 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>(
isEditDescriptionMode,
{},
placeholder,
- currentDirectoryPath,
+ currentDirectory.path,
openLink,
(newMd: string) => {
setDescription(newMd);
@@ -111,7 +111,7 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>(
return crepe;
},
- [currentDirectoryPath], //, isEditDescriptionMode],
+ [currentDirectory?.path], //, isEditDescriptionMode],
);
// Whenever openedEntry changes and the user hasn’t manually edited,
diff --git a/src/renderer/components/md/LigthMdEditor.tsx b/src/renderer/components/md/LigthMdEditor.tsx
index a07cd6226..c13eeac4a 100644
--- a/src/renderer/components/md/LigthMdEditor.tsx
+++ b/src/renderer/components/md/LigthMdEditor.tsx
@@ -15,12 +15,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
-import React from 'react';
-import { Milkdown, useEditor } from '@milkdown/react';
import { createCrepeEditor } from '-/components/md/utils';
import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { Crepe } from '@milkdown/crepe';
+import { Milkdown, useEditor } from '@milkdown/react';
interface LightMdEditorProps {
defaultContent: string;
@@ -29,7 +28,7 @@ interface LightMdEditorProps {
function LightMdEditor(props: LightMdEditorProps) {
const { defaultContent, placeholder } = props;
- const { currentDirectoryPath } = useDirectoryContentContext();
+ const { currentDirectory } = useDirectoryContentContext();
const { openLink } = useOpenedEntryContext();
useEditor(
(root) => {
@@ -44,7 +43,7 @@ function LightMdEditor(props: LightMdEditorProps) {
[Crepe.Feature.Cursor]: false,
},
placeholder,
- currentDirectoryPath,
+ currentDirectory?.path,
openLink,
);
},