@edrlab/thorium-web 1.5.4 → 1.5.6

package/dist/chunk-7SMOXFAF.mjs

@@ -0,0 +1,121 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+// src/lib/publicationReducer.ts
+
+// src/helpers/buildTocTree.ts
+var toEntryRef = ({ children: _, ...ref }) => ref;
+var buildTocTreeFromTimeline = (timeline, publicationTitle) => {
+  let counter = 0;
+  const map = (entries) => entries.map((entry) => {
+    counter += 1;
+    return {
+      id: `toc-${counter}`,
+      href: entry.link.href,
+      title: entry.link.title || (publicationTitle ? `${publicationTitle} ${counter}` : `Resource ${counter}`),
+      position: entry.position ?? entry.timestamp,
+      children: entry.children ? map(entry.children) : void 0
+    };
+  });
+  return map(timeline.contextualizedToc);
+};
+var findTocItemById = (items, id) => {
+  for (const item of items) {
+    if (item.id === id) return item;
+    if (item.children) {
+      const found = findTocItemById(item.children, id);
+      if (found) return found;
+    }
+  }
+  return void 0;
+};
+var findTocItemByHref = (items, href) => {
+  for (const item of items) {
+    if (item.href === href) return item;
+    if (item.children) {
+      const found = findTocItemByHref(item.children, href);
+      if (found) return found;
+    }
+  }
+  return void 0;
+};
+
+// src/lib/publicationReducer.ts
+var initialState = {
+  fontLanguage: "default",
+  isFXL: false,
+  isRTL: false,
+  scriptMode: "ltr",
+  hasDisplayTransformability: false,
+  positionsList: [],
+  atPublicationStart: false,
+  atPublicationEnd: false,
+  progress: void 0,
+  toc: { tree: void 0, currentEntry: void 0 },
+  adjacentTimelineItems: { previous: null, next: null },
+  coverTheme: void 0
+};
+var publicationSlice = createSlice({
+  name: "publication",
+  initialState,
+  reducers: {
+    setFontLanguage: (state, action) => {
+      state.fontLanguage = action.payload;
+    },
+    setFXL: (state, action) => {
+      state.isFXL = action.payload;
+    },
+    setRTL: (state, action) => {
+      state.isRTL = action.payload;
+    },
+    setScriptMode: (state, action) => {
+      state.scriptMode = action.payload;
+    },
+    setHasDisplayTransformability: (state, action) => {
+      state.hasDisplayTransformability = action.payload;
+    },
+    setPositionsList: (state, action) => {
+      state.positionsList = action.payload;
+    },
+    setPublicationStart: (state, action) => {
+      state.atPublicationStart = action.payload;
+    },
+    setPublicationEnd: (state, action) => {
+      state.atPublicationEnd = action.payload;
+    },
+    setProgress: (state, action) => {
+      state.progress = action.payload;
+    },
+    setTocTree: (state, action) => {
+      state.toc.tree = action.payload;
+    },
+    setAdjacentTimelineItems: (state, action) => {
+      state.adjacentTimelineItems = action.payload;
+    },
+    setCoverTheme: (state, action) => {
+      state.coverTheme = action.payload;
+    },
+    setTocEntry: (state, action) => {
+      state.toc.currentEntry = action.payload ? toEntryRef(action.payload) : null;
+    }
+  }
+});
+var {
+  setFontLanguage,
+  setFXL,
+  setRTL,
+  setScriptMode,
+  setHasDisplayTransformability,
+  setPositionsList,
+  setPublicationStart,
+  setPublicationEnd,
+  setProgress,
+  setTocTree,
+  setTocEntry,
+  setAdjacentTimelineItems,
+  setCoverTheme
+} = publicationSlice.actions;
+var publicationReducer_default = publicationSlice.reducer;
+
+export { buildTocTreeFromTimeline, findTocItemByHref, findTocItemById, publicationReducer_default, publicationSlice, setAdjacentTimelineItems, setCoverTheme, setFXL, setFontLanguage, setHasDisplayTransformability, setPositionsList, setProgress, setPublicationEnd, setPublicationStart, setRTL, setScriptMode, setTocEntry, setTocTree };
+//# sourceMappingURL=chunk-7SMOXFAF.mjs.map
+//# sourceMappingURL=chunk-7SMOXFAF.mjs.map

package/dist/chunk-7SMOXFAF.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/helpers/buildTocTree.ts","../src/lib/publicationReducer.ts"],"names":[],"mappings":";;;;;AAYO,IAAM,aAAa,CAAC,EAAE,UAAU,CAAA,EAAG,GAAG,KAAI,KAA4B,GAAA;AAEtE,IAAM,wBAAA,GAA2B,CAAC,QAAA,EAAoB,gBAAA,KAAyC;AACpG,EAAA,IAAI,OAAA,GAAU,CAAA;AAEd,EAAA,MAAM,MAAM,CAAC,OAAA,KACX,OAAA,CAAQ,GAAA,CAAI,CAAC,KAAA,KAAU;AACrB,IAAA,OAAA,IAAW,CAAA;AAEX,IAAA,OAAO;AAAA,MACL,EAAA,EAAI,OAAQ,OAAQ,CAAA,CAAA;AAAA,MACpB,IAAA,EAAM,MAAM,IAAA,CAAK,IAAA;AAAA,MACjB,KAAA,EAAO,KAAA,CAAM,IAAA,CAAK,KAAA,KAChB,gBAAA,GACI,CAAA,EAAI,gBAAiB,CAAA,CAAA,EAAK,OAAQ,CAAA,CAAA,GAClC,CAAA,SAAA,EAAa,OAAQ,CAAA,CAAA,CAAA;AAAA,MAE3B,QAAA,EAAU,KAAA,CAAM,QAAA,IAAY,KAAA,CAAM,SAAA;AAAA,MAClC,UAAU,KAAA,CAAM,QAAA,GAAW,GAAA,CAAI,KAAA,CAAM,QAAQ,CAAA,GAAI;AAAA,KACnD;AAAA,EACF,CAAC,CAAA;AAEH,EAAA,OAAO,GAAA,CAAI,SAAS,iBAAiB,CAAA;AACvC;AAEO,IAAM,eAAA,GAAkB,CAAC,KAAA,EAAkB,EAAA,KAAoC;AACpF,EAAA,KAAA,MAAW,QAAQ,KAAA,EAAO;AACxB,IAAA,IAAI,IAAA,CAAK,EAAA,KAAO,EAAA,EAAI,OAAO,IAAA;AAC3B,IAAA,IAAI,KAAK,QAAA,EAAU;AACjB,MAAA,MAAM,KAAA,GAAQ,eAAA,CAAgB,IAAA,CAAK,QAAA,EAAU,EAAE,CAAA;AAC/C,MAAA,IAAI,OAAO,OAAO,KAAA;AAAA,IACpB;AAAA,EACF;AACA,EAAA,OAAO,MAAA;AACT;AAEO,IAAM,iBAAA,GAAoB,CAAC,KAAA,EAAkB,IAAA,KAAsC;AACxF,EAAA,KAAA,MAAW,QAAQ,KAAA,EAAO;AACxB,IAAA,IAAI,IAAA,CAAK,IAAA,KAAS,IAAA,EAAM,OAAO,IAAA;AAC/B,IAAA,IAAI,KAAK,QAAA,EAAU;AACjB,MAAA,MAAM,KAAA,GAAQ,iBAAA,CAAkB,IAAA,CAAK,QAAA,EAAU,IAAI,CAAA;AACnD,MAAA,IAAI,OAAO,OAAO,KAAA;AAAA,IACpB;AAAA,EACF;AACA,EAAA,OAAO,MAAA;AACT;;;ACvBA,IAAM,YAAA,GAAwC;AAAA,EAC5C,YAAA,EAAc,SAAA;AAAA,EACd,KAAA,EAAO,KAAA;AAAA,EACP,KAAA,EAAO,KAAA;AAAA,EACP,UAAA,EAAY,KAAA;AAAA,EACZ,0BAAA,EAA4B,KAAA;AAAA,EAC5B,eAAe,EAAC;AAAA,EAChB,kBAAA,EAAoB,KAAA;AAAA,EACpB,gBAAA,EAAkB,KAAA;AAAA,EAClB,QAAA,EAAU,MAAA;AAAA,EACV,GAAA,EAAK,EAAE,IAAA,EAAM,MAAA,EAAW,cAAc,MAAA,EAAU;AAAA,EAChD,qBAAA,EAAuB,EAAE,QAAA,EAAU,IAAA,EAAM,MAAM,IAAA,EAAK;AAAA,EACpD,UAAA,EAAY;AACd,CAAA;AAEO,IAAM,mBAAmB,WAAA,CAAY;AAAA,EAC1C,IAAA,EAAM,aAAA;AAAA,EACN,YAAA;AAAA,EACA,QAAA,EAAU;AAAA,IACR,eAAA,EAAiB,CAAC,KAAA,EAAO,MAAA,KAAW;AAClC,MAAA,KAAA,CAAM,eAAe,MAAA,CAAO,OAAA;AAAA,IAC9B,CAAA;AAAA,IACA,MAAA,EAAQ,CAAC,KAAA,EAAO,MAAA,KAAW;AACzB,MAAA,KAAA,CAAM,QAAQ,MAAA,CAAO,OAAA;AAAA,IACvB,CAAA;AAAA,IACA,MAAA,EAAQ,CAAC,KAAA,EAAO,MAAA,KAAW;AACzB,MAAA,KAAA,CAAM,QAAQ,MAAA,CAAO,OAAA;AAAA,IACvB,CAAA;AAAA,IACA,aAAA,EAAe,CAAC,KAAA,EAAO,MAAA,KAAW;AAChC,MAAA,KAAA,CAAM,aAAa,MAAA,CAAO,OAAA;AAAA,IAC5B,CAAA;AAAA,IACA,6BAAA,EAA+B,CAAC,KAAA,EAAO,MAAA,KAAW;AAChD,MAAA,KAAA,CAAM,6BAA6B,MAAA,CAAO,OAAA;AAAA,IAC5C,CAAA;AAAA,IACA,gBAAA,EAAkB,CAAC,KAAA,EAAO,MAAA,KAAW;AACnC,MAAA,KAAA,CAAM,gBAAgB,MAAA,CAAO,OAAA;AAAA,IAC/B,CAAA;AAAA,IACA,mBAAA,EAAqB,CAAC,KAAA,EAAO,MAAA,KAAW;AACtC,MAAA,KAAA,CAAM,qBAAqB,MAAA,CAAO,OAAA;AAAA,IACpC,CAAA;AAAA,IACA,iBAAA,EAAmB,CAAC,KAAA,EAAO,MAAA,KAAW;AACpC,MAAA,KAAA,CAAM,mBAAmB,MAAA,CAAO,OAAA;AAAA,IAClC,CAAA;AAAA,IACA,WAAA,EAAa,CAAC,KAAA,EAAO,MAAA,KAAkC;AACrD,MAAA,KAAA,CAAM,WAAW,MAAA,CAAO,OAAA;AAAA,IAC1B,CAAA;AAAA,IACA,UAAA,EAAY,CAAC,KAAA,EAAO,MAAA,KAA+C;AACjE,MAAA,KAAA,CAAM,GAAA,CAAI,OAAO,MAAA,CAAO,OAAA;AAAA,IAC1B,CAAA;AAAA,IACA,wBAAA,EAA0B,CAAC,KAAA,EAAO,MAAA,KAA4F;AAC5H,MAAA,KAAA,CAAM,wBAAwB,MAAA,CAAO,OAAA;AAAA,IACvC,CAAA;AAAA,IACA,aAAA,EAAe,CAAC,KAAA,EAAO,MAAA,KAAiD;AACtE,MAAA,KAAA,CAAM,aAAa,MAAA,CAAO,OAAA;AAAA,IAC5B,CAAA;AAAA,IACA,WAAA,EAAa,CAAC,KAAA,EAAO,MAAA,KAAwC;AAC3D,MAAA,KAAA,CAAM,IAAI,YAAA,GAAe,MAAA,CAAO,UAAU,UAAA,CAAW,MAAA,CAAO,OAAO,CAAA,GAAI,IAAA;AAAA,IACzE;AAAA;AAEJ,CAAC;AAGM,IAAM;AAAA,EACX,eAAA;AAAA,EACA,MAAA;AAAA,EACA,MAAA;AAAA,EACA,aAAA;AAAA,EACA,6BAAA;AAAA,EACA,gBAAA;AAAA,EACA,mBAAA;AAAA,EACA,iBAAA;AAAA,EACA,WAAA;AAAA,EACA,UAAA;AAAA,EACA,WAAA;AAAA,EACA,wBAAA;AAAA,EACA;AACF,CAAA,GAAI,gBAAA,CAAiB;AAErB,IAAO,6BAAQ,gBAAA,CAAiB","file":"chunk-7SMOXFAF.mjs","sourcesContent":["import { ContextualizedTocEntry, Timeline } from \"@readium/shared\";\n\nexport interface TocItem {\n  id: string;\n  href: string;\n  title: string;\n  position?: string;\n  children?: TocItem[];\n}\n\nexport type TocEntryRef = Omit<TocItem, \"children\">;\n\nexport const toEntryRef = ({ children: _, ...ref }: TocItem): TocEntryRef => ref;\n\nexport const buildTocTreeFromTimeline = (timeline: Timeline, publicationTitle?: string): TocItem[] => {\n  let counter = 0;\n\n  const map = (entries: ContextualizedTocEntry[]): TocItem[] =>\n    entries.map((entry) => {\n      counter += 1;\n\n      return {\n        id: `toc-${ counter }`,\n        href: entry.link.href,\n        title: entry.link.title || (\n          publicationTitle\n            ? `${ publicationTitle } ${ counter }`\n            : `Resource ${ counter }`\n        ),\n        position: entry.position ?? entry.timestamp,\n        children: entry.children ? map(entry.children) : undefined\n      };\n    });\n\n  return map(timeline.contextualizedToc);\n};\n\nexport const findTocItemById = (items: TocItem[], id: string): TocItem | undefined => {\n  for (const item of items) {\n    if (item.id === id) return item;\n    if (item.children) {\n      const found = findTocItemById(item.children, id);\n      if (found) return found;\n    }\n  }\n  return undefined;\n};\n\nexport const findTocItemByHref = (items: TocItem[], href: string): TocItem | undefined => {\n  for (const item of items) {\n    if (item.href === href) return item;\n    if (item.children) {\n      const found = findTocItemByHref(item.children, href);\n      if (found) return found;\n    }\n  }\n  return undefined;\n};\n","import { createSlice } from \"@reduxjs/toolkit\";\n\nimport { SerializedLocator } from \"@/helpers/serializePositions\";\nimport { ThemeTokens } from \"@/preferences/hooks/useTheming\";\nimport { ScriptMode } from \"@readium/navigator\";\nimport { Progress } from \"@/core/Hooks/usePublicationProgress\";\nimport { TocItem, TocEntryRef, toEntryRef } from \"@/helpers/buildTocTree\";\n\nexport interface TimelineItemRef {\n  title?: string;\n  href: string;\n}\n\nexport interface PublicationReducerState {\n  fontLanguage: string;\n  isFXL: boolean;\n  isRTL: boolean;\n  scriptMode: ScriptMode;\n  hasDisplayTransformability: boolean;\n  positionsList: SerializedLocator[],\n  atPublicationStart: boolean;\n  atPublicationEnd: boolean;\n  progress?: Progress;\n  toc: {\n    tree?: TocItem[];\n    currentEntry?: TocEntryRef | null;\n  };\n  adjacentTimelineItems: {\n    previous: TimelineItemRef | null;\n    next: TimelineItemRef | null;\n  };\n  coverTheme?: ThemeTokens;\n}\n\nconst initialState: PublicationReducerState = {\n  fontLanguage: \"default\",\n  isFXL: false,\n  isRTL: false,\n  scriptMode: \"ltr\",\n  hasDisplayTransformability: false,\n  positionsList: [],\n  atPublicationStart: false,\n  atPublicationEnd: false,\n  progress: undefined,\n  toc: { tree: undefined, currentEntry: undefined },\n  adjacentTimelineItems: { previous: null, next: null },\n  coverTheme: undefined,\n}\n\nexport const publicationSlice = createSlice({\n  name: \"publication\",\n  initialState,\n  reducers: {\n    setFontLanguage: (state, action) => {\n      state.fontLanguage = action.payload\n    },\n    setFXL: (state, action) => {\n      state.isFXL = action.payload\n    },\n    setRTL: (state, action) => {\n      state.isRTL = action.payload\n    },\n    setScriptMode: (state, action) => {\n      state.scriptMode = action.payload\n    },\n    setHasDisplayTransformability: (state, action) => {\n      state.hasDisplayTransformability = action.payload\n    },\n    setPositionsList: (state, action) => {\n      state.positionsList = action.payload\n    },\n    setPublicationStart: (state, action) => {\n      state.atPublicationStart = action.payload\n    },\n    setPublicationEnd: (state, action) => {\n      state.atPublicationEnd = action.payload\n    },\n    setProgress: (state, action: { payload: Progress }) => {\n      state.progress = action.payload;\n    },\n    setTocTree: (state, action: { payload: TocItem[] | undefined }) => {\n      state.toc.tree = action.payload;\n    },\n    setAdjacentTimelineItems: (state, action: { payload: { previous: TimelineItemRef | null; next: TimelineItemRef | null } }) => {\n      state.adjacentTimelineItems = action.payload;\n    },\n    setCoverTheme: (state, action: { payload: ThemeTokens | undefined }) => {\n      state.coverTheme = action.payload;\n    },\n    setTocEntry: (state, action: { payload: TocItem | null }) => {\n      state.toc.currentEntry = action.payload ? toEntryRef(action.payload) : null;\n    }\n  }\n});\n\n// Action creators are generated for each case reducer function\nexport const {\n  setFontLanguage,\n  setFXL,\n  setRTL,\n  setScriptMode,\n  setHasDisplayTransformability,\n  setPositionsList,\n  setPublicationStart,\n  setPublicationEnd,\n  setProgress,\n  setTocTree,\n  setTocEntry,\n  setAdjacentTimelineItems,\n  setCoverTheme,\n} = publicationSlice.actions;\n\nexport default publicationSlice.reducer;\n"]}

package/dist/{chunk-AEEGHJVM.mjs → chunk-CXKDZVAV.mjs}

@@ -1,8 +1,9 @@
-import { toEntryRef, buildTocTree } from './chunk-TEZB4ULX.mjs';
+import { setAdjacentTimelineItems } from './chunk-7SMOXFAF.mjs';
+import { useAppDispatch } from './chunk-MFVZ5AEN.mjs';
 import { isIOSish } from './chunk-KQ3KS5O5.mjs';
 import { useEffect, useState, useRef, useCallback, useMemo } from 'react';
-import { Layout, Link, Locator } from '@readium/shared';
 import { AudioPreferences, AudioNavigator, EpubPreferences, EpubNavigator, getScriptMode, WebPubPreferences, ExperimentalWebPubNavigator } from '@readium/navigator';
+import { Locator } from '@readium/shared';
 
 var useDocumentTitle = (title) => {
   useEffect(() => {
@@ -93,220 +94,109 @@ var useObservableCondition = (value) => {
   }, [value]);
   return condition;
 };
-var timelineInstance;
-var useTimeline = ({
+
+// src/helpers/timelineFallback.ts
+var walkPrecedingResources = (timeline, href, resolve) => {
+  const timelineItems = timeline.items;
+  const startIndex = timelineItems.findIndex((item) => timeline.linkFor(item)?.href === href);
+  if (startIndex === -1) return void 0;
+  for (let i = startIndex - 1; i >= 0; i--) {
+    const candidate = timelineItems[i];
+    if (!candidate) continue;
+    const result = resolve(candidate, startIndex - i);
+    if (result !== void 0) return result;
+  }
+  return void 0;
+};
+var resolveChapterTitle = (timeline, item) => {
+  if (item.title !== void 0) return item.title;
+  const href = timeline.linkFor(item)?.href;
+  if (!href) return void 0;
+  return walkPrecedingResources(
+    timeline,
+    href,
+    (candidate, stepsBack) => candidate.title !== void 0 ? `${candidate.title} (${stepsBack + 1})` : void 0
+  );
+};
+
+// src/core/Hooks/usePublicationProgress.ts
+var usePublicationProgress = ({
   publication,
+  getNavigatorTimeline,
+  currentTimelineItem,
   currentLocation,
   currentPositions,
   positionsList,
   onChange
 }) => {
-  const layout = publication?.metadata.effectiveLayout || Layout.reflowable;
-  const [timelineItems, setTimelineItems] = useState({});
-  const [tocTree, setTocTree] = useState([]);
-  const [currentTocEntry, setCurrentTocEntry] = useState(null);
-  const [currentItem, setCurrentItem] = useState(null);
-  const [previousItem, setPreviousItem] = useState(null);
-  const [nextItem, setNextItem] = useState(null);
-  const [relativeProgression, setRelativeProgression] = useState(void 0);
-  const [totalProgression, setTotalProgression] = useState(void 0);
-  const idCounterRef = useRef(0);
-  const timeline = useMemo(() => ({
-    title: publication?.metadata.title.getTranslation("en"),
-    items: timelineItems,
-    toc: {
-      tree: tocTree,
-      currentEntry: currentTocEntry
-    },
-    currentItem,
-    previousItem,
-    nextItem,
-    progression: {
-      totalItems: publication?.readingOrder.items.length,
-      currentIndex: currentItem?.readingOrderIndex !== void 0 ? currentItem.readingOrderIndex + 1 : void 0,
-      totalPositions: positionsList?.length,
-      currentPositions: currentPositions || [],
-      relativeProgression,
-      totalProgression,
-      currentChapter: currentItem?.title,
-      positionsLeft: (() => {
-        const endPosition = currentItem?.positionRange?.[1];
-        const currentPosition = currentPositions?.[0];
-        if (!positionsList?.length || endPosition === void 0 || currentPosition === void 0) {
-          return void 0;
-        }
-        return Math.max(0, endPosition - currentPosition);
-      })()
-    }
-  }), [
-    publication?.metadata.title,
-    publication?.readingOrder.items,
-    timelineItems,
-    tocTree,
-    currentTocEntry,
-    currentItem,
-    previousItem,
-    nextItem,
-    positionsList,
-    currentPositions,
-    relativeProgression,
-    totalProgression
-  ]);
-  const handleTocEntryOnNav = useCallback((locator, currentPos) => {
-    if (!locator || !tocTree.length) return;
-    const findMatch = (items, link) => {
-      for (const item of items) {
-        if (item.href === link?.href) {
-          return item;
-        }
-        if (item.children) {
-          const match = findMatch(item.children, link);
-          if (match) return match;
-        }
-      }
-      return void 0;
-    };
-    const currentMatch = findMatch(tocTree, new Link(locator));
-    if (currentMatch) {
-      setCurrentTocEntry((prev) => prev?.id === currentMatch.id ? prev : toEntryRef(currentMatch));
-      return;
-    }
-    if (layout === Layout.fixed) {
-      if (currentPos && currentPos.length === 2) {
-        const otherPosition = currentPos[0] === locator.locations.position ? currentPos[1] : currentPos[0];
-        const otherPositionInList = positionsList?.find((pos) => pos.locations.position === otherPosition);
-        if (otherPositionInList) {
-          const match = findMatch(tocTree, new Link(otherPositionInList));
-          if (match) {
-            setCurrentTocEntry((prev) => prev?.id === match.id ? prev : toEntryRef(match));
-            return;
-          }
-        }
-      }
-    }
-    const otherPositions = currentPos?.filter((pos) => pos !== locator.locations.position) || [];
-    for (const otherPosition of otherPositions) {
-      const otherPositionInList = positionsList?.find((pos) => pos.locations.position === otherPosition);
-      if (otherPositionInList) {
-        const match = findMatch(tocTree, new Link(otherPositionInList));
-        if (match) {
-          setCurrentTocEntry((prev) => prev?.id === match.id ? prev : toEntryRef(match));
-          return;
-        }
-      }
-    }
-  }, [tocTree, layout, positionsList]);
-  const buildTimelineItems = useCallback(() => {
-    const timelineItems2 = {};
+  const positionEntries = useMemo(() => {
+    const entries = {};
+    if (!positionsList?.length) return entries;
     const readingOrder = publication?.readingOrder?.items || [];
-    const toc = publication?.toc?.items && publication?.toc?.items.length > 0 ? publication.toc.items : publication?.readingOrder?.items || [];
-    const flatToc = toc.flatMap((t) => [t, ...t.children?.items || []]);
-    const getBaseUrl = (url) => {
-      const [base] = url.split("#");
-      const [path] = base.split("?");
-      return path;
-    };
-    const findNearestTitle = (currentHref) => {
-      const currentIndex = readingOrder.findIndex((item) => getBaseUrl(item.href) === getBaseUrl(currentHref));
-      if (currentIndex === -1) return "";
-      for (let i = currentIndex; i >= 0; i--) {
-        const item = readingOrder[i];
-        const matchingTocItems = flatToc.filter(
-          (t) => getBaseUrl(t.href) === getBaseUrl(item.href)
-        );
-        const title = matchingTocItems[0]?.title?.trim();
-        if (title) {
-          const diff = currentIndex - i;
-          return diff > 0 ? `${title} (${diff + 1})` : title;
-        }
-      }
-      return "";
-    };
-    readingOrder.forEach((item, index) => {
-      const matchingTocItems = flatToc.filter((t) => {
-        const baseHref = getBaseUrl(t.href);
-        const baseItemHref = getBaseUrl(item.href);
-        return baseHref === baseItemHref;
-      });
-      const timelineItem = {
-        href: item.href,
-        readingOrderIndex: index,
-        title: item.title || matchingTocItems[0]?.title || findNearestTitle(item.href),
-        fragments: matchingTocItems.map((t) => t.href.split("#")[1]).filter(Boolean),
-        children: matchingTocItems[0]?.children?.items?.map((child) => ({
-          // We do not care about index for children
-          // since currentLocation is guaranteed to be in the reading order
-          title: child.title,
-          href: child.href
-        })) || []
-      };
-      timelineItems2[item.href] = timelineItem;
-    });
     for (const item of readingOrder) {
-      const timelineItem = timelineItems2[item.href];
-      if (!timelineItem) continue;
-      const positions = positionsList ? positionsList.filter((p) => p.href === item.href).sort((a, b) => (a.locations.position || 0) - (b.locations.position || 0)) : [];
-      if (positions.length > 0) {
-        const start = positions[0].locations;
-        const end = positions.length > 1 ? positions[positions.length - 1].locations : start;
-        timelineItem.positionRange = start.position !== void 0 ? [start.position, end.position] : void 0;
-        timelineItem.progressionRange = start.progression !== void 0 ? [start.progression, end.progression] : void 0;
-        timelineItem.totalProgressionRange = start.totalProgression !== void 0 ? [start.totalProgression, end.totalProgression] : void 0;
-      }
+      const positions = positionsList.filter((p) => p.href === item.href).sort((a, b) => (a.locations?.position || 0) - (b.locations?.position || 0));
+      if (positions.length === 0) continue;
+      const start = positions[0].locations;
+      const end = positions.length > 1 ? positions[positions.length - 1].locations : start;
+      entries[item.href] = {
+        positionRange: start?.position !== void 0 ? [start.position, end?.position] : void 0
+      };
     }
-    return timelineItems2;
+    return entries;
   }, [publication, positionsList]);
-  const updateTimelineItems = useCallback((currentLoc) => {
-    if (!currentLoc || !timelineItems) {
-      setPreviousItem(null);
-      setNextItem(null);
-      setCurrentItem(null);
-      return;
-    }
-    const currentItem2 = timelineItems[currentLoc.href];
-    if (!currentItem2) {
-      setPreviousItem(null);
-      setNextItem(null);
-      setCurrentItem(null);
-      return;
-    }
-    setCurrentItem(currentItem2);
-    const timelineItemsArray = Object.values(timelineItems);
-    const currentIndex = timelineItemsArray.findIndex((item) => item.href === currentLoc.href);
-    if (currentIndex === -1) {
-      setPreviousItem(null);
-      setNextItem(null);
-    } else {
-      setPreviousItem(currentIndex > 0 ? timelineItemsArray[currentIndex - 1] : null);
-      setNextItem(currentIndex < timelineItemsArray.length - 1 ? timelineItemsArray[currentIndex + 1] : null);
-    }
-  }, [timelineItems]);
-  useEffect(() => {
-    if (!publication) return;
-    const idGenerator = () => `toc-${++idCounterRef.current}`;
-    const tocItems = publication.toc?.items && publication.toc.items.length > 0 ? publication.toc.items : publication.readingOrder?.items || [];
-    const publicationTitle = publication?.metadata.title.getTranslation("en");
-    setTocTree(buildTocTree(tocItems, idGenerator, positionsList, publicationTitle));
-    setTimelineItems(buildTimelineItems());
-  }, [publication, positionsList, buildTimelineItems]);
-  useEffect(() => {
-    if (!tocTree.length || !timelineItems) return;
-    if (currentLocation) {
-      handleTocEntryOnNav(currentLocation, currentPositions);
-    } else if (tocTree.length > 0) {
-      handleTocEntryOnNav(new Locator({ href: tocTree[0].href, type: "" }), currentPositions);
-    }
-    updateTimelineItems(currentLocation);
-    setRelativeProgression(currentLocation?.locations.progression);
-    setTotalProgression(currentLocation?.locations.totalProgression);
-  }, [currentLocation, currentPositions, tocTree, timelineItems, handleTocEntryOnNav, updateTimelineItems]);
+  const navigatorTimeline = getNavigatorTimeline();
+  const currentHref = currentLocation?.href;
+  const currentIndex = currentHref ? publication?.readingOrder.items.findIndex((item) => item.href === currentHref) : void 0;
+  const currentChapter = currentTimelineItem && navigatorTimeline ? resolveChapterTitle(navigatorTimeline, currentTimelineItem) : void 0;
+  const progress = useMemo(() => {
+    const positionRange = currentHref ? positionEntries[currentHref]?.positionRange : void 0;
+    const endPosition = positionRange?.[1];
+    const currentPosition = currentPositions?.[0];
+    return {
+      title: publication?.metadata.title.getTranslation("en"),
+      progression: {
+        totalItems: publication?.readingOrder.items.length,
+        currentIndex: currentIndex !== void 0 && currentIndex >= 0 ? currentIndex + 1 : void 0,
+        totalPositions: positionsList?.length,
+        currentPositions: currentPositions || [],
+        relativeProgression: currentLocation?.locations.progression,
+        totalProgression: currentLocation?.locations.totalProgression,
+        currentChapter,
+        positionsLeft: !positionsList?.length || endPosition === void 0 || currentPosition === void 0 ? void 0 : Math.max(0, endPosition - currentPosition)
+      }
+    };
+  }, [
+    publication,
+    currentChapter,
+    currentHref,
+    currentIndex,
+    positionEntries,
+    positionsList,
+    currentPositions,
+    currentLocation
+  ]);
   useEffect(() => {
-    timelineInstance = timeline;
-    if (onChange) {
-      onChange(timeline);
-    }
-  }, [timeline, onChange]);
-  return timeline;
+    if (onChange) onChange(progress);
+  }, [progress, onChange]);
+  return progress;
+};
+var useTimelineAdjacency = (getNavigatorTimeline) => {
+  const dispatch = useAppDispatch();
+  const updateAdjacentItems = useCallback((item) => {
+    const tl = getNavigatorTimeline();
+    if (!tl) return;
+    const { previous, next } = tl.navigableFrom(item);
+    const previousHref = previous ? tl.linkFor(previous)?.href : void 0;
+    const nextHref = next ? tl.linkFor(next)?.href : void 0;
+    dispatch(setAdjacentTimelineItems({
+      previous: previous && previousHref ? { title: resolveChapterTitle(tl, previous), href: previousHref } : null,
+      next: next && nextHref ? { title: resolveChapterTitle(tl, next), href: nextHref } : null
+    }));
+  }, [dispatch, getNavigatorTimeline]);
+  const clearAdjacentItems = useCallback(() => {
+    dispatch(setAdjacentTimelineItems({ previous: null, next: null }));
+  }, [dispatch]);
+  return { updateAdjacentItems, clearAdjacentItems };
 };
 var navigatorInstance = null;
 var useAudioNavigator = () => {
@@ -397,6 +287,9 @@ var useAudioNavigator = () => {
   const currentTime = useCallback(() => {
     return navigatorInstance?.currentTime || 0;
   }, []);
+  const timeline = useCallback(() => {
+    return navigatorInstance?.timeline;
+  }, []);
   return {
     AudioNavigatorLoad,
     AudioNavigatorDestroy,
@@ -424,7 +317,7 @@ var useAudioNavigator = () => {
     remotePlayback: navigatorInstance?.remotePlayback,
     getSetting,
     submitPreferences,
-    timeline: useCallback(() => navigatorInstance?.timeline, [])
+    timeline
   };
 };
 var useAudioSettingsCache = (volume, playbackRate, preservePitch, skipBackwardInterval, skipForwardInterval, skipInterval, pollInterval, autoPlay, enableMediaSession) => {
@@ -487,7 +380,7 @@ var useEpubNavigator = () => {
         config.container,
         config.publication,
         config.listeners,
-        config.positionsList,
+        config.positionsList?.map((p) => Locator.deserialize(p)).filter((l) => !!l),
         config.initialPosition,
         {
           preferences: config.preferences || {},
@@ -532,27 +425,6 @@ var useEpubNavigator = () => {
   const currentLocator = useCallback(() => {
     return navigatorInstance2?.currentLocator;
   }, []);
-  const getLocatorAtOffset = useCallback((offset) => {
-    const readingOrder = navigatorInstance2?.publication?.readingOrder;
-    if (!readingOrder) return null;
-    const currentLocator2 = navigatorInstance2?.currentLocator;
-    if (!currentLocator2) return null;
-    const currentLocatorIndex = readingOrder.findIndexWithHref(currentLocator2.href);
-    if (currentLocatorIndex === -1) return null;
-    const newIndex = currentLocatorIndex + offset;
-    if (newIndex < 0 || newIndex >= readingOrder.items.length) return null;
-    return readingOrder.items[newIndex];
-  }, []);
-  const previousLocator = useCallback(() => {
-    const link = getLocatorAtOffset(-1);
-    if (!link) return null;
-    return navigatorInstance2?.publication?.manifest?.locatorFromLink(link);
-  }, [getLocatorAtOffset]);
-  const nextLocator = useCallback(() => {
-    const link = getLocatorAtOffset(1);
-    if (!link) return null;
-    return navigatorInstance2?.publication?.manifest?.locatorFromLink(link);
-  }, [getLocatorAtOffset]);
   const currentPositions = useCallback(() => {
     return navigatorInstance2?.viewport?.positions;
   }, []);
@@ -576,6 +448,9 @@ var useEpubNavigator = () => {
     if (!metadata) return void 0;
     return getScriptMode(metadata);
   }, []);
+  const timeline = useCallback(() => {
+    return navigatorInstance2?.timeline;
+  }, []);
   return {
     EpubNavigatorLoad,
     EpubNavigatorDestroy,
@@ -587,8 +462,6 @@ var useEpubNavigator = () => {
     go,
     navLayout,
     currentLocator,
-    previousLocator,
-    nextLocator,
     currentPositions,
     canGoBackward,
     canGoForward,
@@ -598,7 +471,8 @@ var useEpubNavigator = () => {
     getSetting,
     submitPreferences,
     getCframes,
-    getScriptMode: currentScriptMode
+    getScriptMode: currentScriptMode,
+    timeline
   };
 };
 var useEpubSettingsCache = (textAlign, columnCount, fontFamily, fontSize, fontWeight, hyphens, letterSpacing, ligatures, lineLength, lineHeight, noRuby, paragraphIndent, paragraphSpacing, publisherStyles, scroll, textNormalization, wordSpacing, theme) => {
@@ -729,27 +603,6 @@ var useWebPubNavigator = () => {
   const currentLocator = useCallback(() => {
     return navigatorInstance3?.currentLocator;
   }, []);
-  const getLocatorAtOffset = useCallback((offset) => {
-    const readingOrder = navigatorInstance3?.publication?.readingOrder;
-    if (!readingOrder) return null;
-    const currentLocator2 = navigatorInstance3?.currentLocator;
-    if (!currentLocator2) return null;
-    const currentLocatorIndex = readingOrder.findIndexWithHref(currentLocator2.href);
-    if (currentLocatorIndex === -1) return null;
-    const newIndex = currentLocatorIndex + offset;
-    if (newIndex < 0 || newIndex >= readingOrder.items.length) return null;
-    return readingOrder.items[newIndex];
-  }, []);
-  const previousLocator = useCallback(() => {
-    const link = getLocatorAtOffset(-1);
-    if (!link) return null;
-    return navigatorInstance3?.publication?.manifest?.locatorFromLink(link);
-  }, [getLocatorAtOffset]);
-  const nextLocator = useCallback(() => {
-    const link = getLocatorAtOffset(1);
-    if (!link) return null;
-    return navigatorInstance3?.publication?.manifest?.locatorFromLink(link);
-  }, [getLocatorAtOffset]);
   const currentPositions = useCallback(() => {
     return navigatorInstance3?.viewport?.positions;
   }, []);
@@ -773,6 +626,9 @@ var useWebPubNavigator = () => {
     if (!metadata) return void 0;
     return getScriptMode(metadata);
   }, []);
+  const timeline = useCallback(() => {
+    return navigatorInstance3?.timeline;
+  }, []);
   return {
     WebPubNavigatorLoad,
     WebPubNavigatorDestroy,
@@ -783,8 +639,6 @@ var useWebPubNavigator = () => {
     goLink,
     go,
     currentLocator,
-    previousLocator,
-    nextLocator,
     currentPositions,
     canGoBackward,
     canGoForward,
@@ -794,7 +648,8 @@ var useWebPubNavigator = () => {
     getSetting,
     submitPreferences,
     getCframes,
-    getScriptMode: currentScriptMode
+    getScriptMode: currentScriptMode,
+    timeline
   };
 };
 var useWebPubSettingsCache = (fontFamily, fontWeight, hyphens, letterSpacing, ligatures, lineHeight, noRuby, paragraphIndent, paragraphSpacing, publisherStyles, textAlign, textNormalization, wordSpacing, zoom) => {
@@ -853,6 +708,6 @@ var useWebPubSettingsCache = (fontFamily, fontWeight, hyphens, letterSpacing, li
   return cache;
 };
 
-export { timelineInstance, useAudioNavigator, useAudioSettingsCache, useDocumentTitle, useEpubNavigator, useEpubSettingsCache, useFullscreen, useIsClient, useLocalStorage, useObservableCondition, useTimeline, useWebPubNavigator, useWebPubSettingsCache };
-//# sourceMappingURL=chunk-AEEGHJVM.mjs.map
-//# sourceMappingURL=chunk-AEEGHJVM.mjs.map
+export { useAudioNavigator, useAudioSettingsCache, useDocumentTitle, useEpubNavigator, useEpubSettingsCache, useFullscreen, useIsClient, useLocalStorage, useObservableCondition, usePublicationProgress, useTimelineAdjacency, useWebPubNavigator, useWebPubSettingsCache };
+//# sourceMappingURL=chunk-CXKDZVAV.mjs.map
+//# sourceMappingURL=chunk-CXKDZVAV.mjs.map