fix chat height editor

This commit is contained in:
PhilReact 2024-11-25 04:23:36 +02:00
parent d9d1aab54d
commit f098d04551
4 changed files with 9 additions and 4599 deletions

File diff suppressed because it is too large Load Diff

View File

@ -620,15 +620,7 @@ const sendMessage = async ()=> {
}}> }}>
<ReplyPreview message={replyMessage} /> <ReplyPreview message={replyMessage} />
<ButtonBase
onClick={() => {
setReplyMessage(null)
setOnEditMessage(null)
}}
>
<ExitIcon />
</ButtonBase>
</Box> </Box>
)} )}
{onEditMessage && ( {onEditMessage && (
@ -640,20 +632,10 @@ const sendMessage = async ()=> {
}}> }}>
<ReplyPreview isEdit message={onEditMessage} /> <ReplyPreview isEdit message={onEditMessage} />
<ButtonBase
onClick={() => {
setReplyMessage(null)
setOnEditMessage(null)
editorRef.current.chain().focus().clearContent().run()
}}
>
<ExitIcon />
</ButtonBase>
</Box> </Box>
)} )}
<Tiptap isFocusedParent={isFocusedParent} setEditorRef={setEditorRef} onEnter={sendMessage} isChat disableEnter={isMobile ? true : false} setIsFocusedParent={setIsFocusedParent}/> <Tiptap isReply={onEditMessage || replyMessage} isFocusedParent={isFocusedParent} setEditorRef={setEditorRef} onEnter={sendMessage} isChat disableEnter={isMobile ? true : false} setIsFocusedParent={setIsFocusedParent}/>
</div> </div>
<Box sx={{ <Box sx={{
display: 'flex', display: 'flex',

View File

@ -791,16 +791,6 @@ const sendMessage = async ()=> {
width: '100%' width: '100%'
}}> }}>
<ReplyPreview message={replyMessage} /> <ReplyPreview message={replyMessage} />
<ButtonBase
onClick={() => {
setReplyMessage(null)
setOnEditMessage(null)
}}
>
<ExitIcon />
</ButtonBase>
</Box> </Box>
)} )}
@ -813,17 +803,6 @@ const sendMessage = async ()=> {
}}> }}>
<ReplyPreview isEdit message={onEditMessage} /> <ReplyPreview isEdit message={onEditMessage} />
<ButtonBase
onClick={() => {
setReplyMessage(null)
setOnEditMessage(null)
editorRef.current.chain().focus().clearContent().run()
}}
>
<ExitIcon />
</ButtonBase>
</Box> </Box>
)} )}
@ -835,7 +814,7 @@ const sendMessage = async ()=> {
}}> }}>
<Tiptap enableMentions setEditorRef={setEditorRef} onEnter={sendMessage} isChat disableEnter={isMobile ? true : false} isFocusedParent={isFocusedParent} setIsFocusedParent={setIsFocusedParent} membersWithNames={members} /> <Tiptap isReply={onEditMessage || replyMessage} enableMentions setEditorRef={setEditorRef} onEnter={sendMessage} isChat disableEnter={isMobile ? true : false} isFocusedParent={isFocusedParent} setIsFocusedParent={setIsFocusedParent} membersWithNames={members} />

View File

@ -298,7 +298,8 @@ export default ({
overrideMobile, overrideMobile,
customEditorHeight, customEditorHeight,
membersWithNames, membersWithNames,
enableMentions enableMentions,
isReply
}) => { }) => {
const extensionsFiltered = isChat const extensionsFiltered = isChat
@ -446,10 +447,10 @@ export default ({
attributes: { attributes: {
class: "tiptap-prosemirror", class: "tiptap-prosemirror",
style: style:
isMobile ? isMobile ?
`overflow: auto; min-height: ${ `overflow: auto; min-height: ${
customEditorHeight ? "200px" : "0px" customEditorHeight ? "200px" : "0px"
}; max-height:calc(100svh - ${customEditorHeight || "140px"})`: `overflow: auto; max-height: 250px`, }; max-height:calc(100svh - ${customEditorHeight || isReply ? "230px" : "190px"})`: `overflow: auto; max-height: 250px`,
}, },
handleKeyDown(view, event) { handleKeyDown(view, event) {
if (!disableEnter && event.key === "Enter") { if (!disableEnter && event.key === "Enter") {