react-iiif-vault 0.9.17 → 0.9.20

package/dist/bundle/esm/index.mjs

@@ -408,14 +408,18 @@ function getManifestSequence(vault, manifestOrRange, { disablePaging } = {}) {
       currentOrdering = [];
     }
   };
+  let offset = 0;
   for (let i = 0; i < manifestItems.length; i++) {
     const canvas = vault.get(manifestItems[i]);
-    if (i === 0 || canvas.behavior.includes("facing-pages")) {
-      flush();
-      ordering.push([i]);
+    if (canvas.behavior.includes("non-paged")) {
+      if (i === offset) {
+        offset++;
+      }
       continue;
     }
-    if (canvas.behavior.includes("non-paged")) {
+    if (i === offset || canvas.behavior.includes("facing-pages")) {
+      flush();
+      ordering.push([i]);
       continue;
     }
     currentOrdering.push(i);
@@ -1303,8 +1307,11 @@ function getPaintables(vault, paintingAnnotations, enabledChoices) {
   let choice = null;
   const items = [];
   for (const annotation of paintingAnnotations) {
-    const bodies = vault.get(annotation.body);
+    const bodies = vault.get(annotation.body, { skipSelfReturn: false });
     for (const unknownBody of bodies) {
+      if (!unknownBody) {
+        continue;
+      }
       const [body, { selector }] = parseSpecificResource(unknownBody);
       const type = (body.type || "unknown").toLowerCase();
       if (type === "choice") {
@@ -1560,11 +1567,15 @@ function useLoadImageService() {
   return [loadImageService, imageServiceStatus];
 }
 function usePaintingAnnotations(options = {}) {
+  const annotation = useAnnotation();
   const canvas = useCanvas(options.canvasId ? { id: options.canvasId } : void 0);
   return useVaultSelector((state, vault) => {
     if (!canvas) {
       return [];
     }
+    if (annotation && options.enableSingleAnnotation) {
+      return [annotation];
+    }
     const annotationPages = vault.get(canvas.items);
     const flatAnnotations = [];
     for (const page of annotationPages) {
@@ -1575,7 +1586,7 @@ function usePaintingAnnotations(options = {}) {
 }
 function usePaintables(options, deps = []) {
   const vault = useVault();
-  const paintingAnnotations = usePaintingAnnotations();
+  const paintingAnnotations = usePaintingAnnotations({ enableSingleAnnotation: options == null ? void 0 : options.enableSingleAnnotation });
   const [enabledChoices, setEnabledChoices] = useState((options == null ? void 0 : options.defaultChoices) || []);
   const paintables = useMemo(() => getPaintables(vault, paintingAnnotations, enabledChoices), [vault, paintingAnnotations, enabledChoices, ...deps]);
   const makeChoice = useCallback((id, { deselectOthers = true, deselect = false } = {}) => {
@@ -3031,6 +3042,21 @@ function CollectionContext({
     children
   });
 }
+function useAnnotationPage(options = {}, deps = []) {
+  const { id, selector } = options;
+  const ctx = useResourceContext();
+  const annotationPageId = id ? id : ctx.annotationPage;
+  const annotationPage = useVaultSelector((s) => annotationPageId ? s.iiif.entities.AnnotationPage[annotationPageId] : void 0, [annotationPageId]);
+  return useMemo(() => {
+    if (!annotationPage) {
+      return void 0;
+    }
+    if (selector) {
+      return selector(annotationPage);
+    }
+    return annotationPage;
+  }, [annotationPage, ...deps]);
+}
 function useAnnotationsAtTime(time, options = {}) {
   const allAnnotations = usePaintingAnnotations(options);
   return allAnnotations;
@@ -3189,5 +3215,5 @@ function useStyleHelper() {
   const vault = useVault();
   return useMemo(() => createStylesHelper(vault), [vault]);
 }
-export { AnnotationContext, AnnotationPageContext, CanvasContext, CanvasPanel, CanvasPortal, CollectionContext, ContextBridge, ImageServiceLoaderContext, InnerViewerProvider, ManifestContext, MediaPlayerProvider, OverlayPortalContext, PortalContext, RangeContext, ReactVaultContext, ResourceProvider, ResourceReactContext, SimpleViewerProvider, SimpleViewerReactContext, VaultProvider, ViewerPresetContext, VirtualAnnotationProvider, VisibleCanvasReactContext, emptyActions, emptyStrategy, expandTarget, findAllCanvasesInRange, findFirstCanvasFromRange, findManifestSelectedRange, findSelectedRange, flattenAnnotationPageIds, formatTime, getImageStrategy, getManifestSequence, getPaintables, getParsedTargetSelector, getVisibleCanvasesFromCanvasId, parseSelector, parseSpecificResource, unknownResponse, unsupportedStrategy, useAnnotation, useAnnotationPageManager, useAnnotationsAtTime, useCanvas, useCanvasClock, useCanvasSequence, useCanvasSubset, useCollection, useContextBridge, useDispatch, useEventListener, useExistingVault, useExternalCollection, useExternalManifest, useExternalResource, useImageService, useImageServiceLoader, useImageTile, useLoadImageService, useManifest, useMediaActions, useMediaElements, useMediaState, usePaintables, usePaintingAnnotations, useRange, useRenderingStrategy, useResourceContext, useResourceEvents, useResources, useSearchService, useSimpleMediaPlayer, useSimpleViewer, useStyleHelper, useStyles, useThumbnail, useVault, useVaultEffect, useVaultSelector, useViewerPreset, useVirtualAnnotationPage, useVirtualAnnotationPageContext, useVisibleCanvases };
+export { AnnotationContext, AnnotationPageContext, CanvasContext, CanvasPanel, CanvasPortal, CollectionContext, ContextBridge, ImageServiceLoaderContext, InnerViewerProvider, ManifestContext, MediaPlayerProvider, OverlayPortalContext, PortalContext, RangeContext, ReactVaultContext, ResourceProvider, ResourceReactContext, SimpleViewerProvider, SimpleViewerReactContext, VaultProvider, ViewerPresetContext, VirtualAnnotationProvider, VisibleCanvasReactContext, emptyActions, emptyStrategy, expandTarget, findAllCanvasesInRange, findFirstCanvasFromRange, findManifestSelectedRange, findSelectedRange, flattenAnnotationPageIds, formatTime, getImageStrategy, getManifestSequence, getPaintables, getParsedTargetSelector, getVisibleCanvasesFromCanvasId, parseSelector, parseSpecificResource, unknownResponse, unsupportedStrategy, useAnnotation, useAnnotationPage, useAnnotationPageManager, useAnnotationsAtTime, useCanvas, useCanvasClock, useCanvasSequence, useCanvasSubset, useCollection, useContextBridge, useDispatch, useEventListener, useExistingVault, useExternalCollection, useExternalManifest, useExternalResource, useImageService, useImageServiceLoader, useImageTile, useLoadImageService, useManifest, useMediaActions, useMediaElements, useMediaState, usePaintables, usePaintingAnnotations, useRange, useRenderingStrategy, useResourceContext, useResourceEvents, useResources, useSearchService, useSimpleMediaPlayer, useSimpleViewer, useStyleHelper, useStyles, useThumbnail, useVault, useVaultEffect, useVaultSelector, useViewerPreset, useVirtualAnnotationPage, useVirtualAnnotationPageContext, useVisibleCanvases };
 //# sourceMappingURL=index.mjs.map