@mjhls/mjh-framework 1.0.270 → 1.0.272

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.270
+# mjh-framework v. 1.0.272
 
 > Foundation Framework
 

package/dist/cjs/{ADInfeed-0da6acd4.js → ADInfeed-f560c2f9.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-93d892f5.js');
+var AdSlot = require('./AdSlot-f69a31ec.js');
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

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

@@ -1114,7 +1114,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
   }, 500);
 
   var matchAd = function matchAd(element) {
-    return slotId.includes(element);
+    return slotId && slotId.includes(element);
   };
 
   return React__default.createElement(

package/dist/cjs/DeckContent.js

@@ -28,9 +28,9 @@ var index$1 = require('./index-be0c82be.js');
 var index$2 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
 require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-93d892f5.js');
+require('./AdSlot-f69a31ec.js');
 require('./promise-b96c61f8.js');
-var ADInfeed = require('./ADInfeed-0da6acd4.js');
+var ADInfeed = require('./ADInfeed-f560c2f9.js');
 
 var DeckContent = function (_React$Component) {
   inherits$2._inherits(DeckContent, _React$Component);

package/dist/cjs/{GridContent-81563bbb.js → GridContent-df5951a1.js}

@@ -21,7 +21,7 @@ var Router__default = _interopDefault(Router);
 var index$1 = require('./index-be0c82be.js');
 var index$2 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
-var ADInfeed = require('./ADInfeed-0da6acd4.js');
+var ADInfeed = require('./ADInfeed-f560c2f9.js');
 var get$1 = require('./get-1f91592f.js');
 
 var Dfp = React__default.lazy(function () {

package/dist/cjs/GridContent.js

@@ -24,11 +24,11 @@ require('./index-be0c82be.js');
 require('./index-fa0fb52c.js');
 require('./entities-310b46ee.js');
 require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-93d892f5.js');
+require('./AdSlot-f69a31ec.js');
 require('./promise-b96c61f8.js');
-require('./ADInfeed-0da6acd4.js');
+require('./ADInfeed-f560c2f9.js');
 require('./get-1f91592f.js');
-var GridContent = require('./GridContent-81563bbb.js');
+var GridContent = require('./GridContent-df5951a1.js');
 
 
 

package/dist/cjs/{Normal-05dd6f72.js → Normal-47f04b2b.js}

@@ -13,7 +13,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-93d892f5.js');
+var AdSlot = require('./AdSlot-f69a31ec.js');
 var get$1 = require('./get-1f91592f.js');
 var reactBootstrap = require('react-bootstrap');
 var index_esm = require('./index.esm-340d3792.js');
@@ -1297,7 +1297,6 @@ var NavMagazine = function NavMagazine(props) {
 
   React.useEffect(function () {
     var navOffsetTop = navRef.current.getBoundingClientRect().top;
-    var navOffsetHeight = navRef.current.getBoundingClientRect().height;
     var adSection = document.querySelector('.AD728x90');
     var stickyNav = window.addEventListener('scroll', function () {
       if (window.pageYOffset > navOffsetTop) {
@@ -1306,7 +1305,6 @@ var NavMagazine = function NavMagazine(props) {
           navRef.current.style.top = 0;
           navRef.current.style.width = '100%';
           navRef.current.style.zIndex = '9999';
-          adSection.style.marginTop = navOffsetHeight + 'px';
         }
       } else {
         if (navRef.current && navRef.current.style) {
@@ -2071,7 +2069,6 @@ var HamMagazine = function HamMagazine(props) {
 
   React.useEffect(function () {
     var navOffsetTop = navRef.current.getBoundingClientRect().top;
-    var navOffsetHeight = navRef.current.getBoundingClientRect().height;
     var adSection = document.querySelector('.AD728x90');
     var stickyNav = window.addEventListener('scroll', function () {
       if (window.pageYOffset > navOffsetTop) {
@@ -2080,7 +2077,6 @@ var HamMagazine = function HamMagazine(props) {
           navRef.current.style.top = 0;
           navRef.current.style.width = '100%';
           navRef.current.style.zIndex = '9999';
-          adSection.style.marginTop = navOffsetHeight + 'px';
         }
       } else {
         if (navRef.current && navRef.current.style) {
@@ -2371,8 +2367,29 @@ var AD728x90 = function AD728x90(_ref) {
       adTargeting = _useState4[0],
       setTargeting = _useState4[1];
 
+  var adRef = React.useRef(null);
+
   React.useEffect(function () {
     if (window && window.innerWidth && window.innerWidth < 768) {
+      var navbar = document.querySelector('.navbar');
+      var AdOffsetTop = adRef.current.getBoundingClientRect().top;
+      window.addEventListener('scroll', function () {
+        if (window.pageYOffset + (AdOffsetTop - navbar.offsetHeight) > AdOffsetTop) {
+          if (adRef.current && adRef.current.style) {
+            adRef.current.style.position = 'fixed';
+            adRef.current.style.top = '60px';
+            adRef.current.style.left = '0px';
+            adRef.current.style.zIndex = '9999';
+            adRef.current.style.width = '100%';
+            adRef.current.style.marginTop = '2px';
+          }
+        } else {
+          if (adRef.current && adRef.current.style) {
+            adRef.current.style.position = 'relative';
+            adRef.current.style.top = '';
+          }
+        }
+      });
       setMobileView(true);
       adTargeting['pos'] = pos && pos.length ? pos : 'top-mobile';
     } else {
@@ -2384,21 +2401,25 @@ var AD728x90 = function AD728x90(_ref) {
   var browserSizes = [[728, 90], [970, 90], [320, 50], [300, 50]];
   var mobileSizes = [[320, 50], [300, 50]];
 
-  return React__default.createElement(AdSlot.DFPAdSlot, {
-    slotId: slotId,
-    networkID: networkID,
-    adUnit: adUnit,
-    targeting: adTargeting,
-    className: 'AD728x90',
-    sizes: mobileView ? mobileSizes : browserSizes,
-    sizeMapping: [{
-      viewport: [768, 1],
-      sizes: [[728, 90], [970, 90]]
-    }, {
-      viewport: [1, 1],
-      sizes: [[320, 50], [300, 50]]
-    }]
-  });
+  return React__default.createElement(
+    'div',
+    { className: 'leaderboard-ad-wrapper', ref: adRef, style: { backgroundColor: '#fff' } },
+    React__default.createElement(AdSlot.DFPAdSlot, {
+      slotId: slotId,
+      networkID: networkID,
+      adUnit: adUnit,
+      targeting: adTargeting,
+      className: 'AD728x90',
+      sizes: mobileView ? mobileSizes : browserSizes,
+      sizeMapping: [{
+        viewport: [768, 1],
+        sizes: [[728, 90], [970, 90]]
+      }, {
+        viewport: [1, 1],
+        sizes: [[320, 50], [300, 50]]
+      }]
+    })
+  );
 };
 
 // Main

package/dist/cjs/TemplateNormal.js

@@ -15,13 +15,13 @@ require('react-bootstrap/Row');
 require('react-bootstrap/Col');
 require('next/link');
 require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-93d892f5.js');
+require('./AdSlot-f69a31ec.js');
 require('./promise-b96c61f8.js');
 require('./get-1f91592f.js');
 require('react-bootstrap');
 require('./index.esm-340d3792.js');
 require('react-bootstrap/Button');
-var TemplateNormal = require('./Normal-05dd6f72.js');
+var TemplateNormal = require('./Normal-47f04b2b.js');
 require('react-bootstrap/ListGroup');
 require('next/head');
 require('react-bootstrap/Nav');

package/dist/cjs/index.js

@@ -30,12 +30,12 @@ var index$1 = require('./index-be0c82be.js');
 require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
 var slicedToArray = require('./slicedToArray-e38fb29d.js');
-var AdSlot = require('./AdSlot-93d892f5.js');
+var AdSlot = require('./AdSlot-f69a31ec.js');
 require('./promise-b96c61f8.js');
-require('./ADInfeed-0da6acd4.js');
+require('./ADInfeed-f560c2f9.js');
 var DeckContent = require('./DeckContent.js');
 require('./get-1f91592f.js');
-var GridContent = require('./GridContent-81563bbb.js');
+var GridContent = require('./GridContent-df5951a1.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
 var ThumbnailCard = require('./ThumbnailCard.js');
@@ -53,7 +53,7 @@ var IssueDeck = require('./IssueDeck.js');
 require('react-bootstrap/Badge');
 var IssueContentDeck = require('./IssueContentDeck.js');
 var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
-var TemplateNormal = require('./Normal-05dd6f72.js');
+var TemplateNormal = require('./Normal-47f04b2b.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -2742,7 +2742,7 @@ var SocialShare = function SocialShare(props) {
       { url: shareUrl, title: shareTitle, via: shareVia },
       React__default.createElement(reactShare.LinkedinIcon, { size: size, round: true })
     ),
-    React__default.createElement(
+    !props.hidePinterest && React__default.createElement(
       reactShare.PinterestShareButton,
       { url: shareUrl, media: shareImage, description: shareSummary },
       React__default.createElement(reactShare.PinterestIcon, { size: size, round: true })

package/dist/esm/{ADInfeed-e546ea87.js → ADInfeed-a77b2850.js}

@@ -1,7 +1,7 @@
 import React__default, { useState } from 'react';
 import Card from 'react-bootstrap/Card';
 import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import { D as DFPAdSlot } from './AdSlot-9b4ae186.js';
+import { D as DFPAdSlot } from './AdSlot-69bf3195.js';
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/esm/{AdSlot-9b4ae186.js → AdSlot-69bf3195.js}

@@ -1109,7 +1109,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
   }, 500);
 
   var matchAd = function matchAd(element) {
-    return slotId.includes(element);
+    return slotId && slotId.includes(element);
   };
 
   return React__default.createElement(

package/dist/esm/DeckContent.js

@@ -22,9 +22,9 @@ import { i as imageUrlBuilder } from './index-73819142.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
 import './slicedToArray-d0a9593a.js';
-import './AdSlot-9b4ae186.js';
+import './AdSlot-69bf3195.js';
 import './promise-683a9c54.js';
-import { A as ADInfeed } from './ADInfeed-e546ea87.js';
+import { A as ADInfeed } from './ADInfeed-a77b2850.js';
 
 var DeckContent = function (_React$Component) {
   _inherits(DeckContent, _React$Component);

package/dist/esm/{GridContent-b2edf91a.js → GridContent-8479e775.js}

@@ -15,7 +15,7 @@ import { withRouter } from 'next/router';
 import { i as imageUrlBuilder } from './index-73819142.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
-import { A as ADInfeed } from './ADInfeed-e546ea87.js';
+import { A as ADInfeed } from './ADInfeed-a77b2850.js';
 import { g as get_1 } from './get-b2201dc8.js';
 
 var Dfp = React__default.lazy(function () {

package/dist/esm/GridContent.js

@@ -22,8 +22,8 @@ import './index-73819142.js';
 import './index-5f9f807a.js';
 import './entities-7cc3bf45.js';
 import './slicedToArray-d0a9593a.js';
-import './AdSlot-9b4ae186.js';
+import './AdSlot-69bf3195.js';
 import './promise-683a9c54.js';
-import './ADInfeed-e546ea87.js';
+import './ADInfeed-a77b2850.js';
 import './get-b2201dc8.js';
-export { G as default } from './GridContent-b2edf91a.js';
+export { G as default } from './GridContent-8479e775.js';

package/dist/esm/{Normal-ccc2f7f8.js → Normal-3e5ad3d1.js}

@@ -8,7 +8,7 @@ import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import Link from 'next/link';
 import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import { D as DFPAdSlot } from './AdSlot-9b4ae186.js';
+import { D as DFPAdSlot } from './AdSlot-69bf3195.js';
 import { g as get_1 } from './get-b2201dc8.js';
 import { Dropdown } from 'react-bootstrap';
 import { G as GenIcon, b as IoMdLogIn, c as IoIosHome } from './index.esm-536609db.js';
@@ -1292,7 +1292,6 @@ var NavMagazine = function NavMagazine(props) {
 
   useEffect(function () {
     var navOffsetTop = navRef.current.getBoundingClientRect().top;
-    var navOffsetHeight = navRef.current.getBoundingClientRect().height;
     var adSection = document.querySelector('.AD728x90');
     var stickyNav = window.addEventListener('scroll', function () {
       if (window.pageYOffset > navOffsetTop) {
@@ -1301,7 +1300,6 @@ var NavMagazine = function NavMagazine(props) {
           navRef.current.style.top = 0;
           navRef.current.style.width = '100%';
           navRef.current.style.zIndex = '9999';
-          adSection.style.marginTop = navOffsetHeight + 'px';
         }
       } else {
         if (navRef.current && navRef.current.style) {
@@ -2066,7 +2064,6 @@ var HamMagazine = function HamMagazine(props) {
 
   useEffect(function () {
     var navOffsetTop = navRef.current.getBoundingClientRect().top;
-    var navOffsetHeight = navRef.current.getBoundingClientRect().height;
     var adSection = document.querySelector('.AD728x90');
     var stickyNav = window.addEventListener('scroll', function () {
       if (window.pageYOffset > navOffsetTop) {
@@ -2075,7 +2072,6 @@ var HamMagazine = function HamMagazine(props) {
           navRef.current.style.top = 0;
           navRef.current.style.width = '100%';
           navRef.current.style.zIndex = '9999';
-          adSection.style.marginTop = navOffsetHeight + 'px';
         }
       } else {
         if (navRef.current && navRef.current.style) {
@@ -2366,8 +2362,29 @@ var AD728x90 = function AD728x90(_ref) {
       adTargeting = _useState4[0],
       setTargeting = _useState4[1];
 
+  var adRef = useRef(null);
+
   useEffect(function () {
     if (window && window.innerWidth && window.innerWidth < 768) {
+      var navbar = document.querySelector('.navbar');
+      var AdOffsetTop = adRef.current.getBoundingClientRect().top;
+      window.addEventListener('scroll', function () {
+        if (window.pageYOffset + (AdOffsetTop - navbar.offsetHeight) > AdOffsetTop) {
+          if (adRef.current && adRef.current.style) {
+            adRef.current.style.position = 'fixed';
+            adRef.current.style.top = '60px';
+            adRef.current.style.left = '0px';
+            adRef.current.style.zIndex = '9999';
+            adRef.current.style.width = '100%';
+            adRef.current.style.marginTop = '2px';
+          }
+        } else {
+          if (adRef.current && adRef.current.style) {
+            adRef.current.style.position = 'relative';
+            adRef.current.style.top = '';
+          }
+        }
+      });
       setMobileView(true);
       adTargeting['pos'] = pos && pos.length ? pos : 'top-mobile';
     } else {
@@ -2379,21 +2396,25 @@ var AD728x90 = function AD728x90(_ref) {
   var browserSizes = [[728, 90], [970, 90], [320, 50], [300, 50]];
   var mobileSizes = [[320, 50], [300, 50]];
 
-  return React__default.createElement(DFPAdSlot, {
-    slotId: slotId,
-    networkID: networkID,
-    adUnit: adUnit,
-    targeting: adTargeting,
-    className: 'AD728x90',
-    sizes: mobileView ? mobileSizes : browserSizes,
-    sizeMapping: [{
-      viewport: [768, 1],
-      sizes: [[728, 90], [970, 90]]
-    }, {
-      viewport: [1, 1],
-      sizes: [[320, 50], [300, 50]]
-    }]
-  });
+  return React__default.createElement(
+    'div',
+    { className: 'leaderboard-ad-wrapper', ref: adRef, style: { backgroundColor: '#fff' } },
+    React__default.createElement(DFPAdSlot, {
+      slotId: slotId,
+      networkID: networkID,
+      adUnit: adUnit,
+      targeting: adTargeting,
+      className: 'AD728x90',
+      sizes: mobileView ? mobileSizes : browserSizes,
+      sizeMapping: [{
+        viewport: [768, 1],
+        sizes: [[728, 90], [970, 90]]
+      }, {
+        viewport: [1, 1],
+        sizes: [[320, 50], [300, 50]]
+      }]
+    })
+  );
 };
 
 // Main

package/dist/esm/TemplateNormal.js

@@ -13,13 +13,13 @@ import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'next/link';
 import './slicedToArray-d0a9593a.js';
-import './AdSlot-9b4ae186.js';
+import './AdSlot-69bf3195.js';
 import './promise-683a9c54.js';
 import './get-b2201dc8.js';
 import 'react-bootstrap';
 import './index.esm-536609db.js';
 import 'react-bootstrap/Button';
-export { T as default } from './Normal-ccc2f7f8.js';
+export { T as default } from './Normal-3e5ad3d1.js';
 import 'react-bootstrap/ListGroup';
 import 'next/head';
 import 'react-bootstrap/Nav';

package/dist/esm/index.js

@@ -22,13 +22,13 @@ import { i as imageUrlBuilder } from './index-73819142.js';
 import './index-5f9f807a.js';
 import { h as html_decode_1, c as clean_html_1 } from './entities-7cc3bf45.js';
 import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import { _ as _JSON$stringify, a as _asyncToGenerator, r as regenerator, D as DFPAdSlot, B as Beam } from './AdSlot-9b4ae186.js';
-export { D as AdSlot, B as Beam } from './AdSlot-9b4ae186.js';
+import { _ as _JSON$stringify, a as _asyncToGenerator, r as regenerator, D as DFPAdSlot, B as Beam } from './AdSlot-69bf3195.js';
+export { D as AdSlot, B as Beam } from './AdSlot-69bf3195.js';
 import './promise-683a9c54.js';
-import './ADInfeed-e546ea87.js';
+import './ADInfeed-a77b2850.js';
 export { default as DeckContent } from './DeckContent.js';
 import './get-b2201dc8.js';
-export { A as AD, G as GridContent } from './GridContent-b2edf91a.js';
+export { A as AD, G as GridContent } from './GridContent-8479e775.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
 export { default as ThumbnailCard } from './ThumbnailCard.js';
@@ -49,8 +49,8 @@ export { default as IssueDeck } from './IssueDeck.js';
 import 'react-bootstrap/Badge';
 export { default as IssueContentDeck } from './IssueContentDeck.js';
 import Spinner from 'react-bootstrap/Spinner';
-import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-ccc2f7f8.js';
-export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-ccc2f7f8.js';
+import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-3e5ad3d1.js';
+export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-3e5ad3d1.js';
 import 'react-bootstrap/ListGroup';
 import Head from 'next/head';
 import Accordion from 'react-bootstrap/Accordion';
@@ -2740,7 +2740,7 @@ var SocialShare = function SocialShare(props) {
       { url: shareUrl, title: shareTitle, via: shareVia },
       React__default.createElement(LinkedinIcon, { size: size, round: true })
     ),
-    React__default.createElement(
+    !props.hidePinterest && React__default.createElement(
       PinterestShareButton,
       { url: shareUrl, media: shareImage, description: shareSummary },
       React__default.createElement(PinterestIcon, { size: size, round: true })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.270",
+  "version": "1.0.272",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",