@mjhls/mjh-framework 1.0.221 → 1.0.223

package/dist/esm/AdSlot-b67f8534.js

@@ -0,0 +1,64 @@
+import React__default, { useState } from 'react';
+import { b as lib_2 } from './index-6a79dad6.js';
+import PropTypes from 'prop-types';
+import { d as debounce_1 } from './debounce-dc0c02e5.js';
+import { s as slicedToArray } from './_babelHelpers-67c05996.js';
+
+var DFPAdSlot = function DFPAdSlot(_ref) {
+  var adUnit = _ref.adUnit,
+      sizeMapping = _ref.sizeMapping,
+      className = _ref.className,
+      slotId = _ref.slotId,
+      sizes = _ref.sizes,
+      _ref$targeting = _ref.targeting,
+      targeting = _ref$targeting === undefined ? {} : _ref$targeting;
+
+  var _useState = useState(false),
+      _useState2 = slicedToArray(_useState, 2),
+      adRendered = _useState2[0],
+      setAdRendered = _useState2[1];
+
+  var _useState3 = useState(false),
+      _useState4 = slicedToArray(_useState3, 2),
+      adRefreshable = _useState4[0],
+      setAdRefreshable = _useState4[1];
+
+  var handleVisibilityChange = debounce_1(function (_ref2) {
+    var event = _ref2.event;
+
+    if (event.inViewPercentage <= 0) {
+      setAdRefreshable(false);
+    } else {
+      setAdRefreshable(true);
+    }
+  }, 500);
+
+  return React__default.createElement(
+    'div',
+    { className: className },
+    React__default.createElement(lib_2, {
+      slotId: slotId,
+      sizes: sizes,
+      adUnit: adUnit,
+      sizeMapping: sizeMapping,
+      targetingArguments: targeting,
+      onSlotRender: function onSlotRender(eventData) {
+        setAdRendered(true);
+      },
+      onSlotVisibilityChanged: handleVisibilityChange,
+      shouldRefresh: function shouldRefresh() {
+        if (adRendered && adRefreshable) return true;else return false;
+      }
+    })
+  );
+};
+
+DFPAdSlot.propTypes = {
+  adUnit: PropTypes.string.isRequired,
+  slotId: PropTypes.string,
+  className: PropTypes.string,
+  sizeMapping: PropTypes.array,
+  sizes: PropTypes.array
+};
+
+export { DFPAdSlot as D };

package/dist/esm/DeckContent.js

@@ -6,16 +6,17 @@ import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import Card from 'react-bootstrap/Card';
-import { I as InfiniteScroll, V as VisibilitySensor, m as moment } from './visibility-sensor-675d3fa1.js';
+import { I as InfiniteScroll, V as VisibilitySensor, m as moment } from './visibility-sensor-61158020.js';
 import 'next/link';
 import { withRouter } from 'next/router';
 import { d as debounce_1 } from './debounce-dc0c02e5.js';
 import 'react-dom';
-import { i as imageUrlBuilder } from './index-ca4ff5cb.js';
+import { i as imageUrlBuilder } from './index-b7bbf1d4.js';
 import { L as LazyLoad } from './index-3c1ee9ab.js';
-import { a as main_36 } from './main-dea495b7.js';
+import { a as main_36 } from './main-2504c03f.js';
 import { c as clean_html_1 } from './entities-e85d3a4a.js';
 import { i as inherits, c as createClass, a as classCallCheck, p as possibleConstructorReturn, _ as _extends, t as toConsumableArray } from './_babelHelpers-67c05996.js';
+import { D as DFPAdSlot } from './AdSlot-b67f8534.js';
 
 var DeckContent = function (_React$Component) {
   inherits(DeckContent, _React$Component);
@@ -156,14 +157,14 @@ var DeckContent = function (_React$Component) {
             var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
 
             // please leave this for later debug purpose : Yong Jun.
-            /* console.log('page change reported', {
-              currentPage: currentPage,
-              pageNumber: pageNumber,
-              pathname: pathname,
-              path: path,
-              newPath: newPath,
-              firstPage: pageNumber === 1,
-              queryString: queryString
+            /* console.log('page change reported', {
+              currentPage: currentPage,
+              pageNumber: pageNumber,
+              pathname: pathname,
+              path: path,
+              newPath: newPath,
+              firstPage: pageNumber === 1,
+              queryString: queryString
             }) */
 
             if (pageview) {
@@ -216,16 +217,47 @@ var DeckContent = function (_React$Component) {
           );
         }
       } else return null;
-    }, _this.cardLoader = function (page, columns, variant) {
+    }, _this.cardLoader = function (page, columns, variant, showBI, brandInsight) {
       var mode = variant && variant === 'bottom' ? 'column-reverse' : 'column';
 
       var itemCounter = 0;
       var lgVar = 12;
       var numberOfItemsBeforeAd = 6;
+
+      var insert = function insert(arr, index, newElement) {
+        return [].concat(toConsumableArray(arr.slice(0, index)), [newElement], toConsumableArray(arr.slice(index)));
+      };
+      var articles = [];
+      if (showBI) {
+        var data = _this.state.data;
+        articles = data;
+        var pos = 3;
+        for (var i = 1; pos < articles.length; i++) {
+          var inFeedAd = {
+            adUnit: brandInsight.adUnit,
+            className: brandInsight.className,
+            networkID: brandInsight.networkID,
+            sizes: brandInsight.sizes,
+            slotId: brandInsight.slotId,
+            targeting: {
+              pos: 'article' + i,
+              content_placement: brandInsight.targeting.content_placement,
+              document_url: brandInsight.targeting.document_url
+            },
+            _type: 'BrandInsight'
+          };
+
+          articles = insert(articles, pos, inFeedAd);
+          pos += brandInsight.interval + 1;
+        }
+      } else {
+        articles = _this.state.data;
+      }
+
       return React__default.createElement(
         Row,
         null,
-        _this.state.data && _this.state.data.map(function (row, index) {
+        articles && articles.map(function (row, index) {
           if (columns === 'rotate' && itemCounter % 3 === 0) {
             lgVar = 12;
           } else if (columns && columns !== 'rotate') {
@@ -233,64 +265,87 @@ var DeckContent = function (_React$Component) {
           } else {
             lgVar = 6;
           }
-
-          var pageNumber = row.pageNumber || _this.state.page;
-          var contentCategoryName = row.contentCategory && row.contentCategory.name && _this.mapping[row.contentCategory.name] ? row.contentCategory.name : 'Articles';
-          return React__default.createElement(
-            React__default.Fragment,
-            { key: itemCounter },
-            React__default.createElement(
-              VisibilitySensor,
-              {
-                onChange: function onChange(isVisible) {
-                  isVisible && _this.changePageNumber(pageNumber);
-                } },
+          if (row._type === 'BrandInsight' && row.adUnit) {
+            return React__default.createElement(
+              React__default.Fragment,
+              { key: itemCounter, className: 'brand-insight-wrapper' },
               React__default.createElement(
                 Col,
-                { md: 12, lg: lgVar, counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
+                { sm: 12, counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
                 React__default.createElement(
                   Card,
-                  { className: 'content-card', style: { flexDirection: mode } },
-                  (row.thumbnail && row.thumbnail.asset || _this.props.defaultImage) && React__default.createElement(
-                    'a',
-                    { href: _this.mapping[contentCategoryName] + '/' + row.url.current },
-                    React__default.createElement(
-                      LazyLoad,
-                      { height: _this.props.imageHeight },
-                      React__default.createElement(Card.Img, { variant: 'top', src: _this.renderCardImage(row, page), alt: row.thumbnail && row.thumbnail.asset ? row.thumbnail.asset.originalFilename : '' })
-                    )
-                  ),
+                  { className: 'content-card ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
                   React__default.createElement(
-                    Card.Body,
-                    null,
-                    React__default.createElement(
+                    'div',
+                    { className: row.className, style: { width: '100%', height: 'auto' } },
+                    React__default.createElement(DFPAdSlot, { networkID: row.networkID, adUnit: row.adUnit, slotId: row.slotId, targeting: row.targeting, sizes: row.sizes })
+                  )
+                )
+              )
+            );
+          } else {
+            var pageNumber = row.pageNumber || _this.state.page;
+            var contentCategoryName = row.contentCategory && row.contentCategory.name && _this.mapping[row.contentCategory.name] ? row.contentCategory.name : 'Articles';
+            return React__default.createElement(
+              React__default.Fragment,
+              { key: itemCounter },
+              React__default.createElement(
+                VisibilitySensor,
+                {
+                  onChange: function onChange(isVisible) {
+                    isVisible && _this.changePageNumber(pageNumber);
+                  } },
+                React__default.createElement(
+                  Col,
+                  { md: 12, lg: lgVar, counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
+                  React__default.createElement(
+                    Card,
+                    { className: 'content-card', style: { flexDirection: mode } },
+                    (row.thumbnail && row.thumbnail.asset || _this.props.defaultImage) && React__default.createElement(
                       'a',
                       { href: _this.mapping[contentCategoryName] + '/' + row.url.current },
                       React__default.createElement(
-                        Card.Title,
-                        null,
-                        row.title
+                        LazyLoad,
+                        { height: _this.props.imageHeight },
+                        React__default.createElement(Card.Img, {
+                          variant: 'top',
+                          src: _this.renderCardImage(row, page),
+                          alt: row.thumbnail && row.thumbnail.asset ? row.thumbnail.asset.originalFilename : ''
+                        })
                       )
                     ),
-                    _this.props.showPublished && row.published && React__default.createElement(
-                      Card.Subtitle,
-                      null,
-                      moment(row.published).format('MMMM DD, YYYY')
-                    ),
-                    _this.props.showAuthor && row.authorMapping && row.authorMapping.length > 0 && row.authorMapping.map(function (authorDetail, index) {
-                      return _this.renderAuthor(authorDetail, index, row.authorMapping.length);
-                    }),
                     React__default.createElement(
-                      Card.Text,
+                      Card.Body,
                       null,
-                      clean_html_1(row.summary)
+                      React__default.createElement(
+                        'a',
+                        { href: _this.mapping[contentCategoryName] + '/' + row.url.current },
+                        React__default.createElement(
+                          Card.Title,
+                          null,
+                          row.title
+                        )
+                      ),
+                      _this.props.showPublished && row.published && React__default.createElement(
+                        Card.Subtitle,
+                        null,
+                        moment(row.published).format('MMMM DD, YYYY')
+                      ),
+                      _this.props.showAuthor && row.authorMapping && row.authorMapping.length > 0 && row.authorMapping.map(function (authorDetail, index) {
+                        return _this.renderAuthor(authorDetail, index, row.authorMapping.length);
+                      }),
+                      React__default.createElement(
+                        Card.Text,
+                        null,
+                        clean_html_1(row.summary)
+                      )
                     )
                   )
                 )
-              )
-            ),
-            main_36 && _this.props.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && _this.renderMobileAd(index, numberOfItemsBeforeAd)
-          );
+              ),
+              main_36 && _this.props.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && _this.renderMobileAd(index, numberOfItemsBeforeAd)
+            );
+          }
         })
       );
     }, _this.renderMobileAd = function (index, numberOfItemsBeforeAd) {
@@ -354,7 +409,9 @@ var DeckContent = function (_React$Component) {
           columns = _props.columns,
           variant = _props.variant,
           autoScroll = _props.autoScroll,
-          page = _props.page;
+          page = _props.page,
+          showBI = _props.showBI,
+          brandInsight = _props.brandInsight;
 
 
       return React__default.createElement(
@@ -369,7 +426,7 @@ var DeckContent = function (_React$Component) {
             React__default.createElement(
               Container,
               null,
-              this.cardLoader(page, columns, variant)
+              this.cardLoader(page, columns, variant, showBI, brandInsight)
             )
           ),
           React__default.createElement(
@@ -383,7 +440,7 @@ var DeckContent = function (_React$Component) {
           React__default.createElement(
             Container,
             null,
-            this.cardLoader(page, columns, variant)
+            this.cardLoader(page, columns, variant, showBI, brandInsight)
           ),
           React__default.createElement(
             'div',

package/dist/esm/DeckQueue.js

@@ -6,14 +6,14 @@ import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import Card from 'react-bootstrap/Card';
-import { V as VisibilitySensor, m as moment, I as InfiniteScroll } from './visibility-sensor-675d3fa1.js';
+import { V as VisibilitySensor, m as moment, I as InfiniteScroll } from './visibility-sensor-61158020.js';
 import 'next/link';
 import { withRouter } from 'next/router';
 import { d as debounce_1 } from './debounce-dc0c02e5.js';
 import 'react-dom';
-import { i as imageUrlBuilder } from './index-ca4ff5cb.js';
+import { i as imageUrlBuilder } from './index-b7bbf1d4.js';
 import { L as LazyLoad } from './index-3c1ee9ab.js';
-import { a as main_36 } from './main-dea495b7.js';
+import { a as main_36 } from './main-2504c03f.js';
 import { c as clean_html_1 } from './entities-e85d3a4a.js';
 import { i as inherits, c as createClass, a as classCallCheck, p as possibleConstructorReturn, _ as _extends, t as toConsumableArray } from './_babelHelpers-67c05996.js';
 import { g as get_1 } from './get-b074314b.js';

package/dist/esm/{Dfp-6731ac01.js → Dfp-6c8d69e6.js}

@@ -2,7 +2,7 @@ import React__default, { useState } from 'react';
 import './_commonjsHelpers-ae1b5db5.js';
 import { l as lib_1, b as lib_2 } from './index-6a79dad6.js';
 import PropTypes from 'prop-types';
-import { V as VisibilitySensor } from './visibility-sensor-675d3fa1.js';
+import { V as VisibilitySensor } from './visibility-sensor-61158020.js';
 import { d as debounce_1 } from './debounce-dc0c02e5.js';
 import 'react-dom';
 import { s as slicedToArray } from './_babelHelpers-67c05996.js';

package/dist/esm/{GridContent-214acb61.js → GridContent-0777cc42.js}

@@ -4,19 +4,20 @@ import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import Card from 'react-bootstrap/Card';
-import { m as moment, V as VisibilitySensor, I as InfiniteScroll } from './visibility-sensor-675d3fa1.js';
+import { m as moment, V as VisibilitySensor, I as InfiniteScroll } from './visibility-sensor-61158020.js';
 import 'next/link';
 import { withRouter } from 'next/router';
 import { d as debounce_1 } from './debounce-dc0c02e5.js';
-import { i as imageUrlBuilder } from './index-ca4ff5cb.js';
+import { i as imageUrlBuilder } from './index-b7bbf1d4.js';
 import { L as LazyLoad } from './index-3c1ee9ab.js';
-import { a as main_36 } from './main-dea495b7.js';
+import { a as main_36 } from './main-2504c03f.js';
 import { c as clean_html_1 } from './entities-e85d3a4a.js';
 import { i as inherits, c as createClass, t as toConsumableArray, a as classCallCheck, p as possibleConstructorReturn, _ as _extends } from './_babelHelpers-67c05996.js';
+import { D as DFPAdSlot } from './AdSlot-b67f8534.js';
 import { g as get_1 } from './get-b074314b.js';
 
 var Dfp = React__default.lazy(function () {
-  return import('./Dfp-6731ac01.js');
+  return import('./Dfp-6c8d69e6.js');
 });
 
 var AD = function AD(props) {
@@ -336,11 +337,22 @@ var GridContent = function (_React$Component) {
         var data = this.state.data;
         posts = data;
         var pos = 3;
-        var i = 1;
-        while (pos < posts.length) {
-          brandInsight.targeting.pos = 'article' + i;
-          posts = insert(posts, pos, brandInsight);
-          i++;
+        for (var i = 1; pos < posts.length; i++) {
+          var inFeedAd = {
+            adUnit: brandInsight.adUnit,
+            className: brandInsight.className,
+            networkID: brandInsight.networkID,
+            sizes: brandInsight.sizes,
+            slotId: brandInsight.slotId,
+            targeting: {
+              pos: 'article' + i,
+              content_placement: brandInsight.targeting.content_placement,
+              document_url: brandInsight.targeting.document_url
+            },
+            _type: 'BrandInsight'
+          };
+
+          posts = insert(posts, pos, inFeedAd);
           pos += brandInsight.interval + 1;
         }
       } else {
@@ -488,7 +500,11 @@ var GridContent = function (_React$Component) {
                 React__default.createElement(
                   Card,
                   { className: 'content-card ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
-                  React__default.createElement(AD, { networkID: row.networkID, adUnit: row.adUnit, targeting: row.targeting, className: row.className, sizes: row.sizes, slotId: row.slotId })
+                  React__default.createElement(
+                    'div',
+                    { className: row.className },
+                    React__default.createElement(DFPAdSlot, { networkID: row.networkID, adUnit: row.adUnit, slotId: row.slotId, targeting: row.targeting, sizes: row.sizes })
+                  )
                 )
               )
             );

package/dist/esm/GridContent.js

@@ -6,15 +6,16 @@ import 'react-bootstrap/Container';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'react-bootstrap/Card';
-import './visibility-sensor-675d3fa1.js';
+import './visibility-sensor-61158020.js';
 import 'next/link';
 import 'next/router';
 import './debounce-dc0c02e5.js';
 import 'react-dom';
-import './index-ca4ff5cb.js';
+import './index-b7bbf1d4.js';
 import './index-3c1ee9ab.js';
-import './main-dea495b7.js';
+import './main-2504c03f.js';
 import './entities-e85d3a4a.js';
 import './_babelHelpers-67c05996.js';
+import './AdSlot-b67f8534.js';
 import './get-b074314b.js';
-export { G as default } from './GridContent-214acb61.js';
+export { G as default } from './GridContent-0777cc42.js';

package/dist/esm/IssueContentDeck.js

@@ -6,7 +6,7 @@ import Col from 'react-bootstrap/Col';
 import Card from 'react-bootstrap/Card';
 import 'next/link';
 import 'react-dom';
-import { i as imageUrlBuilder } from './index-ca4ff5cb.js';
+import { i as imageUrlBuilder } from './index-b7bbf1d4.js';
 import { L as LazyLoad } from './index-3c1ee9ab.js';
 import Badge from 'react-bootstrap/Badge';
 

package/dist/esm/IssueDeck.js

@@ -6,7 +6,7 @@ import Col from 'react-bootstrap/Col';
 import Card from 'react-bootstrap/Card';
 import 'next/link';
 import 'react-dom';
-import { i as imageUrlBuilder } from './index-ca4ff5cb.js';
+import { i as imageUrlBuilder } from './index-b7bbf1d4.js';
 import { L as LazyLoad } from './index-3c1ee9ab.js';
 import Button from 'react-bootstrap/Button';
 

package/dist/esm/MasterDeck.js

@@ -6,13 +6,13 @@ import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'react-bootstrap/Card';
-import { I as InfiniteScroll, V as VisibilitySensor } from './visibility-sensor-675d3fa1.js';
+import { I as InfiniteScroll, V as VisibilitySensor } from './visibility-sensor-61158020.js';
 import 'next/link';
 import { withRouter } from 'next/router';
 import { d as debounce_1 } from './debounce-dc0c02e5.js';
 import 'react-dom';
-import './index-ca4ff5cb.js';
-import { a as main_36 } from './main-dea495b7.js';
+import './index-b7bbf1d4.js';
+import { a as main_36 } from './main-2504c03f.js';
 import { i as inherits, c as createClass, a as classCallCheck, p as possibleConstructorReturn, _ as _extends, t as toConsumableArray } from './_babelHelpers-67c05996.js';
 
 var MasterDeck = function (_React$Component) {
@@ -158,14 +158,14 @@ var MasterDeck = function (_React$Component) {
             var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
 
             // please leave this for later debug purpose : Yong Jun.
-            /* console.log('page change reported', {
-              currentPage: currentPage,
-              pageNumber: pageNumber,
-              pathname: pathname,
-              path: path,
-              newPath: newPath,
-              firstPage: pageNumber === 1,
-              queryString: queryString
+            /* console.log('page change reported', {
+              currentPage: currentPage,
+              pageNumber: pageNumber,
+              pathname: pathname,
+              path: path,
+              newPath: newPath,
+              firstPage: pageNumber === 1,
+              queryString: queryString
             }) */
 
             if (pageview) {