diff --git a/packages/vulcan-base-components/lib/posts/PostsList.jsx b/packages/vulcan-base-components/lib/posts/PostsList.jsx index 99ef1b9c5..fe35636fb 100644 --- a/packages/vulcan-base-components/lib/posts/PostsList.jsx +++ b/packages/vulcan-base-components/lib/posts/PostsList.jsx @@ -23,7 +23,12 @@ const PostsList = ({className, results, loading, count, totalCount, loadMore, sh
{results.map(post => )}
- {showLoadMore ? hasMore ? (loadingMore ? : ) : : null} + {showLoadMore ? + hasMore ? + : + : + null + } ) } else if (loading) { diff --git a/packages/vulcan-base-components/lib/posts/PostsLoadMore.jsx b/packages/vulcan-base-components/lib/posts/PostsLoadMore.jsx index 30909ad66..72fc25b26 100644 --- a/packages/vulcan-base-components/lib/posts/PostsLoadMore.jsx +++ b/packages/vulcan-base-components/lib/posts/PostsLoadMore.jsx @@ -1,14 +1,18 @@ -import { registerComponent } from 'meteor/vulcan:core'; +import { Components, registerComponent } from 'meteor/vulcan:core'; import React from 'react'; import { FormattedMessage } from 'meteor/vulcan:i18n'; +import classNames from 'classnames'; -const PostsLoadMore = ({loadMore, count, totalCount}) => { +const PostsLoadMore = ({loading, loadMore, count, totalCount}) => { return ( - {e.preventDefault(); loadMore();}}> - -   - {totalCount ? {`(${count}/${totalCount})`} : null} - + ) }