From cda13046ff6fc0af71a06540b691feeac0d871f5 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 9 Feb 2024 16:33:41 +0100
Subject: [PATCH 1/2] location adaption

---
 packages/web-app-epub-reader/src/App.vue | 25 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/web-app-epub-reader/src/App.vue b/packages/web-app-epub-reader/src/App.vue
index 8828345462a..917476e6923 100644
--- a/packages/web-app-epub-reader/src/App.vue
+++ b/packages/web-app-epub-reader/src/App.vue
@@ -31,8 +31,15 @@
 <script lang="ts">
 import { defineComponent, nextTick, PropType, ref, unref, watch } from 'vue'
 import { Resource } from '@ownclouders/web-client/src/helpers/resource/types'
-import { AppConfigObject, Key, useKeyboardActions, useThemeStore } from '@ownclouders/web-pkg'
-import ePub, { Book, NavItem, Rendition } from 'epubjs'
+import {
+  AppConfigObject,
+  Key,
+  useKeyboardActions,
+  useLocalStorage,
+  useThemeStore
+} from '@ownclouders/web-pkg'
+import ePub, { Book, NavItem, Rendition, Location } from 'epubjs'
+import { DisplayedLocation } from 'epubjs/types/rendition'
 
 const DARK_THEME_CONFIG = {
   html: {
@@ -96,6 +103,8 @@ export default defineComponent({
           book.destroy()
         }
 
+        const localStorageData = useLocalStorage(`oc_epubReader__${props.resource.id}`, {})
+
         book = ePub(props.currentContent)
         book.loaded.navigation.then(({ toc }) => {
           chapters.value = toc
@@ -111,7 +120,7 @@ export default defineComponent({
         rendition.themes.register('dark', DARK_THEME_CONFIG)
         rendition.themes.register('light', LIGHT_THEME_CONFIG)
         rendition.themes.select(themeStore.currentTheme.isDark ? 'dark' : 'light')
-        rendition.display()
+        rendition.display(unref(localStorageData)?.currentLocation?.start?.cfi)
 
         rendition.on('keydown', (event: KeyboardEvent) => {
           if (event.key === Key.ArrowLeft) {
@@ -123,18 +132,18 @@ export default defineComponent({
         })
 
         rendition.on('relocated', () => {
-          const currentLocation = rendition.currentLocation() as any
+          const currentLocation = rendition.currentLocation() as DisplayedLocation & Location
+          localStorageData.value = { currentLocation }
+          navigateLeftDisabled.value = currentLocation.atStart === true
+          navigateRightDisabled.value = currentLocation.atEnd === true
+
           const locationCfi = currentLocation.start.cfi
           const spineItem = book.spine.get(locationCfi)
           const navItem = book.navigation.get(spineItem.href)
-
           // Might be sub nav item and therefore undefined
           if (navItem) {
             currentChapter.value = navItem
           }
-
-          navigateLeftDisabled.value = currentLocation.atStart === true
-          navigateRightDisabled.value = currentLocation.atEnd === true
         })
       },
       {

From d3c663da6b269211e39159c48d9e701cd3e407a8 Mon Sep 17 00:00:00 2001
From: Jan <jan.alexander.ackermann@outlook.com>
Date: Sun, 11 Feb 2024 05:35:03 +0100
Subject: [PATCH 2/2] Update App.vue

---
 packages/web-app-epub-reader/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-app-epub-reader/src/App.vue b/packages/web-app-epub-reader/src/App.vue
index 917476e6923..fbd09b51cfd 100644
--- a/packages/web-app-epub-reader/src/App.vue
+++ b/packages/web-app-epub-reader/src/App.vue
@@ -103,7 +103,7 @@ export default defineComponent({
           book.destroy()
         }
 
-        const localStorageData = useLocalStorage(`oc_epubReader__${props.resource.id}`, {})
+        const localStorageData = useLocalStorage(`oc_epubReader_resource_${props.resource.id}`, {})
 
         book = ePub(props.currentContent)
         book.loaded.navigation.then(({ toc }) => {