Merge pull request #522 from egdose/master

added bookmark deletion confirmation prompt, enhancement #274
gergelyszabo94 · Aug 11, 2024 · 73a7f44 · 73a7f44
2 parents 29a75b0 + 1c88fa0
commit 73a7f44
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/extension/src/components/Bookmarks/Bookmark/Bookmark.js b/extension/src/components/Bookmarks/Bookmark/Bookmark.js
@@ -81,8 +81,9 @@ const Bookmark = ({
     }
   };
 
-  const removeBookmarkFunction = () => {
+  const removeBookmarkFunction = (closeModal) => {
     removeBookmark(itemInfo.appid, itemInfo.contextid, itemInfo.assetid, added);
+    closeModal();
   };
 
   const qualityClass = (itemInfo.quality !== undefined && itemInfo.quality !== null)
@@ -153,7 +154,7 @@ const Bookmark = ({
           </Modal>
         </Action>
         <Action title="Delete bookmark">
-          <FontAwesomeIcon icon={faTrash} onClick={removeBookmarkFunction} />
+          <Modal modalTitle="Are you sure?" opener={<FontAwesomeIcon icon={faTrash} />} validator={removeBookmarkFunction} />
         </Action>
       </div>
       <div className="actions">

diff --git a/extension/src/components/Modal/Modal.js b/extension/src/components/Modal/Modal.js
@@ -19,9 +19,12 @@ const Modal = ({
         <BSModal.Header closeButton>
           <BSModal.Title>{modalTitle}</BSModal.Title>
         </BSModal.Header>
-        <BSModal.Body>
-          {children}
-        </BSModal.Body>
+        {children
+          && (
+          <BSModal.Body>
+            {children}
+          </BSModal.Body>
+          )}
         <BSModal.Footer>
           <Button className="button button__cancel" onClick={handleClose}>
             Close