@mjhls/mjh-framework 1.0.268 → 1.0.269

package/README.md

@@ -1,171 +1,171 @@
-
-# mjh-framework v. 1.0.268
-
-> Foundation Framework
-
-[![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
-
-## Install
-
-```bash
-npm install --save @mjhls/mjh-framework
-```
-
-## Usage
-
-```jsx
-import React, { Component } from 'react'
-
-import { NavMagazine, DeckQueue } from 'mjh-framework'
-
-export default class App extends Component {
-  render() {
-    return (
-      <div>
-        <NavMagazine />
-        <DeckQueue />
-      </div>
-    )
-  }
-}
-```
-
-## Publish new updates to the npm registry
-
-```bash
-npm publish
-```
-
-## For getting updates in the template without publishing each time a change is made in the framework
-
-Link react and react-dom of the template repo, so that it can be used by the framework.
-This is to avoid the error arising due to multiple instances of React.
-
-```bash
-cd ../mjh-template/node_modules/react
-
-yarn link
-
-cd ../react-dom
-
-yarn link
-
-cd ../../../mjh-framework
-
-yarn link react && yarn link react-dom
-```
-
-Link the framework repo so that it can be used in the template
-
-```bash
-npm link
-
-cd ../mjh-template
-
-npm link @mjhls/mjh-framework
-```
-
-## Components and "props"
-
-### Deck Components
-
-- #### DeckContent
-
-  ##### Props
-
-  - mapping
-  - dataRecord
-  - query
-  - params
-  - pointer
-  - pointerArray
-  - defaultImage
-
-- #### DeckQueue
-  ##### Props
-  - page
-  - dataRecord
-  - query
-  - params
-  - pointer
-  - pointerArray
-
-### Layout Components
-
-- #### Column1
-- #### Column2
-  ##### Props
-  - rightItems
-- #### Column3
-  ##### Props
-  - leftItems
-  - rightItems
-  ##### Common Props (Column1, Column2, Column3)
-  - title
-  - children
-- #### Header
-  ##### Props
-  - title
-  - keyword
-  - description
-- #### LeftNav
-  ##### Props
-  - leftItems
-- #### AccordionPanel
-  ##### Props
-  - accordionClassName
-  - data
-
-### Navigation Components
-
-- #### NavMagazine
-  ##### Props
-  - logo
-  - dataObject
-- #### NavNative
-  ##### Props
-  - logo
-  - dataObject
-- #### NavNormal
-  ##### Props
-  - logo
-  - dataObject
-  - variant
-- #### NavDvm
-  ##### Props
-  - logo
-  - dataObject
-  - subNavHeads
-
-### Template Components
-
-- #### TemplateNormal
-  ##### Props
-  - config
-  - title
-  - keywords
-  - description
-  - website
-
-### Ad Components
-
-- #### AD300x250
-- #### AD300x250x600
-- #### AD728x90
-  ##### Common Props
-  - networkID
-  - adUnit
-
-### Serializers
-
-- #### getSerializers (function)
-  ##### arguments
-  - client
-  ##### types
-  - youtube
-  - figure
-  - slideshow
-
-## License
-
-MIT © [mjh-framework](https://github.com/mjh-framework)
+
+# mjh-framework v. 1.0.269
+
+> Foundation Framework
+
+[![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+
+## Install
+
+```bash
+npm install --save @mjhls/mjh-framework
+```
+
+## Usage
+
+```jsx
+import React, { Component } from 'react'
+
+import { NavMagazine, DeckQueue } from 'mjh-framework'
+
+export default class App extends Component {
+  render() {
+    return (
+      <div>
+        <NavMagazine />
+        <DeckQueue />
+      </div>
+    )
+  }
+}
+```
+
+## Publish new updates to the npm registry
+
+```bash
+npm publish
+```
+
+## For getting updates in the template without publishing each time a change is made in the framework
+
+Link react and react-dom of the template repo, so that it can be used by the framework.
+This is to avoid the error arising due to multiple instances of React.
+
+```bash
+cd ../mjh-template/node_modules/react
+
+yarn link
+
+cd ../react-dom
+
+yarn link
+
+cd ../../../mjh-framework
+
+yarn link react && yarn link react-dom
+```
+
+Link the framework repo so that it can be used in the template
+
+```bash
+npm link
+
+cd ../mjh-template
+
+npm link @mjhls/mjh-framework
+```
+
+## Components and "props"
+
+### Deck Components
+
+- #### DeckContent
+
+  ##### Props
+
+  - mapping
+  - dataRecord
+  - query
+  - params
+  - pointer
+  - pointerArray
+  - defaultImage
+
+- #### DeckQueue
+  ##### Props
+  - page
+  - dataRecord
+  - query
+  - params
+  - pointer
+  - pointerArray
+
+### Layout Components
+
+- #### Column1
+- #### Column2
+  ##### Props
+  - rightItems
+- #### Column3
+  ##### Props
+  - leftItems
+  - rightItems
+  ##### Common Props (Column1, Column2, Column3)
+  - title
+  - children
+- #### Header
+  ##### Props
+  - title
+  - keyword
+  - description
+- #### LeftNav
+  ##### Props
+  - leftItems
+- #### AccordionPanel
+  ##### Props
+  - accordionClassName
+  - data
+
+### Navigation Components
+
+- #### NavMagazine
+  ##### Props
+  - logo
+  - dataObject
+- #### NavNative
+  ##### Props
+  - logo
+  - dataObject
+- #### NavNormal
+  ##### Props
+  - logo
+  - dataObject
+  - variant
+- #### NavDvm
+  ##### Props
+  - logo
+  - dataObject
+  - subNavHeads
+
+### Template Components
+
+- #### TemplateNormal
+  ##### Props
+  - config
+  - title
+  - keywords
+  - description
+  - website
+
+### Ad Components
+
+- #### AD300x250
+- #### AD300x250x600
+- #### AD728x90
+  ##### Common Props
+  - networkID
+  - adUnit
+
+### Serializers
+
+- #### getSerializers (function)
+  ##### arguments
+  - client
+  ##### types
+  - youtube
+  - figure
+  - slideshow
+
+## License
+
+MIT © [mjh-framework](https://github.com/mjh-framework)

package/dist/cjs/ADInfeed-0da6acd4.js

@@ -0,0 +1,47 @@
+'use strict';
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var React = require('react');
+var React__default = _interopDefault(React);
+var Card = _interopDefault(require('react-bootstrap/Card'));
+var slicedToArray = require('./slicedToArray-e38fb29d.js');
+var AdSlot = require('./AdSlot-93d892f5.js');
+
+var ADInfeed = function ADInfeed(_ref) {
+  var index = _ref.index,
+      infeedAd = _ref.infeedAd;
+  var className = infeedAd.className,
+      slotId = infeedAd.slotId,
+      adUnit = infeedAd.adUnit,
+      _infeedAd$targeting = infeedAd.targeting,
+      targeting = _infeedAd$targeting === undefined ? {} : _infeedAd$targeting,
+      networkID = infeedAd.networkID,
+      sizes = infeedAd.sizes;
+
+  var _useState = React.useState(true),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
+      showAd = _useState2[0],
+      setShowAd = _useState2[1];
+
+  return React__default.createElement(
+    React__default.Fragment,
+    null,
+    showAd && React__default.createElement(
+      'div',
+      { className: 'brand-insight-wrapper', style: { display: 'flex', flex: '1 0 auto' } },
+      React__default.createElement(
+        Card,
+        { className: 'ad-wrapper', style: { display: 'block !important', flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
+        React__default.createElement(AdSlot.DFPAdSlot, { className: className, networkID: networkID, adUnit: adUnit, slotId: slotId, targeting: targeting, sizes: sizes, setShowAd: setShowAd })
+      ),
+      React__default.createElement(
+        'style',
+        { jsx: 'true' },
+        ''
+      )
+    )
+  );
+};
+
+exports.ADInfeed = ADInfeed;

package/dist/cjs/{AdSlot-1c436555.js → AdSlot-93d892f5.js}

@@ -1113,6 +1113,10 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
     }
   }, 500);
 
+  var matchAd = function matchAd(element) {
+    return slotId.includes(element);
+  };
+
   return React__default.createElement(
     'div',
     { className: className, style: { textAlign: 'center' } },
@@ -1123,7 +1127,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
       sizeMapping: sizeMapping,
       targetingArguments: targeting,
       onSlotRender: function onSlotRender(eventData) {
-        if (slotId === 'floating-ad' && eventData && eventData.event && eventData.event.creativeId == null) {
+        if (['floating-ad', 'infeed'].some(matchAd) && eventData && eventData.event && eventData.event.creativeId == null) {
           setShowAd(false);
         }
         setAdRendered(true);

package/dist/cjs/DeckContent.js

@@ -24,12 +24,13 @@ require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('react-dom');
-var index$1 = require('./index-be0c82be.js');
+var index$1 = require('./index-39beccb3.js');
 var index$2 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
 require('./slicedToArray-e38fb29d.js');
-var AdSlot = require('./AdSlot-1c436555.js');
+require('./AdSlot-93d892f5.js');
 require('./promise-b96c61f8.js');
+var ADInfeed = require('./ADInfeed-0da6acd4.js');
 
 var DeckContent = function (_React$Component) {
   inherits$2._inherits(DeckContent, _React$Component);
@@ -170,14 +171,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) {
@@ -279,23 +280,7 @@ var DeckContent = function (_React$Component) {
             lgVar = 6;
           }
           if (row._type === 'BrandInsight' && row.adUnit) {
-            return React__default.createElement(
-              React__default.Fragment,
-              { key: itemCounter },
-              React__default.createElement(
-                Col,
-                { className: 'brand-insight-wrapper', sm: 12, counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
-                React__default.createElement(
-                  Card,
-                  { className: 'ad-wrapper', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
-                  React__default.createElement(
-                    'div',
-                    { style: { width: '100%', height: 'auto' } },
-                    React__default.createElement(AdSlot.DFPAdSlot, { className: row.className, networkID: row.networkID, adUnit: row.adUnit, slotId: row.slotId, targeting: row.targeting, sizes: row.sizes })
-                  )
-                )
-              )
-            );
+            return React__default.createElement(ADInfeed.ADInfeed, { index: index, infeedAd: row });
           } else {
             var pageNumber = row.pageNumber || _this.state.page;
             var contentCategoryName = row.contentCategory && row.contentCategory.name && _this.mapping[row.contentCategory.name] ? row.contentCategory.name : 'Articles';

package/dist/cjs/DeckQueue.js

@@ -24,7 +24,7 @@ require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('react-dom');
-var index$1 = require('./index-be0c82be.js');
+var index$1 = require('./index-39beccb3.js');
 var index$2 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
 var get$1 = require('./get-1f91592f.js');

package/dist/cjs/{GridContent-e459f9e3.js → GridContent-524f2ad8.js}

@@ -18,14 +18,14 @@ var visibilitySensor = require('./visibility-sensor-b72d9527.js');
 require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
-var index$1 = require('./index-be0c82be.js');
+var index$1 = require('./index-39beccb3.js');
 var index$2 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
-var AdSlot = require('./AdSlot-1c436555.js');
+var ADInfeed = require('./ADInfeed-0da6acd4.js');
 var get$1 = require('./get-1f91592f.js');
 
 var Dfp = React__default.lazy(function () {
-  return Promise.resolve().then(function () { return require('./Dfp-7a5533f9.js'); });
+  return new Promise(function (resolve) { resolve(require('./Dfp-7a5533f9.js')); });
 });
 
 var AD = function AD(props) {
@@ -513,19 +513,7 @@ var GridContent = function (_React$Component) {
               );
             }
           } else if (row._type === 'BrandInsight' && row.adUnit) {
-            return React__default.createElement(
-              React__default.Fragment,
-              { key: itemCounter },
-              React__default.createElement(
-                'div',
-                { className: 'brand-insight-wrapper', counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
-                React__default.createElement(
-                  Card,
-                  { className: 'ad-wrapper', style: { display: 'block !important', flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
-                  React__default.createElement(AdSlot.DFPAdSlot, { className: row.className, networkID: row.networkID, adUnit: row.adUnit, slotId: row.slotId, targeting: row.targeting, sizes: row.sizes })
-                )
-              )
-            );
+            return React__default.createElement(ADInfeed.ADInfeed, { index: index, infeedAd: row });
           }
           return React__default.createElement(
             React__default.Fragment,

package/dist/cjs/GridContent.js

@@ -20,14 +20,15 @@ require('./visibility-sensor-b72d9527.js');
 require('next/link');
 require('next/router');
 require('react-dom');
-require('./index-be0c82be.js');
+require('./index-39beccb3.js');
 require('./index-fa0fb52c.js');
 require('./entities-310b46ee.js');
 require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-1c436555.js');
+require('./AdSlot-93d892f5.js');
 require('./promise-b96c61f8.js');
+require('./ADInfeed-0da6acd4.js');
 require('./get-1f91592f.js');
-var GridContent = require('./GridContent-e459f9e3.js');
+var GridContent = require('./GridContent-524f2ad8.js');
 
 
 

package/dist/cjs/IssueContentDeck.js

@@ -11,7 +11,7 @@ var Col = _interopDefault(require('react-bootstrap/Col'));
 var Card = _interopDefault(require('react-bootstrap/Card'));
 require('next/link');
 require('react-dom');
-var index$1 = require('./index-be0c82be.js');
+var index$1 = require('./index-39beccb3.js');
 var index$2 = require('./index-fa0fb52c.js');
 var Badge = _interopDefault(require('react-bootstrap/Badge'));
 

package/dist/cjs/IssueDeck.js

@@ -11,7 +11,7 @@ var Col = _interopDefault(require('react-bootstrap/Col'));
 var Card = _interopDefault(require('react-bootstrap/Card'));
 require('next/link');
 require('react-dom');
-var index$1 = require('./index-be0c82be.js');
+var index$1 = require('./index-39beccb3.js');
 var index$2 = require('./index-fa0fb52c.js');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 

package/dist/cjs/MasterDeck.js

@@ -24,7 +24,7 @@ require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('react-dom');
-require('./index-be0c82be.js');
+require('./index-39beccb3.js');
 var promise = require('./promise-b96c61f8.js');
 
 var MasterDeck = function (_React$Component) {
@@ -170,14 +170,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) {