react-iiif-vault 0.9.20 → 0.9.21

package/dist/react17/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");
@@ -409,20 +409,35 @@ function getManifestSequence(vault, manifestOrRange, { disablePaging } = {}) {
     }
   };
   let offset = 0;
+  let flushNextPaged = false;
   for (let i = 0; i < manifestItems.length; i++) {
     const canvas = vault.get(manifestItems[i]);
     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;
     }
     currentOrdering.push(i);
+    if (flushNextPaged) {
+      flush();
+      flushNextPaged = false;
+      continue;
+    }
     if (currentOrdering.length > 1) {
       flush();
     }