From 53f812f73346dc3eb53df04d17c1ce14a6c89970 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Thu, 31 Aug 2023 14:14:09 +0800
Subject: [PATCH] refactor: move Markdown Editor and Markdown component into
 together

---
 .../{MarkdownEditor/style.less => Markdown/editor.less}     | 0
 .../src/components/{MarkdownEditor => Markdown}/editor.tsx  | 6 ++++--
 .../src/components/{MarkdownEditor => Markdown}/index.tsx   | 2 ++
 .../src/components/{Markdown.less => Markdown/render.less}  | 0
 .../src/components/{Markdown.tsx => Markdown/render.tsx}    | 4 ++--
 client/web/src/components/MarkdownEditor/plugins.ts         | 6 ------
 client/web/src/plugin/component/index.tsx                   | 3 +--
 7 files changed, 9 insertions(+), 12 deletions(-)
 rename client/web/src/components/{MarkdownEditor/style.less => Markdown/editor.less} (100%)
 rename client/web/src/components/{MarkdownEditor => Markdown}/editor.tsx (91%)
 rename client/web/src/components/{MarkdownEditor => Markdown}/index.tsx (79%)
 rename client/web/src/components/{Markdown.less => Markdown/render.less} (100%)
 rename client/web/src/components/{Markdown.tsx => Markdown/render.tsx} (95%)
 delete mode 100644 client/web/src/components/MarkdownEditor/plugins.ts

diff --git a/client/web/src/components/MarkdownEditor/style.less b/client/web/src/components/Markdown/editor.less
similarity index 100%
rename from client/web/src/components/MarkdownEditor/style.less
rename to client/web/src/components/Markdown/editor.less
diff --git a/client/web/src/components/MarkdownEditor/editor.tsx b/client/web/src/components/Markdown/editor.tsx
similarity index 91%
rename from client/web/src/components/MarkdownEditor/editor.tsx
rename to client/web/src/components/Markdown/editor.tsx
index 97ee12a9..c1294d32 100644
--- a/client/web/src/components/MarkdownEditor/editor.tsx
+++ b/client/web/src/components/Markdown/editor.tsx
@@ -1,11 +1,13 @@
 import React from 'react';
 import { Editor } from '@bytemd/react';
-import { plugins } from './plugins';
 import { uploadFile } from 'tailchat-shared';
 import { Markdown } from '../Markdown';
 import { createRoot } from 'react-dom/client';
+import gfm from '@bytemd/plugin-gfm';
 import 'bytemd/dist/index.css';
-import './style.less';
+import './editor.less';
+
+export const plugins = [gfm()];
 
 interface MarkdownEditorProps {
   value: string;
diff --git a/client/web/src/components/MarkdownEditor/index.tsx b/client/web/src/components/Markdown/index.tsx
similarity index 79%
rename from client/web/src/components/MarkdownEditor/index.tsx
rename to client/web/src/components/Markdown/index.tsx
index 8db90ee9..04874b03 100644
--- a/client/web/src/components/MarkdownEditor/index.tsx
+++ b/client/web/src/components/Markdown/index.tsx
@@ -1,5 +1,7 @@
 import { Loadable } from '../Loadable';
 
+export { Markdown } from './render';
+
 export const MarkdownEditor = Loadable(() =>
   import('./editor').then((module) => module.MarkdownEditor)
 );
diff --git a/client/web/src/components/Markdown.less b/client/web/src/components/Markdown/render.less
similarity index 100%
rename from client/web/src/components/Markdown.less
rename to client/web/src/components/Markdown/render.less
diff --git a/client/web/src/components/Markdown.tsx b/client/web/src/components/Markdown/render.tsx
similarity index 95%
rename from client/web/src/components/Markdown.tsx
rename to client/web/src/components/Markdown/render.tsx
index f4617f61..df483b4f 100644
--- a/client/web/src/components/Markdown.tsx
+++ b/client/web/src/components/Markdown/render.tsx
@@ -1,11 +1,11 @@
 import { makeAbsoluteUrl } from '@/utils/url-helper';
 import React, { useCallback, useMemo } from 'react';
 import { isValidStr, parseUrlStr } from 'tailchat-shared';
-import { Loadable } from './Loadable';
+import { Loadable } from '../Loadable';
 import { Image } from 'tailchat-design';
 import remarkGfm from 'remark-gfm';
 import rehypeRaw from 'rehype-raw';
-import './Markdown.less';
+import './render.less';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
diff --git a/client/web/src/components/MarkdownEditor/plugins.ts b/client/web/src/components/MarkdownEditor/plugins.ts
deleted file mode 100644
index 5c20381c..00000000
--- a/client/web/src/components/MarkdownEditor/plugins.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import gfm from '@bytemd/plugin-gfm';
-
-export const plugins = [
-  gfm(),
-  // Add more plugins here
-];
diff --git a/client/web/src/plugin/component/index.tsx b/client/web/src/plugin/component/index.tsx
index 7288c6f4..8efdef4f 100644
--- a/client/web/src/plugin/component/index.tsx
+++ b/client/web/src/plugin/component/index.tsx
@@ -65,8 +65,7 @@ export { ErrorBoundary } from '@/components/ErrorBoundary';
 export { ErrorView } from '@/components/ErrorView';
 export { UserAvatar } from '@/components/UserAvatar';
 export { UserName } from '@/components/UserName';
-export { Markdown } from '@/components/Markdown';
-export { MarkdownEditor } from '@/components/MarkdownEditor';
+export { Markdown, MarkdownEditor } from '@/components/Markdown';
 export { Webview, WebviewKeepAlive } from '@/components/Webview';
 export { Card } from '@/components/Card';
 export { Problem } from '@/components/Problem';