diff --git a/src/app/organisms/room/message/Reactions.tsx b/src/app/organisms/room/message/Reactions.tsx index 17b914e..728cf81 100644 --- a/src/app/organisms/room/message/Reactions.tsx +++ b/src/app/organisms/room/message/Reactions.tsx @@ -43,7 +43,6 @@ export const Reactions = as<'div', ReactionsProps>( evt.stopPropagation(); evt.preventDefault(); const key = evt.currentTarget.getAttribute('data-reaction-key'); - console.log(key); if (!key) setViewer(true); else setViewer(key); }; @@ -58,7 +57,7 @@ export const Reactions = as<'div', ReactionsProps>( > {reactions.map(([key, events]) => { const rEvents = Array.from(events); - if (rEvents.length === 0) return null; + if (rEvents.length === 0 || typeof key !== 'string') return null; const myREvent = myUserId ? rEvents.find(factoryEventSentBy(myUserId)) : undefined; const isPressed = !!myREvent?.getRelation(); diff --git a/src/app/organisms/room/reaction-viewer/ReactionViewer.tsx b/src/app/organisms/room/reaction-viewer/ReactionViewer.tsx index 5626981..7bcc0cc 100644 --- a/src/app/organisms/room/reaction-viewer/ReactionViewer.tsx +++ b/src/app/organisms/room/reaction-viewer/ReactionViewer.tsx @@ -41,7 +41,12 @@ export const ReactionViewer = as<'div', ReactionViewerProps>( relations, useCallback((rel) => [...(rel.getSortedAnnotationsByKey() ?? [])], []) ); - const [selectedKey, setSelectedKey] = useState(initialKey ?? reactions[0][0]); + + const [selectedKey, setSelectedKey] = useState(() => { + if (initialKey) return initialKey; + const defaultReaction = reactions.find((reaction) => typeof reaction[0] === 'string'); + return defaultReaction ? defaultReaction[0] : ''; + }); const getName = (member: RoomMember) => getMemberDisplayName(room, member.userId) ?? getMxIdLocalPart(member.userId) ?? member.userId; @@ -68,16 +73,19 @@ export const ReactionViewer = as<'div', ReactionViewerProps>( - {reactions.map(([key, evts]) => ( - setSelectedKey(key)} - /> - ))} + {reactions.map(([key, evts]) => { + if (typeof key !== 'string') return null; + return ( + setSelectedKey(key)} + /> + ); + })}