summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaksim Sukharev <antreesy.web@gmail.com>2023-07-05 20:27:39 +0200
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>2023-08-07 16:14:38 +0000
commitf3bf8a77a6918ab384513f0d50b4863340b6997b (patch)
tree7a559ad284c8622ccd712abe5fcccbcea295efbd
parent82ca3be0364ec14f58311c95f51134f6b7603de8 (diff)
resolve Uncaught Typerror and focus-trap warn for reactions
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
-rw-r--r--src/components/MessagesList/MessagesGroup/Message/Message.vue1
-rw-r--r--src/store/messagesStore.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 55ea2d0fe..7189a60d5 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -138,6 +138,7 @@ the main body of the message as well as a quote.
<NcPopover v-for="reaction in Object.keys(simpleReactions)"
:key="reaction"
:delay="200"
+ :focus-trap="false"
:triggers="['hover']">
<template #trigger>
<NcButton v-if="simpleReactions[reaction] !== 0"
diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index b22bc7b6f..3572618ae 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -246,7 +246,7 @@ const getters = {
// Returns true if the message has reactions
hasReactions: (state) => (token, messageId) => {
- return Object.keys(state.messages[token][messageId].reactions).length !== 0
+ return Object.keys(Object(state.messages[token]?.[messageId]?.reactions)).length !== 0
},
}