@a3s-lab/office 0.12.0 → 0.13.1

package/dist/0~pdf-viewer.js

@@ -3,6 +3,7 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { AnnotationPlugin, DocumentManagerPlugin, ExportPlugin, FormPlugin, HistoryPlugin, PDFViewer, PdfAnnotationSubtype, ScrollPlugin, SearchPlugin, ThumbnailPlugin, ViewportPlugin, ZoomMode, ZoomPlugin } from "@embedpdf/react-pdf-viewer";
 import { AlertCircle, Check, ChevronDown, ChevronLeft, ChevronRight, ChevronUp, Ellipsis, GalleryVerticalEnd, Highlighter, Loader2, Minus, MousePointer2, MoveHorizontal, Pencil, Plus, Redo2, Save, Scan, Search, SlidersHorizontal, Strikethrough, Trash2, Type, Underline, Undo2, X } from "lucide-react";
 import { useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { PdfErrorCode } from "@embedpdf/models";
 import { readOfficePdfCollaborationSource as readWorkOfficePdfCollaborationSource, createOfficePdfCollaborationBinding as createWorkOfficePdfCollaborationBinding, assertPdfCollaborationSource as assertWorkOfficePdfCollaborationSource } from "./3818.js";
 import { createOfficeEditorExtension, useOfficeEditorRuntime, useOfficeEditorKeyboardShortcuts } from "./0~3557.js";
 import { isOfficeShortcutBlocked, OfficeColorPicker } from "./0~3635.js";
@@ -1233,6 +1234,10 @@ const PDF_THUMBNAIL_WINDOW_THRESHOLD = 48;
 const PDF_THUMBNAIL_OVERSCAN = 5;
 const PDF_THUMBNAIL_FALLBACK_VIEWPORT_HEIGHT = 720;
 const PDF_THUMBNAIL_WINDOW_LIMIT = 32;
+const PDF_THUMBNAIL_CANCEL_REASON = Object.freeze({
+    code: PdfErrorCode.Cancelled,
+    message: 'PDF thumbnail rendering was cancelled.'
+});
 function PdfThumbnailRail({ currentPage, mobileCloseButtonRef, mobileNavigationId, mobileNavigationModal = false, registry, totalPages, onCloseMobileNavigation, onSelectPage }) {
     const viewportRef = useRef(null);
     const pendingKeyboardFocusPageRef = useRef(null);
@@ -1269,7 +1274,7 @@ function PdfThumbnailRail({ currentPage, mobileCloseButtonRef, mobileNavigationI
         const top = Math.max(0, pageTop - (viewportHeight - itemHeight) / 2);
         if ('function' == typeof viewport.scrollTo) viewport.scrollTo({
             top,
-            behavior: 'smooth'
+            behavior: totalPages > PDF_THUMBNAIL_WINDOW_THRESHOLD ? 'auto' : 'smooth'
         });
         else viewport.scrollTop = top;
     }, [
@@ -1340,7 +1345,9 @@ function PdfThumbnailRail({ currentPage, mobileCloseButtonRef, mobileNavigationI
         className: "work-pdf-thumbnail-rail",
         "aria-label": "PDF 页面",
         "data-pdf-page-count": totalPages,
+        "data-pdf-thumbnail-mounted-count": pages.length,
         "data-pdf-thumbnail-window-end": range.end,
+        "data-pdf-thumbnail-window-limit": PDF_THUMBNAIL_WINDOW_LIMIT,
         "data-pdf-thumbnail-window-start": range.start,
         "data-pdf-thumbnail-windowed": range.windowed ? 'true' : 'false',
         children: [
@@ -1456,7 +1463,8 @@ function usePdfThumbnailSource(registry, page) {
         let objectUrl = null;
         setSourceUrl(null);
         setState('loading');
-        renderPdfThumbnail(registry, page).then((blob)=>{
+        const request = requestPdfThumbnail(registry, page);
+        request.result.then((blob)=>{
             objectUrl = URL.createObjectURL(blob);
             if (disposed) return void URL.revokeObjectURL(objectUrl);
             setSourceUrl(objectUrl);
@@ -1466,6 +1474,7 @@ function usePdfThumbnailSource(registry, page) {
         });
         return ()=>{
             disposed = true;
+            request.abort();
             if (objectUrl) URL.revokeObjectURL(objectUrl);
         };
     }, [
@@ -1477,14 +1486,36 @@ function usePdfThumbnailSource(registry, page) {
         state
     };
 }
-async function renderPdfThumbnail(registry, page) {
-    await registry.pluginsReady();
-    const documentManager = registry.getPlugin(DocumentManagerPlugin.id)?.provides();
-    const thumbnail = registry.getPlugin(ThumbnailPlugin.id)?.provides();
-    const documentId = documentManager?.getActiveDocumentId();
-    if (!documentId || !thumbnail) throw new Error('PDF thumbnail rendering is unavailable.');
-    const devicePixelRatio = "u" < typeof window ? 1 : Math.min(2, Math.max(1, window.devicePixelRatio || 1));
-    return thumbnail.forDocument(documentId).renderThumb(page - 1, devicePixelRatio).toPromise();
+function requestPdfThumbnail(registry, page) {
+    let aborted = false;
+    let task = null;
+    const result = registry.pluginsReady().then(()=>{
+        if (aborted) throw thumbnailAbortError();
+        const documentManager = registry.getPlugin(DocumentManagerPlugin.id)?.provides();
+        const thumbnail = registry.getPlugin(ThumbnailPlugin.id)?.provides();
+        const documentId = documentManager?.getActiveDocumentId();
+        if (!documentId || !thumbnail) throw new Error('PDF thumbnail rendering is unavailable.');
+        const devicePixelRatio = "u" < typeof window ? 1 : Math.min(2, Math.max(1, window.devicePixelRatio || 1));
+        task = thumbnail.forDocument(documentId).renderThumb(page - 1, devicePixelRatio);
+        if (aborted) {
+            task.abort(PDF_THUMBNAIL_CANCEL_REASON);
+            throw thumbnailAbortError();
+        }
+        return task.toPromise();
+    });
+    return {
+        abort: ()=>{
+            if (aborted) return;
+            aborted = true;
+            task?.abort(PDF_THUMBNAIL_CANCEL_REASON);
+        },
+        result
+    };
+}
+function thumbnailAbortError() {
+    const error = new Error(PDF_THUMBNAIL_CANCEL_REASON.message);
+    error.name = 'AbortError';
+    return error;
 }
 function PdfThumbnailSpacer({ height, position }) {
     if (height <= 0) return null;

package/dist/0~presentation-editor.js

@@ -10,7 +10,7 @@ import font_size from "@tiptap/extension-text-style/font-size";
 import extension_underline from "@tiptap/extension-underline";
 import { EditorContent, useEditor } from "@tiptap/react";
 import starter_kit from "@tiptap/starter-kit";
-import { canUngroupPresentationElements, withPresentationDesign, groupPresentationElements, expandPresentationGroupSelection, ungroupPresentationElements, canGroupPresentationElements, presentationSlideView, applyPresentationLayout, presentationSelectionUnits, remapPresentationGroupPaths } from "./0~1403.js";
+import { canUngroupPresentationElements, withPresentationDesign, withPresentationDesignMetadata, groupPresentationElements, expandPresentationGroupSelection, ungroupPresentationElements, presentationSlideViewFromDesign, canGroupPresentationElements, presentationSlideView, applyPresentationLayout, presentationSelectionUnits, remapPresentationGroupPaths } from "./0~1403.js";
 import { createOfficeId as createWorkId } from "./5184.js";
 import { OfficeTableInsertPopover, readOfficeFileAsDataUrl } from "./0~9445.js";
 import { normalizePresentationChartLegendPosition, presentationChartDataLabelPositions, presentationChartDataLabelText, normalizePresentationBubbleSizeRepresents, parsePresentationChartCategories, presentationChartXValues, withPresentationChartLayout, presentationChartTypeLabel, presentationChartAxes, withPresentationChartSeriesAnalysis, presentationChartUsesNumericXAxis, presentationChartSupportsSeriesMarkers, presentationChartBubbleSizes, createPresentationChartElement, parsePresentationChartValueDraft, normalizePresentationChartDataLabelPosition, presentationChartSupportsAxisTitles, withPresentationChartDataLabels, withPresentationChartType, createPresentationChartSeries, presentationChartErrorBarCount, normalizePresentationScatterStyle, withPresentationChartSeriesStyle, normalizePresentationBubbleScale, presentationChartDataLabelPositionLabel, presentationChartShowsLegend, presentationChartTrendlineCount, presentationChartHasDataLabels, normalizeDoughnutHoleSize, withPresentationChartAxes } from "./0~work-presentation-charts.js";
@@ -3572,8 +3572,8 @@ function drawRadarChart(context, chart, sourceRect) {
         });
     }
 }
-function SlideCanvas({ content, slide, interactive, aspectRatio, showPlaceholders = false }) {
-    const view = content ? presentationSlideView(content, slide) : void 0;
+function SlideCanvas({ content, designContent, slide, interactive, aspectRatio, showPlaceholders = false }) {
+    const view = designContent ? presentationSlideViewFromDesign(designContent, slide) : content ? presentationSlideView(content, slide) : void 0;
     const elements = [
         ...view?.inheritedElements.map((element)=>({
                 element,
@@ -5557,7 +5557,7 @@ function PresentationSlideThumbnail({ content, slide, index, selected, slideCoun
                 children: index + 1
             }),
             renderPreview ? /*#__PURE__*/ jsx(SlideCanvas, {
-                content: content,
+                designContent: content,
                 slide: slide,
                 interactive: false,
                 aspectRatio: aspectRatio,
@@ -7984,7 +7984,9 @@ function PresentationEditingSurface({ initialSlide, autoFocus = true, collaborat
     const restoreObjectFocus = useCallback(()=>restorePresentationWorkspaceFocus(presentationRootRef.current, ()=>workspaceFocusStateRef.current), []);
     const imageInputRef = useRef(null);
     const geometry = usePresentationGeometry(kernelWasmUrl, !preview);
-    const designContent = withPresentationDesign(content);
+    const designContent = useMemo(()=>withPresentationDesignMetadata(content), [
+        content
+    ]);
     const selectedSlide = designContent.slides.find((slide)=>slide.id === selectedSlideId) ?? designContent.slides[0] ?? initialSlide;
     const selectedLayout = designContent.layouts?.find((layout)=>layout.id === selectedSlide?.layoutId) ?? designContent.layouts?.[0];
     const selectedMaster = designContent.masters?.find((master)=>master.id === selectedLayout?.masterId) ?? designContent.masters?.[0];
@@ -8058,7 +8060,7 @@ function PresentationEditingSurface({ initialSlide, autoFocus = true, collaborat
         selectedElementId
     ]);
     const toolbarSelectedElement = selectedElement ? selectedTextEditor && !selectedTextEditor.state.selection.empty ? presentationTextToolbarState(selectedTextEditor, selectedElement) : presentationElementToolbarState(selectedElement) : null;
-    const slideView = selectedSlide ? presentationSlideView(designContent, selectedSlide) : void 0;
+    const slideView = selectedSlide ? presentationSlideViewFromDesign(designContent, selectedSlide) : void 0;
     const activeBackground = 'layout' === designMode ? selectedLayout?.background ?? selectedMaster?.background ?? '#ffffff' : 'master' === designMode ? selectedMaster?.background ?? '#ffffff' : slideView?.background ?? selectedSlide?.background ?? '#ffffff';
     const inheritedElements = 'slide' === designMode ? slideView?.inheritedElements ?? [] : 'layout' === designMode ? selectedMaster?.elements.filter((element)=>!element.placeholder) ?? [] : [];
     const placeholderGuides = 'slide' === designMode ? slideView?.placeholderElements.filter((definition)=>!activeElements.some((element)=>element.placeholder?.key === definition.placeholder?.key)) ?? [] : [];