From a8bc1df3e7da55ecfa84e6b3fb94183abad7275f Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 18 Jun 2023 12:56:32 -0500
Subject: [PATCH] Fix epub ereader theme sticking for other ebook formats

---
 client/components/readers/EpubReader.vue | 2 +-
 client/components/readers/Reader.vue     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/components/readers/EpubReader.vue b/client/components/readers/EpubReader.vue
index 7e0cd2d2..339d73bf 100644
--- a/client/components/readers/EpubReader.vue
+++ b/client/components/readers/EpubReader.vue
@@ -69,7 +69,7 @@ export default {
     },
     /** @returns {Array<ePub.NavItem>} */
     chapters() {
-      return this.book ? this.book.navigation.toc : []
+      return this.book?.navigation?.toc || []
     },
     userMediaProgress() {
       if (!this.libraryItemId) return
diff --git a/client/components/readers/Reader.vue b/client/components/readers/Reader.vue
index 333b6e2b..b9d92286 100644
--- a/client/components/readers/Reader.vue
+++ b/client/components/readers/Reader.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="show" id="reader" :data-theme="ereaderSettings.theme" class="group absolute top-0 left-0 w-full z-60 data-[theme=dark]:bg-primary data-[theme=dark]:text-white data-[theme=light]:bg-white data-[theme=light]:text-black" :class="{ 'reader-player-open': !!streamLibraryItem }">
+  <div v-if="show" id="reader" :data-theme="ereaderTheme" class="group absolute top-0 left-0 w-full z-60 data-[theme=dark]:bg-primary data-[theme=dark]:text-white data-[theme=light]:bg-white data-[theme=light]:text-black" :class="{ 'reader-player-open': !!streamLibraryItem }">
     <div class="absolute top-4 left-4 z-20 flex items-center">
       <button v-if="isEpub" @click="toggleToC" type="button" aria-label="Table of contents menu" class="inline-flex opacity-80 hover:opacity-100">
         <span class="material-icons text-2xl">menu</span>
@@ -51,6 +51,7 @@
       </div>
     </div>
 
+    <!-- ereader settings modal -->
     <modals-modal v-model="showSettings" name="ereader-settings-modal" :width="500" :height="'unset'" :processing="false">
       <template #outer>
         <div class="absolute top-0 left-0 p-5 w-3/4 overflow-hidden">
@@ -118,6 +119,10 @@ export default {
         this.$store.commit('setShowEReader', val)
       }
     },
+    ereaderTheme() {
+      if (this.isEpub) return this.ereaderSettings.theme
+      return 'dark'
+    },
     spreadItems() {
       return [
         {