react-iiif-vault 0.9.7 → 0.9.8

package/dist/cjs/index.js

@@ -874,7 +874,7 @@ function RenderImage({
   }, /* @__PURE__ */ React__default["default"].createElement(TileSet, {
     viewport: isStatic,
     tiles: {
-      id: image.service.id,
+      id: image.service.id || image.service["@id"],
       height: image.height,
       width: image.width,
       imageService: image.service,
@@ -1298,6 +1298,9 @@ function getImageStrategy(canvas, paintables, loadImageService) {
         height: imageSelector.selector.spatial.height
       }
     } : defaultImageSelector;
+    if (imageService && !imageService.id) {
+      imageService.id = imageService["@id"];
+    }
     const imageType = {
       id: resource.id,
       type: "Image",
@@ -1318,6 +1321,21 @@ function getImageStrategy(canvas, paintables, loadImageService) {
   };
 }
 
+const supportedFormats = ["model/gltf-binary"];
+function get3dStrategy(canvas, paintables) {
+  const first = paintables.items[0];
+  if (!first.format) {
+    return unsupportedStrategy("Unknown format");
+  }
+  if (supportedFormats.indexOf(first.format) === -1) {
+    return unsupportedStrategy(`3D format: ${first.format} is unsupported`);
+  }
+  return {
+    type: "3d-model",
+    model: first
+  };
+}
+
 var __defProp$1 = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -1365,6 +1383,12 @@ function useRenderingStrategy(options) {
       }
       return getImageStrategy(canvas, paintables, loadImageService);
     }
+    if (mainType === "Model") {
+      if (supports.indexOf("3d-model") === -1) {
+        return unsupportedStrategy("3D not supported");
+      }
+      return get3dStrategy(canvas, paintables);
+    }
     if (mainType === "audio") {
       if (supports.indexOf("media") === -1) {
         return unsupportedStrategy("Media not supported");

package/dist/esm/index.mjs

@@ -866,7 +866,7 @@ function RenderImage({
   }, /* @__PURE__ */ React.createElement(TileSet, {
     viewport: isStatic,
     tiles: {
-      id: image.service.id,
+      id: image.service.id || image.service["@id"],
       height: image.height,
       width: image.width,
       imageService: image.service,
@@ -1290,6 +1290,9 @@ function getImageStrategy(canvas, paintables, loadImageService) {
         height: imageSelector.selector.spatial.height
       }
     } : defaultImageSelector;
+    if (imageService && !imageService.id) {
+      imageService.id = imageService["@id"];
+    }
     const imageType = {
       id: resource.id,
       type: "Image",
@@ -1310,6 +1313,21 @@ function getImageStrategy(canvas, paintables, loadImageService) {
   };
 }
 
+const supportedFormats = ["model/gltf-binary"];
+function get3dStrategy(canvas, paintables) {
+  const first = paintables.items[0];
+  if (!first.format) {
+    return unsupportedStrategy("Unknown format");
+  }
+  if (supportedFormats.indexOf(first.format) === -1) {
+    return unsupportedStrategy(`3D format: ${first.format} is unsupported`);
+  }
+  return {
+    type: "3d-model",
+    model: first
+  };
+}
+
 var __defProp$1 = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -1357,6 +1375,12 @@ function useRenderingStrategy(options) {
       }
       return getImageStrategy(canvas, paintables, loadImageService);
     }
+    if (mainType === "Model") {
+      if (supports.indexOf("3d-model") === -1) {
+        return unsupportedStrategy("3D not supported");
+      }
+      return get3dStrategy(canvas, paintables);
+    }
     if (mainType === "audio") {
       if (supports.indexOf("media") === -1) {
         return unsupportedStrategy("Media not supported");

package/dist/index.d.ts

@@ -2,9 +2,10 @@ import * as _atlas_viewer_atlas from '@atlas-viewer/atlas';
 import * as React from 'react';
 import React__default, { ReactNode, FC } from 'react';
 import * as _iiif_presentation_3 from '@iiif/presentation-3';
-import { InternationalString, ImageService, AnnotationPageNormalized, ContentResource, IIIFExternalWebResource, SpecificResource, AnnotationNormalized, CanvasNormalized, CollectionNormalized, Reference, ManifestNormalized, RangeNormalized, SearchService, Annotation, ExternalWebResource, W3CAnnotationTarget, Selector } from '@iiif/presentation-3';
+import { InternationalString, ImageService, AnnotationPageNormalized, ContentResource, IIIFExternalWebResource, SpecificResource, AnnotationNormalized, CanvasNormalized, CollectionNormalized, Reference, ManifestNormalized, RangeNormalized, SearchService, Annotation, ExternalWebResource as ExternalWebResource$1, W3CAnnotationTarget, Selector } from '@iiif/presentation-3';
 import { AtlasProps } from '@atlas-viewer/atlas/dist/types/modules/react-reconciler/Atlas';
 import { Vault, VaultOptions, ReduxStore, NormalizedEntity, IIIFStore } from '@iiif/vault';
+import { ExternalWebResource } from '@iiif/presentation-3/resources/annotation';
 import { ImageCandidate, ImageServiceLoader, ImageCandidateRequest } from '@atlas-viewer/iiif-image-api';
 import * as _iiif_vault__ from '@iiif/vault/*';
 import * as _iiif_vault_helpers from '@iiif/vault-helpers';
@@ -162,6 +163,13 @@ declare type SingleImageStrategy = {
 };
 declare function getImageStrategy(canvas: CanvasNormalized, paintables: Paintables, loadImageService: ImageServiceLoaderType): RenderingStrategy;
 
+declare type Single3DModelStrategy = {
+    type: '3d-model';
+    model: ExternalWebResource;
+    choice?: ChoiceDescription;
+    annotations?: AnnotationPageDescription;
+};
+
 declare type MediaStrategy = {
     type: 'media';
     media: SingleAudio | SingleVideo | AudioSequence | VideoSequence;
@@ -179,7 +187,7 @@ declare type UnknownStrategy = {
     reason?: string;
     annotations?: AnnotationPageDescription;
 };
-declare type RenderingStrategy = SingleImageStrategy | MediaStrategy | ComplexTimelineStrategy | UnknownStrategy;
+declare type RenderingStrategy = SingleImageStrategy | MediaStrategy | ComplexTimelineStrategy | Single3DModelStrategy | UnknownStrategy;
 
 declare type StrategyActions = {
     makeChoice: (id: string, options?: {
@@ -488,7 +496,7 @@ declare function VirtualAnnotationProvider({ children }: {
 
 declare type SupportedTarget = {
     type: 'SpecificResource';
-    source: ExternalWebResource | {
+    source: ExternalWebResource$1 | {
         id: string;
         type: 'Unknown' | 'Canvas' | 'Range' | 'Manifest';
         partOf?: Array<{

package/dist/index.umd.js

@@ -30103,7 +30103,7 @@
     }, /* @__PURE__ */ React__default["default"].createElement(TileSet, {
       viewport: isStatic,
       tiles: {
-        id: image.service.id,
+        id: image.service.id || image.service["@id"],
         height: image.height,
         width: image.width,
         imageService: image.service,
@@ -30527,6 +30527,9 @@
           height: imageSelector.selector.spatial.height
         }
       } : defaultImageSelector;
+      if (imageService && !imageService.id) {
+        imageService.id = imageService["@id"];
+      }
       const imageType = {
         id: resource.id,
         type: "Image",
@@ -30547,6 +30550,21 @@
     };
   }
 
+  const supportedFormats = ["model/gltf-binary"];
+  function get3dStrategy(canvas, paintables) {
+    const first = paintables.items[0];
+    if (!first.format) {
+      return unsupportedStrategy("Unknown format");
+    }
+    if (supportedFormats.indexOf(first.format) === -1) {
+      return unsupportedStrategy(`3D format: ${first.format} is unsupported`);
+    }
+    return {
+      type: "3d-model",
+      model: first
+    };
+  }
+
   var __defProp$1 = Object.defineProperty;
   var __defProps = Object.defineProperties;
   var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -30594,6 +30612,12 @@
         }
         return getImageStrategy(canvas, paintables, loadImageService);
       }
+      if (mainType === "Model") {
+        if (supports.indexOf("3d-model") === -1) {
+          return unsupportedStrategy("3D not supported");
+        }
+        return get3dStrategy(canvas, paintables);
+      }
       if (mainType === "audio") {
         if (supports.indexOf("media") === -1) {
           return unsupportedStrategy("Media not supported");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-iiif-vault",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.mjs",
   "types": "./dist/index.d.ts",