yohei0125 пре 3 година
родитељ
комит
1757b6a2da
1 измењених фајлова са 9 додато и 12 уклоњено
  1. 9 12
      packages/app/src/components/PageComment/DeleteCommentModal.tsx

+ 9 - 12
packages/app/src/components/PageComment/DeleteCommentModal.tsx

@@ -25,7 +25,7 @@ export const DeleteCommentModal = (props: DeleteCommentModalProps): JSX.Element
     isShown, comment, errorMessage, cancelToDelete, confirmToDelete,
     isShown, comment, errorMessage, cancelToDelete, confirmToDelete,
   } = props;
   } = props;
 
 
-  const HeaderContent = React.memo(() => {
+  const HeaderContent = useMemo(() => {
     if (comment == null || isShown === false) {
     if (comment == null || isShown === false) {
       return <></>;
       return <></>;
     }
     }
@@ -35,10 +35,9 @@ export const DeleteCommentModal = (props: DeleteCommentModalProps): JSX.Element
         Delete comment?
         Delete comment?
       </span>
       </span>
     );
     );
-  });
-  HeaderContent.displayName = 'HeaderContent';
+  }, [comment, isShown]);
 
 
-  const BodyContent = React.memo(() => {
+  const BodyContent = useMemo(() => {
     if (comment == null || isShown === false) {
     if (comment == null || isShown === false) {
       return <></>;
       return <></>;
     }
     }
@@ -60,10 +59,9 @@ export const DeleteCommentModal = (props: DeleteCommentModalProps): JSX.Element
         <p className="card well comment-body mt-2 p-2">{commentBodyElement}</p>
         <p className="card well comment-body mt-2 p-2">{commentBodyElement}</p>
       </>
       </>
     );
     );
-  });
-  BodyContent.displayName = 'BodyContent';
+  }, [comment, isShown]);
 
 
-  const FooterContent = React.memo(() => {
+  const FooterContent = useMemo(() => {
     if (comment == null || isShown === false) {
     if (comment == null || isShown === false) {
       return <></>;
       return <></>;
     }
     }
@@ -77,19 +75,18 @@ export const DeleteCommentModal = (props: DeleteCommentModalProps): JSX.Element
         </Button>
         </Button>
       </>
       </>
     );
     );
-  });
-  FooterContent.displayName = 'FooterContent';
+  }, [cancelToDelete, comment, confirmToDelete, errorMessage, isShown]);
 
 
   return (
   return (
     <Modal isOpen={isShown} toggle={cancelToDelete} className={`${styles['page-comment-delete-modal']}`}>
     <Modal isOpen={isShown} toggle={cancelToDelete} className={`${styles['page-comment-delete-modal']}`}>
       <ModalHeader tag="h4" toggle={cancelToDelete} className="bg-danger text-light">
       <ModalHeader tag="h4" toggle={cancelToDelete} className="bg-danger text-light">
-        <HeaderContent/>
+        {HeaderContent}
       </ModalHeader>
       </ModalHeader>
       <ModalBody>
       <ModalBody>
-        <BodyContent/>
+        {BodyContent}
       </ModalBody>
       </ModalBody>
       <ModalFooter>
       <ModalFooter>
-        <FooterContent/>
+        {FooterContent}
       </ModalFooter>
       </ModalFooter>
     </Modal>
     </Modal>
   );
   );