Merge pull request #11448 from nextcloud/feat/11372/live-polls

feat(Poll): live polls pop-ups during the call
nextcloud · Feb 21, 2024 · 22848f4 · 22848f4
2 parents 2833efc + ae19ca8
commit 22848f4
Show file tree

Hide file tree

Showing 11 changed files with 622 additions and 461 deletions.
diff --git a/src/PublicShareAuthSidebar.vue b/src/PublicShareAuthSidebar.vue
@@ -32,6 +32,7 @@
 					:is-sidebar="true" />
 				<CallView :token="token" :is-sidebar="true" />
 				<ChatView />
+				<PollViewer />
 				<MediaSettings :recording-consent-given.sync="recordingConsentGiven" />
 			</template>
 		</aside>
@@ -46,6 +47,7 @@ import { loadState } from '@nextcloud/initial-state'
 import CallView from './components/CallView/CallView.vue'
 import ChatView from './components/ChatView.vue'
 import MediaSettings from './components/MediaSettings/MediaSettings.vue'
+import PollViewer from './components/PollViewer/PollViewer.vue'
 import TopBar from './components/TopBar/TopBar.vue'
 import TransitionWrapper from './components/TransitionWrapper.vue'
 
@@ -66,6 +68,7 @@ export default {
 		CallView,
 		ChatView,
 		MediaSettings,
+		PollViewer,
 		TopBar,
 		TransitionWrapper,
 	},

diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
@@ -46,6 +46,7 @@
 				<PreventUnload :when="warnLeaving" />
 				<CallButton class="call-button" />
 				<ChatView />
+				<PollViewer />
 				<MediaSettings :recording-consent-given.sync="recordingConsentGiven" />
 			</template>
 		</aside>
@@ -63,6 +64,7 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import CallView from './components/CallView/CallView.vue'
 import ChatView from './components/ChatView.vue'
 import MediaSettings from './components/MediaSettings/MediaSettings.vue'
+import PollViewer from './components/PollViewer/PollViewer.vue'
 import CallButton from './components/TopBar/CallButton.vue'
 import TopBar from './components/TopBar/TopBar.vue'
 import TransitionWrapper from './components/TransitionWrapper.vue'
@@ -83,12 +85,13 @@ export default {
 	name: 'PublicShareSidebar',
 
 	components: {
-		NcButton,
 		CallButton,
 		CallView,
 		ChatView,
-		PreventUnload,
 		MediaSettings,
+		NcButton,
+		PollViewer,
+		PreventUnload,
 		TopBar,
 		TransitionWrapper,
 	},

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
@@ -28,7 +28,7 @@
 			:class="{
 				'system-message': isSystemMessage && !showJoinCallButton,
 				'deleted-message': isDeletedMessage,
-				'call-started': showJoinCallButton,
+				'message-highlighted': showJoinCallButton,
 			}">
 			<!-- Message content / text -->
 			<CancelIcon v-if="isDeletedMessage" :size="16" />
@@ -49,6 +49,7 @@
 		<!-- Normal message body content -->
 		<div v-else
 			class="message-main__text markdown-message"
+			:class="{'message-highlighted': isNewPollMessage }"
 			@mouseover="handleMarkdownMouseOver"
 			@mouseleave="handleMarkdownMouseLeave">
 			<!-- Replied parent message -->
@@ -284,6 +285,14 @@ export default {
 			return this.messageParameters?.file
 		},
 
+		isNewPollMessage() {
+			if (this.messageParameters?.object?.type !== 'talk-poll') {
+				return false
+			}
+
+			return this.isInCall && !!this.$store.getters.getNewPolls[this.messageParameters.object.id]
+		},
+
 		hideDate() {
 			return this.isTemporary || this.isDeleting || !!this.sendingFailure
 		},
@@ -442,7 +451,7 @@ export default {
 			padding: 0 20px;
 		}
 
-		&.call-started {
+		&.message-highlighted {
 			color: var(--color-text-light);
 			background-color: var(--color-primary-element-light);
 			padding: 10px;