@mjhls/mjh-framework 1.0.463 → 1.0.464

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.
Files changed (62) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/AD300x250.js +1 -2
  3. package/dist/cjs/AD300x250x600.js +1 -2
  4. package/dist/cjs/AD728x90.js +1 -2
  5. package/dist/cjs/ADFloatingFooter.js +1 -2
  6. package/dist/cjs/ADGutter.js +1 -2
  7. package/dist/cjs/ADSponsoredResources.js +1 -2
  8. package/dist/cjs/ADWebcast.js +1 -2
  9. package/dist/cjs/ADWelcome.js +1 -2
  10. package/dist/cjs/AdSlot.js +1 -2
  11. package/dist/cjs/ArticleQueue.js +1 -2
  12. package/dist/cjs/Auth.js +1 -2
  13. package/dist/cjs/Beam.js +1 -2
  14. package/dist/cjs/CMEDeck.js +1 -2
  15. package/dist/cjs/Column3.js +1 -2
  16. package/dist/cjs/DeckContent.js +2 -3
  17. package/dist/cjs/GridContent.js +26 -16
  18. package/dist/cjs/IssueLanding.js +3 -4
  19. package/dist/cjs/LeftNav.js +1 -2
  20. package/dist/cjs/MasterDeck.js +124 -26
  21. package/dist/cjs/QueueDeckExpanded.js +14 -5
  22. package/dist/cjs/Segment.js +1 -2
  23. package/dist/cjs/TemplateNormal.js +1 -2
  24. package/dist/cjs/VideoSeriesFilter.js +1 -2
  25. package/dist/cjs/View.js +1 -2
  26. package/dist/cjs/{asyncToGenerator-db08763c.js → asyncToGenerator-8e707718.js} +536 -2
  27. package/dist/cjs/getSerializers.js +1 -2
  28. package/dist/cjs/index.js +3 -4
  29. package/dist/esm/AD300x250.js +1 -2
  30. package/dist/esm/AD300x250x600.js +1 -2
  31. package/dist/esm/AD728x90.js +1 -2
  32. package/dist/esm/ADFloatingFooter.js +1 -2
  33. package/dist/esm/ADGutter.js +1 -2
  34. package/dist/esm/ADSponsoredResources.js +1 -2
  35. package/dist/esm/ADWebcast.js +1 -2
  36. package/dist/esm/ADWelcome.js +1 -2
  37. package/dist/esm/AdSlot.js +1 -2
  38. package/dist/esm/ArticleQueue.js +1 -2
  39. package/dist/esm/Auth.js +1 -2
  40. package/dist/esm/Beam.js +1 -2
  41. package/dist/esm/CMEDeck.js +1 -2
  42. package/dist/esm/Column3.js +1 -2
  43. package/dist/esm/DeckContent.js +2 -3
  44. package/dist/esm/GridContent.js +26 -16
  45. package/dist/esm/IssueLanding.js +3 -4
  46. package/dist/esm/LeftNav.js +1 -2
  47. package/dist/esm/MasterDeck.js +123 -25
  48. package/dist/esm/QueueDeckExpanded.js +14 -5
  49. package/dist/esm/Segment.js +1 -2
  50. package/dist/esm/TemplateNormal.js +1 -2
  51. package/dist/esm/VideoSeriesFilter.js +1 -2
  52. package/dist/esm/View.js +1 -2
  53. package/dist/esm/{asyncToGenerator-204b5a5c.js → asyncToGenerator-0379e924.js} +536 -3
  54. package/dist/esm/getSerializers.js +1 -2
  55. package/dist/esm/index.js +3 -4
  56. package/package.json +1 -1
  57. package/dist/cjs/promise-074978a7.js +0 -540
  58. package/dist/esm/promise-53143c9a.js +0 -537
  59. /package/dist/cjs/{ADInfeed-5adbfbba.js → ADInfeed-4b904089.js} +0 -0
  60. /package/dist/cjs/{ADlgInfeed-028da9eb.js → ADlgInfeed-f540f438.js} +0 -0
  61. /package/dist/esm/{ADInfeed-08192400.js → ADInfeed-23148e88.js} +0 -0
  62. /package/dist/esm/{ADlgInfeed-a90cf553.js → ADlgInfeed-5460339b.js} +0 -0
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # mjh-framework v. 1.0.463
1
+ # mjh-framework v. 1.0.464
2
2
 
3
3
  > Foundation Framework
4
4
 
@@ -17,9 +17,8 @@ require('./debounce-32e57002.js');
17
17
  var main = require('./main-00905561.js');
18
18
  require('./slicedToArray-8063ee51.js');
19
19
  require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  require('./Beam.js');
24
23
  require('./Segment.js');
25
24
  var AdSlot = require('./AdSlot.js');
@@ -17,9 +17,8 @@ require('./debounce-32e57002.js');
17
17
  var main = require('./main-00905561.js');
18
18
  require('./slicedToArray-8063ee51.js');
19
19
  require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  require('./Beam.js');
24
23
  require('./Segment.js');
25
24
  var AdSlot = require('./AdSlot.js');
@@ -17,9 +17,8 @@ require('./debounce-32e57002.js');
17
17
  var main = require('./main-00905561.js');
18
18
  var slicedToArray = require('./slicedToArray-8063ee51.js');
19
19
  require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  require('./Beam.js');
24
23
  require('./Segment.js');
25
24
  var AdSlot = require('./AdSlot.js');
@@ -17,9 +17,8 @@ require('./debounce-32e57002.js');
17
17
  require('./main-00905561.js');
18
18
  var slicedToArray = require('./slicedToArray-8063ee51.js');
19
19
  var stringify = require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  require('./Beam.js');
24
23
  require('./Segment.js');
25
24
  var AdSlot = require('./AdSlot.js');
@@ -17,9 +17,8 @@ require('./debounce-32e57002.js');
17
17
  require('./main-00905561.js');
18
18
  var slicedToArray = require('./slicedToArray-8063ee51.js');
19
19
  require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  require('./Beam.js');
24
23
  require('./Segment.js');
25
24
  var AdSlot = require('./AdSlot.js');
@@ -17,9 +17,8 @@ require('./debounce-32e57002.js');
17
17
  require('./main-00905561.js');
18
18
  var slicedToArray = require('./slicedToArray-8063ee51.js');
19
19
  require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  require('./Beam.js');
24
23
  require('./Segment.js');
25
24
  var AdSlot = require('./AdSlot.js');
@@ -17,9 +17,8 @@ require('./debounce-32e57002.js');
17
17
  require('./main-00905561.js');
18
18
  var slicedToArray = require('./slicedToArray-8063ee51.js');
19
19
  require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  require('./Beam.js');
24
23
  require('./Segment.js');
25
24
  var AdSlot = require('./AdSlot.js');
@@ -17,9 +17,8 @@ require('./debounce-32e57002.js');
17
17
  require('./main-00905561.js');
18
18
  var slicedToArray = require('./slicedToArray-8063ee51.js');
19
19
  require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  require('./Beam.js');
24
23
  require('./Segment.js');
25
24
  var AdSlot = require('./AdSlot.js');
@@ -17,9 +17,8 @@ var debounce = require('./debounce-32e57002.js');
17
17
  var main = require('./main-00905561.js');
18
18
  var slicedToArray = require('./slicedToArray-8063ee51.js');
19
19
  require('./stringify-7c5aff47.js');
20
- require('./asyncToGenerator-db08763c.js');
20
+ require('./asyncToGenerator-8e707718.js');
21
21
  require('./_set-species-4458e975.js');
22
- require('./promise-074978a7.js');
23
22
  var Beam = require('./Beam.js');
24
23
  var Segment = require('./Segment.js');
25
24
 
@@ -32,9 +32,8 @@ var main = require('./main-00905561.js');
32
32
  require('./entities-310b46ee.js');
33
33
  var slicedToArray = require('./slicedToArray-8063ee51.js');
34
34
  var stringify = require('./stringify-7c5aff47.js');
35
- require('./asyncToGenerator-db08763c.js');
35
+ require('./asyncToGenerator-8e707718.js');
36
36
  require('./_set-species-4458e975.js');
37
- require('./promise-074978a7.js');
38
37
  require('./Beam.js');
39
38
  require('./Segment.js');
40
39
  var AdSlot = require('./AdSlot.js');
package/dist/cjs/Auth.js CHANGED
@@ -18,9 +18,8 @@ var Router = require('next/router');
18
18
  var Router__default = _interopDefault(Router);
19
19
  var slicedToArray = require('./slicedToArray-8063ee51.js');
20
20
  var stringify = require('./stringify-7c5aff47.js');
21
- var asyncToGenerator = require('./asyncToGenerator-db08763c.js');
21
+ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
22
22
  require('./_set-species-4458e975.js');
23
- require('./promise-074978a7.js');
24
23
  var reactBootstrap = require('react-bootstrap');
25
24
  var util = require('./util-f2c1b65b.js');
26
25
  var useSWR = _interopDefault(require('swr'));
package/dist/cjs/Beam.js CHANGED
@@ -7,9 +7,8 @@ require('./_library-dd23b178.js');
7
7
  require('./_iter-detect-4d0352f8.js');
8
8
  require('./web.dom.iterable-43c3e277.js');
9
9
  var stringify = require('./stringify-7c5aff47.js');
10
- var asyncToGenerator = require('./asyncToGenerator-db08763c.js');
10
+ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
11
11
  require('./_set-species-4458e975.js');
12
- require('./promise-074978a7.js');
13
12
 
14
13
  require("babel-polyfill");
15
14
  // server key for beam
@@ -26,9 +26,8 @@ require('react-dom');
26
26
  var visibilitySensor = require('./visibility-sensor-0c45a583.js');
27
27
  var main = require('./main-00905561.js');
28
28
  var slicedToArray = require('./slicedToArray-8063ee51.js');
29
- var asyncToGenerator = require('./asyncToGenerator-db08763c.js');
29
+ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
30
30
  require('./_set-species-4458e975.js');
31
- require('./promise-074978a7.js');
32
31
  var reactBootstrap = require('react-bootstrap');
33
32
 
34
33
  var corsProxy = 'https://cors-anywhere.herokuapp.com/';
@@ -21,9 +21,8 @@ require('./debounce-32e57002.js');
21
21
  var main = require('./main-00905561.js');
22
22
  require('./slicedToArray-8063ee51.js');
23
23
  require('./stringify-7c5aff47.js');
24
- require('./asyncToGenerator-db08763c.js');
24
+ require('./asyncToGenerator-8e707718.js');
25
25
  require('./_set-species-4458e975.js');
26
- require('./promise-074978a7.js');
27
26
  require('./Beam.js');
28
27
  require('./Segment.js');
29
28
  require('./AdSlot.js');
@@ -38,13 +38,12 @@ var main = require('./main-00905561.js');
38
38
  var entities = require('./entities-310b46ee.js');
39
39
  require('./slicedToArray-8063ee51.js');
40
40
  require('./stringify-7c5aff47.js');
41
- require('./asyncToGenerator-db08763c.js');
41
+ require('./asyncToGenerator-8e707718.js');
42
42
  require('./_set-species-4458e975.js');
43
- require('./promise-074978a7.js');
44
43
  require('./Beam.js');
45
44
  require('./Segment.js');
46
45
  require('./AdSlot.js');
47
- var ADInfeed = require('./ADInfeed-5adbfbba.js');
46
+ var ADInfeed = require('./ADInfeed-4b904089.js');
48
47
 
49
48
  var DeckContent = function (_React$Component) {
50
49
  inherits._inherits(DeckContent, _React$Component);
@@ -38,15 +38,14 @@ var main = require('./main-00905561.js');
38
38
  var entities = require('./entities-310b46ee.js');
39
39
  require('./slicedToArray-8063ee51.js');
40
40
  require('./stringify-7c5aff47.js');
41
- require('./asyncToGenerator-db08763c.js');
41
+ require('./asyncToGenerator-8e707718.js');
42
42
  require('./_set-species-4458e975.js');
43
- require('./promise-074978a7.js');
44
43
  require('./Beam.js');
45
44
  require('./Segment.js');
46
45
  require('./AdSlot.js');
47
- var ADInfeed = require('./ADInfeed-5adbfbba.js');
46
+ var ADInfeed = require('./ADInfeed-4b904089.js');
48
47
  var lodash = require('./lodash-fc2922d0.js');
49
- var ADlgInfeed = require('./ADlgInfeed-028da9eb.js');
48
+ var ADlgInfeed = require('./ADlgInfeed-f540f438.js');
50
49
  require('./_arrayMap-3b4a0f75.js');
51
50
  var get = require('./get-5dfcdc33.js');
52
51
  require('./AD.js');
@@ -417,20 +416,30 @@ var GridContent = function (_React$Component) {
417
416
  }
418
417
  }
419
418
  posts = firstThree.concat(posts);
420
- posts = posts.map(function (ele, i) {
421
- if (ele._type === 'lg-infeed') {
422
- // Setting pos as top2 for the first occurence of large infeed ad
423
- var _pos = posts.indexOf(posts.find(function (d) {
424
- return d._type === 'lg-infeed';
425
- })) === i ? 'top2' : 'lg-infeed_' + i;
426
- return _extends._extends({}, ele, { slotId: 'lg-infeed_' + i, targeting: _extends._extends({}, ele.targeting, { pos: _pos }) });
427
- } else {
428
- return ele;
429
- }
430
- });
431
419
  } else {
432
420
  posts = this.state.data;
433
421
  }
422
+
423
+ // 'articleCount' is New parameter to use instead of 'index' while passing to 'changePageNumber()'
424
+ // 'index' was including the indexes for infeed ads along with article count making the page number change before it reaches last article.
425
+ // 'articleCount' will be the indexes of only the articles in the deck.
426
+ var articleCount = -1;
427
+ posts = posts.map(function (ele, i) {
428
+ if (ele._type === 'lg-infeed') {
429
+ // Setting pos as top2 for the first occurence of large infeed ad
430
+ var _pos = posts.indexOf(posts.find(function (d) {
431
+ return d._type === 'lg-infeed';
432
+ })) === i ? 'top2' : 'lg-infeed_' + i;
433
+ return _extends._extends({}, ele, { slotId: 'lg-infeed_' + i, targeting: _extends._extends({}, ele.targeting, { pos: _pos }) });
434
+ } else if (ele._type === 'article') {
435
+ // incrementing 'articleCount' for each article.
436
+ ++articleCount;
437
+ return _extends._extends({}, ele, { articleCount: articleCount });
438
+ } else {
439
+ return ele;
440
+ }
441
+ });
442
+
434
443
  var itemsPerPage = this.props.params && this.props.params.itemsPerPage ? this.props.params.itemsPerPage : 10;
435
444
  var heroContent = this.props.heroContent ? this.props.heroContent : 0;
436
445
  var featureCount = 0;
@@ -585,7 +594,8 @@ var GridContent = function (_React$Component) {
585
594
  visibilitySensor.VisibilitySensor,
586
595
  {
587
596
  onChange: function onChange(isVisible) {
588
- isVisible && _this2.changePageNumber(pageNumber, itemsPerPage, index);
597
+ // Passing 'articleCount' instead of index because index will be including the indexes of ads whereas articleCount will be having index of article only.
598
+ isVisible && _this2.changePageNumber(pageNumber, itemsPerPage, row.articleCount);
589
599
  } },
590
600
  React__default.createElement(
591
601
  'div',
@@ -30,15 +30,14 @@ require('./main-00905561.js');
30
30
  require('./entities-310b46ee.js');
31
31
  require('./slicedToArray-8063ee51.js');
32
32
  require('./stringify-7c5aff47.js');
33
- require('./asyncToGenerator-db08763c.js');
33
+ require('./asyncToGenerator-8e707718.js');
34
34
  require('./_set-species-4458e975.js');
35
- require('./promise-074978a7.js');
36
35
  require('./Beam.js');
37
36
  require('./Segment.js');
38
37
  require('./AdSlot.js');
39
- require('./ADInfeed-5adbfbba.js');
38
+ require('./ADInfeed-4b904089.js');
40
39
  require('./lodash-fc2922d0.js');
41
- require('./ADlgInfeed-028da9eb.js');
40
+ require('./ADlgInfeed-f540f438.js');
42
41
  require('./AuthorComponent-cb8b8128.js');
43
42
  require('react-bootstrap');
44
43
  var QueueDeckExpanded = require('./QueueDeckExpanded.js');
@@ -19,9 +19,8 @@ require('./debounce-32e57002.js');
19
19
  require('./main-00905561.js');
20
20
  require('./slicedToArray-8063ee51.js');
21
21
  require('./stringify-7c5aff47.js');
22
- require('./asyncToGenerator-db08763c.js');
22
+ require('./asyncToGenerator-8e707718.js');
23
23
  require('./_set-species-4458e975.js');
24
- require('./promise-074978a7.js');
25
24
  require('./Beam.js');
26
25
  require('./Segment.js');
27
26
  require('./AdSlot.js');
@@ -34,8 +34,16 @@ require('react-dom');
34
34
  var visibilitySensor = require('./visibility-sensor-0c45a583.js');
35
35
  require('./index-b5eb3ff8.js');
36
36
  var main = require('./main-00905561.js');
37
+ require('./slicedToArray-8063ee51.js');
38
+ require('./stringify-7c5aff47.js');
39
+ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
37
40
  require('./_set-species-4458e975.js');
38
- var promise = require('./promise-074978a7.js');
41
+ require('./Beam.js');
42
+ require('./Segment.js');
43
+ require('./AdSlot.js');
44
+ var ADInfeed = require('./ADInfeed-4b904089.js');
45
+ var lodash = require('./lodash-fc2922d0.js');
46
+ var ADlgInfeed = require('./ADlgInfeed-f540f438.js');
39
47
 
40
48
  var MasterDeck = function (_React$Component) {
41
49
  inherits._inherits(MasterDeck, _React$Component);
@@ -91,7 +99,7 @@ var MasterDeck = function (_React$Component) {
91
99
  var params = _extends._extends({}, _this.params, { from: from, to: to });
92
100
 
93
101
  if (dataHandler) {
94
- var dataHandlerPromise = new promise._Promise(function (resolve, reject) {
102
+ var dataHandlerPromise = new asyncToGenerator._Promise(function (resolve, reject) {
95
103
  try {
96
104
  var result = dataHandler(params);
97
105
  resolve(result);
@@ -206,35 +214,118 @@ var MasterDeck = function (_React$Component) {
206
214
  });
207
215
  }
208
216
  }
209
- }, _this.cardLoader = function (page, columns, variant) {
217
+ }, _this.cardLoader = function (page, columns, variant, brandInsightAd, showBI, lgInfeedAd) {
210
218
  var numberOfItemsBeforeAd = 6;
219
+ var data = _this.state.data;
220
+ var insertBrandInsightAd = function insertBrandInsightAd(arr, index, newElement) {
221
+ return [].concat(toConsumableArray._toConsumableArray(arr.slice(0, index)), [newElement], toConsumableArray._toConsumableArray(arr.slice(index)));
222
+ };
223
+
224
+ // Need to pass flag "lgInfeedAd={true}" along with brandInsightAd from site level for large infeed-ad to render
225
+ // Checking lgInfeedAd flag in desktop view ( window >= 1400px ).
226
+ // Integrating large infeed AD
227
+ if (lgInfeedAd && brandInsightAd && typeof window !== 'undefined' && window.innerWidth >= 1400) {
228
+ var lgInfeed = {
229
+ _type: 'lg-infeed',
230
+ adUnit: brandInsightAd.adUnit,
231
+ className: 'lg-infeed',
232
+ networkID: brandInsightAd.networkID,
233
+ sizes: [728, 90],
234
+ sizeMapping: [{
235
+ viewport: [1400, 0],
236
+ sizes: [[728, 90]]
237
+ }, { viewport: [0, 0], sizes: [] }],
238
+ targeting: {
239
+ content_placement: brandInsightAd.targeting.content_placement,
240
+ document_url: brandInsightAd.targeting.document_url
241
+ }
242
+ };
243
+
244
+ var chunks = lodash.lodash.chunk(data, 6).map(function (chunk) {
245
+ var set = lodash.lodash.chunk(chunk, 2);
246
+ for (var i = 0; i < set.length; i++) {
247
+ if (i !== set.length - 1) {
248
+ set[i].push(lgInfeed);
249
+ }
250
+ }
251
+ return lodash.lodash.flattenDeep(set);
252
+ });
253
+ data = lodash.lodash.flatten(chunks);
254
+ }
255
+
256
+ // Integrating infeed AD
257
+ if (showBI && brandInsightAd) {
258
+ // Checking lgInfeedAd flag in desktop view ( window >= 1400px ).
259
+ if (lgInfeedAd && typeof window !== 'undefined' && window.innerWidth >= 1400) brandInsightAd.interval = 8;
260
+ var pos = 0;
261
+ for (var i = 1; pos < data.length; i++) {
262
+ var inFeedAd = {
263
+ adUnit: brandInsightAd.adUnit,
264
+ className: brandInsightAd.className,
265
+ networkID: brandInsightAd.networkID,
266
+ sizes: brandInsightAd.sizes,
267
+ slotId: brandInsightAd.slotId + '_' + i,
268
+ targeting: {
269
+ pos: 'article' + i,
270
+ content_placement: brandInsightAd.targeting.content_placement,
271
+ document_url: brandInsightAd.targeting.document_url
272
+ },
273
+ _type: 'brandInsightAd'
274
+ };
275
+
276
+ data = insertBrandInsightAd(data, pos, inFeedAd);
277
+ pos += brandInsightAd.interval + 1;
278
+ }
279
+ }
280
+
281
+ // 'index' was including the indexes for infeed ads along with article count making the page number change before it reaches last article.
282
+ data = data.map(function (ele, i) {
283
+ if (ele._type === 'lg-infeed') {
284
+ // Setting pos as top2 for the first occurence of large infeed ad
285
+ var _pos = data.indexOf(data.find(function (d) {
286
+ return d._type === 'lg-infeed';
287
+ })) === i ? 'top2' : 'lg-infeed_' + i;
288
+ return _extends._extends({}, ele, { slotId: 'lg-infeed_' + i, targeting: _extends._extends({}, ele.targeting, { pos: _pos }) });
289
+ } else {
290
+ return ele;
291
+ }
292
+ });
293
+
211
294
  return React__default.createElement(
212
295
  'div',
213
296
  null,
214
- _this.state.data && _this.state.data.length > 0 ? _this.state.data.map(function (row, index) {
297
+ data && data.length > 0 ? data.map(function (row, index) {
215
298
  var pageNumber = row.pageNumber || _this.state.page;
216
-
217
- return React__default.createElement(
218
- React__default.Fragment,
219
- { key: index },
220
- React__default.createElement(
221
- visibilitySensor.VisibilitySensor,
222
- {
223
- onChange: function onChange(isVisible) {
224
- isVisible && _this.changePageNumber(pageNumber);
225
- } },
299
+ // Returning view for articles
300
+ if (row._type === 'article') {
301
+ return React__default.createElement(
302
+ React__default.Fragment,
303
+ { key: index },
226
304
  React__default.createElement(
227
- 'div',
228
- null,
229
- React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client, defaultImage: _this.defaultImage }),
230
- main.main_36 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
305
+ visibilitySensor.VisibilitySensor,
306
+ {
307
+ onChange: function onChange(isVisible) {
308
+ isVisible && _this.changePageNumber(pageNumber);
309
+ } },
310
+ React__default.createElement(
231
311
  'div',
232
- { className: 'ad-container', style: { margin: '0 auto' } },
233
- _this.renderMobileAd(index, numberOfItemsBeforeAd, _this.rightItems)
312
+ null,
313
+ React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client, defaultImage: _this.defaultImage }),
314
+ main.main_36 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
315
+ 'div',
316
+ { className: 'ad-container', style: { margin: '0 auto' } },
317
+ _this.renderMobileAd(index, numberOfItemsBeforeAd, _this.rightItems)
318
+ )
234
319
  )
235
320
  )
236
- )
237
- );
321
+ );
322
+ // Returning view for large infeed Ad
323
+ } else if (row._type === 'lg-infeed' && row.adUnit) {
324
+ return React__default.createElement(ADlgInfeed.ADlgInfeed, _extends._extends({ index: index }, row));
325
+ // Returning view for infeed Ad
326
+ } else if (row._type === 'brandInsightAd' && row.adUnit) {
327
+ return React__default.createElement(ADInfeed.ADInfeed, { index: index, infeedAd: row });
328
+ }
238
329
  }) : React__default.createElement(
239
330
  'div',
240
331
  null,
@@ -299,17 +390,24 @@ var MasterDeck = function (_React$Component) {
299
390
  value: function componentDidMount() {
300
391
  // this.loadData();
301
392
  }
393
+ // Passing 'brandInsightAd','showBI' and 'lgInfeedAd'
394
+
302
395
  }, {
303
396
  key: 'render',
304
397
  value: function render() {
305
398
  var _this3 = this;
306
399
 
400
+ // Setting default value for 'showBI' and 'lgInfeedAd'
307
401
  var _props = this.props,
308
402
  columns = _props.columns,
309
403
  variant = _props.variant,
310
404
  autoScroll = _props.autoScroll,
311
- page = _props.page;
312
-
405
+ page = _props.page,
406
+ brandInsightAd = _props.brandInsightAd,
407
+ _props$showBI = _props.showBI,
408
+ showBI = _props$showBI === undefined ? false : _props$showBI,
409
+ _props$lgInfeedAd = _props.lgInfeedAd,
410
+ lgInfeedAd = _props$lgInfeedAd === undefined ? false : _props$lgInfeedAd;
313
411
 
314
412
  return React__default.createElement(
315
413
  'div',
@@ -323,7 +421,7 @@ var MasterDeck = function (_React$Component) {
323
421
  React__default.createElement(
324
422
  Container,
325
423
  null,
326
- this.cardLoader(page, columns, variant)
424
+ this.cardLoader(page, columns, variant, brandInsightAd, showBI, lgInfeedAd)
327
425
  )
328
426
  ),
329
427
  React__default.createElement(
@@ -337,7 +435,7 @@ var MasterDeck = function (_React$Component) {
337
435
  React__default.createElement(
338
436
  Container,
339
437
  null,
340
- this.cardLoader(page, columns, variant)
438
+ this.cardLoader(page, columns, variant, brandInsightAd, showBI, lgInfeedAd)
341
439
  ),
342
440
  React__default.createElement(
343
441
  'div',
@@ -31,15 +31,14 @@ var main = require('./main-00905561.js');
31
31
  var entities = require('./entities-310b46ee.js');
32
32
  var slicedToArray = require('./slicedToArray-8063ee51.js');
33
33
  require('./stringify-7c5aff47.js');
34
- require('./asyncToGenerator-db08763c.js');
34
+ require('./asyncToGenerator-8e707718.js');
35
35
  require('./_set-species-4458e975.js');
36
- require('./promise-074978a7.js');
37
36
  require('./Beam.js');
38
37
  require('./Segment.js');
39
38
  require('./AdSlot.js');
40
- var ADInfeed = require('./ADInfeed-5adbfbba.js');
39
+ var ADInfeed = require('./ADInfeed-4b904089.js');
41
40
  var lodash = require('./lodash-fc2922d0.js');
42
- var ADlgInfeed = require('./ADlgInfeed-028da9eb.js');
41
+ var ADlgInfeed = require('./ADlgInfeed-f540f438.js');
43
42
  var AuthorComponent = require('./AuthorComponent-cb8b8128.js');
44
43
  var reactBootstrap = require('react-bootstrap');
45
44
 
@@ -215,6 +214,11 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
215
214
  pos += brandInsightAd.interval + 1;
216
215
  }
217
216
  }
217
+
218
+ // 'articleCount' is New parameter to use instead of 'index' while passing to 'changePageNumber()'
219
+ // 'index' was including the indexes for infeed ads along with article count making the page number change before it reaches last article.
220
+ // 'articleCount' will be the indexes of only the articles in the deck.
221
+ var articleCount = -1;
218
222
  data = data.map(function (ele, i) {
219
223
  if (ele._type === 'lg-infeed') {
220
224
  // Setting pos as top2 for the first occurence of large infeed ad
@@ -222,6 +226,10 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
222
226
  return d._type === 'lg-infeed';
223
227
  })) === i ? 'top2' : 'lg-infeed_' + i;
224
228
  return _extends._extends({}, ele, { slotId: 'lg-infeed_' + i, targeting: _extends._extends({}, ele.targeting, { pos: _pos }) });
229
+ } else if (ele._type === 'article') {
230
+ // incrementing 'articleCount' for each article.
231
+ ++articleCount;
232
+ return _extends._extends({}, ele, { articleCount: articleCount });
225
233
  } else {
226
234
  return ele;
227
235
  }
@@ -455,7 +463,8 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
455
463
  {
456
464
  key: article._id ? article._id : index,
457
465
  onChange: function onChange(isVisible) {
458
- isVisible && changePageNumber(pageNumber, seoPaginate, pageview, router, currentPage, setCurrentPage, itemsPerPage, index);
466
+ // Passing 'articleCount' instead of index because index will be including the indexes of ads whereas articleCount will be having index of artilce only.
467
+ isVisible && changePageNumber(pageNumber, seoPaginate, pageview, router, currentPage, setCurrentPage, itemsPerPage, article.articleCount);
459
468
  } },
460
469
  React__default.createElement(
461
470
  React__default.Fragment,
@@ -6,9 +6,8 @@ require('./core.get-iterator-method-41e87ec1.js');
6
6
  require('./_library-dd23b178.js');
7
7
  require('./_iter-detect-4d0352f8.js');
8
8
  require('./web.dom.iterable-43c3e277.js');
9
- var asyncToGenerator = require('./asyncToGenerator-db08763c.js');
9
+ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
10
10
  require('./_set-species-4458e975.js');
11
- require('./promise-074978a7.js');
12
11
 
13
12
  require("babel-polyfill");
14
13
 
@@ -22,9 +22,8 @@ require('./debounce-32e57002.js');
22
22
  require('./main-00905561.js');
23
23
  var slicedToArray = require('./slicedToArray-8063ee51.js');
24
24
  require('./stringify-7c5aff47.js');
25
- require('./asyncToGenerator-db08763c.js');
25
+ require('./asyncToGenerator-8e707718.js');
26
26
  require('./_set-species-4458e975.js');
27
- require('./promise-074978a7.js');
28
27
  require('./Beam.js');
29
28
  require('./Segment.js');
30
29
  require('./AdSlot.js');
@@ -14,9 +14,8 @@ var moment = require('./moment-3cf060f6.js');
14
14
  var Router = require('next/router');
15
15
  var Router__default = _interopDefault(Router);
16
16
  var slicedToArray = require('./slicedToArray-8063ee51.js');
17
- var asyncToGenerator = require('./asyncToGenerator-db08763c.js');
17
+ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
18
18
  require('./_set-species-4458e975.js');
19
- require('./promise-074978a7.js');
20
19
  var reactBootstrap = require('react-bootstrap');
21
20
 
22
21
  var _this = undefined;
package/dist/cjs/View.js CHANGED
@@ -32,9 +32,8 @@ var main = require('./main-00905561.js');
32
32
  require('./entities-310b46ee.js');
33
33
  var slicedToArray = require('./slicedToArray-8063ee51.js');
34
34
  var stringify = require('./stringify-7c5aff47.js');
35
- var asyncToGenerator = require('./asyncToGenerator-db08763c.js');
35
+ var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
36
36
  require('./_set-species-4458e975.js');
37
- require('./promise-074978a7.js');
38
37
  require('./Beam.js');
39
38
  require('./Segment.js');
40
39
  var AdSlot = require('./AdSlot.js');