TypeScript
Fix DOCX thumbnail rendering in file thumbnails
Andrew Luo9f99c85f6bb0
diff --git a/apps/v4/components/ui/file-thumbnail.tsx b/apps/v4/components/ui/file-thumbnail.tsxindex 8db5ea1..ca4fb84 100644--- a/apps/v4/components/ui/file-thumbnail.tsx+++ b/apps/v4/components/ui/file-thumbnail.tsx@@ -591,15 +591,15 @@ function DocxFileThumbnail({const firstThumbnail = thumbnails[0]const [hasError, setHasError] = React.useState(false)const [isReady, setIsReady] = React.useState(false)- const [thumbnailCanvasRef, setThumbnailCanvasRef] = React.useState<- ((canvas: HTMLCanvasElement | null) => void) | null- >(null)const [thumbnailSize, setThumbnailSize] = React.useState<{height: numberwidth: number} | null>(null)+ const [thumbnailCanvas, setThumbnailCanvas] =+ React.useState<HTMLCanvasElement | null>(null)const editorRef = React.useRef(editor)const importedDocxKeyRef = React.useRef<string | null>(null)+ const hiddenDocxViewerRef = React.useRef<HTMLDivElement | null>(null)React.useEffect(() => {editorRef.current = editor@@ -639,28 +639,117 @@ function DocxFileThumbnail({}, [file, isActive, source])React.useEffect(() => {- if (firstThumbnail?.status === "ready") {- setThumbnailCanvasRef(() => firstThumbnail.canvasRef)- setThumbnailSize({+ if (!firstThumbnail) {+ setThumbnailSize(null)+ return+ }++ setThumbnailSize((currentSize) => {+ if (+ currentSize?.height === firstThumbnail.pixelHeightPx &&+ currentSize.width === firstThumbnail.pixelWidthPx+ ) {+ return currentSize+ }++ return {height: firstThumbnail.pixelHeightPx,width: firstThumbnail.pixelWidthPx,- })- setIsReady(true)- } else if (firstThumbnail?.status === "error") {+ }+ })++ if (firstThumbnail?.status === "error") {setHasError(true)- } else if (!firstThumbnail) {- setThumbnailCanvasRef(null)- setThumbnailSize(null)}- }, [firstThumbnail])+ }, [+ firstThumbnail,+ firstThumbnail?.pixelHeightPx,+ firstThumbnail?.pixelWidthPx,+ firstThumbnail?.status,+ ])const attachThumbnailCanvas = React.useCallback((canvas: HTMLCanvasElement | null) => {- thumbnailCanvasRef?.(canvas)+ setThumbnailCanvas(canvas)},- [thumbnailCanvasRef]+ [])+ React.useEffect(() => {+ if (+ !isActive ||+ !firstThumbnail ||+ !thumbnailCanvas ||+ isReady ||+ hasError+ ) {+ return+ }++ let isCurrent = true+ let timeoutId: number | undefined+ let animationFrameId: number | undefined+ let nestedAnimationFrameId: number | undefined+ let attempts = 0++ const getRenderedPageSurface = () => {+ const pageSurface = hiddenDocxViewerRef.current?.querySelector(+ '[data-docx-page-surface="true"]'+ )++ if (!pageSurface) return null++ const hasText = Boolean(pageSurface.textContent?.trim())+ const hasEmbeddedContent = Boolean(+ pageSurface.querySelector("canvas,img,svg,table")+ )++ return hasText || hasEmbeddedContent ? pageSurface : null+ }++ const renderThumbnail = () => {+ if (!isCurrent) return++ if (!getRenderedPageSurface()) {+ attempts += 1++ if (attempts > 50) {+ setHasError(true)+ return+ }++ timeoutId = window.setTimeout(renderThumbnail, 100)+ return+ }++ animationFrameId = window.requestAnimationFrame(() => {+ nestedAnimationFrameId = window.requestAnimationFrame(() => {+ void firstThumbnail+ .renderToCanvas(thumbnailCanvas)+ .then(() => {+ if (isCurrent) setIsReady(true)+ })+ .catch(() => {+ if (isCurrent) setHasError(true)+ })+ })+ })+ }++ renderThumbnail()++ return () => {+ isCurrent = false+ if (timeoutId !== undefined) window.clearTimeout(timeoutId)+ if (animationFrameId !== undefined) {+ window.cancelAnimationFrame(animationFrameId)+ }+ if (nestedAnimationFrameId !== undefined) {+ window.cancelAnimationFrame(nestedAnimationFrameId)+ }+ }+ }, [firstThumbnail, hasError, isActive, isReady, thumbnailCanvas])+const previewContent = thumbnailSize ? (<canvasref={attachThumbnailCanvas}@@ -683,6 +772,7 @@ function DocxFileThumbnail({/>{isActive && !hasError && !isReady ? (<div+ ref={hiddenDocxViewerRef}aria-hidden="true"className="pointer-events-none fixed top-0 left-[-10000px] w-[816px] overflow-hidden bg-white">diff --git a/apps/v4/lib/turbopack-duke-sheets-wasm-url.ts b/apps/v4/lib/turbopack-duke-sheets-wasm-url.tsnew file mode 100644index 0000000..99a0274--- /dev/null+++ b/apps/v4/lib/turbopack-duke-sheets-wasm-url.ts@@ -0,0 +1,3 @@+const dukeSheetsWasmUrl = "/vendor/dukelib/duke_sheets_wasm_bg.wasm"++export default dukeSheetsWasmUrldiff --git a/apps/v4/next.config.mjs b/apps/v4/next.config.mjsindex f3e69b3..33ad4c9 100644--- a/apps/v4/next.config.mjs+++ b/apps/v4/next.config.mjs@@ -28,6 +28,10 @@ const nextConfig = {},turbopack: {root: path.resolve(import.meta.dirname, "../.."),+ resolveAlias: {+ "@dukelib/sheets-wasm/duke_sheets_wasm_bg.wasm":+ "./lib/turbopack-duke-sheets-wasm-url.ts",+ },},experimental: {turbopackFileSystemCacheForDev: true,diff --git a/apps/v4/package.json b/apps/v4/package.jsonindex 002d8d6..94ceca0 100644--- a/apps/v4/package.json+++ b/apps/v4/package.json@@ -4,7 +4,7 @@"private": true,"type": "module","scripts": {- "dev": "next dev --webpack --port 4000",+ "dev": "next dev --turbopack --port 4000","build": "next build","start": "next start --port 4000","preview": "next build && next start --port 4000",diff --git a/apps/v4/public/vendor/dukelib/duke_sheets_wasm_bg.wasm b/apps/v4/public/vendor/dukelib/duke_sheets_wasm_bg.wasmnew file mode 100644index 0000000..51c35f7Binary files /dev/null and b/apps/v4/public/vendor/dukelib/duke_sheets_wasm_bg.wasm differdiff --git a/docx-viewer-page.png b/docx-viewer-page.pngnew file mode 100644index 0000000..d6bfa3dBinary files /dev/null and b/docx-viewer-page.png differdiff --git a/file-thumbnail-docs.png b/file-thumbnail-docs.pngnew file mode 100644index 0000000..e984b7dBinary files /dev/null and b/file-thumbnail-docs.png differdiff --git a/file-thumbnail-docx-fixed-later.png b/file-thumbnail-docx-fixed-later.pngnew file mode 100644index 0000000..aca15cbBinary files /dev/null and b/file-thumbnail-docx-fixed-later.png differdiff --git a/file-thumbnail-docx-fixed.png b/file-thumbnail-docx-fixed.pngnew file mode 100644index 0000000..aca15cbBinary files /dev/null and b/file-thumbnail-docx-fixed.png differdiff --git a/file-thumbnail-docx-manual-render.png b/file-thumbnail-docx-manual-render.pngnew file mode 100644index 0000000..e5f415dBinary files /dev/null and b/file-thumbnail-docx-manual-render.png differ