From 10d85deb09d012f86dbb05ec94fcff53f1fbd06a Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Fri, 5 May 2023 00:25:41 +0200
Subject: [PATCH] fix(ViewerOverlay): add EmptyCallView

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/components/CallView/CallView.vue          |  10 +-
 .../CallView/shared/EmptyCallView.vue         |  52 ++++++--
 src/components/CallView/shared/VideoVue.vue   |   7 +-
 .../CallView/shared/ViewerOverlayCallView.vue | 122 ++++++++++--------
 4 files changed, 120 insertions(+), 71 deletions(-)

diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index f89f2bc01e3..392aa008b8c 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -22,13 +22,13 @@
 
 <template>
 	<div id="call-container">
-		<EmptyCallView v-if="!remoteParticipantsCount && !screenSharingActive && !isGrid"
-			:is-sidebar="isSidebar" />
-
-		<ViewerOverlayCallView v-else-if="isViewerOverlay && promotedParticipantModel"
+		<ViewerOverlayCallView v-if="isViewerOverlay"
 			:token="token"
 			:model="promotedParticipantModel"
-			:shared-data="sharedDatas[promotedParticipantModel.attributes.peerId]" />
+			:shared-data="promotedParticipantModel && sharedDatas[promotedParticipantModel.attributes.peerId]" />
+
+		<EmptyCallView v-if="!remoteParticipantsCount && !screenSharingActive && !isGrid"
+			:is-sidebar="isSidebar" />
 
 		<div v-else-if="!isViewerOverlay" id="videos">
 			<template v-if="!isGrid">
diff --git a/src/components/CallView/shared/EmptyCallView.vue b/src/components/CallView/shared/EmptyCallView.vue
index f2cf303c28e..a495ff9c6f2 100644
--- a/src/components/CallView/shared/EmptyCallView.vue
+++ b/src/components/CallView/shared/EmptyCallView.vue
@@ -19,19 +19,23 @@
   -->
 
 <template>
-	<div class="empty-call-view" :class="{'empty-call-view--sidebar': isSidebar}">
+	<div class="empty-call-view"
+		:class="{
+			'empty-call-view--sidebar': isSidebar,
+			'empty-call-view--small': isSmall
+		}">
 		<div class="icon" :class="iconClass" />
-		<h2>
-			{{ title }}
-		</h2>
-		<p v-if="message" class="emptycontent-additional">
-			{{ message }}
-		</p>
-		<NcButton v-if="showLink"
-			type="primary"
-			@click.stop.prevent="handleCopyLink">
-			{{ t('spreed', 'Copy link') }}
-		</NcButton>
+		<h2>{{ title }}</h2>
+		<template v-if="!isSmall">
+			<p v-if="message" class="emptycontent-additional">
+				{{ message }}
+			</p>
+			<NcButton v-if="showLink"
+				type="primary"
+				@click.stop.prevent="handleCopyLink">
+				{{ t('spreed', 'Copy link') }}
+			</NcButton>
+		</template>
 	</div>
 </template>
 
@@ -59,6 +63,11 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+
+		isSmall: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	computed: {
@@ -210,6 +219,25 @@ export default {
 			margin-bottom: 0;
 		}
 	}
+
+	&--small {
+		border-radius: calc(var(--default-clickable-area) / 2);
+		background-color: rgba(34, 34, 34, 0.8); /* Copy from the call view */
+		padding: 8px;
+
+		h2 {
+			font-size: 1rem;
+			font-weight: normal;
+		}
+
+		.icon {
+			transform: none;
+			margin-bottom: 0;
+			background-size: 32px;
+			height: 32px;
+			width: 32px;
+		}
+	}
 }
 
 </style>
diff --git a/src/components/CallView/shared/VideoVue.vue b/src/components/CallView/shared/VideoVue.vue
index 702333fa280..91f6c6783bc 100644
--- a/src/components/CallView/shared/VideoVue.vue
+++ b/src/components/CallView/shared/VideoVue.vue
@@ -82,7 +82,7 @@
 			class="connection-message">
 			{{ connectionMessage }}
 		</div>
-		<slot name="bottom-bar">
+		<slot v-if="!hideBottomBar" name="bottom-bar">
 			<VideoBottomBar v-bind="$props"
 				:has-shadow="hasVideo"
 				:participant-name="participantName" />
@@ -176,6 +176,11 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+
+		hideBottomBar: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	data() {
diff --git a/src/components/CallView/shared/ViewerOverlayCallView.vue b/src/components/CallView/shared/ViewerOverlayCallView.vue
index f50020db0f8..110c658d1ee 100644
--- a/src/components/CallView/shared/ViewerOverlayCallView.vue
+++ b/src/components/CallView/shared/ViewerOverlayCallView.vue
@@ -20,7 +20,8 @@
 <template>
 	<div ref="ghost" class="viewer-overlay-ghost">
 		<Portal>
-			<div class="viewer-overlay"
+			<!-- Add .app-talk to use Talk icon classes outside of #content-vue -->
+			<div class="viewer-overlay app-talk"
 				:style="{
 					right: position.right + 'px',
 					bottom: position.bottom + 'px'
@@ -41,7 +42,10 @@
 				</div>
 
 				<Transition name="slide-down">
-					<div v-show="!isCollapsed" class="viewer-overlay__video-container">
+					<div v-show="!isCollapsed"
+						class="viewer-overlay__video-container"
+						tabindex="0"
+						@click="maximize">
 						<div class="video-overlay__top-bar">
 							<NcButton type="secondary"
 								class="viewer-overlay__button"
@@ -53,6 +57,20 @@
 							</NcButton>
 						</div>
 
+						<VideoVue v-if="model"
+							class="viewer-overlay__video"
+							:token="token"
+							:model="model"
+							:shared-data="sharedData"
+							is-grid
+							un-selectable
+							hide-bottom-bar
+							@click-video="maximize">
+							<template #bottom-bar />
+						</VideoVue>
+
+						<EmptyCallView v-else is-small />
+
 						<LocalVideo v-if="localModel.attributes.videoEnabled"
 							class="viewer-overlay__local-video"
 							:token="token"
@@ -62,28 +80,18 @@
 							is-small
 							un-selectable />
 
-						<VideoVue class="viewer-overlay__video"
-							:token="token"
-							:model="model"
-							:shared-data="sharedData"
-							is-grid
-							un-selectable
-							@click-video="maximize">
-							<template #bottom-bar>
-								<div class="viewer-overlay__bottom-bar">
-									<LocalAudioControlButton class="viewer-overlay__button"
-										:conversation="conversation"
-										:model="localModel"
-										nc-button-type="secondary"
-										disable-keyboard-shortcuts />
-									<LocalVideoControlButton class="viewer-overlay__button"
-										:conversation="conversation"
-										:model="localModel"
-										nc-button-type="secondary"
-										disable-keyboard-shortcuts />
-								</div>
-							</template>
-						</VideoVue>
+						<div class="viewer-overlay__bottom-bar">
+							<LocalAudioControlButton class="viewer-overlay__button"
+								:conversation="conversation"
+								:model="localModel"
+								nc-button-type="secondary"
+								disable-keyboard-shortcuts />
+							<LocalVideoControlButton class="viewer-overlay__button"
+								:conversation="conversation"
+								:model="localModel"
+								nc-button-type="secondary"
+								disable-keyboard-shortcuts />
+						</div>
 					</div>
 				</Transition>
 			</div>
@@ -100,6 +108,7 @@ import ChevronUp from 'vue-material-design-icons/ChevronUp.vue'
 
 import { NcButton, Tooltip } from '@nextcloud/vue'
 
+import EmptyCallView from './EmptyCallView.vue'
 import LocalAudioControlButton from './LocalAudioControlButton.vue'
 import LocalVideo from './LocalVideo.vue'
 import LocalVideoControlButton from './LocalVideoControlButton.vue'
@@ -111,6 +120,7 @@ export default {
 	name: 'ViewerOverlayCallView',
 
 	components: {
+		EmptyCallView,
 		LocalAudioControlButton,
 		LocalVideoControlButton,
 		Portal,
@@ -134,12 +144,14 @@ export default {
 
 		model: {
 			type: Object,
-			required: true,
+			required: false,
+			default: null,
 		},
 
 		sharedData: {
 			type: Object,
-			required: true,
+			required: false,
+			default: null,
 		},
 
 		localModel: {
@@ -203,10 +215,10 @@ export default {
 @import "../../../assets/variables";
 
 .viewer-overlay-ghost {
-  position: absolute;
-  bottom: 8px;
-  right: 8px;
-  left: 0;
+	position: absolute;
+	bottom: 8px;
+	right: 8px;
+	left: 0;
 }
 
 .viewer-overlay {
@@ -222,11 +234,15 @@ export default {
 	z-index: 11000;
 }
 
+.viewer-overlay * {
+	box-sizing: border-box;
+}
+
 .viewer-overlay__collapse {
-  position: absolute;
-  top: 8px;
-  right: 8px;
-  z-index: 100;
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	z-index: 100;
 }
 
 .viewer-overlay__button {
@@ -239,22 +255,22 @@ export default {
 }
 
 .video-overlay__top-bar {
-  position: absolute;
-  top: 8px;
-  left: 8px;
-  z-index: 100;
+	position: absolute;
+	top: 8px;
+	left: 8px;
+	z-index: 100;
 }
 
 .viewer-overlay__bottom-bar {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  padding: 0 12px 8px 12px;
-  z-index: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 8px;
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	padding: 0 12px 8px 12px;
+	z-index: 1;
 }
 
 .viewer-overlay__video-container {
@@ -268,12 +284,12 @@ export default {
 }
 
 .viewer-overlay__local-video {
-  position: absolute;
-  bottom: 8px;
-  right: 8px;
-  width: 25%;
-  height: 25%;
-  overflow: hidden;
+	position: absolute;
+	bottom: 8px;
+	right: 8px;
+	width: 25%;
+	height: 25%;
+	overflow: hidden;
 }
 
 .viewer-overlay__video {