From b9ac33d8816cbd2f8c5a71d9892ede7825806552 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Tue, 3 Dec 2019 16:24:52 +0700 Subject: [PATCH] cancel comment edit --- src/components/input/Button/styles.scss | 1 + src/components/node/CommentForm/index.tsx | 13 ++++++++++++- src/redux/node/actions.ts | 5 +++++ src/redux/node/constants.ts | 1 + src/redux/node/sagas.ts | 12 ++++++++++++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/components/input/Button/styles.scss b/src/components/input/Button/styles.scss index 5dd24338..a11ca2b4 100644 --- a/src/components/input/Button/styles.scss +++ b/src/components/input/Button/styles.scss @@ -169,6 +169,7 @@ background: transparent; color: white; box-shadow: none; + padding: 0 $gap; svg { fill: white; diff --git a/src/components/node/CommentForm/index.tsx b/src/components/node/CommentForm/index.tsx index 9cfb433b..7d47f583 100644 --- a/src/components/node/CommentForm/index.tsx +++ b/src/components/node/CommentForm/index.tsx @@ -1,6 +1,5 @@ import React, { FC, useCallback, KeyboardEventHandler, useEffect, useMemo } from 'react'; import { Textarea } from '~/components/input/Textarea'; -import { CommentWrapper } from '~/components/containers/CommentWrapper'; import * as styles from './styles.scss'; import { Filler } from '~/components/containers/Filler'; import { Button } from '~/components/input/Button'; @@ -30,6 +29,7 @@ const mapStateToProps = (state: IState) => ({ const mapDispatchToProps = { nodePostComment: NODE_ACTIONS.nodePostComment, + nodeCancelCommentEdit: NODE_ACTIONS.nodeCancelCommentEdit, nodeSetCommentData: NODE_ACTIONS.nodeSetCommentData, uploadUploadFiles: UPLOAD_ACTIONS.uploadUploadFiles, }; @@ -48,6 +48,7 @@ const CommentFormUnconnected: FC = ({ nodePostComment, nodeSetCommentData, uploadUploadFiles, + nodeCancelCommentEdit, }) => { const onInputChange = useCallback( event => { @@ -196,6 +197,10 @@ const CommentFormUnconnected: FC = ({ [images, audios] ); + const onCancelEdit = useCallback(() => { + nodeCancelCommentEdit(id); + }, [nodeCancelCommentEdit, comment.id]); + return (
@@ -252,6 +257,12 @@ const CommentFormUnconnected: FC = ({ {(is_sending_comment || is_uploading_files) && } + {id !== 0 && ( + + )} +