2 files changed, 10 insertions, 56 deletions
diff --git a/src/content/dependencies/generateFlashActNavAccent.js b/src/content/dependencies/generateFlashActNavAccent.js
index 7ad46051..035f852a 100644
--- a/src/content/dependencies/generateFlashActNavAccent.js
+++ b/src/content/dependencies/generateFlashActNavAccent.js
@@ -1,27 +1,5 @@
-import {atOffset} from '#sugar';
-
 export default {
-  sprawl: ({flashActData}) =>
-    ({flashActData}),
-
-  query(sprawl, flashAct) {
-    // Like with generateFlashNavAccent, don't sort chronologically here.
-    const flashActs =
-      sprawl.flashActData;
-
-    const index =
-      flashActs.indexOf(flashAct);
-
-    const previousFlashAct =
-      atOffset(flashActs, index, -1);
-
-    const nextFlashAct =
-      atOffset(flashActs, index, +1);
-
-    return {previousFlashAct, nextFlashAct};
-  },
-
-  relations: (relation, query) => ({
+  relations: (relation, flashAct) => ({
     switcher:
       relation('generateInterpageDotSwitcher'),
 
@@ -32,13 +10,13 @@ export default {
       relation('generateNextLink'),
 
     previousFlashActLink:
-      (query.previousFlashAct
-        ? relation('linkFlashAct', query.previousFlashAct)
+      (flashAct.previousAct
+        ? relation('linkFlashAct', flashAct.previousAct)
         : null),
 
     nextFlashActLink:
-      (query.nextFlashAct
-        ? relation('linkFlashAct', query.nextFlashAct)
+      (flashAct.nextAct
+        ? relation('linkFlashAct', flashAct.nextAct)
         : null),
   }),
 
diff --git a/src/content/dependencies/generateFlashNavAccent.js b/src/content/dependencies/generateFlashNavAccent.js
index db9d3c1e..e93d763c 100644
--- a/src/content/dependencies/generateFlashNavAccent.js
+++ b/src/content/dependencies/generateFlashNavAccent.js
@@ -1,29 +1,5 @@
-import {atOffset} from '#sugar';
-
 export default {
-  sprawl: ({flashActData}) =>
-    ({flashActData}),
-
-  query(sprawl, flash) {
-    // Don't sort chronologically here. The previous/next buttons should match
-    // the order in the sidebar, by act rather than date.
-    const flashes =
-      sprawl.flashActData
-        .flatMap(act => act.flashes);
-
-    const index =
-      flashes.indexOf(flash);
-
-    const previousFlash =
-      atOffset(flashes, index, -1);
-
-    const nextFlash =
-      atOffset(flashes, index, +1);
-
-    return {previousFlash, nextFlash};
-  },
-
-  relations: (relation, query) => ({
+  relations: (relation, flash) => ({
     switcher:
       relation('generateInterpageDotSwitcher'),
 
@@ -34,13 +10,13 @@ export default {
       relation('generateNextLink'),
 
     previousFlashLink:
-      (query.previousFlash
-        ? relation('linkFlash', query.previousFlash)
+      (flash.previousFlash
+        ? relation('linkFlash', flash.previousFlash)
         : null),
 
     nextFlashLink:
-      (query.nextFlash
-        ? relation('linkFlash', query.nextFlash)
+      (flash.nextFlash
+        ? relation('linkFlash', flash.nextFlash)
         : null),
   }),