Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

consolidate MessageMarkdown

Steven Tey8891728e2d5e
diff --git a/apps/web/ui/messages/message-markdown.tsx b/apps/web/ui/messages/message-markdown.tsx
index caf9177867..9b9c1106ec 100644
--- a/apps/web/ui/messages/message-markdown.tsx
+++ b/apps/web/ui/messages/message-markdown.tsx
@@ -1,6 +1,7 @@
import { cn } from "@dub/utils";
import ReactMarkdown from "react-markdown";
import "react-medium-image-zoom/dist/styles.css";
+import remarkGfm from "remark-gfm";
import { ZoomImage } from "../shared/zoom-image";
export function MessageMarkdown({
@@ -34,7 +35,6 @@ export function MessageMarkdown({
"prose-li:mb-1 prose-li:leading-5",
"prose-hr:my-8",
"prose-img:rounded-lg prose-img:border-1",
- // Color styles (conditional based on invert)
invert
? [
"prose-headings:text-white prose-headings:border-neutral-600",
@@ -65,6 +65,19 @@ export function MessageMarkdown({
"prose-img:border-neutral-200",
],
)}
+ allowedElements={[
+ "p",
+ "a",
+ "code",
+ "pre",
+ "strong",
+ "em",
+ "ul",
+ "ol",
+ "li",
+ "blockquote",
+ "hr",
+ ]}
components={{
a: ({ node, ...props }) => (
<a {...props} target="_blank" rel="noopener noreferrer" />
@@ -85,6 +98,7 @@ export function MessageMarkdown({
},
...components,
}}
+ remarkPlugins={[remarkGfm] as any}
>
{children}
</ReactMarkdown>
diff --git a/apps/web/ui/messages/messages-panel.tsx b/apps/web/ui/messages/messages-panel.tsx
index c11e13b6eb..21ba2b9cb7 100644
--- a/apps/web/ui/messages/messages-panel.tsx
+++ b/apps/web/ui/messages/messages-panel.tsx
@@ -4,15 +4,12 @@ import {
Check2,
Envelope,
LoadingSpinner,
- PROSE_STYLES,
Tooltip,
useMediaQuery,
} from "@dub/ui";
import { OG_AVATAR_URL, cn, formatDateTime } from "@dub/utils";
import { ChevronRight } from "lucide-react";
import { Fragment, useMemo, useRef, useState } from "react";
-import ReactMarkdown from "react-markdown";
-import remarkGfm from "remark-gfm";
import { MessageInput } from "../shared/message-input";
import { MessageMarkdown } from "./message-markdown";
@@ -220,50 +217,9 @@ export function MessagesPanel({
: "rounded-bl bg-neutral-100",
)}
>
- <ReactMarkdown
- className={cn(
- isMySide
- ? "text-content-inverted prose-invert prose-a:text-content-inverted"
- : "text-content-default prose-a:text-content-emphasis",
- "prose prose-sm break-words",
- PROSE_STYLES.chat,
- "prose-a:font-medium prose-a:underline-offset-4",
- )}
- allowedElements={[
- "p",
- "a",
- "code",
- "pre",
- "strong",
- "em",
- "ul",
- "ol",
- "li",
- ]}
- components={{
- a: ({ node, ...props }) => (
- <a
- {...props}
- target="_blank"
- rel="noopener noreferrer"
- />
- ),
- pre: ({ node, ...props }) => (
- <pre
- {...props}
- className={cn(
- "my-1 text-wrap py-1 text-sm",
- isMySide
- ? "text-content-inverted bg-neutral-600"
- : "text-content-default bg-neutral-200",
- )}
- />
- ),
- }}
- remarkPlugins={[remarkGfm] as any}
- >
+ <MessageMarkdown invert={isMySide}>
{message.text}
- </ReactMarkdown>
+ </MessageMarkdown>
</div>
</div>
</div>