feat: allow banner markdown

Signed-off-by: Innei <i@innei.in>
Innei · Jul 3, 2023 · 485d49e · 485d49e · vercel · Jul 3, 2023
1 parent 72d1f52
commit 485d49e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/src/components/ui/markdown/parsers/container.tsx b/src/components/ui/markdown/parsers/container.tsx
@@ -4,9 +4,21 @@ import type { MarkdownToJSX } from 'markdown-to-jsx'
 
 import { Banner } from '../../banner/Banner'
 import { Gallery } from '../../gallery/Gallery'
+import { Markdown } from '../Markdown'
 import { pickImagesFromMarkdown } from '../utils/image'
 
-const shouldCatchContainerName = ['gallery', 'banner', 'carousel'].join('|')
+const shouldCatchContainerName = [
+  'gallery',
+  'banner',
+  'carousel',
+
+  'warn',
+  'error',
+  'danger',
+  'info',
+  'success',
+  'warning',
+].join('|')
 export const ContainerRule: MarkdownToJSX.Rule = {
   match: blockRegex(
     new RegExp(
@@ -45,9 +57,14 @@ export const ContainerRule: MarkdownToJSX.Rule = {
           <Banner
             type={name || (transformMap as any)[name] || 'info'}
             className="my-4"
-            message={content}
             key={state?.key}
-          />
+          >
+            <Markdown
+              value={content}
+              allowsScript
+              className="[&>p:first-child]:mt-0"
+            />
+          </Banner>
         )
       }
       case 'banner': {
@@ -56,12 +73,9 @@ export const ContainerRule: MarkdownToJSX.Rule = {
         }
 
         return (
-          <Banner
-            type={params}
-            className="my-4"
-            message={content}
-            key={state?.key}
-          />
+          <Banner type={params} className="my-4" key={state?.key}>
+            <Markdown value={content} allowsScript />
+          </Banner>
         )
       }
     }

diff --git a/src/socket/handler.ts b/src/socket/handler.ts
@@ -57,7 +57,7 @@ export const eventHandler = (
     case EventTypes.POST_DELETE: {
       const post = data as PostModel
       if (getCurrentPostData()?.id === post.id) {
-        router.push(routeBuilder(Routes.PageDeletd, {}))
+        router.replace(routeBuilder(Routes.PageDeletd, {}))
         toast.error('文章已删除')
       }
       break
@@ -77,7 +77,7 @@ export const eventHandler = (
     case 'NOTE_DELETE': {
       const note = data as NoteModel
       if (getCurrentNoteData()?.data.id === note.id) {
-        router.push(routeBuilder(Routes.PageDeletd, {}))
+        router.replace(routeBuilder(Routes.PageDeletd, {}))
         toast.error('手记已删除')
       }
       break