From fe3d2e0af4b07ed0d38175e1107bd27b992343df Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 20 Aug 2021 19:12:07 +0530 Subject: [PATCH] added msg edit component [#40] --- src/app/molecules/message/Message.jsx | 39 +++++++++++++++++++++++--- src/app/molecules/message/Message.scss | 11 ++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx index 1b4b3b6..c1da0f0 100644 --- a/src/app/molecules/message/Message.jsx +++ b/src/app/molecules/message/Message.jsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useRef } from 'react'; import PropTypes from 'prop-types'; import './Message.scss'; @@ -13,7 +13,9 @@ import { getUsername } from '../../../util/matrixUtil'; import Text from '../../atoms/text/Text'; import RawIcon from '../../atoms/system-icons/RawIcon'; +import Button from '../../atoms/button/Button'; import Tooltip from '../../atoms/tooltip/Tooltip'; +import Input from '../../atoms/input/Input'; import ReplyArrowIC from '../../../../public/res/ic/outlined/reply-arrow.svg'; @@ -124,6 +126,30 @@ MessageContent.propTypes = { isEdited: PropTypes.bool, }; +function MessageEdit({ content, onSave, onCancel }) { + const editInputRef = useRef(null); + return ( +
{ e.preventDefault(); onSave(editInputRef.current.value); }}> + +
+ + +
+
+ ); +} +MessageEdit.propTypes = { + content: PropTypes.string.isRequired, + onSave: PropTypes.func.isRequired, + onCancel: PropTypes.func.isRequired, +}; + function MessageReactionGroup({ children }) { return (
@@ -192,7 +218,7 @@ MessageOptions.propTypes = { }; function Message({ - avatar, header, reply, content, reactions, options, + avatar, header, reply, content, editContent, reactions, options, }) { const msgClass = header === null ? ' message--content-only' : ' message--full'; return ( @@ -203,7 +229,8 @@ function Message({
{header !== null && header} {reply !== null && reply} - {content} + {content !== null && content} + {editContent !== null && editContent} {reactions !== null && reactions} {options !== null && options}
@@ -214,6 +241,8 @@ Message.defaultProps = { avatar: null, header: null, reply: null, + content: null, + editContent: null, reactions: null, options: null, }; @@ -221,7 +250,8 @@ Message.propTypes = { avatar: PropTypes.node, header: PropTypes.node, reply: PropTypes.node, - content: PropTypes.node.isRequired, + content: PropTypes.node, + editContent: PropTypes.node, reactions: PropTypes.node, options: PropTypes.node, }; @@ -231,6 +261,7 @@ export { MessageHeader, MessageReply, MessageContent, + MessageEdit, MessageReactionGroup, MessageReaction, MessageOptions, diff --git a/src/app/molecules/message/Message.scss b/src/app/molecules/message/Message.scss index ea6508d..b9e02de 100644 --- a/src/app/molecules/message/Message.scss +++ b/src/app/molecules/message/Message.scss @@ -94,6 +94,7 @@ .message__reply, .message__content, +.message__edit, .message__reactions { max-width: 640px; min-width: 0; @@ -164,6 +165,15 @@ color: var(--tc-surface-low); } } +.message__edit { + padding: var(--sp-extra-tight) 0; + &-btns button { + margin: var(--sp-tight) var(--sp-tight) 0 0; + [dir=rtl] & { + margin: 0 0 var(--sp-tight) var(--sp-tight); + } + } +} .message__reactions { display: flex; flex-wrap: wrap; @@ -238,6 +248,7 @@ position: absolute; top: 0; right: 60px; + z-index: 999; transform: translateY(-50%); border-radius: var(--bo-radius);