@mjhls/mjh-framework 1.0.285 → 1.0.287

package/README.md

@@ -1,171 +1,171 @@
-
-# mjh-framework v. 1.0.285
-
-> 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.287
+
+> 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-a33644bc.js → ADInfeed-db54195d.js}

@@ -6,7 +6,7 @@ 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-1886ea26.js');
+var AdSlot = require('./AdSlot-0cd6f861.js');
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/cjs/{AdSlot-1886ea26.js → AdSlot-0cd6f861.js}

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

package/dist/cjs/DeckContent.js

@@ -23,13 +23,13 @@ require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('react-dom');
-var index = require('./index-39beccb3.js');
+var index = require('./index-be0c82be.js');
 var index$1 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
 require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-1886ea26.js');
+require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
-var ADInfeed = require('./ADInfeed-a33644bc.js');
+var ADInfeed = require('./ADInfeed-db54195d.js');
 
 var DeckContent = function (_React$Component) {
   inherits$2._inherits(DeckContent, _React$Component);
@@ -170,14 +170,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) {

package/dist/cjs/DeckQueue.js

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

package/dist/cjs/{Figure-a7cd5161.js → Figure-8789df2d.js}

@@ -8,7 +8,7 @@ require('./web.dom.iterable-0998bdc3.js');
 require('./core.get-iterator-method-e049ca4a.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-var index = require('./index-39beccb3.js');
+var index = require('./index-be0c82be.js');
 var slicedToArray = require('./slicedToArray-e38fb29d.js');
 var reactBootstrap = require('react-bootstrap');
 

package/dist/cjs/{GridContent-26572c38.js → GridContent-fa2e1b56.js}

@@ -17,14 +17,14 @@ var visibilitySensor = require('./visibility-sensor-b72d9527.js');
 require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
-var index = require('./index-39beccb3.js');
+var index = require('./index-be0c82be.js');
 var index$1 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
-var ADInfeed = require('./ADInfeed-a33644bc.js');
+var ADInfeed = require('./ADInfeed-db54195d.js');
 var get$1 = require('./get-de2660c3.js');
 
 var Dfp = React__default.lazy(function () {
-  return new Promise(function (resolve) { resolve(require('./Dfp-f75c65fd.js')); });
+  return Promise.resolve().then(function () { return require('./Dfp-f75c65fd.js'); });
 });
 
 var AD = function AD(props) {

package/dist/cjs/GridContent.js

@@ -19,15 +19,15 @@ require('./visibility-sensor-b72d9527.js');
 require('next/link');
 require('next/router');
 require('react-dom');
-require('./index-39beccb3.js');
+require('./index-be0c82be.js');
 require('./index-fa0fb52c.js');
 require('./entities-310b46ee.js');
 require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-1886ea26.js');
+require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
-require('./ADInfeed-a33644bc.js');
+require('./ADInfeed-db54195d.js');
 require('./get-de2660c3.js');
-var GridContent = require('./GridContent-26572c38.js');
+var GridContent = require('./GridContent-fa2e1b56.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 = require('./index-39beccb3.js');
+var index = require('./index-be0c82be.js');
 var index$1 = 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 = require('./index-39beccb3.js');
+var index = require('./index-be0c82be.js');
 var index$1 = require('./index-fa0fb52c.js');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 

package/dist/cjs/MasterDeck.js

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

package/dist/cjs/{Normal-92be86eb.js → Normal-39da6300.js}

@@ -12,7 +12,7 @@ var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
 var Link = _interopDefault(require('next/link'));
 var slicedToArray = require('./slicedToArray-e38fb29d.js');
-var AdSlot = require('./AdSlot-1886ea26.js');
+var AdSlot = require('./AdSlot-0cd6f861.js');
 var get$1 = require('./get-de2660c3.js');
 var reactBootstrap = require('react-bootstrap');
 var index_esm = require('./index.esm-340d3792.js');
@@ -674,8 +674,8 @@ var renderLink = function renderLink(row) {
 };
 
 var SideFooter = function SideFooter(props) {
-  /*
-  useage example: <SideFooter cache={props.cache} logo='https://mjh-web.s3.amazonaws.com/_media/an_mjhls_brand_logo.png' />
+  /*
+  useage example: <SideFooter cache={props.cache} logo='https://mjh-web.s3.amazonaws.com/_media/an_mjhls_brand_logo.png' />
   */
   var _get = get$1.get_1(props, 'cache.siteSettingCache', {}),
       socialLinks = _get.socialLinks,
@@ -1248,15 +1248,15 @@ var SocialNavFooter = function SocialNavFooter(props) {
 };
 
 var NavMagazine = function NavMagazine(props) {
-  /*
-  Example Nav with acceptable props
-    <MagazineNav
-     showLogin
-     logo={props.settings.logo}
-     dataObject={props.cache.mainNavCache}
-     website={website}
-     subNav={props.cache.subNavCache}
-      />
+  /*
+  Example Nav with acceptable props
+   <MagazineNav
+     showLogin
+     logo={props.settings.logo}
+     dataObject={props.cache.mainNavCache}
+     website={website}
+     subNav={props.cache.subNavCache}
+      />
   */
 
   var logo = props.logo,
@@ -1568,15 +1568,15 @@ var NavMagazine = function NavMagazine(props) {
 var MagazineNav = React__default.memo(NavMagazine);
 
 var NavNative = function NavNative(props) {
-  /*
-  Example Nav with acceptable props
-    <MagazineNav
-     showLogin
-     logo={props.settings.logo}
-     dataObject={props.cache.mainNavCache}
-     website={website}
-     subNav={props.cache.subNavCache}
-      />
+  /*
+  Example Nav with acceptable props
+   <MagazineNav
+     showLogin
+     logo={props.settings.logo}
+     dataObject={props.cache.mainNavCache}
+     website={website}
+     subNav={props.cache.subNavCache}
+      />
   */
 
   var logo = props.logo,
@@ -1970,15 +1970,15 @@ var NavDvm = function NavDvm(props) {
 };
 
 var HamMagazine = function HamMagazine(props) {
-  /*
-  Example Nav with acceptable props
-  <MagazineNav
-     showLogin
-     logo={props.settings.logo}
-     dataObject={props.cache.mainNavCache}
-     website={website}
-     subNav={props.cache.subNavCache}
-      />
+  /*
+  Example Nav with acceptable props
+  <MagazineNav
+     showLogin
+     logo={props.settings.logo}
+     dataObject={props.cache.mainNavCache}
+     website={website}
+     subNav={props.cache.subNavCache}
+      />
   */
 
   var logo = props.logo,

package/dist/cjs/PublicationDeck.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 = require('./index-39beccb3.js');
+var index = require('./index-be0c82be.js');
 var index$1 = require('./index-fa0fb52c.js');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 

package/dist/cjs/QueueDeckExpanded.js

@@ -19,13 +19,13 @@ require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('react-dom');
-var index = require('./index-39beccb3.js');
+var index = require('./index-be0c82be.js');
 var index$1 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
 var slicedToArray = require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-1886ea26.js');
+require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
-var ADInfeed = require('./ADInfeed-a33644bc.js');
+var ADInfeed = require('./ADInfeed-db54195d.js');
 var reactBootstrap = require('react-bootstrap');
 
 var urlFor = function urlFor(source, builder) {

package/dist/cjs/{TaxonomyCard-cf5bbc07.js → TaxonomyCard-7ba4a872.js}

@@ -10,7 +10,7 @@ var Container = _interopDefault(require('react-bootstrap/Container'));
 var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
 var Card = _interopDefault(require('react-bootstrap/Card'));
-var index = require('./index-39beccb3.js');
+var index = require('./index-be0c82be.js');
 var index$1 = require('./index-fa0fb52c.js');
 
 /*