@mjhls/mjh-framework 1.0.221 → 1.0.223

package/README.md

@@ -1,174 +1,174 @@
-
-# mjh-framework v. 1.0.221
-
-
-
-
-> 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.223
+
+
+
+
+> 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/AdSlot-d87cef08.js

@@ -0,0 +1,69 @@
+'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 index = require('./index-0322e486.js');
+var PropTypes = _interopDefault(require('prop-types'));
+var debounce = require('./debounce-a963b136.js');
+var _babelHelpers = require('./_babelHelpers-f321c258.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 = React.useState(false),
+      _useState2 = _babelHelpers.slicedToArray(_useState, 2),
+      adRendered = _useState2[0],
+      setAdRendered = _useState2[1];
+
+  var _useState3 = React.useState(false),
+      _useState4 = _babelHelpers.slicedToArray(_useState3, 2),
+      adRefreshable = _useState4[0],
+      setAdRefreshable = _useState4[1];
+
+  var handleVisibilityChange = debounce.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(index.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
+};
+
+exports.DFPAdSlot = DFPAdSlot;

package/dist/cjs/DeckContent.js

@@ -11,17 +11,18 @@ 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 visibilitySensor = require('./visibility-sensor-bea3105d.js');
+var visibilitySensor = require('./visibility-sensor-59b2685c.js');
 require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 var debounce = require('./debounce-a963b136.js');
 require('react-dom');
-var index$1 = require('./index-a4c53ff4.js');
+var index$1 = require('./index-eb596973.js');
 var index$2 = require('./index-0d0efcfa.js');
-var main = require('./main-58839f4e.js');
+var main = require('./main-c1bd47fe.js');
 var entities = require('./entities-3e0b4a16.js');
 var _babelHelpers = require('./_babelHelpers-f321c258.js');
+var AdSlot = require('./AdSlot-d87cef08.js');
 
 var DeckContent = function (_React$Component) {
   _babelHelpers.inherits(DeckContent, _React$Component);
@@ -162,14 +163,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) {
@@ -222,16 +223,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(_babelHelpers.toConsumableArray(arr.slice(0, index)), [newElement], _babelHelpers.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') {
@@ -239,64 +271,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.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(
-                      index$2.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(AdSlot.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.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
+                        index$2.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,
-                      visibilitySensor.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,
-                      entities.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,
+                        visibilitySensor.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,
+                        entities.clean_html_1(row.summary)
+                      )
                     )
                   )
                 )
-              )
-            ),
-            main.main_36 && _this.props.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && _this.renderMobileAd(index, numberOfItemsBeforeAd)
-          );
+              ),
+              main.main_36 && _this.props.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && _this.renderMobileAd(index, numberOfItemsBeforeAd)
+            );
+          }
         })
       );
     }, _this.renderMobileAd = function (index, numberOfItemsBeforeAd) {
@@ -360,7 +415,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(
@@ -375,7 +432,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(
@@ -389,7 +446,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/cjs/DeckQueue.js

@@ -11,15 +11,15 @@ 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 visibilitySensor = require('./visibility-sensor-bea3105d.js');
+var visibilitySensor = require('./visibility-sensor-59b2685c.js');
 require('next/link');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 var debounce = require('./debounce-a963b136.js');
 require('react-dom');
-var index$1 = require('./index-a4c53ff4.js');
+var index$1 = require('./index-eb596973.js');
 var index$2 = require('./index-0d0efcfa.js');
-var main = require('./main-58839f4e.js');
+var main = require('./main-c1bd47fe.js');
 var entities = require('./entities-3e0b4a16.js');
 var _babelHelpers = require('./_babelHelpers-f321c258.js');
 var get$1 = require('./get-126b1712.js');