fix: bookmarks of null on a preview article (#2418)

newsuk · Dec 4, 2019 · 5d58e54 · 5d58e54
1 parent 77e3cd6
commit 5d58e54
Showing 1 changed file with 29 additions and 26 deletions.
diff --git a/packages/save-star-web/src/save-api.js b/packages/save-star-web/src/save-api.js
@@ -53,33 +53,36 @@ function onUnsaveMutationUpdate(
 function SaveAPI({ articleId, children }) {
   return (
     <ArticleBookmarked id={articleId} debounceTimeMs={0}>
-      {({ isLoading, article: { isBookmarked = false } = {} }) => (
-        <Mutation mutation={saveBookmarks} update={onSaveMutationUpdate}>
-          {(save, { loading: saveMutationLoading }) => (
-            <Mutation
-              mutation={unsaveBookmarks}
-              update={onUnsaveMutationUpdate}
-            >
-              {(unsave, { loading: unsaveMutationLoading }) =>
-                children({
-                  savedStatus: isBookmarked,
-                  async toggleSaved() {
-                    const args = { variables: { id: articleId } };
+      {({ isLoading, article }) => {
+        const isSaved = article && Boolean(article.isBookmarked);
+        return (
+          <Mutation mutation={saveBookmarks} update={onSaveMutationUpdate}>
+            {(save, { loading: saveMutationLoading }) => (
+              <Mutation
+                mutation={unsaveBookmarks}
+                update={onUnsaveMutationUpdate}
+              >
+                {(unsave, { loading: unsaveMutationLoading }) =>
+                  children({
+                    savedStatus: isSaved,
+                    async toggleSaved() {
+                      const args = { variables: { id: articleId } };
 
-                    if (isBookmarked) {
-                      await unsave(args);
-                    } else {
-                      await save(args);
-                    }
-                  },
-                  isLoading:
-                    isLoading || saveMutationLoading || unsaveMutationLoading
-                })
-              }
-            </Mutation>
-          )}
-        </Mutation>
-      )}
+                      if (isSaved) {
+                        await unsave(args);
+                      } else {
+                        await save(args);
+                      }
+                    },
+                    isLoading:
+                      isLoading || saveMutationLoading || unsaveMutationLoading
+                  })
+                }
+              </Mutation>
+            )}
+          </Mutation>
+        );
+      }}
     </ArticleBookmarked>
   );
 }