[Upd #113] Refactor

kbss-cvut · Mar 31, 2022 · 37c5b83 · 37c5b83
1 parent 83c7b29
commit 37c5b83
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -73,15 +73,15 @@ const options = {
   icons: [
     {
       id: Constants.ICONS.QUESTION_HELP,
-      behavior: Constants.ICON_BEHAVIOR.ON_HOVER,
+      behavior: Constants.ICON_BEHAVIOR.ENABLE,
     },
     {
       id: Constants.ICONS.QUESTION_LINK,
-      behavior: Constants.ICON_BEHAVIOR.ON_HOVER,
+      behavior: Constants.ICON_BEHAVIOR.ENABLE,
     },
     {
       id: Constants.ICONS.QUESTION_COMMENTS,
-      behavior: Constants.ICON_BEHAVIOR.ON_HOVER,
+      behavior: Constants.ICON_BEHAVIOR.ENABLE,
     },
   ],
 };

diff --git a/src/components/comment/CommentView.jsx b/src/components/comment/CommentView.jsx
@@ -99,16 +99,20 @@ const CommentView = (props) => {
   };
 
   const handleCommentBinMouseEnter = () => {
-        setShowRecycleBin(!showRecycleBin)
+        setShowRecycleBin(true)
     }
 
+  const handleCommentBinMouseLeave = () => {
+    setShowRecycleBin(false)
+  }
+
     const handleDeleteCommentClick = () => {
         props.onDeleteQuestionComment(props.index);
         props.onDeleteViewComment();
     }
 
     return (
-        <div className="comment-content" onMouseEnter={handleCommentBinMouseEnter} onMouseLeave={handleCommentBinMouseEnter}>
+        <div className="comment-content" onMouseEnter={handleCommentBinMouseEnter} onMouseLeave={handleCommentBinMouseLeave}>
       <div className="row">
         <div
           className="col-auto comment-author"
@@ -140,7 +144,7 @@ CommentView.propTypes = {
   timestamp: PropTypes.string.isRequired,
   commentValue: PropTypes.string.isRequired,
   onDeleteQuestionComment: PropTypes.func.isRequired,
-  onDeleteViewComment: PropTypes.func.isRequired,
+  onDeleteViewComment: PropTypes.func,
   index: PropTypes.number.isRequired
 };
 

diff --git a/src/components/comment/QuestionCommentIcon.jsx b/src/components/comment/QuestionCommentIcon.jsx
@@ -65,7 +65,7 @@ const QuestionCommentIcon = (props) => {
 
     const handleOverlayClick = (e) => {
         handleStopPropagationClick(e);
-    setShowOverlay(!showOverlay);
+        setShowOverlay(!showOverlay);
   };
 
     const getCommentsLength = () => {
@@ -88,7 +88,7 @@ const QuestionCommentIcon = (props) => {
 
     return (
         <div ref={overlayTarget} onClick={handleStopPropagationClick}>
-            <span data-testid="comment-bubble" ref={target} onClick={handleOverlayClick}>
+            <span className="comment-bubble" ref={target} onClick={handleOverlayClick}>
                 <CommentBubble/>
                 {getCommentsLength() > 0 ? <Badge className="comment-badge" pill variant="primary">{getCommentsLength()}</Badge> : null}
             </span>