@mjhls/mjh-framework 1.0.351 → 1.0.353

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17,6 +17,29 @@ var PublicationDeck = function PublicationDeck(props) {
17
17
  Website = props.Website,
18
18
  client = props.client;
19
19
 
20
+ var regPubs = data.filter(function (a) {
21
+ return typeof a.is_legacy === 'undefined' || a.is_legacy === false;
22
+ });
23
+ var legacyPubs = data.filter(function (a) {
24
+ return a.is_legacy === true;
25
+ });
26
+
27
+ var sortedLegacyPubs = legacyPubs.sort(function (a, b) {
28
+ if (parseInt(a.childIssue.year) < parseInt(b.childIssue.year)) {
29
+ return 1;
30
+ } else {
31
+ return -1;
32
+ }
33
+ });
34
+
35
+ var sortedRegPubs = regPubs.sort(function (a, b) {
36
+ if (parseInt(a.childIssue.year) < parseInt(b.childIssue.year)) {
37
+ return 1;
38
+ } else {
39
+ return -1;
40
+ }
41
+ });
42
+
20
43
  var urlFor = function urlFor(source) {
21
44
  var builder = imageUrlBuilder(client);
22
45
  return builder.image(source).auto('format');
@@ -33,47 +56,111 @@ var PublicationDeck = function PublicationDeck(props) {
33
56
  }
34
57
  };
35
58
 
36
- return React__default.createElement(
37
- Row,
38
- null,
39
- data && data.length ? data.map(function (row, index) {
40
- return row.identifier && row.identifier.current && React__default.createElement(
41
- Col,
42
- { xs: 6, sm: 6, md: 6, lg: 4, style: { display: 'flex', flex: '1 0 auto' }, key: index },
43
- React__default.createElement(
44
- Card,
45
- { className: 'block-card', style: { width: '200px' } },
46
- React__default.createElement(
47
- 'a',
48
- { href: href + '/' + row.identifier.current },
49
- row.childIssue && row.childIssue.thumbnail && React__default.createElement(
50
- LazyLoad,
51
- { height: imageHeight },
52
- React__default.createElement(Card.Img, {
53
- variant: 'top',
54
- src: renderCardImage(row.childIssue.thumbnail),
55
- alt: row.name,
56
- style: { objectFit: 'contain', maxHeight: '200px', maxWidth: '200px' }
57
- })
58
- ),
59
+ if (sortedRegPubs && sortedRegPubs.length || sortedLegacyPubs && sortedLegacyPubs.length) {
60
+ return React__default.createElement(
61
+ 'div',
62
+ { className: 'publication-wrapper', style: { paddingBottom: '150px' } },
63
+ sortedRegPubs && sortedRegPubs.length && React__default.createElement(
64
+ Row,
65
+ { className: 'regular-publication-wrapper' },
66
+ sortedRegPubs.map(function (row, index) {
67
+ return row.identifier && row.identifier.current && React__default.createElement(
68
+ Col,
69
+ { xs: 6, sm: 6, md: 6, lg: 4, style: { display: 'flex', flex: '1 0 auto' }, key: index },
59
70
  React__default.createElement(
60
- Card.Body,
61
- { style: { paddingTop: '0', paddingBottom: '2.75rem' } },
62
- React__default.createElement(
63
- Card.Title,
64
- null,
65
- row.name
66
- ),
71
+ Card,
72
+ { className: 'block-card', style: { width: '200px' } },
67
73
  React__default.createElement(
68
- Button,
69
- { style: { position: 'absolute', bottom: '1rem', left: '20%', margin: '0px' }, variant: 'secondary' },
70
- 'Browse Issues'
74
+ 'a',
75
+ { href: href + '/' + row.identifier.current },
76
+ row.childIssue && row.childIssue.thumbnail && React__default.createElement(
77
+ LazyLoad,
78
+ { height: imageHeight },
79
+ React__default.createElement(Card.Img, {
80
+ variant: 'top',
81
+ src: renderCardImage(row.childIssue.thumbnail),
82
+ alt: row.name,
83
+ style: { objectFit: 'contain', maxHeight: '200px', maxWidth: '200px' }
84
+ })
85
+ ),
86
+ React__default.createElement(
87
+ Card.Body,
88
+ { style: { paddingTop: '0', paddingBottom: '2.75rem' } },
89
+ React__default.createElement(
90
+ Card.Title,
91
+ null,
92
+ row.name
93
+ ),
94
+ React__default.createElement(
95
+ Button,
96
+ { style: { position: 'absolute', bottom: '1rem', left: '20%', margin: '0px' }, variant: 'secondary' },
97
+ 'Browse Issues'
98
+ )
99
+ )
71
100
  )
72
101
  )
73
- )
102
+ );
103
+ })
104
+ ),
105
+ sortedLegacyPubs && sortedLegacyPubs.length && React__default.createElement(
106
+ React__default.Fragment,
107
+ null,
108
+ React__default.createElement(
109
+ 'div',
110
+ { className: 'legacy-publication-title' },
111
+ React__default.createElement(
112
+ 'h2',
113
+ null,
114
+ 'Legacy'
115
+ ),
116
+ React__default.createElement('hr', null)
117
+ ),
118
+ React__default.createElement(
119
+ Row,
120
+ { className: 'legacy-publication-wrapper' },
121
+ sortedLegacyPubs.map(function (row, index) {
122
+ return row.identifier && row.identifier.current && React__default.createElement(
123
+ Col,
124
+ { xs: 6, sm: 6, md: 6, lg: 4, style: { display: 'flex', flex: '1 0 auto' }, key: index },
125
+ React__default.createElement(
126
+ Card,
127
+ { className: 'block-card', style: { width: '200px' } },
128
+ React__default.createElement(
129
+ 'a',
130
+ { href: href + '/' + row.identifier.current },
131
+ row.childIssue && row.childIssue.thumbnail && React__default.createElement(
132
+ LazyLoad,
133
+ { height: imageHeight },
134
+ React__default.createElement(Card.Img, {
135
+ variant: 'top',
136
+ src: renderCardImage(row.childIssue.thumbnail),
137
+ alt: row.name,
138
+ style: { objectFit: 'contain', maxHeight: '200px', maxWidth: '200px' }
139
+ })
140
+ ),
141
+ React__default.createElement(
142
+ Card.Body,
143
+ { style: { paddingTop: '0', paddingBottom: '2.75rem' } },
144
+ React__default.createElement(
145
+ Card.Title,
146
+ null,
147
+ row.name
148
+ ),
149
+ React__default.createElement(
150
+ Button,
151
+ { style: { position: 'absolute', bottom: '1rem', left: '20%', margin: '0px' }, variant: 'secondary' },
152
+ 'Browse Issues'
153
+ )
154
+ )
155
+ )
156
+ )
157
+ );
158
+ })
74
159
  )
75
- );
76
- }) : React__default.createElement(
160
+ )
161
+ );
162
+ } else {
163
+ return React__default.createElement(
77
164
  'div',
78
165
  null,
79
166
  React__default.createElement(
@@ -85,8 +172,8 @@ var PublicationDeck = function PublicationDeck(props) {
85
172
  'New content coming soon, please check back later.'
86
173
  )
87
174
  )
88
- )
89
- );
175
+ );
176
+ }
90
177
  };
91
178
 
92
179
  export default PublicationDeck;
package/dist/esm/index.js CHANGED
@@ -6,7 +6,7 @@ import { m as main_39, a as main_16, b as main_38 } from './main-cb86f95d.js';
6
6
  import { _ as _toConsumableArray, a as _Array$from } from './toConsumableArray-2718dc16.js';
7
7
  import { _ as _extends$2, a as _Object$assign } from './extends-26d3b609.js';
8
8
  import { _ as _objectSap, a as _inherits$1, b as _classCallCheck$1, c as _possibleConstructorReturn$1, d as _Object$getPrototypeOf, e as _createClass$1 } from './inherits-4b85034c.js';
9
- import React__default, { useState, useRef, useEffect } from 'react';
9
+ import React__default, { useState, useEffect, useRef } from 'react';
10
10
  import PropTypes from 'prop-types';
11
11
  import Container from 'react-bootstrap/Container';
12
12
  import Row from 'react-bootstrap/Row';
@@ -1797,20 +1797,13 @@ var clientId = process.env.CVENT_CLIENT_ID;
1797
1797
  var clientSecret = process.env.CVENT_CLIENT_SECRET;
1798
1798
  var corsProxy = 'https://cors-anywhere.herokuapp.com/';
1799
1799
  var currentTime = momentTimezone$1().toISOString();
1800
- var itemsPerPage = 10;
1800
+ var itemsPerPage = 200;
1801
1801
 
1802
1802
  var EventsDeck = function EventsDeck(_ref) {
1803
- var _ref$autoScroll = _ref.autoScroll,
1804
- autoScroll = _ref$autoScroll === undefined ? true : _ref$autoScroll,
1805
- rightItems = _ref.rightItems,
1806
- _ref$seoPaginate = _ref.seoPaginate,
1807
- seoPaginate = _ref$seoPaginate === undefined ? true : _ref$seoPaginate,
1808
- pageview = _ref.pageview,
1803
+ var rightItems = _ref.rightItems,
1809
1804
  _ref$filter = _ref.filter,
1810
1805
  filter = _ref$filter === undefined ? 'start gt \'' + currentTime + '\' and status eq \'Active\'' : _ref$filter;
1811
1806
 
1812
- var router = useRouter();
1813
-
1814
1807
  var _useState = useState(true),
1815
1808
  _useState2 = _slicedToArray(_useState, 2),
1816
1809
  isLoading = _useState2[0],
@@ -1836,16 +1829,7 @@ var EventsDeck = function EventsDeck(_ref) {
1836
1829
  scrolling = _useState10[0],
1837
1830
  setScrolling = _useState10[1];
1838
1831
 
1839
- var _useState11 = useState(1),
1840
- _useState12 = _slicedToArray(_useState11, 2),
1841
- currentPage = _useState12[0],
1842
- setCurrentPage = _useState12[1];
1843
-
1844
- var currentPageRef = useRef(currentPage);
1845
-
1846
- var getEvents = function getEvents(params) {
1847
- var url = params.url;
1848
-
1832
+ var getEvents = function getEvents(url) {
1849
1833
  fetch(url, {
1850
1834
  headers: {
1851
1835
  Accept: 'application/json',
@@ -1860,43 +1844,49 @@ var EventsDeck = function EventsDeck(_ref) {
1860
1844
  }).then(function (events) {
1861
1845
  setIsLoading(false);
1862
1846
  if (events.data && events.data.length > 0) {
1863
- var newData = events.data.map(function (item) {
1864
- return _extends$2({}, item, {
1865
- pageNumber: currentPage
1866
- });
1847
+ var filteredEventsByTestMode = events.data.filter(function (event) {
1848
+ return event.testMode === false;
1849
+ });
1850
+ var sortedEventsByStartData = filteredEventsByTestMode.sort(function (a, b) {
1851
+ if (momentTimezone$1(a.start).isAfter(b.start)) {
1852
+ return 1;
1853
+ } else if (momentTimezone$1(a.start).isBefore(b.start)) {
1854
+ return -1;
1855
+ }
1856
+ return 0;
1867
1857
  });
1868
1858
  setData(function (prevData) {
1869
- return [].concat(_toConsumableArray(prevData), _toConsumableArray(newData));
1859
+ return [].concat(_toConsumableArray(prevData), _toConsumableArray(sortedEventsByStartData));
1870
1860
  });
1871
1861
  setNextPageLink(events.paging._links.next ? events.paging._links.next.href : null);
1872
- newData.length === itemsPerPage ? setScrolling(true) : setScrolling(false);
1862
+ setScrolling(events.paging._links.next ? true : false);
1873
1863
  } else {
1874
1864
  setScrolling(false);
1875
1865
  }
1866
+ }).catch(function (e) {
1867
+ console.error(e);
1876
1868
  });
1877
1869
  };
1878
1870
 
1879
1871
  useEffect(function () {
1880
1872
  // load initial data
1881
- if (accessToken && currentPage === 1) {
1873
+ if (accessToken) {
1882
1874
  var initailUrl = 'https://api-platform.cvent.com/event/v1/events/filter?limit=' + itemsPerPage;
1883
- getEvents({ url: initailUrl });
1875
+ getEvents(initailUrl);
1884
1876
  }
1885
- }, [accessToken, currentPage, filter]);
1877
+ }, [accessToken, filter]);
1886
1878
 
1887
- useEffect(function () {
1879
+ var loadMore = function loadMore() {
1888
1880
  // load more events
1889
- if (accessToken && nextPageLink && currentPage !== 1 && currentPage !== currentPageRef.current) {
1890
- getEvents({ url: nextPageLink });
1881
+ if (accessToken && nextPageLink) {
1882
+ getEvents(nextPageLink);
1891
1883
  }
1892
- }, [currentPage]);
1884
+ };
1893
1885
 
1894
1886
  useEffect(function () {
1895
1887
  // reset state when filter changes
1896
1888
  setIsLoading(true);
1897
1889
  setData([]);
1898
- setCurrentPage(1);
1899
- currentPageRef.current = 1;
1900
1890
  }, [filter]);
1901
1891
 
1902
1892
  useEffect(function () {
@@ -1926,63 +1916,7 @@ var EventsDeck = function EventsDeck(_ref) {
1926
1916
  }
1927
1917
  }, []);
1928
1918
 
1929
- var loadMore = debounce_1(function () {
1930
- setCurrentPage(function (prevCurrentPage) {
1931
- return prevCurrentPage + 1;
1932
- });
1933
- }, 0);
1934
-
1935
- var changePageNumber = function changePageNumber(pageNumber) {
1936
- if (seoPaginate) {
1937
- var path = router.asPath;
1938
- var qrIndex = path.indexOf('?');
1939
- var pathname = router.pathname;
1940
- var queryString = '';
1941
- if (qrIndex > 0) {
1942
- path = path.substring(1, qrIndex);
1943
-
1944
- var partialQS = router.asPath.substring(qrIndex + 1);
1945
- var partialQSArr = partialQS.split('&');
1946
-
1947
- // exclude page=xxx from query string
1948
- partialQSArr.map(function (item) {
1949
- var itemArr = item.split('=');
1950
- var key = itemArr[0];
1951
- var val = itemArr[1];
1952
-
1953
- if (key !== 'page') {
1954
- queryString += (queryString.length === 0 ? '' : '&') + key + '=' + val;
1955
- }
1956
- });
1957
- }
1958
-
1959
- if (queryString.length > 0) {
1960
- path += '?' + queryString;
1961
- }
1962
-
1963
- pageNumber = parseInt(pageNumber);
1964
-
1965
- if (pageNumber !== currentPageRef.current) {
1966
- lib_3.refresh();
1967
-
1968
- currentPageRef.current = pageNumber;
1969
- if (path[0] !== '/') {
1970
- path = '/' + path;
1971
- }
1972
- var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
1973
-
1974
- if (pageview) {
1975
- pageview(newPath);
1976
- }
1977
-
1978
- router.push(pathname, newPath, {
1979
- shallow: true
1980
- });
1981
- }
1982
- }
1983
- };
1984
-
1985
- var renderRegisterButton = function renderRegisterButton(links, closeAfter, timezone) {
1919
+ var renderRegisterButton = function renderRegisterButton(links) {
1986
1920
  return React__default.createElement(
1987
1921
  'a',
1988
1922
  { href: links.summary.href || '#', target: '_blank' },
@@ -1992,33 +1926,13 @@ var EventsDeck = function EventsDeck(_ref) {
1992
1926
  'Register Now'
1993
1927
  )
1994
1928
  );
1995
- // const now = moment().tz(timezone)
1996
- // closeAfter = moment(closeAfter).tz(timezone)
1997
- // const isRegister = moment(now).isBefore(closeAfter)
1998
- // if (isRegister) {
1999
- // return (
2000
- // <a href={links.registration.href || '#'} target='_blank'>
2001
- // <Button size='sm' className='event-registration-button'>
2002
- // Register Now
2003
- // </Button>
2004
- // </a>
2005
- // )
2006
- // } else {
2007
- // return (
2008
- // <a href={links.summary.href || '#'} target='_blank'>
2009
- // <Button size='sm' className='event-registration-button'>
2010
- // Learn more
2011
- // </Button>
2012
- // </a>
2013
- // )
2014
- // }
2015
1929
  };
2016
1930
 
2017
1931
  var cardLoader = function cardLoader() {
2018
1932
  var numberOfItemsBeforeAd = 5;
2019
1933
  return React__default.createElement(
2020
- React__default.Fragment,
2021
- null,
1934
+ Container,
1935
+ { style: { padding: 1 } },
2022
1936
  data && data.map(function (row, index) {
2023
1937
  var speakerInfo = [];
2024
1938
  if (row.customFields) {
@@ -2052,105 +1966,97 @@ var EventsDeck = function EventsDeck(_ref) {
2052
1966
  return result;
2053
1967
  }, '') : '';
2054
1968
 
2055
- var pageNumber = row.pageNumber || 1;
2056
1969
  return React__default.createElement(
2057
1970
  React__default.Fragment,
2058
1971
  { key: index },
2059
1972
  React__default.createElement(
2060
- VisibilitySensor,
2061
- {
2062
- onChange: function onChange(isVisible) {
2063
- isVisible && changePageNumber(pageNumber);
2064
- } },
2065
- React__default.createElement(
2066
- Card,
1973
+ Card,
1974
+ null,
1975
+ isRegister && _links && React__default.createElement(
1976
+ Row,
2067
1977
  null,
2068
- isRegister && _links && React__default.createElement(
2069
- Row,
1978
+ React__default.createElement(
1979
+ Col,
2070
1980
  null,
2071
- React__default.createElement(
2072
- Col,
2073
- null,
2074
- renderRegisterButton(_links)
2075
- )
2076
- ),
2077
- discussionTopic && React__default.createElement(
2078
- Row,
1981
+ renderRegisterButton(_links)
1982
+ )
1983
+ ),
1984
+ discussionTopic && React__default.createElement(
1985
+ Row,
1986
+ null,
1987
+ React__default.createElement(
1988
+ Col,
2079
1989
  null,
2080
- React__default.createElement(
2081
- Col,
2082
- null,
2083
- React__default.createElement('h5', { className: 'topic', style: { fontWeight: '500', marginBottom: 0 }, dangerouslySetInnerHTML: { __html: discussionTopic } })
2084
- )
2085
- ),
2086
- start && timezone && React__default.createElement(
2087
- Row,
1990
+ React__default.createElement('h5', { className: 'topic', style: { fontWeight: '500', marginBottom: 0 }, dangerouslySetInnerHTML: { __html: discussionTopic } })
1991
+ )
1992
+ ),
1993
+ start && timezone && React__default.createElement(
1994
+ Row,
1995
+ null,
1996
+ React__default.createElement(
1997
+ Col,
2088
1998
  null,
2089
1999
  React__default.createElement(
2090
- Col,
2091
- null,
2092
- React__default.createElement(
2093
- 'p',
2094
- { className: 'start-time', style: { padding: 0, margin: 0 } },
2095
- momentTimezone$1(start).tz(timezone).format('LLL')
2096
- )
2000
+ 'p',
2001
+ { className: 'start-time', style: { padding: 0, margin: 0 } },
2002
+ momentTimezone$1(start).tz(timezone).format('LLL')
2097
2003
  )
2098
- ),
2099
- eventRegion && React__default.createElement(
2100
- Row,
2004
+ )
2005
+ ),
2006
+ eventRegion && React__default.createElement(
2007
+ Row,
2008
+ null,
2009
+ React__default.createElement(
2010
+ Col,
2101
2011
  null,
2102
2012
  React__default.createElement(
2103
- Col,
2104
- null,
2105
- React__default.createElement(
2106
- 'p',
2107
- { className: 'event-region', style: { padding: 0, margin: 0 } },
2108
- eventRegion
2109
- )
2013
+ 'p',
2014
+ { className: 'event-region', style: { padding: 0, margin: 0 } },
2015
+ eventRegion
2110
2016
  )
2111
- ),
2112
- venues && venues.length && venues[0].name && React__default.createElement(
2113
- Row,
2017
+ )
2018
+ ),
2019
+ venues && venues.length && venues[0].name && React__default.createElement(
2020
+ Row,
2021
+ null,
2022
+ React__default.createElement(
2023
+ Col,
2114
2024
  null,
2115
2025
  React__default.createElement(
2116
- Col,
2117
- null,
2118
- React__default.createElement(
2119
- 'p',
2120
- { className: 'venue', style: { padding: 0, margin: 0 } },
2121
- venues[0].name
2122
- )
2026
+ 'p',
2027
+ { className: 'venue', style: { padding: 0, margin: 0 } },
2028
+ venues[0].name
2123
2029
  )
2124
- ),
2125
- speakerInfo && speakerInfo.length && React__default.createElement(
2126
- Row,
2030
+ )
2031
+ ),
2032
+ speakerInfo && speakerInfo.length && React__default.createElement(
2033
+ Row,
2034
+ null,
2035
+ React__default.createElement(
2036
+ Col,
2127
2037
  null,
2128
2038
  React__default.createElement(
2129
- Col,
2130
- null,
2039
+ 'div',
2040
+ { className: 'speaker-section', style: { border: '1px solid', borderRadius: '8px', padding: '8px' } },
2131
2041
  React__default.createElement(
2132
- 'div',
2133
- { className: 'speaker-section', style: { border: '1px solid', borderRadius: '8px', padding: '8px' } },
2134
- React__default.createElement(
2135
- 'h6',
2136
- { className: 'speaker-title', style: { fontWeight: '600', marginBottom: '0', marginTop: '.25rem;' } },
2137
- 'SPEAKER'
2138
- ),
2139
- speakerInfo.map(function (info) {
2140
- return React__default.createElement(
2141
- 'p',
2142
- { style: { marginBottom: '0' } },
2143
- info.value.map(function (speaker, index) {
2144
- return React__default.createElement(
2145
- 'span',
2146
- { key: index, className: 'kol-speaker' },
2147
- speaker,
2148
- info.value.length > index + 1 ? ', ' : ''
2149
- );
2150
- })
2151
- );
2152
- })
2153
- )
2042
+ 'h6',
2043
+ { className: 'speaker-title', style: { fontWeight: '600', marginBottom: '0', marginTop: '.25rem' } },
2044
+ 'SPEAKER'
2045
+ ),
2046
+ speakerInfo.map(function (info, index) {
2047
+ return React__default.createElement(
2048
+ 'p',
2049
+ { key: index, style: { marginBottom: '0' } },
2050
+ info.value.map(function (speaker, index) {
2051
+ return React__default.createElement(
2052
+ 'b',
2053
+ { key: index, className: 'kol-speaker' },
2054
+ speaker,
2055
+ info.value.length > index + 1 ? ', ' : ''
2056
+ );
2057
+ })
2058
+ );
2059
+ })
2154
2060
  )
2155
2061
  )
2156
2062
  )
@@ -2179,20 +2085,6 @@ var EventsDeck = function EventsDeck(_ref) {
2179
2085
  );
2180
2086
  };
2181
2087
 
2182
- var renderManualPagination = function renderManualPagination() {
2183
- var currentPage = 1;
2184
- return React__default.createElement(
2185
- 'div',
2186
- { className: 'd-flex justify-content-between' },
2187
- currentPage > 1 ,
2188
- React__default.createElement(
2189
- 'a',
2190
- { href: '?page=' + (currentPage + 1) },
2191
- 'Next >>'
2192
- )
2193
- );
2194
- };
2195
-
2196
2088
  if (isLoading) {
2197
2089
  return React__default.createElement(
2198
2090
  'div',
@@ -2215,57 +2107,10 @@ var EventsDeck = function EventsDeck(_ref) {
2215
2107
  return React__default.createElement(
2216
2108
  'div',
2217
2109
  { className: 'cvent-events' },
2218
- autoScroll ? React__default.createElement(
2219
- React__default.Fragment,
2220
- null,
2221
- React__default.createElement(
2222
- InfiniteScroll,
2223
- { dataLength: data.length, next: loadMore, hasMore: scrolling, scrollThreshold: 0.9 },
2224
- React__default.createElement(
2225
- Container,
2226
- null,
2227
- cardLoader()
2228
- )
2229
- ),
2230
- React__default.createElement(
2231
- 'noscript',
2232
- null,
2233
- renderManualPagination()
2234
- )
2235
- ) : React__default.createElement(
2236
- React__default.Fragment,
2237
- null,
2238
- React__default.createElement(
2239
- Container,
2240
- null,
2241
- cardLoader()
2242
- ),
2243
- React__default.createElement(
2244
- 'div',
2245
- { style: { padding: '0px 10px' } },
2246
- scrolling ? React__default.createElement(
2247
- 'button',
2248
- {
2249
- style: { margin: 'auto', width: '100%' },
2250
- onClick: function onClick(e) {
2251
- loadMore();
2252
- } },
2253
- 'Load More'
2254
- ) : React__default.createElement(
2255
- 'p',
2256
- { style: { textAlign: 'center' } },
2257
- React__default.createElement(
2258
- 'b',
2259
- null,
2260
- 'End of data'
2261
- )
2262
- )
2263
- ),
2264
- React__default.createElement(
2265
- 'noscript',
2266
- null,
2267
- renderManualPagination()
2268
- )
2110
+ React__default.createElement(
2111
+ InfiniteScroll,
2112
+ { dataLength: data.length, next: loadMore, hasMore: scrolling, scrollThreshold: 0.9 },
2113
+ cardLoader()
2269
2114
  )
2270
2115
  );
2271
2116
  } else {
@@ -16710,6 +16555,7 @@ var Article = function Article(props) {
16710
16555
  );
16711
16556
  }
16712
16557
  }),
16558
+ React__default.createElement('div', { className: 'clearfix', style: { minHeight: '1px' } }),
16713
16559
  React__default.createElement('hr', { className: 'article-seperater' })
16714
16560
  );
16715
16561
  };
@@ -16929,7 +16775,7 @@ var ArticleQueue = function ArticleQueue(props) {
16929
16775
 
16930
16776
  return React__default.createElement(
16931
16777
  InfiniteScroll,
16932
- { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true },
16778
+ { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true, style: { overflow: 'hidden' } },
16933
16779
  queueData.map(function (article, index) {
16934
16780
  if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
16935
16781
  article.contextualAD = Ads.getNativeContextualAD(getTargeting(article, 'native-ad'));