TypeScript
update styles
Andrew Luodef6f5f3e93b
diff --git a/apps/v4/components/callout.tsx b/apps/v4/components/callout.tsxindex 52c3160..9ea8fd7 100644--- a/apps/v4/components/callout.tsx+++ b/apps/v4/components/callout.tsx@@ -20,14 +20,14 @@ export function Callout({<Alertdata-variant={variant}className={cn(- "mt-6 w-auto rounded-xl border-surface bg-surface text-surface-foreground md:-mx-1",+ "mt-6 w-auto min-w-0 grid-cols-[minmax(0,1fr)] rounded-xl border-surface bg-surface text-surface-foreground md:-mx-1",className)}{...props}>{icon}- {title && <AlertTitle>{title}</AlertTitle>}- <AlertDescription className="text-card-foreground/80">+ {title && <AlertTitle className="min-w-0">{title}</AlertTitle>}+ <AlertDescription className="min-w-0 text-card-foreground/80">{children}</AlertDescription></Alert>diff --git a/apps/v4/components/code-block-command.tsx b/apps/v4/components/code-block-command.tsxindex 9cb0137..bf9dd5c 100644--- a/apps/v4/components/code-block-command.tsx+++ b/apps/v4/components/code-block-command.tsx@@ -4,9 +4,8 @@ import * as React from "react"import { IconTerminal } from "@tabler/icons-react"import { useConfig } from "@/hooks/use-config"-import { Button } from "@/components/ui/button"import {- CopyButtonIcon,+ CodeHeaderCopyButton,copyToClipboardWithMeta,} from "@/components/copy-button"import {@@ -15,11 +14,6 @@ import {TabsList,TabsTrigger,} from "@/registry/new-york-v4/ui/tabs"-import {- Tooltip,- TooltipContent,- TooltipTrigger,-} from "@/registry/new-york-v4/ui/tooltip"export function CodeBlockCommand({__npm__,@@ -81,23 +75,31 @@ export function CodeBlockCommand({})}}>- <div className="flex items-center gap-2 border-b border-border/50 px-3 py-1">- <div className="flex size-4 items-center justify-center rounded-[1px] bg-foreground opacity-70">- <IconTerminal className="size-3 text-code" />+ <div className="flex min-h-10 items-center justify-between gap-3 border-b border-border/50 px-3 py-1">+ <div className="flex min-w-0 items-center gap-2">+ <div className="flex size-4 shrink-0 items-center justify-center rounded-[1px] bg-foreground opacity-70">+ <IconTerminal className="size-3 text-code" />+ </div>+ <TabsList className="min-w-0 rounded-none bg-transparent p-0">+ {Object.entries(tabs).map(([key]) => {+ return (+ <TabsTrigger+ key={key}+ value={key}+ className="h-7 border border-transparent pt-0.5 shadow-none! data-[state=active]:border-input data-[state=active]:bg-background!"+ >+ {key}+ </TabsTrigger>+ )+ })}+ </TabsList></div>- <TabsList className="rounded-none bg-transparent p-0">- {Object.entries(tabs).map(([key]) => {- return (- <TabsTrigger- key={key}- value={key}- className="h-7 border border-transparent pt-0.5 shadow-none! data-[state=active]:border-input data-[state=active]:bg-background!"- >- {key}- </TabsTrigger>- )- })}- </TabsList>+ <CodeHeaderCopyButton+ value={tabs[packageManager] ?? ""}+ copied={hasCopied}+ disabled={hasCopied}+ onClick={copyCommand}+ /></div><div className="no-scrollbar overflow-x-auto">{Object.entries(tabs).map(([key, value]) => {@@ -116,19 +118,6 @@ export function CodeBlockCommand({})}</div></Tabs>- <Button- data-slot="copy-button"- data-copied={hasCopied}- aria-label={hasCopied ? "Copied" : "Copy to clipboard"}- disabled={hasCopied}- size="icon"- variant="ghost"- className="absolute top-2 right-2 z-10 size-7 opacity-70 transition-all duration-200 ease-out hover:opacity-100 focus-visible:opacity-100 active:scale-[0.97] disabled:opacity-100"- onClick={copyCommand}- >- <span className="sr-only">{hasCopied ? "Copied" : "Copy"}</span>- <CopyButtonIcon copied={hasCopied} />- </Button></div>)}diff --git a/apps/v4/components/code-collapsible-wrapper.tsx b/apps/v4/components/code-collapsible-wrapper.tsxindex 4f30d03..c3abc4f 100644--- a/apps/v4/components/code-collapsible-wrapper.tsx+++ b/apps/v4/components/code-collapsible-wrapper.tsx@@ -4,7 +4,7 @@ import * as React from "react"import { cn } from "@/lib/utils"import { buttonVariants } from "@/components/ui/button"-import { CopyButton } from "@/components/copy-button"+import { CodeHeaderCopyButton } from "@/components/copy-button"import { getIconForLanguageExtension } from "@/components/icons"import {Collapsible,@@ -38,12 +38,12 @@ export function CodeCollapsibleWrapper({open={isOpened}onOpenChange={setIsOpened}className={cn(- "group/collapsible relative overflow-hidden rounded-lg border bg-code md:-mx-1",+ "group/collapsible relative overflow-hidden rounded-lg bg-code md:-mx-1",className)}{...props}>- <div className="flex min-h-10 items-center justify-between gap-3 border-b bg-code px-3 text-code-foreground">+ <div className="flex min-h-10 items-center justify-between gap-3 bg-code px-3 text-code-foreground"><div className="flex min-w-0 items-center gap-2 text-sm [&_svg]:size-4 [&_svg]:shrink-0 [&_svg]:text-code-foreground [&_svg]:opacity-70">{getIconForLanguageExtension(language)}<span className="truncate">{title}</span>@@ -60,10 +60,7 @@ export function CodeCollapsibleWrapper({</CollapsibleTrigger><Separator orientation="vertical" className="mx-1.5 h-4!" />{copyValue ? (- <CopyButton- value={copyValue}- className="static z-auto size-7 shrink-0 bg-transparent opacity-100"- />+ <CodeHeaderCopyButton value={copyValue} />) : null}</div></div>@@ -72,7 +69,7 @@ export function CodeCollapsibleWrapper({{children}</CollapsibleContent>) : (- <div className="relative max-h-64 overflow-hidden [content-visibility:auto] [&>figure]:mt-0 [&>figure]:md:mx-0!">+ <div className="relative h-64 max-h-64 overflow-hidden [&>figure]:mt-0 [&>figure]:md:mx-0!">{closedContent}</div>)}diff --git a/apps/v4/components/copy-button.tsx b/apps/v4/components/copy-button.tsxindex 54a5705..eb32bd7 100644--- a/apps/v4/components/copy-button.tsx+++ b/apps/v4/components/copy-button.tsx@@ -104,19 +104,26 @@ export function CopyButtonIcon({)}+export const codeHeaderCopyButtonClassName =+ "static z-auto shrink-0 bg-transparent"+export function CopyButton({value,className,+ copied,variant = "ghost",event,+ onClick,...props}: React.ComponentProps<typeof Button> & {value: stringsrc?: stringevent?: Event["name"]tooltip?: string+ copied?: boolean}) {const [hasCopied, setHasCopied] = React.useState(false)+ const isCopied = copied ?? hasCopiedReact.useEffect(() => {if (hasCopied) {@@ -128,16 +135,21 @@ export function CopyButton({return (<Buttondata-slot="copy-button"- data-copied={hasCopied}- aria-label={hasCopied ? "Copied" : "Copy to clipboard"}- disabled={hasCopied}+ data-copied={isCopied}+ aria-label={isCopied ? "Copied" : "Copy to clipboard"}+ disabled={isCopied}size="icon"variant={variant}className={cn(- "absolute top-3 right-2 z-10 size-7 bg-code transition-all duration-200 ease-out hover:opacity-100 focus-visible:opacity-100 active:scale-[0.97] disabled:opacity-100",+ "absolute top-3 right-2 z-10 size-7 bg-code opacity-70 transition-all duration-200 ease-out hover:opacity-100 focus-visible:opacity-100 active:scale-[0.97] disabled:opacity-100",className)}- onClick={async () => {+ onClick={async (event_) => {+ if (onClick) {+ onClick(event_)+ return+ }+const hasCopied = await copyToClipboardWithMeta(value,event@@ -156,8 +168,20 @@ export function CopyButton({}}{...props}>- <span className="sr-only">{hasCopied ? "Copied" : "Copy"}</span>- <CopyButtonIcon copied={hasCopied} />+ <span className="sr-only">{isCopied ? "Copied" : "Copy"}</span>+ <CopyButtonIcon copied={isCopied} /></Button>)}++export function CodeHeaderCopyButton({+ className,+ ...props+}: React.ComponentProps<typeof CopyButton>) {+ return (+ <CopyButton+ className={cn(codeHeaderCopyButtonClassName, className)}+ {...props}+ />+ )+}diff --git a/apps/v4/components/docs-code-block.tsx b/apps/v4/components/docs-code-block.tsxindex 9e006ea..0bd364f 100644--- a/apps/v4/components/docs-code-block.tsx+++ b/apps/v4/components/docs-code-block.tsx@@ -7,6 +7,22 @@ import { Button } from "@/components/ui/button"import { CodeCollapsibleWrapper } from "@/components/code-collapsible-wrapper"import { HighlightedCodeBlock } from "@/components/highlighted-code-block"+const VIEW_CODE_COLLAPSE_LINE_THRESHOLD = 20++function getLineCount(code: string) {+ if (!code) return 0++ let lineCount = 1++ for (let index = 0; index < code.length; index += 1) {+ if (code.charCodeAt(index) === 10) {+ lineCount += 1+ }+ }++ return lineCount+}+function DocsSourceCodePreview({code,fileName,@@ -25,6 +41,7 @@ function DocsSourceCodePreview({lazy={false}maxHeightClassName="h-64 max-h-64"previewLines={12}+ renderFallbackCodeshowCopy={false}/>)@@ -80,17 +97,19 @@ export function DocsViewCodeBlock({language?: string}) {const [isCodeVisible, setIsCodeVisible] = React.useState(false)+ const shouldCollapse = getLineCount(code) > VIEW_CODE_COLLAPSE_LINE_THRESHOLD+ const isExpanded = !shouldCollapse || isCodeVisiblereturn (<divdata-slot="code"- data-mobile-code-visible={isCodeVisible}+ data-mobile-code-visible={isExpanded}className={cn("relative overflow-hidden **:data-[slot=copy-button]:right-4 **:data-[slot=copy-button]:hidden data-[mobile-code-visible=true]:**:data-[slot=copy-button]:flex [&_[data-rehype-pretty-code-figure]]:m-0! [&_[data-rehype-pretty-code-figure]]:rounded-t-none [&_[data-rehype-pretty-code-figure]]:border-t [&_pre]:max-h-72",className)}>- {isCodeVisible ? (+ {isExpanded ? (<HighlightedCodeBlockcode={code}fileName={fileName}@@ -107,6 +126,7 @@ export function DocsViewCodeBlock({lazy={false}maxHeightClassName="h-full max-h-56"previewLines={10}+ renderFallbackCodeshowCopy={false}/><div className="absolute inset-0 flex items-center justify-center pb-4">@@ -132,3 +152,32 @@ export function DocsViewCodeBlock({</div>)}++export function DocsMdxCodeBlock({+ code,+ className,+ copyButtonClassName,+ fileName,+ language = "tsx",+}: {+ code: string+ className?: string+ copyButtonClassName?: string+ fileName?: string+ language?: string+}) {+ return (+ <HighlightedCodeBlock+ code={code}+ copyButtonClassName={copyButtonClassName}+ className={cn(+ "mt-6! mb-0 min-w-0 max-w-full",+ className+ )}+ fileName={fileName}+ language={language}+ lazy={false}+ maxHeightClassName="max-h-72"+ />+ )+}diff --git a/apps/v4/components/highlighted-code-block.tsx b/apps/v4/components/highlighted-code-block.tsxindex 6597fc4..88696fd 100644--- a/apps/v4/components/highlighted-code-block.tsx+++ b/apps/v4/components/highlighted-code-block.tsx@@ -187,26 +187,73 @@ function syncVirtualizerBuffers(})}+function handleCodeBlockWheel(event: WheelEvent, container: HTMLElement) {+ if (event.deltaY === 0 && event.deltaX === 0) {+ return+ }++ const scrollElement = container.querySelector<HTMLElement>(".no-scrollbar")++ if (!scrollElement) {+ return+ }++ const maxScrollTop = scrollElement.scrollHeight - scrollElement.clientHeight+ const maxScrollLeft = scrollElement.scrollWidth - scrollElement.clientWidth+ const canScrollVertically = maxScrollTop > 0+ const canScrollHorizontally = maxScrollLeft > 0+ const canScrollDown =+ canScrollVertically && scrollElement.scrollTop < maxScrollTop+ const canScrollUp = canScrollVertically && scrollElement.scrollTop > 0+ const canScrollRight =+ canScrollHorizontally && scrollElement.scrollLeft < maxScrollLeft+ const canScrollLeft = canScrollHorizontally && scrollElement.scrollLeft > 0+ const shouldHandleVertical =+ (event.deltaY > 0 && canScrollDown) || (event.deltaY < 0 && canScrollUp)+ const shouldHandleHorizontal =+ (event.deltaX > 0 && canScrollRight) ||+ (event.deltaX < 0 && canScrollLeft)++ if (!shouldHandleVertical && !shouldHandleHorizontal) {+ return+ }++ event.preventDefault()+ event.stopPropagation()+ event.stopImmediatePropagation()+ scrollElement.scrollBy({+ left: shouldHandleHorizontal ? event.deltaX : 0,+ top: shouldHandleVertical ? event.deltaY : 0,+ })+}+export function HighlightedCodeBlock({code,className,+ copyButtonClassName,fileName = "component.tsx",language = "tsx",lazy = true,maxHeightClassName = "max-h-[34rem]",previewLines,+ renderFallbackCode = false,showCopy = true,}: {code: stringclassName?: string+ copyButtonClassName?: stringfileName?: stringlanguage?: stringlazy?: booleanmaxHeightClassName?: stringpreviewLines?: number+ renderFallbackCode?: booleanshowCopy?: boolean}) {const [isVisible, setIsVisible] = React.useState(!lazy)+ const [renderedCodeKey, setRenderedCodeKey] = React.useState<string | null>(+ null+ )const codeThemeType = useCodeThemeType()const containerRef = React.useRef<HTMLDivElement | null>(null)const visibleCode = React.useMemo(() => {@@ -224,6 +271,10 @@ export function HighlightedCodeBlock({}),[fileName, language, visibleCode])+ const codeRenderKey = `${file.cacheKey}:${codeThemeType}`+ const hasRenderedCode = renderedCodeKey === codeRenderKey+ const shouldShowFallback =+ renderFallbackCode && isVisible && !hasRenderedCodeconst fileOptions = React.useMemo(() => ({@@ -236,10 +287,11 @@ export function HighlightedCodeBlock({themeType: codeThemeType,onPostRender: (fileContainer: HTMLElement) => {syncVirtualizerBuffers(fileContainer, lastRenderableLineIndex)+ setRenderedCodeKey(codeRenderKey)},unsafeCSS: CODE_FILE_UNSAFE_CSS,}),- [codeThemeType, lastRenderableLineIndex]+ [codeRenderKey, codeThemeType, lastRenderableLineIndex])React.useEffect(() => {@@ -271,6 +323,24 @@ export function HighlightedCodeBlock({return () => observer.disconnect()}, [lazy])+ React.useEffect(() => {+ const container = containerRef.current+ if (!container) return++ const onWheel = (event: WheelEvent) => {+ handleCodeBlockWheel(event, container)+ }++ container.addEventListener("wheel", onWheel, {+ capture: true,+ passive: false,+ })++ return () => {+ container.removeEventListener("wheel", onWheel, { capture: true })+ }+ }, [])+return (<divref={containerRef}@@ -280,27 +350,46 @@ export function HighlightedCodeBlock({className)}>- {showCopy && <CopyButton value={code} />}+ {showCopy && <CopyButton value={code} className={copyButtonClassName} />}+ {shouldShowFallback ? (+ <pre+ aria-hidden="true"+ className={cn(+ "pointer-events-none absolute inset-0 z-[1] m-0 overflow-hidden px-4 py-3.5 font-mono text-[0.8rem] leading-[1.625] whitespace-pre text-code-foreground",+ maxHeightClassName+ )}+ >+ <code>{visibleCode}</code>+ </pre>+ ) : null}{isVisible ? (- <WorkerPoolContextProvider- poolOptions={CODE_WORKER_POOL_OPTIONS}- highlighterOptions={CODE_HIGHLIGHTER_OPTIONS}+ <div+ aria-hidden={shouldShowFallback}+ className={cn(+ "h-full min-h-0 transition-opacity",+ shouldShowFallback && "opacity-0"+ )}>- <Virtualizer- className={cn(- "no-scrollbar min-w-0 overflow-x-auto overflow-y-auto overscroll-x-contain overscroll-y-auto outline-none",- maxHeightClassName- )}- contentClassName="min-w-full"+ <WorkerPoolContextProvider+ poolOptions={CODE_WORKER_POOL_OPTIONS}+ highlighterOptions={CODE_HIGHLIGHTER_OPTIONS}>- <File- file={file}- metrics={CODE_VIRTUAL_FILE_METRICS}- style={CODE_FILE_THEME}- options={fileOptions}- />- </Virtualizer>- </WorkerPoolContextProvider>+ <Virtualizer+ className={cn(+ "no-scrollbar min-w-0 overflow-x-auto overflow-y-auto overscroll-contain outline-none",+ maxHeightClassName+ )}+ contentClassName="min-w-full"+ >+ <File+ file={file}+ metrics={CODE_VIRTUAL_FILE_METRICS}+ style={CODE_FILE_THEME}+ options={fileOptions}+ />+ </Virtualizer>+ </WorkerPoolContextProvider>+ </div>) : (<div className={cn("min-h-72 bg-code", maxHeightClassName)} />)}diff --git a/apps/v4/components/pdf-viewer-blocks.tsx b/apps/v4/components/pdf-viewer-blocks.tsxindex a6ab6ae..629584d 100644--- a/apps/v4/components/pdf-viewer-blocks.tsx+++ b/apps/v4/components/pdf-viewer-blocks.tsx@@ -32,7 +32,10 @@ import {ResizablePanel,ResizablePanelGroup,} from "@/components/ui/resizable"-import { CopyButton, copyToClipboardWithMeta } from "@/components/copy-button"+import {+ CodeHeaderCopyButton,+ copyToClipboardWithMeta,+} from "@/components/copy-button"import {DocumentSplitsBlock,XlsxDocumentSplitsBlock,@@ -457,9 +460,9 @@ function BlockCodePanel({<div className="flex h-12 items-center gap-2 border-b px-4 text-sm"><HugeiconsIcon icon={CodeIcon} className="size-4 opacity-70" /><span className="truncate">{activeCodeSample.targetPath}</span>- <CopyButton+ <CodeHeaderCopyButtonvalue={activeCodeSample.content}- className="static ml-auto size-7 bg-transparent"+ className="ml-auto"event="copy_block_code"/></div>diff --git a/apps/v4/content/docs/components/csv-tsv-viewer.mdx b/apps/v4/content/docs/components/csv-tsv-viewer.mdxindex 6606aee..762239c 100644--- a/apps/v4/content/docs/components/csv-tsv-viewer.mdx+++ b/apps/v4/content/docs/components/csv-tsv-viewer.mdx@@ -21,16 +21,17 @@ the last child of your app's `<body>` before using the component:Glide Data Grid uses browser-only APIs. If you see SSR errors, render the CSVViewer through `next/dynamic` with `ssr: false`.-```tsx-"use client"+<DocsMdxCodeBlock+ language="tsx"+ code={`"use client"import dynamic from "next/dynamic"const CsvViewer = dynamic(() => import("@/components/ui/csv-viewer").then((mod) => mod.CsvViewer),{ ssr: false }-)-```+)`}+/></Callout>@@ -64,9 +65,11 @@ npm install @glideapps/[email protected] papaparse<Step>Add the Glide Data Grid styles.</Step>-```tsx-import "@glideapps/glide-data-grid/dist/index.css"-```+<DocsMdxCodeBlock+ language="tsx"+ copyButtonClassName="top-0.5"+ code={`import "@glideapps/glide-data-grid/dist/index.css"`}+/><Step>Update the import paths to match your project setup.</Step>diff --git a/apps/v4/content/docs/components/human-review.mdx b/apps/v4/content/docs/components/human-review.mdxindex 3ef70c0..5fa4d04 100644--- a/apps/v4/content/docs/components/human-review.mdx+++ b/apps/v4/content/docs/components/human-review.mdx@@ -23,8 +23,9 @@ the last child of your app's `<body>` before using the component:Glide Data Grid uses browser-only APIs. If you see SSR errors, render HumanReview through `next/dynamic` with `ssr: false`.-```tsx-"use client"+<DocsMdxCodeBlock+ language="tsx"+ code={`"use client"import dynamic from "next/dynamic"@@ -32,8 +33,8 @@ const HumanReviewPanel = dynamic(() =>import("@/components/ui/human-review").then((mod) => mod.HumanReviewPanel),{ ssr: false }-)-```+)`}+/></Callout>diff --git a/apps/v4/content/docs/components/pdf-viewer.mdx b/apps/v4/content/docs/components/pdf-viewer.mdxindex f6dae35..a7cef13 100644--- a/apps/v4/content/docs/components/pdf-viewer.mdx+++ b/apps/v4/content/docs/components/pdf-viewer.mdx@@ -41,9 +41,11 @@ npm install react-pdf<Step>Add the React PDF text layer styles.</Step>-```tsx-import "react-pdf/dist/Page/TextLayer.css"-```+<DocsMdxCodeBlock+ language="tsx"+ copyButtonClassName="top-0.5"+ code={`import "react-pdf/dist/Page/TextLayer.css"`}+/><Step>Update the import paths to match your project setup.</Step>diff --git a/apps/v4/mdx-components.tsx b/apps/v4/mdx-components.tsxindex c5f86e2..9f8e5be 100644--- a/apps/v4/mdx-components.tsx+++ b/apps/v4/mdx-components.tsx@@ -11,6 +11,7 @@ import { CodeCollapsibleWrapper } from "@/components/code-collapsible-wrapper"import { CodeTabs } from "@/components/code-tabs"import { ComponentsList } from "@/components/components-list"import { CopyButton } from "@/components/copy-button"+import { DocsMdxCodeBlock } from "@/components/docs-code-block"import { CsvViewerDemo, CsvViewerSource } from "@/components/csv-viewer-docs"import {DocumentSplitsDemo,@@ -375,6 +376,7 @@ export const mdxComponents = {AspectRatio,CodeTabs,CodeCollapsibleWrapper,+ DocsMdxCodeBlock,ComponentsList: ComponentsListWrapper,CsvViewerDemo,CsvViewerSource,