Merge pull request #183 from ritikprajapat21/main

Fix #181: Added slider to increase/decrease volume
This commit is contained in:
Rohan Verma 2025-07-10 10:29:42 -07:00 committed by GitHub
commit db536fc845
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 2187 additions and 1778 deletions

View file

@ -966,14 +966,14 @@ export default function PodcastsPageClient({
</Button> </Button>
</motion.div> </motion.div>
<div className="relative w-24"> <div className="relative w-full">
<Slider <Slider
value={[isMuted ? 0 : volume]} value={[isMuted ? 0 : volume]}
min={0} min={0}
max={1} max={1}
step={0.01} step={0.01}
onValueChange={handleVolumeChange} onValueChange={handleVolumeChange}
className="w-24" className="w-full"
disabled={isMuted} disabled={isMuted}
/> />
<motion.div <motion.div

View file

@ -0,0 +1,42 @@
"use client";
import { useEffect, useRef, useState } from "react";
import type { RefObject } from "react";
import { Button } from "./ui/button";
import { Copy, CopyCheck } from "lucide-react";
export default function CopyButton({
ref,
}: {
ref: RefObject<HTMLDivElement | null>;
}) {
const [copy, setCopy] = useState(false);
const timeoutRef = useRef<NodeJS.Timeout | null>(null);
useEffect(() => {
return () => {
if (timeoutRef.current) {
clearTimeout(timeoutRef.current);
}
};
}, []);
const handleClick = () => {
if (ref.current) {
const text = ref.current.innerText;
navigator.clipboard.writeText(text);
setCopy(true);
timeoutRef.current = setTimeout(() => {
setCopy(false);
}, 2000);
}
};
return (
<div className="w-full flex justify-end">
<Button variant="ghost" onClick={handleClick}>
{copy ? <CopyCheck /> : <Copy />}
</Button>
</div>
);
}

View file

@ -1,4 +1,4 @@
import React, { useMemo, useState, useEffect } from "react"; import React, { useMemo, useState, useEffect, useRef } from "react";
import ReactMarkdown from "react-markdown"; import ReactMarkdown from "react-markdown";
import rehypeRaw from "rehype-raw"; import rehypeRaw from "rehype-raw";
import rehypeSanitize from "rehype-sanitize"; import rehypeSanitize from "rehype-sanitize";
@ -7,97 +7,164 @@ import { cn } from "@/lib/utils";
import { Citation } from "./chat/Citation"; import { Citation } from "./chat/Citation";
import { Source } from "./chat/types"; import { Source } from "./chat/types";
import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"; import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
import { oneLight, oneDark } from "react-syntax-highlighter/dist/cjs/styles/prism"; import {
oneLight,
oneDark,
} from "react-syntax-highlighter/dist/cjs/styles/prism";
import { Check, Copy } from "lucide-react"; import { Check, Copy } from "lucide-react";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
import CopyButton from "./copy-button";
interface MarkdownViewerProps { interface MarkdownViewerProps {
content: string; content: string;
className?: string; className?: string;
getCitationSource?: (id: number) => Source | null; getCitationSource?: (id: number) => Source | null;
type?: "user" | "ai";
} }
export function MarkdownViewer({ content, className, getCitationSource }: MarkdownViewerProps) { export function MarkdownViewer({
content,
className,
getCitationSource,
type = "user",
}: MarkdownViewerProps) {
const ref = useRef<HTMLDivElement>(null);
// Memoize the markdown components to prevent unnecessary re-renders // Memoize the markdown components to prevent unnecessary re-renders
const components = useMemo(() => { const components = useMemo(() => {
return { return {
// Define custom components for markdown elements // Define custom components for markdown elements
p: ({node, children, ...props}: any) => { p: ({ node, children, ...props }: any) => {
// If there's no getCitationSource function, just render normally // If there's no getCitationSource function, just render normally
if (!getCitationSource) { if (!getCitationSource) {
return <p className="my-2" {...props}>{children}</p>; return (
<p className="my-2" {...props}>
{children}
</p>
);
} }
// Process citations within paragraph content // Process citations within paragraph content
return <p className="my-2" {...props}>{processCitationsInReactChildren(children, getCitationSource)}</p>; return (
<p className="my-2" {...props}>
{processCitationsInReactChildren(children, getCitationSource)}
</p>
);
}, },
a: ({node, children, ...props}: any) => { a: ({ node, children, ...props }: any) => {
// Process citations within link content if needed // Process citations within link content if needed
const processedChildren = getCitationSource const processedChildren = getCitationSource
? processCitationsInReactChildren(children, getCitationSource) ? processCitationsInReactChildren(children, getCitationSource)
: children; : children;
return <a className="text-primary hover:underline" {...props}>{processedChildren}</a>; return (
<a className="text-primary hover:underline" {...props}>
{processedChildren}
</a>
);
}, },
li: ({node, children, ...props}: any) => { li: ({ node, children, ...props }: any) => {
// Process citations within list item content // Process citations within list item content
const processedChildren = getCitationSource const processedChildren = getCitationSource
? processCitationsInReactChildren(children, getCitationSource) ? processCitationsInReactChildren(children, getCitationSource)
: children; : children;
return <li {...props}>{processedChildren}</li>; return <li {...props}>{processedChildren}</li>;
}, },
ul: ({node, ...props}: any) => <ul className="list-disc pl-5 my-2" {...props} />, ul: ({ node, ...props }: any) => (
ol: ({node, ...props}: any) => <ol className="list-decimal pl-5 my-2" {...props} />, <ul className="list-disc pl-5 my-2" {...props} />
h1: ({node, children, ...props}: any) => { ),
ol: ({ node, ...props }: any) => (
<ol className="list-decimal pl-5 my-2" {...props} />
),
h1: ({ node, children, ...props }: any) => {
const processedChildren = getCitationSource const processedChildren = getCitationSource
? processCitationsInReactChildren(children, getCitationSource) ? processCitationsInReactChildren(children, getCitationSource)
: children; : children;
return <h1 className="text-2xl font-bold mt-6 mb-2" {...props}>{processedChildren}</h1>; return (
<h1 className="text-2xl font-bold mt-6 mb-2" {...props}>
{processedChildren}
</h1>
);
}, },
h2: ({node, children, ...props}: any) => { h2: ({ node, children, ...props }: any) => {
const processedChildren = getCitationSource const processedChildren = getCitationSource
? processCitationsInReactChildren(children, getCitationSource) ? processCitationsInReactChildren(children, getCitationSource)
: children; : children;
return <h2 className="text-xl font-bold mt-5 mb-2" {...props}>{processedChildren}</h2>; return (
<h2 className="text-xl font-bold mt-5 mb-2" {...props}>
{processedChildren}
</h2>
);
}, },
h3: ({node, children, ...props}: any) => { h3: ({ node, children, ...props }: any) => {
const processedChildren = getCitationSource const processedChildren = getCitationSource
? processCitationsInReactChildren(children, getCitationSource) ? processCitationsInReactChildren(children, getCitationSource)
: children; : children;
return <h3 className="text-lg font-bold mt-4 mb-2" {...props}>{processedChildren}</h3>; return (
<h3 className="text-lg font-bold mt-4 mb-2" {...props}>
{processedChildren}
</h3>
);
}, },
h4: ({node, children, ...props}: any) => { h4: ({ node, children, ...props }: any) => {
const processedChildren = getCitationSource const processedChildren = getCitationSource
? processCitationsInReactChildren(children, getCitationSource) ? processCitationsInReactChildren(children, getCitationSource)
: children; : children;
return <h4 className="text-base font-bold mt-3 mb-1" {...props}>{processedChildren}</h4>; return (
<h4 className="text-base font-bold mt-3 mb-1" {...props}>
{processedChildren}
</h4>
);
}, },
blockquote: ({node, ...props}: any) => <blockquote className="border-l-4 border-muted pl-4 italic my-2" {...props} />, blockquote: ({ node, ...props }: any) => (
hr: ({node, ...props}: any) => <hr className="my-4 border-muted" {...props} />, <blockquote
img: ({node, ...props}: any) => <img className="max-w-full h-auto my-4 rounded" {...props} />, className="border-l-4 border-muted pl-4 italic my-2"
table: ({node, ...props}: any) => <div className="overflow-x-auto my-4"><table className="min-w-full divide-y divide-border" {...props} /></div>, {...props}
th: ({node, ...props}: any) => <th className="px-3 py-2 text-left font-medium bg-muted" {...props} />, />
td: ({node, ...props}: any) => <td className="px-3 py-2 border-t border-border" {...props} />, ),
code: ({node, className, children, ...props}: any) => { hr: ({ node, ...props }: any) => (
const match = /language-(\w+)/.exec(className || ''); <hr className="my-4 border-muted" {...props} />
const language = match ? match[1] : ''; ),
img: ({ node, ...props }: any) => (
<img className="max-w-full h-auto my-4 rounded" {...props} />
),
table: ({ node, ...props }: any) => (
<div className="overflow-x-auto my-4">
<table className="min-w-full divide-y divide-border" {...props} />
</div>
),
th: ({ node, ...props }: any) => (
<th className="px-3 py-2 text-left font-medium bg-muted" {...props} />
),
td: ({ node, ...props }: any) => (
<td className="px-3 py-2 border-t border-border" {...props} />
),
code: ({ node, className, children, ...props }: any) => {
const match = /language-(\w+)/.exec(className || "");
const language = match ? match[1] : "";
const isInline = !match; const isInline = !match;
if (isInline) { if (isInline) {
return <code className="bg-muted px-1 py-0.5 rounded text-xs" {...props}>{children}</code>; return (
<code className="bg-muted px-1 py-0.5 rounded text-xs" {...props}>
{children}
</code>
);
} }
// For code blocks, add syntax highlighting and copy functionality // For code blocks, add syntax highlighting and copy functionality
return ( return (
<CodeBlock language={language} {...props}> <CodeBlock language={language} {...props}>
{String(children).replace(/\n$/, '')} {String(children).replace(/\n$/, "")}
</CodeBlock> </CodeBlock>
); );
} },
}; };
}, [getCitationSource]); }, [getCitationSource]);
return ( return (
<div className={cn("prose prose-sm dark:prose-invert max-w-none", className)}> <div
className={cn("prose prose-sm dark:prose-invert max-w-none", className)}
ref={ref}
>
<ReactMarkdown <ReactMarkdown
rehypePlugins={[rehypeRaw, rehypeSanitize]} rehypePlugins={[rehypeRaw, rehypeSanitize]}
remarkPlugins={[remarkGfm]} remarkPlugins={[remarkGfm]}
@ -105,12 +172,19 @@ export function MarkdownViewer({ content, className, getCitationSource }: Markdo
> >
{content} {content}
</ReactMarkdown> </ReactMarkdown>
{type === "ai" && <CopyButton ref={ref} />}
</div> </div>
); );
} }
// Code block component with syntax highlighting and copy functionality // Code block component with syntax highlighting and copy functionality
const CodeBlock = ({ children, language }: { children: string, language: string }) => { const CodeBlock = ({
children,
language,
}: {
children: string;
language: string;
}) => {
const [copied, setCopied] = useState(false); const [copied, setCopied] = useState(false);
const { resolvedTheme, theme } = useTheme(); const { resolvedTheme, theme } = useTheme();
const [mounted, setMounted] = useState(false); const [mounted, setMounted] = useState(false);
@ -127,7 +201,7 @@ const CodeBlock = ({ children, language }: { children: string, language: string
}; };
// Choose theme based on current system/user preference // Choose theme based on current system/user preference
const isDarkTheme = mounted && (resolvedTheme === 'dark' || theme === 'dark'); const isDarkTheme = mounted && (resolvedTheme === "dark" || theme === "dark");
const syntaxTheme = isDarkTheme ? oneDark : oneLight; const syntaxTheme = isDarkTheme ? oneDark : oneLight;
return ( return (
@ -138,57 +212,58 @@ const CodeBlock = ({ children, language }: { children: string, language: string
className="p-1.5 rounded-md bg-background/80 hover:bg-background border border-border flex items-center justify-center transition-colors" className="p-1.5 rounded-md bg-background/80 hover:bg-background border border-border flex items-center justify-center transition-colors"
aria-label="Copy code" aria-label="Copy code"
> >
{copied ? {copied ? (
<Check size={14} className="text-green-500" /> : <Check size={14} className="text-green-500" />
) : (
<Copy size={14} className="text-muted-foreground" /> <Copy size={14} className="text-muted-foreground" />
} )}
</button> </button>
</div> </div>
{mounted ? ( {mounted ? (
<SyntaxHighlighter <SyntaxHighlighter
language={language || 'text'} language={language || "text"}
style={{ style={{
...syntaxTheme, ...syntaxTheme,
'pre[class*="language-"]': { 'pre[class*="language-"]': {
...syntaxTheme['pre[class*="language-"]'], ...syntaxTheme['pre[class*="language-"]'],
margin: 0, margin: 0,
border: 'none', border: "none",
borderRadius: '0.375rem', borderRadius: "0.375rem",
background: 'var(--syntax-bg)' background: "var(--syntax-bg)",
}, },
'code[class*="language-"]': { 'code[class*="language-"]': {
...syntaxTheme['code[class*="language-"]'], ...syntaxTheme['code[class*="language-"]'],
border: 'none', border: "none",
background: 'var(--syntax-bg)' background: "var(--syntax-bg)",
} },
}} }}
customStyle={{ customStyle={{
margin: 0, margin: 0,
borderRadius: '0.375rem', borderRadius: "0.375rem",
fontSize: '0.75rem', fontSize: "0.75rem",
lineHeight: '1.5rem', lineHeight: "1.5rem",
backgroundColor: 'var(--syntax-bg)', backgroundColor: "var(--syntax-bg)",
border: 'none', border: "none",
}} }}
codeTagProps={{ codeTagProps={{
className: "font-mono", className: "font-mono",
style: { style: {
border: 'none', border: "none",
background: 'var(--syntax-bg)' background: "var(--syntax-bg)",
} },
}} }}
showLineNumbers={false} showLineNumbers={false}
wrapLines={false} wrapLines={false}
lineProps={{ lineProps={{
style: { style: {
wordBreak: 'break-all', wordBreak: "break-all",
whiteSpace: 'pre-wrap', whiteSpace: "pre-wrap",
border: 'none', border: "none",
borderBottom: 'none', borderBottom: "none",
paddingLeft: 0, paddingLeft: 0,
paddingRight: 0, paddingRight: 0,
margin: '0.25rem 0' margin: "0.25rem 0",
} },
}} }}
PreTag="div" PreTag="div"
> >
@ -197,7 +272,9 @@ const CodeBlock = ({ children, language }: { children: string, language: string
) : ( ) : (
<div className="bg-muted p-4 rounded-md"> <div className="bg-muted p-4 rounded-md">
<pre className="m-0 p-0 border-0"> <pre className="m-0 p-0 border-0">
<code className="text-xs font-mono border-0 leading-6">{children}</code> <code className="text-xs font-mono border-0 leading-6">
{children}
</code>
</pre> </pre>
</div> </div>
)} )}
@ -206,21 +283,24 @@ const CodeBlock = ({ children, language }: { children: string, language: string
}; };
// Helper function to process citations within React children // Helper function to process citations within React children
const processCitationsInReactChildren = (children: React.ReactNode, getCitationSource: (id: number) => Source | null): React.ReactNode => { const processCitationsInReactChildren = (
children: React.ReactNode,
getCitationSource: (id: number) => Source | null,
): React.ReactNode => {
// If children is not an array or string, just return it // If children is not an array or string, just return it
if (!children || (typeof children !== 'string' && !Array.isArray(children))) { if (!children || (typeof children !== "string" && !Array.isArray(children))) {
return children; return children;
} }
// Handle string content directly - this is where we process citation references // Handle string content directly - this is where we process citation references
if (typeof children === 'string') { if (typeof children === "string") {
return processCitationsInText(children, getCitationSource); return processCitationsInText(children, getCitationSource);
} }
// Handle arrays of children recursively // Handle arrays of children recursively
if (Array.isArray(children)) { if (Array.isArray(children)) {
return React.Children.map(children, child => { return React.Children.map(children, (child) => {
if (typeof child === 'string') { if (typeof child === "string") {
return processCitationsInText(child, getCitationSource); return processCitationsInText(child, getCitationSource);
} }
return child; return child;
@ -231,7 +311,10 @@ const processCitationsInReactChildren = (children: React.ReactNode, getCitationS
}; };
// Process citation references in text content // Process citation references in text content
const processCitationsInText = (text: string, getCitationSource: (id: number) => Source | null): React.ReactNode[] => { const processCitationsInText = (
text: string,
getCitationSource: (id: number) => Source | null,
): React.ReactNode[] => {
// Use improved regex to catch citation numbers more reliably // Use improved regex to catch citation numbers more reliably
// This will match patterns like [1], [42], etc. including when they appear at the end of a line or sentence // This will match patterns like [1], [42], etc. including when they appear at the end of a line or sentence
const citationRegex = /\[(\d+)\]/g; const citationRegex = /\[(\d+)\]/g;
@ -257,7 +340,7 @@ const processCitationsInText = (text: string, getCitationSource: (id: number) =>
citationText={match[0]} citationText={match[0]}
position={position} position={position}
source={source} source={source}
/> />,
); );
lastIndex = match.index + match[0].length; lastIndex = match.index + match[0].length;

View file

@ -4354,8 +4354,8 @@ packages:
tailwind-merge@3.2.0: tailwind-merge@3.2.0:
resolution: {integrity: sha512-FQT/OVqCD+7edmmJpsgCsY820RTD5AkBryuG5IUqR5YQZSdj5xlH5nLgH7YPths7WsLPSpSBNneJdM8aS8aeFA==} resolution: {integrity: sha512-FQT/OVqCD+7edmmJpsgCsY820RTD5AkBryuG5IUqR5YQZSdj5xlH5nLgH7YPths7WsLPSpSBNneJdM8aS8aeFA==}
tailwind-merge@3.3.0: tailwind-merge@3.3.1:
resolution: {integrity: sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==} resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}
tailwindcss-animate@1.0.7: tailwindcss-animate@1.0.7:
resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
@ -6869,7 +6869,7 @@ snapshots:
react: 19.0.0 react: 19.0.0
react-dom: 19.0.0(react@19.0.0) react-dom: 19.0.0(react@19.0.0)
react-easy-sort: 1.6.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react-easy-sort: 1.6.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
tailwind-merge: 3.3.0 tailwind-merge: 3.3.1
tsup: 6.7.0(postcss@8.5.3)(typescript@5.8.2) tsup: 6.7.0(postcss@8.5.3)(typescript@5.8.2)
transitivePeerDependencies: transitivePeerDependencies:
- '@swc/core' - '@swc/core'
@ -9411,7 +9411,7 @@ snapshots:
tailwind-merge@3.2.0: {} tailwind-merge@3.2.0: {}
tailwind-merge@3.3.0: {} tailwind-merge@3.3.1: {}
tailwindcss-animate@1.0.7(tailwindcss@4.0.9): tailwindcss-animate@1.0.7(tailwindcss@4.0.9):
dependencies: dependencies: