@file-viewer/core 2.1.16 → 2.1.17

package/dist/contracts/types.d.ts

@@ -575,6 +575,10 @@ export interface FileViewerDocumentChunk {
 export interface FileViewerComponentProps {
     file?: FileViewerFileRef;
     url?: string;
+    name?: string;
+    filename?: string;
+    type?: string;
+    size?: number;
     options?: FileViewerOptions;
 }
 export interface FileViewerComponentEventMap {

package/dist/rendering/handler.js

@@ -29,6 +29,9 @@ export const clearFileViewerRenderSurface = (container) => {
 export const createFileViewerRenderTarget = (container, options = {}) => {
     const target = container.ownerDocument.createElement('div');
     target.className = options.className || DEFAULT_FILE_VIEWER_RENDER_TARGET_CLASS;
+    target.style.width = '100%';
+    target.style.minWidth = '0';
+    target.style.minHeight = '0';
     container.appendChild(target);
     return target;
 };

package/dist/viewer/createViewer.js

@@ -12,7 +12,7 @@ import { DEFAULT_FILE_VIEWER_DOWNLOAD_FILENAME, DEFAULT_FILE_VIEWER_EXPORT_FILEN
 import { applyFileViewerZoomAvailability, createUnsupportedAvailability, getRendererAvailability, } from '../registry/capabilities.js';
 import { buildFileViewerLifecycleContextFromNormalizedSource, buildFileViewerOperationContext, runFileViewerBeforeOperation, runFileViewerLifecycleHook, } from '../lifecycle/operations.js';
 import { collectFileViewerRendererPlugins, createRendererRegistry, getFileViewerAutoRendererPresetVersion, hasFileViewerRendererPresetName, installFileViewerRendererPlugins, listFileViewerAutoRendererPresets, resolveFileViewerRendererPresetInputs, } from '../registry/registry.js';
-import { createFileRenderHandlerLoader, applyFileViewerRenderSurfaceState, createFileViewerRenderSurfaceState, } from '../rendering/handler.js';
+import { createFileRenderHandlerLoader, applyFileViewerRenderSurfaceState, createFileViewerRenderSurfaceState, createFileViewerRenderTarget, removeFileViewerRenderTarget, } from '../rendering/handler.js';
 import { createFileViewerCoreRendererRegistry } from '../renderers/index.js';
 import { createFileViewerRequestScope } from '../source/loading.js';
 import { normalizeSource } from '../source/index.js';
@@ -93,6 +93,7 @@ export const createViewer = (container, createOptions = {}) => {
     let installedAutoRenderersEnabled = resolveAutoRenderersEnabled(options);
     let installedAutoRendererVersion = -1;
     let currentSource = null;
+    let currentRenderTarget = null;
     const renderSurfaceState = createFileViewerRenderSurfaceState();
     const requestScope = createFileViewerRequestScope();
     const documentTarget = {
@@ -179,6 +180,32 @@ export const createViewer = (container, createOptions = {}) => {
             forcedWatermarkContainerPosition = false;
         }
     };
+    const removeRenderTarget = (target = currentRenderTarget) => {
+        if (!target) {
+            return;
+        }
+        removeFileViewerRenderTarget(container, target);
+        if (currentRenderTarget === target) {
+            currentRenderTarget = null;
+        }
+    };
+    const createRenderTarget = (fillHeight = true) => {
+        const target = createFileViewerRenderTarget(container);
+        if (fillHeight) {
+            target.style.height = '100%';
+        }
+        currentRenderTarget = target;
+        return target;
+    };
+    const disposeStaleSession = async (session, target) => {
+        var _a;
+        try {
+            await ((_a = session === null || session === void 0 ? void 0 : session.destroy) === null || _a === void 0 ? void 0 : _a.call(session));
+        }
+        finally {
+            removeRenderTarget(target);
+        }
+    };
     const syncWatermarkOverlay = () => {
         const inlineStyle = buildFileViewerWatermarkInlineStyle(options.watermark);
         if (!inlineStyle) {
@@ -352,15 +379,20 @@ export const createViewer = (container, createOptions = {}) => {
     zoomController.observe();
     viewStateController.observe();
     const destroyCurrent = async (reason = 'replace') => {
-        var _a, _b;
-        if (!currentSource) {
+        var _a;
+        const session = renderSurfaceState.session;
+        const target = currentRenderTarget;
+        if (!currentSource && !session && !target) {
             return;
         }
         const source = currentSource;
         const startedAt = Date.now();
         const version = requestScope.getCurrentVersion();
-        await emitLifecycle(options, createOptions.onEvent, 'unload-start', source, version, startedAt, reason);
-        await ((_b = (_a = renderSurfaceState.session) === null || _a === void 0 ? void 0 : _a.destroy) === null || _b === void 0 ? void 0 : _b.call(_a));
+        if (source) {
+            await emitLifecycle(options, createOptions.onEvent, 'unload-start', source, version, startedAt, reason);
+        }
+        await ((_a = session === null || session === void 0 ? void 0 : session.destroy) === null || _a === void 0 ? void 0 : _a.call(session));
+        removeRenderTarget(target || undefined);
         currentSource = null;
         applyFileViewerRenderSurfaceState(renderSurfaceState, {
             session: null,
@@ -371,36 +403,59 @@ export const createViewer = (container, createOptions = {}) => {
         zoomController.clearProvider();
         viewStateController.clearProvider();
         emitZoomAndOperationAvailabilityChange();
-        await emitLifecycle(options, createOptions.onEvent, 'unload-complete', source, version, startedAt, reason);
+        if (source) {
+            await emitLifecycle(options, createOptions.onEvent, 'unload-complete', source, version, startedAt, reason);
+        }
     };
     return {
         container,
         async load(source) {
+            const version = requestScope.requestController.createVersion();
             await destroyCurrent('replace');
             await ensureRendererPluginsInstalled();
+            if (!requestScope.isCurrentRequest(version)) {
+                return null;
+            }
             const normalized = normalizeSource(source);
             currentSource = normalized;
-            const version = requestScope.requestController.createVersion();
             const renderer = registry.getByExtension(normalized.extension);
             const startedAt = Date.now();
             await emitLifecycle(options, createOptions.onEvent, 'load-start', normalized, version, startedAt);
+            const target = createRenderTarget((renderer === null || renderer === void 0 ? void 0 : renderer.id) !== 'office-presentation');
             if (!(renderer === null || renderer === void 0 ? void 0 : renderer.load)) {
-                renderMissingRendererState(container, normalized.extension, options);
+                renderMissingRendererState(target, normalized.extension, options);
                 applyFileViewerRenderSurfaceState(renderSurfaceState, { session: null });
                 syncWatermarkOverlay();
                 emitZoomAndOperationAvailabilityChange();
                 await emitLifecycle(options, createOptions.onEvent, 'load-complete', normalized, version, startedAt);
                 return null;
             }
-            const session = await renderer.load({
-                source: normalized,
-                surface: { container },
-                options,
-                signal: createOptions.signal,
-                registerExportAdapter: adapter => {
-                    applyFileViewerRenderSurfaceState(renderSurfaceState, { exportAdapter: adapter });
-                },
-            });
+            let session;
+            try {
+                session = await renderer.load({
+                    source: normalized,
+                    surface: { container: target },
+                    options,
+                    signal: createOptions.signal,
+                    registerExportAdapter: adapter => {
+                        if (requestScope.isCurrentRequest(version)) {
+                            applyFileViewerRenderSurfaceState(renderSurfaceState, { exportAdapter: adapter });
+                        }
+                    },
+                });
+            }
+            catch (error) {
+                if (!requestScope.isCurrentRequest(version)) {
+                    removeRenderTarget(target);
+                    return null;
+                }
+                removeRenderTarget(target);
+                throw error;
+            }
+            if (!requestScope.isCurrentRequest(version)) {
+                await disposeStaleSession(session, target);
+                return null;
+            }
             applyFileViewerRenderSurfaceState(renderSurfaceState, { session });
             syncWatermarkOverlay();
             zoomController.refreshProvider();
@@ -411,6 +466,7 @@ export const createViewer = (container, createOptions = {}) => {
             return session;
         },
         async destroy(reason = 'component-unmount') {
+            requestScope.requestController.createVersion();
             await destroyCurrent(reason);
             documentActions.destroyDocumentFeatures();
             zoomController.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/core",
-  "version": "2.1.16",
+  "version": "2.1.17",
   "private": false,
   "type": "module",
   "description": "Framework-neutral modular TypeScript core for Flyfish File Viewer renderer orchestration, lifecycle APIs, search, zoom, print, and export",
@@ -35,7 +35,7 @@
   },
   "funding": {
     "type": "individual",
-    "url": "https://dev.flyfish.group/shop"
+    "url": "https://dev.flyfish.group/donate?source=npm"
   },
   "homepage": "https://doc.file-viewer.app/",
   "main": "./dist/index.js",