From bc4142e5501b451c487a9038ff0649280209ca05 Mon Sep 17 00:00:00 2001
From: saltrafael <a657ee92-7eb9-46eb-97d2-6735799df838@aleeas.com>
Date: Thu, 15 Jul 2021 10:25:48 -0300
Subject: [PATCH] Mobile view: Make comments expandable

---
 ui/component/commentsList/view.jsx | 42 +++++++++++++++++++++++++++---
 ui/scss/component/_card.scss       |  5 ++++
 ui/scss/component/_comments.scss   |  8 ++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/ui/component/commentsList/view.jsx b/ui/component/commentsList/view.jsx
index 433103792..5ce7f5f8c 100644
--- a/ui/component/commentsList/view.jsx
+++ b/ui/component/commentsList/view.jsx
@@ -13,6 +13,7 @@ import usePersistedState from 'effects/use-persisted-state';
 import { ENABLE_COMMENT_REACTIONS } from 'config';
 import Empty from 'component/common/empty';
 import debounce from 'util/debounce';
+import { useIsMobile } from 'effects/use-screensize';
 
 const DEBOUNCE_SCROLL_HANDLER_MS = 200;
 
@@ -74,6 +75,8 @@ function CommentList(props: Props) {
   const DEFAULT_SORT = ENABLE_COMMENT_REACTIONS ? SORT_BY.POPULARITY : SORT_BY.NEWEST;
   const [sort, setSort] = usePersistedState('comment-sort-by', DEFAULT_SORT);
   const [page, setPage] = React.useState(0);
+  const isMobile = useIsMobile();
+  const [expandedComments, setExpandedComments] = React.useState(!isMobile);
   const totalFetchedComments = allCommentIds ? allCommentIds.length : 0;
 
   // Display comments immediately if not fetching reactions
@@ -191,7 +194,7 @@ function CommentList(props: Props) {
     }
 
     const handleCommentScroll = debounce(() => {
-      if (shouldFetchNextPage(page, topLevelTotalPages, window, document)) {
+      if (!isMobile && shouldFetchNextPage(page, topLevelTotalPages, window, document)) {
         setPage(page + 1);
       }
     }, DEBOUNCE_SCROLL_HANDLER_MS);
@@ -205,6 +208,7 @@ function CommentList(props: Props) {
       }
     }
   }, [
+    isMobile,
     page,
     moreBelow,
     spinnerRef,
@@ -279,7 +283,10 @@ function CommentList(props: Props) {
             <Empty padded text={__('That was pretty deep. What do you think?')} />
           )}
 
-          <ul className="comments" ref={commentRef}>
+          <ul className={classnames({
+              'comments': expandedComments,
+              'comments--contracted': !expandedComments,
+            })} ref={commentRef}>
             {topLevelComments &&
               displayedComments &&
               displayedComments.map((comment) => {
@@ -307,7 +314,36 @@ function CommentList(props: Props) {
               })}
           </ul>
 
-          {(isFetchingComments || moreBelow) && (
+          {isMobile && (
+            <div className="card__bottom-actions--comments">
+              {moreBelow && (
+                <Button
+                  button="alt"
+                  title={!expandedComments ? __('Expand Comments') : __('Load More')}
+                  label={!expandedComments ? __('Expand Comments') : __('Load More')}
+                  onClick={() => {
+                    if (!expandedComments) {
+                      setExpandedComments(true);
+                    } else {
+                      setPage(page + 1);
+                    }
+                  }}
+                />
+              )}
+              {expandedComments && (
+                <Button
+                  button="alt"
+                  title={__('Collapse Thread')}
+                  label={__('Collapse Thread')}
+                  onClick={() => {
+                    setExpandedComments(false);
+                  }}
+                />
+              )}
+            </div>
+          )}
+
+          {(isFetchingComments || (!isMobile && moreBelow)) && (
             <div className="main--empty" ref={spinnerRef}>
               <Spinner type="small" />
             </div>
diff --git a/ui/scss/component/_card.scss b/ui/scss/component/_card.scss
index efbefa673..fd9bbfb12 100644
--- a/ui/scss/component/_card.scss
+++ b/ui/scss/component/_card.scss
@@ -391,6 +391,11 @@
   align-items: center;
 }
 
+.card__bottom-actions--comments {
+  @extend .card__bottom-actions;
+  margin-top: var(--spacing-s);
+}
+
 .card__multi-pane {
   display: flex;
 
diff --git a/ui/scss/component/_comments.scss b/ui/scss/component/_comments.scss
index 921964a63..e99a2345a 100644
--- a/ui/scss/component/_comments.scss
+++ b/ui/scss/component/_comments.scss
@@ -7,6 +7,14 @@ $thumbnailWidthSmall: 1rem;
   margin-top: var(--spacing-l);
 }
 
+.comments--contracted {
+  @extend .comments;
+  max-height: 5rem;
+  overflow: hidden;
+  -webkit-mask-image: -webkit-gradient(linear, left 30%, left bottom, from(rgba(0, 0, 0, 1)), to(rgba(0, 0, 0, 0)));
+  overflow-wrap: anywhere;
+}
+
 .comments--replies {
   list-style-type: none;
   margin-left: var(--spacing-s);