From 3a9d6b1a08b6f21ba5d50f648023f50916957129 Mon Sep 17 00:00:00 2001
From: Joseph Milazzo <joseph.v.milazzo@gmail.com>
Date: Wed, 16 Mar 2022 20:26:51 -0500
Subject: [PATCH] Fixed a bug where companion bar would be pushing content to
 the right even when not visible. Updated nav service localstorage key.
 (#1159)

---
 UI/Web/src/app/_services/nav.service.ts               |  2 +-
 UI/Web/src/app/app.component.html                     | 10 ++++++++--
 UI/Web/src/app/manga-reader/manga-reader.component.ts |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/UI/Web/src/app/_services/nav.service.ts b/UI/Web/src/app/_services/nav.service.ts
index 9dba9d9b0..816098c73 100644
--- a/UI/Web/src/app/_services/nav.service.ts
+++ b/UI/Web/src/app/_services/nav.service.ts
@@ -5,7 +5,7 @@ import { ReplaySubject, take } from 'rxjs';
   providedIn: 'root'
 })
 export class NavService {
-  public localStorageSideNavKey = 'kavita--sidenav--collapsed';
+  public localStorageSideNavKey = 'kavita--sidenav--expanded';
 
   private navbarVisibleSource = new ReplaySubject<boolean>(1);
   /**
diff --git a/UI/Web/src/app/app.component.html b/UI/Web/src/app/app.component.html
index 7cb10f46e..6aea0bc3f 100644
--- a/UI/Web/src/app/app.component.html
+++ b/UI/Web/src/app/app.component.html
@@ -3,8 +3,14 @@
     <a id="content"></a>
     <app-side-nav *ngIf="navService.sideNavVisibility$ | async"></app-side-nav>
     <div class="container-fluid" style="padding-top: 10px; padding-bottom: 10px;">
-        <div class="companion-bar" [ngClass]="{'companion-bar-content': (navService?.sideNavCollapsed$ | async)}">
+        <ng-container *ngIf="navService.sideNavVisibility$ | async else noSideNav">
+            <div class="companion-bar" [ngClass]="{'companion-bar-content': (navService?.sideNavCollapsed$ | async)}">
+                <router-outlet></router-outlet>
+            </div>
+        </ng-container>
+        <ng-template #noSideNav>
             <router-outlet></router-outlet>
-        </div>
+        </ng-template>
+        
     </div>
 </div>
diff --git a/UI/Web/src/app/manga-reader/manga-reader.component.ts b/UI/Web/src/app/manga-reader/manga-reader.component.ts
index ec00fe7cc..4ae108b45 100644
--- a/UI/Web/src/app/manga-reader/manga-reader.component.ts
+++ b/UI/Web/src/app/manga-reader/manga-reader.component.ts
@@ -431,9 +431,9 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     this.navService.showSideNav();
     this.onDestroy.next();
     this.onDestroy.complete();
-    this.goToPageEvent.complete();
     this.showBookmarkEffectEvent.complete();
     this.readerService.exitFullscreen();
+    if (this.goToPageEvent !== undefined) this.goToPageEvent.complete();
   }
 
   @HostListener('window:keyup', ['$event'])