diff --git a/src/app/components/message/PollEvent.tsx b/src/app/components/message/PollEvent.tsx index dae699a38..c6984f55d 100644 --- a/src/app/components/message/PollEvent.tsx +++ b/src/app/components/message/PollEvent.tsx @@ -191,7 +191,7 @@ export function PollEvent({ content, mEvent, mx, room }: PollEventProps) { const maxValue = Math.max(...Object.values(votes)); let endText = 'The Poll has ended and'; const winnerArray = answers.filter((item) => votes[item.id] === maxValue); - if (votes.maxValue === 0) endText += ' nobody voted'; + if (maxValue === 0) endText += ' nobody voted'; else if (winnerArray.length === 1 && winnerArray[0]) endText += `${winnerArray[0][M_TEXT.name]} won`; else { @@ -223,7 +223,7 @@ export function PollEvent({ content, mEvent, mx, room }: PollEventProps) { // The choice of making it not the same size and style as an Attachment is deliberate as Polls tipically are Way more wordy and this feels more spacious return ( <> - + {questionBody} @@ -298,7 +298,13 @@ export function PollEvent({ content, mEvent, mx, room }: PollEventProps) { : ''} {!isEnded && canEnd && ( - )} diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx index 223b8c6fc..87ec6e68f 100644 --- a/src/app/features/room/RoomInput.tsx +++ b/src/app/features/room/RoomInput.tsx @@ -1599,7 +1599,7 @@ export const RoomInput = forwardRef( size="300" radii="300" title={editorOldAddFile ? 'Upload File' : 'Add'} - aria-label={editorOldAddFile ? 'Upload and attach a File' : 'Add more menu'} + aria-label={editorOldAddFile ? 'Upload and attach a File' : 'Add new Item'} > diff --git a/src/app/features/room/poll-modals/PollDialog.css.tsx b/src/app/features/room/poll-modals/PollDialog.css.tsx index 3bbf5dbbd..648180242 100644 --- a/src/app/features/room/poll-modals/PollDialog.css.tsx +++ b/src/app/features/room/poll-modals/PollDialog.css.tsx @@ -16,8 +16,8 @@ export const PollDialogTitle = style({ }); export const PollDialogAnswerBody = style({ maxHeight: toRem(300), - overflow: 'scroll', }); +export const PollDialogAnswerContainer = style({ paddingTop: toRem(4) }); export const PollDialogAnswerInput = style({ width: '100%' }); export const PollDialogMaxSelectionNumber = style({ width: toRem(80) }); diff --git a/src/app/features/room/poll-modals/PollDialog.tsx b/src/app/features/room/poll-modals/PollDialog.tsx index d9c8036ca..7e6aeb5d4 100644 --- a/src/app/features/room/poll-modals/PollDialog.tsx +++ b/src/app/features/room/poll-modals/PollDialog.tsx @@ -15,6 +15,7 @@ import { Chip, Switch, color, + Scroll, } from 'folds'; import { stopPropagation } from '$utils/keyboard'; import type { ChangeEventHandler, KeyboardEventHandler } from 'react'; @@ -204,9 +205,21 @@ export function PollDialog({ onCancel, mx, room, replyDraft, clearReplyDraft }: Add Option - + {answers.map((item, index) => ( - + ))} - + - +