react-iiif-vault 0.9.18 → 0.9.21

package/dist/bundle/esm/index.mjs

@@ -388,7 +388,7 @@ function getVisibleCanvasesFromCanvasId(vault, manifestOrRange, canvasId, preven
   }
   return [{ id: fullCanvas.id, type: "Canvas" }];
 }
-function getManifestSequence(vault, manifestOrRange, { disablePaging } = {}) {
+function getManifestSequence(vault, manifestOrRange, { disablePaging, skipNonPaged } = {}) {
   const behavior = manifestOrRange.behavior;
   const isPaged = behavior.includes("paged");
   const isContinuous = isPaged ? false : behavior.includes("continuous");
@@ -408,17 +408,36 @@ function getManifestSequence(vault, manifestOrRange, { disablePaging } = {}) {
       currentOrdering = [];
     }
   };
+  let offset = 0;
+  let flushNextPaged = false;
   for (let i = 0; i < manifestItems.length; i++) {
     const canvas = vault.get(manifestItems[i]);
-    if (i === 0 || canvas.behavior.includes("facing-pages")) {
+    if (canvas.behavior.includes("non-paged")) {
+      if (i === offset) {
+        offset++;
+      }
+      if (!skipNonPaged) {
+        flush();
+        ordering.push([i]);
+        flush();
+      }
+      continue;
+    }
+    if (i === offset || canvas.behavior.includes("facing-pages")) {
+      if (currentOrdering.length) {
+        flushNextPaged = true;
+      }
       flush();
       ordering.push([i]);
+      flush();
       continue;
     }
-    if (canvas.behavior.includes("non-paged")) {
+    currentOrdering.push(i);
+    if (flushNextPaged) {
+      flush();
+      flushNextPaged = false;
       continue;
     }
-    currentOrdering.push(i);
     if (currentOrdering.length > 1) {
       flush();
     }
@@ -1303,8 +1322,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 +1582,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 +1601,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 } = {}) => {