feat: Toggle actions details, little redesign

2025-07-29 18:19:46 +02:00 · 2022-07-29 17:40:18 +02:00 · 2022-07-29 17:40:18 +02:00 · 45f35e8042
commit 45f35e8042
parent e1ac5959ba
25 changed files with 301 additions and 81 deletions
--- a/client/src/components/CardModal/Actions/Actions.jsx
+++ b/client/src/components/CardModal/Actions/Actions.jsx
@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
-import { Comment, Icon, Loader, Visibility } from 'semantic-ui-react';
+import { Button, Comment, Icon, Loader, Visibility } from 'semantic-ui-react';

 import { ActionTypes } from '../../../constants/Enums';
 import CommentAdd from './CommentAdd';
@ -14,15 +14,22 @@ const Actions = React.memo(
    items,
    isFetching,
    isAllFetched,
+    isDetailsVisible,
+    isDetailsFetching,
    canEdit,
    canEditAllComments,
    onFetch,
+    onDetailsToggle,
    onCommentCreate,
    onCommentUpdate,
    onCommentDelete,
  }) => {
    const [t] = useTranslation();

+    const handleToggleDetailsClick = useCallback(() => {
+      onDetailsToggle(!isDetailsVisible);
+    }, [isDetailsVisible, onDetailsToggle]);
+
    const handleCommentUpdate = useCallback(
      (id, data) => {
        onCommentUpdate(id, data);
@ -38,54 +45,51 @@ const Actions = React.memo(
    );

    return (
-      <>
-        {canEdit && (
-          <div className={styles.contentModule}>
-            <div className={styles.moduleWrapper}>
-              <Icon name="comment outline" className={styles.moduleIcon} />
-              <div className={styles.moduleHeader}>{t('common.addComment')}</div>
-              <CommentAdd onCreate={onCommentCreate} />
-            </div>
+      <div className={styles.contentModule}>
+        <div className={styles.moduleWrapper}>
+          <Icon name="list ul" className={styles.moduleIcon} />
+          <div className={styles.moduleHeader}>
+            {t('common.actions')}
+            <Button
+              content={isDetailsVisible ? t('action.hideDetails') : t('action.showDetails')}
+              className={styles.toggleButton}
+              onClick={handleToggleDetailsClick}
+            />
          </div>
-        )}
-        <div className={styles.contentModule}>
-          <div className={styles.moduleWrapper}>
-            <Icon name="list ul" className={styles.moduleIcon} />
-            <div className={styles.moduleHeader}>{t('common.actions')}</div>
-            <div className={styles.wrapper}>
-              <Comment.Group>
-                {items.map((item) =>
-                  item.type === ActionTypes.COMMENT_CARD ? (
-                    <Item.Comment
-                      key={item.id}
-                      data={item.data}
-                      createdAt={item.createdAt}
-                      isPersisted={item.isPersisted}
-                      user={item.user}
-                      canEdit={(item.user.isCurrent && canEdit) || canEditAllComments}
-                      onUpdate={(data) => handleCommentUpdate(item.id, data)}
-                      onDelete={() => handleCommentDelete(item.id)}
-                    />
-                  ) : (
-                    <Item
-                      key={item.id}
-                      type={item.type}
-                      data={item.data}
-                      createdAt={item.createdAt}
-                      user={item.user}
-                    />
-                  ),
-                )}
-              </Comment.Group>
-            </div>
-            {isFetching ? (
-              <Loader active inverted inline="centered" size="small" className={styles.loader} />
-            ) : (
-              !isAllFetched && <Visibility fireOnMount onOnScreen={onFetch} />
-            )}
+          {canEdit && <CommentAdd onCreate={onCommentCreate} />}
+          <div className={styles.wrapper}>
+            <Comment.Group>
+              {items.map((item) =>
+                item.type === ActionTypes.COMMENT_CARD ? (
+                  <Item.Comment
+                    key={item.id}
+                    data={item.data}
+                    createdAt={item.createdAt}
+                    isPersisted={item.isPersisted}
+                    user={item.user}
+                    canEdit={(item.user.isCurrent && canEdit) || canEditAllComments}
+                    onUpdate={(data) => handleCommentUpdate(item.id, data)}
+                    onDelete={() => handleCommentDelete(item.id)}
+                  />
+                ) : (
+                  <Item
+                    key={item.id}
+                    type={item.type}
+                    data={item.data}
+                    createdAt={item.createdAt}
+                    user={item.user}
+                  />
+                ),
+              )}
+            </Comment.Group>
          </div>
+          {isFetching || isDetailsFetching ? (
+            <Loader active inverted inline="centered" size="small" className={styles.loader} />
+          ) : (
+            !isAllFetched && <Visibility fireOnMount onOnScreen={onFetch} />
+          )}
        </div>
-      </>
+      </div>
    );
  },
 );
@ -94,9 +98,12 @@ Actions.propTypes = {
  items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
  isFetching: PropTypes.bool.isRequired,
  isAllFetched: PropTypes.bool.isRequired,
+  isDetailsVisible: PropTypes.bool.isRequired,
+  isDetailsFetching: PropTypes.bool.isRequired,
  canEdit: PropTypes.bool.isRequired,
  canEditAllComments: PropTypes.bool.isRequired,
  onFetch: PropTypes.func.isRequired,
+  onDetailsToggle: PropTypes.func.isRequired,
  onCommentCreate: PropTypes.func.isRequired,
  onCommentUpdate: PropTypes.func.isRequired,
  onCommentDelete: PropTypes.func.isRequired,
--- a/client/src/components/CardModal/Actions/Actions.module.scss
+++ b/client/src/components/CardModal/Actions/Actions.module.scss
@ -8,12 +8,14 @@
  }

  .moduleHeader {
+    align-items: center;
    color: #17394d;
+    display: flex;
    font-size: 16px;
    font-weight: bold;
-    line-height: 20px;
+    height: 36px;
+    justify-content: space-between;
    margin: 0 0 4px;
-    padding: 8px 0;
  }

  .moduleIcon {
@ -33,6 +35,24 @@
    position: relative;
  }

+  .toggleButton {
+    background: transparent;
+    box-shadow: none;
+    color: #6b808c;
+    float: right;
+    font-weight: normal;
+    margin-right: 0;
+    padding: 6px 11px;
+    text-align: left;
+    text-decoration: underline;
+    transition: none;
+
+    &:hover {
+      background: rgba(9, 30, 66, 0.08);
+      color: #092d42;
+    }
+  }
+
  .wrapper {
    margin-left: -40px;
    margin-top: 12px;
--- a/client/src/components/CardModal/Actions/CommentAdd.jsx
+++ b/client/src/components/CardModal/Actions/CommentAdd.jsx
@ -1,10 +1,11 @@
-import React, { useCallback, useRef } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import TextareaAutosize from 'react-textarea-autosize';
 import { Button, Form, TextArea } from 'semantic-ui-react';
+import { useDidUpdate, useToggle } from '../../../lib/hooks';

-import { useForm } from '../../../hooks';
+import { useClosableForm, useForm } from '../../../hooks';

 import styles from './CommentAdd.module.scss';

@ -14,10 +15,16 @@ const DEFAULT_DATA = {

 const CommentAdd = React.memo(({ onCreate }) => {
  const [t] = useTranslation();
+  const [isOpened, setIsOpened] = useState(false);
  const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
+  const [selectTextFieldState, selectTextField] = useToggle();

  const textField = useRef(null);

+  const close = useCallback(() => {
+    setIsOpened(false);
+  }, []);
+
  const submit = useCallback(() => {
    const cleanData = {
      ...data,
@ -32,7 +39,12 @@ const CommentAdd = React.memo(({ onCreate }) => {
    onCreate(cleanData);

    setData(DEFAULT_DATA);
-  }, [onCreate, data, setData]);
+    selectTextField();
+  }, [onCreate, data, setData, selectTextField]);
+
+  const handleFieldFocus = useCallback(() => {
+    setIsOpened(true);
+  }, []);

  const handleFieldKeyDown = useCallback(
    (event) => {
@ -43,10 +55,16 @@ const CommentAdd = React.memo(({ onCreate }) => {
    [submit],
  );

+  const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(close);
+
  const handleSubmit = useCallback(() => {
    submit();
  }, [submit]);

+  useDidUpdate(() => {
+    textField.current.ref.current.focus();
+  }, [selectTextFieldState]);
+
  return (
    <Form onSubmit={handleSubmit}>
      <TextArea
@ -55,15 +73,24 @@ const CommentAdd = React.memo(({ onCreate }) => {
        name="text"
        value={data.text}
        placeholder={t('common.writeComment')}
-        minRows={3}
+        minRows={isOpened ? 3 : 1}
        spellCheck={false}
        className={styles.field}
+        onFocus={handleFieldFocus}
        onKeyDown={handleFieldKeyDown}
        onChange={handleFieldChange}
+        onBlur={handleFieldBlur}
      />
-      <div className={styles.controls}>
-        <Button positive content={t('action.addComment')} disabled={!data.text} />
-      </div>
+      {isOpened && (
+        <div className={styles.controls}>
+          <Button
+            positive
+            content={t('action.addComment')}
+            onMouseOver={handleControlMouseOver}
+            onMouseOut={handleControlMouseOut}
+          />
+        </div>
+      )}
    </Form>
  );
 });
--- a/client/src/components/CardModal/CardModal.jsx
+++ b/client/src/components/CardModal/CardModal.jsx
@ -34,6 +34,8 @@ const CardModal = React.memo(
    isSubscribed,
    isActionsFetching,
    isAllActionsFetched,
+    isActionsDetailsVisible,
+    isActionsDetailsFetching,
    listId,
    boardId,
    projectId,
@ -67,6 +69,7 @@ const CardModal = React.memo(
    onAttachmentUpdate,
    onAttachmentDelete,
    onActionsFetch,
+    onActionsDetailsToggle,
    onCommentActionCreate,
    onCommentActionUpdate,
    onCommentActionDelete,
@ -358,9 +361,12 @@ const CardModal = React.memo(
              items={actions}
              isFetching={isActionsFetching}
              isAllFetched={isAllActionsFetched}
+              isDetailsVisible={isActionsDetailsVisible}
+              isDetailsFetching={isActionsDetailsFetching}
              canEdit={canEdit}
              canEditAllComments={canEditAllCommentActions}
              onFetch={onActionsFetch}
+              onDetailsToggle={onActionsDetailsToggle}
              onCommentCreate={onCommentActionCreate}
              onCommentUpdate={onCommentActionUpdate}
              onCommentDelete={onCommentActionDelete}
@ -486,6 +492,8 @@ CardModal.propTypes = {
  isSubscribed: PropTypes.bool.isRequired,
  isActionsFetching: PropTypes.bool.isRequired,
  isAllActionsFetched: PropTypes.bool.isRequired,
+  isActionsDetailsVisible: PropTypes.bool.isRequired,
+  isActionsDetailsFetching: PropTypes.bool.isRequired,
  listId: PropTypes.string.isRequired,
  boardId: PropTypes.string.isRequired,
  projectId: PropTypes.string.isRequired,
@ -521,6 +529,7 @@ CardModal.propTypes = {
  onAttachmentUpdate: PropTypes.func.isRequired,
  onAttachmentDelete: PropTypes.func.isRequired,
  onActionsFetch: PropTypes.func.isRequired,
+  onActionsDetailsToggle: PropTypes.func.isRequired,
  onCommentActionCreate: PropTypes.func.isRequired,
  onCommentActionUpdate: PropTypes.func.isRequired,
  onCommentActionDelete: PropTypes.func.isRequired,