@mjhls/mjh-framework 1.0.42 → 1.0.44

package/dist/index.js

@@ -25,6 +25,7 @@ var Button = _interopDefault(require('react-bootstrap/Button'));
 var router = require('next/router');
 var PropTypes = _interopDefault(require('prop-types'));
 var reactBootstrap = require('react-bootstrap');
+var BlockContent = _interopDefault(require('@sanity/block-content-to-react'));
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3094,7 +3095,7 @@ var NavDvm = function NavDvm(props) {
             Nav,
             { className: 'mr-auto' },
             dataObject && dataObject.map(function (row, index) {
-              if (row.subQuery.length > 1) {
+              if (row.subQuery.length > 0) {
                 return React__default.createElement(
                   NavDropdown,
                   { key: index, title: row.name, id: 'basic-nav-dropdown' },
@@ -5629,14 +5630,15 @@ var main_49 = main.withOrientationChange;
 var AD728x90 = function AD728x90(_ref) {
   var networkID = _ref.networkID,
       adUnit = _ref.adUnit,
-      slotId = _ref.slotId;
-
+      slotId = _ref.slotId,
+      _ref$targeting = _ref.targeting,
+      targeting = _ref$targeting === undefined ? { desktop: {}, mobile: { post: 'mobile1' } } : _ref$targeting;
 
-  var minInViewPercent = 70;
+  console.log('targeting:', targeting);
 
   return React__default.createElement(
     lib_1,
-    { dfpNetworkId: networkID, sizeMapping: [{ viewport: [1024, 768], sizes: [[728, 90]] }, { viewport: [640, 480], sizes: [[320, 50], [300, 50]] }], lazyLoad: { fetchMarginPercent: 500, renderMarginPercent: 200, mobileScaling: 2.0 }, targetingArguments: { post: 'desktop1' } },
+    { dfpNetworkId: networkID, targetingArguments: targeting.desktop, sizeMapping: [{ viewport: [1024, 768], sizes: [[728, 90]] }, { viewport: [640, 480], sizes: [[320, 50], [300, 50]] }], lazyLoad: { fetchMarginPercent: 500, renderMarginPercent: 200, mobileScaling: 2.0 } },
     React__default.createElement(
       main_2,
       null,
@@ -5646,14 +5648,7 @@ var AD728x90 = function AD728x90(_ref) {
         React__default.createElement(lib_2, {
           slotId: slotId,
           sizes: [[728, 90]],
-          adUnit: adUnit,
-          sizeMapping: [{ viewport: [1024, 768], sizes: [[728, 90]] }],
-          onSlotRender: function onSlotRender(eventData) {
-            return console.log('AD728x90 rendered:', eventData);
-          },
-          onSlotIsViewable: function onSlotIsViewable(eventData) {
-            console.log('AD728x90 vieable:', eventData);
-          }
+          adUnit: adUnit
         })
       )
     ),
@@ -5666,20 +5661,8 @@ var AD728x90 = function AD728x90(_ref) {
         React__default.createElement(lib_2, {
           slotId: slotId,
           sizes: [[300, 50], [320, 50]],
-          sizeMapping: [{ viewport: [767, 480], sizes: [[320, 50], [300, 50]] }],
           adUnit: adUnit,
-          targetingArguments: { 'pos': 'mobile1' },
-          onSlotRender: function onSlotRender(eventData) {
-            return console.log('AD300x50 rendered:', eventData);
-          },
-          onSlotVisibilityChanged: function onSlotVisibilityChanged(dfpEventData) {
-            if (dfpEventData.event.inViewPercentage < minInViewPercent) {
-              lib_3.refresh(slotId);
-            }
-          },
-          onSlotIsViewable: function onSlotIsViewable(eventData) {
-            console.log('AD300x50 viewable:', eventData);
-          }
+          targetingArguments: targeting.mobile
         })
       )
     )
@@ -5711,6 +5694,11 @@ var TemplateNormal = function TemplateNormal(props) {
     }
   };
 
+  var adTargeting = { desktop: {}, mobile: {} };
+  if (horizontalAD.targeting) {
+    adTargeting = horizontalAD.targeting;
+  }
+
   function layout() {
     switch (config.columns) {
       case '1':
@@ -5744,7 +5732,7 @@ var TemplateNormal = function TemplateNormal(props) {
     horizontalAD && horizontalAD.networkID && horizontalAD.adUnit && React__default.createElement(
       Container,
       null,
-      React__default.createElement(AD728x90, { networkID: horizontalAD.networkID, adUnit: horizontalAD.adUnit })
+      React__default.createElement(AD728x90, { networkID: horizontalAD.networkID, adUnit: horizontalAD.adUnit, targeting: adTargeting })
     ),
     React__default.createElement(
       Container,
@@ -5762,19 +5750,13 @@ var AD = function AD(_ref) {
       slotId = _ref.slotId,
       sizes = _ref.sizes,
       minInViewPercent = _ref.minInViewPercent,
-      keywords = _ref.keywords;
-
+      _ref$targeting = _ref.targeting,
+      targeting = _ref$targeting === undefined ? { desktop: {} } : _ref$targeting;
 
-  var targetingArguemnts = {};
-  if (keywords) {
-    targetingArguemnts = {
-      'pos': keywords
-    };
-  }
 
   return React__default.createElement(
     lib_1,
-    { dfpNetworkId: networkID, sizeMapping: sizeMapping, lazyLoad: { fetchMarginPercent: 500, renderMarginPercent: 200, mobileScaling: 2.0 } },
+    { dfpNetworkId: networkID, targetingArguments: targeting.desktop, sizeMapping: sizeMapping, lazyLoad: { fetchMarginPercent: 500, renderMarginPercent: 200, mobileScaling: 2.0 } },
     React__default.createElement(
       'div',
       { className: className },
@@ -5782,14 +5764,7 @@ var AD = function AD(_ref) {
         slotId: slotId,
         sizes: sizes,
         adUnit: adUnit,
-        sizeMapping: sizeMapping,
-        targetingArguments: targetingArguemnts,
-        onSlotRender: function onSlotRender(eventData) {
-          return console.log('AD ' + className + ' rendered:', eventData);
-        },
-        onSlotIsViewable: function onSlotIsViewable(eventData) {
-          console.log('AD ' + className + ' viewable:', eventData);
-        }
+        sizeMapping: sizeMapping
       })
     )
   );
@@ -5807,19 +5782,22 @@ AD.propTypes = {
 
 var AD300x250 = function AD300x250(_ref) {
   var networkID = _ref.networkID,
-      adUnit = _ref.adUnit;
+      adUnit = _ref.adUnit,
+      targeting = _ref.targeting;
 
-  return React__default.createElement(AD, { networkID: networkID, adUnit: adUnit, className: 'AD300x250', sizes: [[300, 250]] });
+  return React__default.createElement(AD, { networkID: networkID, adUnit: adUnit, targeting: targeting, className: 'AD300x250', sizes: [[300, 250]] });
 };
 
 var AD300x250x600 = function AD300x250x600(_ref) {
   var networkID = _ref.networkID,
-      adUnit = _ref.adUnit;
+      adUnit = _ref.adUnit,
+      targeting = _ref.targeting;
 
   return React__default.createElement(AD, {
     networkID: networkID,
     adUnit: adUnit,
     className: 'AD300x250',
+    targeting: targeting,
     sizes: [[300, 250], [300, 600]]
   });
 };
@@ -8490,6 +8468,26 @@ var YouTubePlayer$1 = function YouTubePlayer(_ref) {
   return React__default.createElement(YouTube, { videoId: id, opts: { width: '100%' } });
 };
 
+var Sidebar = function Sidebar(_ref) {
+  var caption = _ref.caption,
+      content = _ref.content;
+
+  return React__default.createElement(
+    reactBootstrap.Card,
+    { style: { maxWidth: '50%', float: 'right' } },
+    React__default.createElement(
+      reactBootstrap.Card.Body,
+      null,
+      React__default.createElement(
+        reactBootstrap.Card.Title,
+        null,
+        caption
+      ),
+      React__default.createElement(BlockContent, { blocks: content })
+    )
+  );
+};
+
 var getSerializers = function getSerializers(client) {
   return {
     types: {
@@ -8511,6 +8509,13 @@ var getSerializers = function getSerializers(client) {
         var slides = node.slides;
 
         return React__default.createElement(Slideshow, { slides: slides });
+      },
+      sidebar: function sidebar(_ref4) {
+        var node = _ref4.node;
+        var caption = node.caption,
+            content = node.content;
+
+        return React__default.createElement(Sidebar, { caption: caption, content: content });
       }
     }
   };