message editing form works properly

package.json

@@ -57,6 +57,7 @@
     "@hot-loader/react-dom": "^16.10.2",
     "@typescript-eslint/eslint-plugin": "^1.13.0",
     "@typescript-eslint/parser": "^1.13.0",
+    "autosize": "^4.0.2",
     "axios": "^0.18.0",
     "babel-runtime": "^6.26.0",
     "body-scroll-lock": "^2.6.4",

src/components/profile/Message/index.tsx

@@ -13,10 +13,11 @@ interface IProps {
   incoming: boolean;
   onEdit: (id: number) => void;
   onDelete: (id: number) => void;
+  onCancelEdit: () => void;
   isEditing: boolean;
 }
 
-const Message: FC<IProps> = ({ message, incoming, onEdit, onDelete, isEditing }) => {
+const Message: FC<IProps> = ({ message, incoming, onEdit, onDelete, isEditing, onCancelEdit }) => {
   const onEditClicked = useCallback(() => onEdit(message.id), [message.id]);
   const onDeleteClicked = useCallback(() => onDelete(message.id), [message.id]);
 
@@ -24,7 +25,7 @@ const Message: FC<IProps> = ({ message, incoming, onEdit, onDelete, isEditing })
     <div className={classNames(styles.message, { [styles.incoming]: incoming })}>
       {isEditing ? (
         <div className={styles.form}>
-          <MessageForm id={message.id} text={message.text} />
+          <MessageForm id={message.id} text={message.text} onCancel={onCancelEdit} />
         </div>
       ) : (
         <div className={styles.text}>

src/components/profile/MessageForm/index.tsx

@@ -1,4 +1,4 @@
-import React, { FC, useState, useCallback, KeyboardEventHandler } from 'react';
+import React, { FC, useState, useCallback, KeyboardEventHandler, useMemo } from 'react';
 import styles from './styles.scss';
 import { Textarea } from '~/components/input/Textarea';
 import { Filler } from '~/components/containers/Filler';
@@ -22,19 +22,27 @@ type IProps = ReturnType<typeof mapStateToProps> &
   typeof mapDispatchToProps & {
     id?: number;
     text?: string;
+    onCancel?: () => void;
   };
 
 const MessageFormUnconnected: FC<IProps> = ({
-  id = 0,
-  text: initialText = '',
   profile: { is_sending_messages, is_loading_messages, messages_error },
   authSendMessage,
+
+  id = 0,
+  text: initialText = '',
+  onCancel,
 }) => {
+  const isEditing = useMemo(() => id > 0, [id]);
   const [text, setText] = useState(initialText);
 
   const onSuccess = useCallback(() => {
     setText('');
-  }, [setText]);
+
+    if (isEditing) {
+      onCancel();
+    }
+  }, [setText, isEditing, onCancel]);
 
   const onSubmit = useCallback(() => {
     authSendMessage({ text, id }, onSuccess);
@@ -61,7 +69,7 @@ const MessageFormUnconnected: FC<IProps> = ({
           value={text}
           handler={setText}
           minRows={1}
-          maxRows={4}
+          maxRows={isEditing ? 15 : 5}
           seamless
           onKeyDown={onKeyDown}
           disabled={is_sending_messages}
@@ -73,6 +81,12 @@ const MessageFormUnconnected: FC<IProps> = ({
 
           {is_sending_messages && <LoaderCircle size={20} />}
 
+          {isEditing && (
+            <Button size="small" color="link" onClick={onCancel}>
+              Отмена
+            </Button>
+          )}
+
           <Button
             size="small"
             color="gray"
@@ -80,7 +94,7 @@ const MessageFormUnconnected: FC<IProps> = ({
             disabled={is_sending_messages}
             onClick={onSubmit}
           >
-            Сказать
+            {isEditing ? 'Схоронить' : 'Сказать'}
           </Button>
         </Group>
       </Group>

src/components/profile/MessageForm/styles.scss

@@ -20,6 +20,7 @@
   justify-content: center;
   flex-direction: row;
   padding: 0 $gap / 2 $gap / 2 $gap / 2;
+  border-radius: 0 0 $radius $radius;
 
   :global(.loader-circle) {
     svg {

src/containers/profile/ProfileMessages/index.tsx

@@ -23,6 +23,7 @@ const ProfileMessagesUnconnected: FC<IProps> = ({ profile, user: { id }, authGet
   const [editingMessageId, setEditingMessageId] = useState(0);
 
   const onEditMessage = useCallback((id: number) => setEditingMessageId(id), [setEditingMessageId]);
+  const onCancelEdit = useCallback(() => setEditingMessageId(0), [setEditingMessageId]);
   const onDeleteMessage = useCallback((id: number) => console.log({ id }), []);
 
   useEffect(() => {
@@ -57,6 +58,7 @@ const ProfileMessagesUnconnected: FC<IProps> = ({ profile, user: { id }, authGet
             onEdit={onEditMessage}
             onDelete={onDeleteMessage}
             isEditing={editingMessageId === message.id}
+            onCancelEdit={onCancelEdit}
           />
         ))}
 

src/styles/inputs.scss

@@ -31,7 +31,7 @@
       padding: 0;
 
       textarea {
-        padding: $gap;
+        padding: $gap / 2 $gap;
       }
     }
   }
@@ -77,20 +77,20 @@
     color: white;
     position: relative;
 
-    &::before {
-      content: ' ';
-      background: linear-gradient(270deg, $input_bg_color $gap, transparentize($input_bg_color, 1));
-      position: absolute;
-      width: $gap * 2;
-      height: $input_height;
-      top: 1px;
-      right: 1px;
-      transform: translateX(0);
-      transition: transform 0.25s;
-      border-radius: 0 $input_radius $input_radius 0;
-      pointer-events: none;
-      touch-action: none;
-    }
+    //&::before {
+    //  content: ' ';
+    //  background: linear-gradient(270deg, $input_bg_color $gap, transparentize($input_bg_color, 1));
+    //  position: absolute;
+    //  width: $gap * 2;
+    //  height: $input_height;
+    //  top: 1px;
+    //  right: 1px;
+    //  transform: translateX(0);
+    //  transition: transform 0.25s;
+    //  border-radius: 0 $input_radius $input_radius 0;
+    //  pointer-events: none;
+    //  touch-action: none;
+    //}
   }
 
   &.required {

yarn.lock

@@ -1368,6 +1368,11 @@ autoresponsive-react@^1.1.31:
     autoresponsive-core "^1.0.1"
     exenv "^1.2.0"
 
+autosize@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/autosize/-/autosize-4.0.2.tgz#073cfd07c8bf45da4b9fd153437f5bafbba1e4c9"
+  integrity sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA==
+
 awesome-typescript-loader@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz#a41daf7847515f4925cdbaa3075d61f289e913fc"