From 273925da8a1d85bd12227ceed7576c2817f64865 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Fri, 15 May 2020 01:34:30 -0400
Subject: [PATCH] Updated load more button

- Hide load more button if is disabled or not visible
- Show loader if no load more
---
 app/javascript/gabsocial/components/load_more.js       | 2 ++
 app/javascript/gabsocial/components/scrollable_list.js | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/app/javascript/gabsocial/components/load_more.js b/app/javascript/gabsocial/components/load_more.js
index 7b745763..9312855c 100644
--- a/app/javascript/gabsocial/components/load_more.js
+++ b/app/javascript/gabsocial/components/load_more.js
@@ -32,6 +32,8 @@ class LoadMore extends PureComponent {
       intl,
     } = this.props
 
+    if (!visible || disabled) return null
+
     return (
       <div className={[_s.default, _s.py10, _s.px10].join(' ')}>
         <Button
diff --git a/app/javascript/gabsocial/components/scrollable_list.js b/app/javascript/gabsocial/components/scrollable_list.js
index 61ed4f1b..906d3b06 100644
--- a/app/javascript/gabsocial/components/scrollable_list.js
+++ b/app/javascript/gabsocial/components/scrollable_list.js
@@ -5,6 +5,7 @@ import IntersectionObserverArticle from './intersection_observer_article'
 import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper'
 import Responsive from '../features/ui/util/responsive_component'
 import Block from './block'
+import Icon from './icon'
 import ColumnIndicator from './column_indicator'
 import LoadMore from './load_more'
 
@@ -253,6 +254,12 @@ export default class ScrollableList extends PureComponent {
             }
 
             {loadMore}
+            {
+              isLoading &&
+              <div className={[_s.default, _s.alignItemsCenter].join(' ')}>
+                <Icon id='loading' />
+              </div>
+            }
           </div>
         </div>
       );