From f563b58a85c5d0ec90408c5617b18c695689d980 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 5 Jan 2024 08:47:43 +0800 Subject: [PATCH] chore: fix renderer props --- web/src/components/MemoContent/Blockquote.tsx | 5 +++-- web/src/components/MemoContent/Bold.tsx | 2 +- web/src/components/MemoContent/CodeBlock.tsx | 3 ++- web/src/components/MemoContent/Heading.tsx | 5 +++-- web/src/components/MemoContent/HorizontalRule.tsx | 4 +++- web/src/components/MemoContent/LineBreak.tsx | 4 +++- web/src/components/MemoContent/OrderedList.tsx | 5 +++-- web/src/components/MemoContent/Paragraph.tsx | 5 +++-- web/src/components/MemoContent/Renderer.tsx | 14 +++++++------- web/src/components/MemoContent/UnorderedList.tsx | 2 +- web/src/components/MemoContent/types/index.ts | 5 +++++ 11 files changed, 34 insertions(+), 20 deletions(-) diff --git a/web/src/components/MemoContent/Blockquote.tsx b/web/src/components/MemoContent/Blockquote.tsx index 7d5065c0..baf22a08 100644 --- a/web/src/components/MemoContent/Blockquote.tsx +++ b/web/src/components/MemoContent/Blockquote.tsx @@ -1,7 +1,8 @@ import { Node } from "@/types/proto/api/v2/markdown_service"; import Renderer from "./Renderer"; +import { BaseProps } from "./types"; -interface Props { +interface Props extends BaseProps { children: Node[]; } @@ -9,7 +10,7 @@ const Blockquote: React.FC = ({ children }: Props) => { return (
{children.map((child, index) => ( - + ))}
); diff --git a/web/src/components/MemoContent/Bold.tsx b/web/src/components/MemoContent/Bold.tsx index 3919f0f7..5c197e4a 100644 --- a/web/src/components/MemoContent/Bold.tsx +++ b/web/src/components/MemoContent/Bold.tsx @@ -10,7 +10,7 @@ const Bold: React.FC = ({ children }: Props) => { return ( {children.map((child, index) => ( - + ))} ); diff --git a/web/src/components/MemoContent/CodeBlock.tsx b/web/src/components/MemoContent/CodeBlock.tsx index cb734764..16f8fd93 100644 --- a/web/src/components/MemoContent/CodeBlock.tsx +++ b/web/src/components/MemoContent/CodeBlock.tsx @@ -4,8 +4,9 @@ import copy from "copy-to-clipboard"; import hljs from "highlight.js"; import toast from "react-hot-toast"; import Icon from "../Icon"; +import { BaseProps } from "./types"; -interface Props { +interface Props extends BaseProps { language: string; content: string; } diff --git a/web/src/components/MemoContent/Heading.tsx b/web/src/components/MemoContent/Heading.tsx index a2373824..2d50a35a 100644 --- a/web/src/components/MemoContent/Heading.tsx +++ b/web/src/components/MemoContent/Heading.tsx @@ -1,7 +1,8 @@ import { Node } from "@/types/proto/api/v2/markdown_service"; import Renderer from "./Renderer"; +import { BaseProps } from "./types"; -interface Props { +interface Props extends BaseProps { level: number; children: Node[]; } @@ -24,7 +25,7 @@ const Heading: React.FC = ({ level, children }: Props) => { return ( {children.map((child, index) => ( - + ))} ); diff --git a/web/src/components/MemoContent/HorizontalRule.tsx b/web/src/components/MemoContent/HorizontalRule.tsx index 908d049f..0f81855e 100644 --- a/web/src/components/MemoContent/HorizontalRule.tsx +++ b/web/src/components/MemoContent/HorizontalRule.tsx @@ -1,4 +1,6 @@ -interface Props { +import { BaseProps } from "./types"; + +interface Props extends BaseProps { symbol: string; } diff --git a/web/src/components/MemoContent/LineBreak.tsx b/web/src/components/MemoContent/LineBreak.tsx index 31d1deae..2d5db554 100644 --- a/web/src/components/MemoContent/LineBreak.tsx +++ b/web/src/components/MemoContent/LineBreak.tsx @@ -1,4 +1,6 @@ -interface Props {} +import { BaseProps } from "./types"; + +interface Props extends BaseProps {} const LineBreak: React.FC = () => { return
; diff --git a/web/src/components/MemoContent/OrderedList.tsx b/web/src/components/MemoContent/OrderedList.tsx index fc22c061..d6484224 100644 --- a/web/src/components/MemoContent/OrderedList.tsx +++ b/web/src/components/MemoContent/OrderedList.tsx @@ -1,7 +1,8 @@ import { Node } from "@/types/proto/api/v2/markdown_service"; import Renderer from "./Renderer"; +import { BaseProps } from "./types"; -interface Props { +interface Props extends BaseProps { number: string; children: Node[]; } @@ -15,7 +16,7 @@ const OrderedList: React.FC = ({ number, children }: Props) => {
{children.map((child, index) => ( - + ))}
diff --git a/web/src/components/MemoContent/Paragraph.tsx b/web/src/components/MemoContent/Paragraph.tsx index bda04b79..5b5966ea 100644 --- a/web/src/components/MemoContent/Paragraph.tsx +++ b/web/src/components/MemoContent/Paragraph.tsx @@ -1,7 +1,8 @@ import { Node } from "@/types/proto/api/v2/markdown_service"; import Renderer from "./Renderer"; +import { BaseProps } from "./types"; -interface Props { +interface Props extends BaseProps { children: Node[]; } @@ -9,7 +10,7 @@ const Paragraph: React.FC = ({ children }: Props) => { return (

{children.map((child, index) => ( - + ))}

); diff --git a/web/src/components/MemoContent/Renderer.tsx b/web/src/components/MemoContent/Renderer.tsx index b8357026..c2b7677a 100644 --- a/web/src/components/MemoContent/Renderer.tsx +++ b/web/src/components/MemoContent/Renderer.tsx @@ -51,19 +51,19 @@ interface Props { const Renderer: React.FC = ({ index, node }: Props) => { switch (node.type) { case NodeType.LINE_BREAK: - return ; + return ; case NodeType.PARAGRAPH: - return ; + return ; case NodeType.CODE_BLOCK: - return ; + return ; case NodeType.HEADING: - return ; + return ; case NodeType.HORIZONTAL_RULE: - return ; + return ; case NodeType.BLOCKQUOTE: - return
; + return
; case NodeType.ORDERED_LIST: - return ; + return ; case NodeType.UNORDERED_LIST: return ; case NodeType.TASK_LIST: diff --git a/web/src/components/MemoContent/UnorderedList.tsx b/web/src/components/MemoContent/UnorderedList.tsx index e26d2e3e..803582ed 100644 --- a/web/src/components/MemoContent/UnorderedList.tsx +++ b/web/src/components/MemoContent/UnorderedList.tsx @@ -15,7 +15,7 @@ const UnorderedList: React.FC = ({ children }: Props) => {
{children.map((child, index) => ( - + ))}
diff --git a/web/src/components/MemoContent/types/index.ts b/web/src/components/MemoContent/types/index.ts index 2edd280c..0103e4f6 100644 --- a/web/src/components/MemoContent/types/index.ts +++ b/web/src/components/MemoContent/types/index.ts @@ -1 +1,6 @@ export * from "./context"; + +export interface BaseProps { + index: string; + className?: string; +}