From a00a8ddbb726fc84f56fbc02b5a29b2a03bcc392 Mon Sep 17 00:00:00 2001
From: smuddyx <smuddyx@gmail.com>
Date: Sun, 20 Jun 2021 21:45:15 +0200
Subject: [PATCH] fix show monitor

---
 .../modules/presentation/monitor/monitor.component.html    | 7 ++++---
 src/app/modules/presentation/monitor/monitor.component.ts  | 5 ++++-
 src/app/modules/presentation/remote/remote.component.less  | 2 +-
 .../components/song-text/song-text.component.html          | 1 +
 .../components/song-text/song-text.component.less          | 2 ++
 .../components/song-text/song-text.component.ts            | 1 +
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/modules/presentation/monitor/monitor.component.html b/src/app/modules/presentation/monitor/monitor.component.html
index 51acadb..59285c2 100644
--- a/src/app/modules/presentation/monitor/monitor.component.html
+++ b/src/app/modules/presentation/monitor/monitor.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="song && showType" [style.font-size.px]="zoom" class="fullscreen background">
   <div
-    @songSwitch
+    [@songSwitch]="songId"
     [class.blur]="songId === 'title'"
     [class.hide]="songId !== 'title' && songId !== 'empty'"
     class="start fullscreen logo"
@@ -14,8 +14,9 @@
   </div>
 
   <app-song-text
+    [header]="song.title"
     *ngIf="songId !== 'title' && songId !== 'empty'"
-    @songSwitch
+    [@songSwitch]="songId"
     [fullscreen]="true"
     [index]="index"
     [showSwitch]="false"
@@ -24,7 +25,7 @@
   ></app-song-text>
   <app-legal
     *ngIf="songId !== 'title' && songId !== 'empty'"
-    @songSwitch
+    [@songSwitch]="songId"
     [config]="config$ | async"
     [song]="song"
   ></app-legal>
diff --git a/src/app/modules/presentation/monitor/monitor.component.ts b/src/app/modules/presentation/monitor/monitor.component.ts
index 5764873..74b728e 100644
--- a/src/app/modules/presentation/monitor/monitor.component.ts
+++ b/src/app/modules/presentation/monitor/monitor.component.ts
@@ -55,7 +55,10 @@ export class MonitorComponent implements OnInit {
         map(_ => _ as Show),
         tap<Show>(_ => (this.showType = _.showType)),
         tap<Show>(_ => (this.date = _.date.toDate())),
-        tap<Show>(_ => (this.songId = _.presentationSongId)),
+        tap<Show>(_ => {
+          if (this.songId !== _.presentationSongId) this.songId = 'empty';
+          setTimeout(() => (this.songId = _.presentationSongId), 300);
+        }),
         tap<Show>(_ => (this.index = _.presentationSection)),
         tap<Show>(_ => (this.zoom = _.presentationZoom ?? 30))
       )
diff --git a/src/app/modules/presentation/remote/remote.component.less b/src/app/modules/presentation/remote/remote.component.less
index ba091b6..912ff3e 100644
--- a/src/app/modules/presentation/remote/remote.component.less
+++ b/src/app/modules/presentation/remote/remote.component.less
@@ -66,7 +66,7 @@
 
 .div-bottom {
   display: grid;
-  grid-template-columns: 40px auto;
+  grid-template-columns: 60px auto;
 }
 
 .padding-bottom {
diff --git a/src/app/widget-modules/components/song-text/song-text.component.html b/src/app/widget-modules/components/song-text/song-text.component.html
index ab2e228..105e1db 100644
--- a/src/app/widget-modules/components/song-text/song-text.component.html
+++ b/src/app/widget-modules/components/song-text/song-text.component.html
@@ -49,6 +49,7 @@
   </button>
 
   <div [class.offset]="fullscreen" [style.top.px]="offset + 50">
+    <h1 *ngIf="header">{{header}}</h1>
     <div
       #section
       *ngFor="let section of sections; let i = index"
diff --git a/src/app/widget-modules/components/song-text/song-text.component.less b/src/app/widget-modules/components/song-text/song-text.component.less
index 0276d2d..615b313 100644
--- a/src/app/widget-modules/components/song-text/song-text.component.less
+++ b/src/app/widget-modules/components/song-text/song-text.component.less
@@ -62,6 +62,8 @@
 .offset {
   position: fixed;
   top: 0;
+  left: 40px;
+  right: 40px;
 
   transition: 1000ms all ease-in-out;
 }
diff --git a/src/app/widget-modules/components/song-text/song-text.component.ts b/src/app/widget-modules/components/song-text/song-text.component.ts
index 7ea0728..d4a602b 100644
--- a/src/app/widget-modules/components/song-text/song-text.component.ts
+++ b/src/app/widget-modules/components/song-text/song-text.component.ts
@@ -18,6 +18,7 @@ export type ChordMode = 'show' | 'hide' | 'onlyFirst';
 })
 export class SongTextComponent implements OnInit {
   public sections: Section[] = [];
+  @Input() public header: string | null = null;
   @Input() public index = -1;
   @Input() public fullscreen = false;
   @Input() public showSwitch = false;