Skip to content
Snippets Groups Projects
Commit 63de5e36 authored by Léopold Chappuis's avatar Léopold Chappuis Committed by Léopold Chappuis
Browse files

send-message-form: update UI to align with directives

Change-Id: I5a45cd41b4d3d02d4029acb1b9be7a1a3af2525b
parent a9125609
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* License along with this program. If not, see * License along with this program. If not, see
* <https://www.gnu.org/licenses/>. * <https://www.gnu.org/licenses/>.
*/ */
import DeleteIcon from '@mui/icons-material/Delete'
import { Box, Card, CardContent, TextareaAutosize, useTheme } from '@mui/material' import { Box, Card, CardContent, TextareaAutosize, useTheme } from '@mui/material'
import { Stack, useMediaQuery } from '@mui/system' import { Stack, useMediaQuery } from '@mui/system'
import { WebSocketMessageType } from 'jami-web-common' import { WebSocketMessageType } from 'jami-web-common'
...@@ -35,7 +36,6 @@ import { ...@@ -35,7 +36,6 @@ import {
RecordVoiceMessageButton, RecordVoiceMessageButton,
SelectEmojiButton, SelectEmojiButton,
SendMessageButton, SendMessageButton,
SquareCancelPictureButton,
UploadFileButton, UploadFileButton,
} from './Button' } from './Button'
...@@ -431,14 +431,14 @@ export default function SendMessageForm({ openFilePicker }: SendMessageFormProps ...@@ -431,14 +431,14 @@ export default function SendMessageForm({ openFilePicker }: SendMessageFormProps
onClick={voiceRecordingStatusChange} onClick={voiceRecordingStatusChange}
disabled={editMessage || isRecordingVoice ? true : false} disabled={editMessage || isRecordingVoice ? true : false}
/> />
<UploadFileButton <RecordVideoMessageButton
sx={isReduced ? mobileOptionStyles : {}} sx={isReduced ? mobileOptionStyles : {}}
disabled={editMessage || isRecordingVoice ? true : false} disabled={editMessage || isRecordingVoice ? true : false}
onClick={openFilePicker}
/> />
<RecordVideoMessageButton <UploadFileButton
sx={isReduced ? mobileOptionStyles : {}} sx={isReduced ? mobileOptionStyles : {}}
disabled={editMessage || isRecordingVoice ? true : false} disabled={editMessage || isRecordingVoice ? true : false}
onClick={openFilePicker}
/> />
</Box> </Box>
{isRecordingVoice ? ( {isRecordingVoice ? (
...@@ -490,11 +490,15 @@ export default function SendMessageForm({ openFilePicker }: SendMessageFormProps ...@@ -490,11 +490,15 @@ export default function SendMessageForm({ openFilePicker }: SendMessageFormProps
)} )}
<Box sx={{ display: 'flex', alignItems: 'center', alignContent: 'center' }}> <Box sx={{ display: 'flex', alignItems: 'center', alignContent: 'center' }}>
{isRecordingVoice ? ( {isRecordingVoice ? (
<SquareCancelPictureButton onClick={voiceRecordingStatusChange} /> <DeleteIcon
onClick={voiceRecordingStatusChange}
style={{ color: 'red', width: '30px', height: '30px', cursor: 'pointer' }}
/>
) : ( ) : (
<SelectEmojiButton onEmojiSelected={onEmojiSelected} /> <SelectEmojiButton onEmojiSelected={onEmojiSelected} />
)} )}
<SendMessageButton <SendMessageButton
sx={{ ml: '4px' }}
disabled={!(currentMessage || fileHandlers.length > 0) && !isRecordingVoice} disabled={!(currentMessage || fileHandlers.length > 0) && !isRecordingVoice}
onClick={isRecordingVoice ? handleVoiceRecording : () => {}} onClick={isRecordingVoice ? handleVoiceRecording : () => {}}
type={isRecordingVoice ? undefined : 'submit'} type={isRecordingVoice ? undefined : 'submit'}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment