@mjhls/mjh-framework 1.0.694-beta.3 → 1.0.695

package/dist/esm/{index-0e45a0b2.js → index-93ec3c59.js}

@@ -722,6 +722,8 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
 
     return new Promise(function (resolve) {
       _this3.getGoogletag().then(function (googletag) {
+        _this3.configureInitialOptions(googletag);
+
         slotsToInitialize.forEach(function (currentSlotId) {
           registeredSlots[currentSlotId].loading = false;
           googletag.cmd.push(function () {
@@ -785,14 +787,25 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
       });
     });
   },
-  configureOptions: function configureOptions(googletag) {
+  // configure those gpt parameters that need to be set before pubsads service
+  // initialization.
+  configureInitialOptions: function configureInitialOptions(googletag) {
     var _this4 = this;
 
+    googletag.cmd.push(function () {
+      if (_this4.disableInitialLoadIsEnabled()) {
+        googletag.pubads().disableInitialLoad();
+      }
+    });
+  },
+  configureOptions: function configureOptions(googletag) {
+    var _this5 = this;
+
     googletag.cmd.push(function () {
       var pubadsService = googletag.pubads();
-      pubadsService.setRequestNonPersonalizedAds(_this4.personalizedAdsEnabled() ? 0 : 1);
+      pubadsService.setRequestNonPersonalizedAds(_this5.personalizedAdsEnabled() ? 0 : 1);
 
-      var targetingArguments = _this4.getTargetingArguments(); // set global targetting arguments
+      var targetingArguments = _this5.getTargetingArguments(); // set global targetting arguments
 
 
       Object.keys(targetingArguments).forEach(function (varName) {
@@ -801,34 +814,28 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         }
       }); // set global adSense attributes
 
-      var adSenseAttributes = _this4.getAdSenseAttributes();
+      var adSenseAttributes = _this5.getAdSenseAttributes();
 
       Object.keys(adSenseAttributes).forEach(function (key) {
         pubadsService.set(key, adSenseAttributes[key]);
       });
 
-      if (_this4.lazyLoadIsEnabled()) {
-        var args = [];
-
-        var config = _this4.getLazyLoadConfig();
+      if (_this5.lazyLoadIsEnabled()) {
+        var config = _this5.getLazyLoadConfig();
 
-        if (config !== null) {
-          args.push(config);
+        if (config) {
+          pubadsService.enableLazyLoad(config);
+        } else {
+          pubadsService.enableLazyLoad();
         }
-
-        pubadsService.enableLazyLoad.call(args);
       }
 
-      if (_this4.singleRequestIsEnabled()) {
+      if (_this5.singleRequestIsEnabled()) {
         pubadsService.enableSingleRequest();
       }
 
-      if (_this4.disableInitialLoadIsEnabled()) {
-        pubadsService.disableInitialLoad();
-      }
-
-      if (_this4.collapseEmptyDivs === true || _this4.collapseEmptyDivs === false) {
-        pubadsService.collapseEmptyDivs(_this4.collapseEmptyDivs);
+      if (_this5.collapseEmptyDivs === true || _this5.collapseEmptyDivs === false) {
+        pubadsService.collapseEmptyDivs(_this5.collapseEmptyDivs);
       }
     });
   },
@@ -870,10 +877,10 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     }
   },
   gptRefreshAds: function gptRefreshAds(slots) {
-    var _this5 = this;
+    var _this6 = this;
 
     return this.getGoogletag().then(function (googletag) {
-      _this5.configureOptions(googletag);
+      _this6.configureOptions(googletag);
 
       googletag.cmd.push(function () {
         var pubadsService = googletag.pubads();
@@ -884,14 +891,14 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   reload: function reload() {
-    var _this6 = this;
+    var _this7 = this;
 
     return this.destroyGPTSlots.apply(this, arguments).then(function () {
-      return _this6.load();
+      return _this7.load();
     });
   },
   destroyGPTSlots: function destroyGPTSlots() {
-    var _this7 = this;
+    var _this8 = this;
 
     for (var _len4 = arguments.length, slotsToDestroy = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
       slotsToDestroy[_key4] = arguments[_key4];
@@ -911,7 +918,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         slots.push(slot);
       }
 
-      _this7.getGoogletag().then(function (googletag) {
+      _this8.getGoogletag().then(function (googletag) {
         googletag.cmd.push(function () {
           if (managerAlreadyInitialized === true) {
             if (slotsToDestroy.length > 0) {
@@ -934,7 +941,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   registerSlot: function registerSlot(_ref) {
-    var _this8 = this;
+    var _this9 = this;
 
     var slotId = _ref.slotId,
         dfpNetworkId = _ref.dfpNetworkId,
@@ -973,7 +980,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
                 gptSlot = slot.gptSlot;
 
             if (loading === false && !gptSlot) {
-              _this8.load(slotId);
+              _this9.load(slotId);
             }
           }
         });

package/dist/esm/{index-ef6d5dcf.js → index-d2f90501.js}

@@ -1,5 +1,5 @@
 import { c as createCommonjsModule, a as commonjsGlobal, g as getCjsExportFromNamespace } from './_commonjsHelpers-0c4b6f40.js';
-import { m as moment } from './moment-e2f9b20c.js';
+import { m as moment } from './moment-12415288.js';
 
 var momentTimezone = createCommonjsModule(function (module) {
 //! moment-timezone.js

package/dist/esm/{index.es-29c1cef5.js → index.es-938a3a58.js}

@@ -263,6 +263,9 @@ var InfiniteScroll = /** @class */ (function (_super) {
             _this.dragging = false;
             if (_this.state.pullToRefreshThresholdBreached) {
                 _this.props.refreshFunction && _this.props.refreshFunction();
+                _this.setState({
+                    pullToRefreshThresholdBreached: false,
+                });
             }
             requestAnimationFrame(function () {
                 // this._infScroll
@@ -369,7 +372,6 @@ var InfiniteScroll = /** @class */ (function (_super) {
         // update state when new data was sent in
         this.setState({
             showLoader: false,
-            pullToRefreshThresholdBreached: false,
         });
     };
     InfiniteScroll.prototype.isElementAtBottom = function (target, scrollThreshold) {

package/dist/esm/index.js

@@ -14,22 +14,22 @@ import './web.dom.iterable-8956f9a5.js';
 import './typeof-08f2c380.js';
 import './_is-array-49698029.js';
 import 'react';
-import './index-0e45a0b2.js';
+import './index-93ec3c59.js';
 import 'prop-types';
 import 'react-bootstrap/Container';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'react-bootstrap/Card';
-import './moment-e2f9b20c.js';
+import './moment-12415288.js';
 import 'next/router';
 import './isSymbol-807e927e.js';
 import './debounce-1a993acf.js';
-import './index.es-29c1cef5.js';
+import './index.es-938a3a58.js';
 import 'react-dom';
 import './visibility-sensor-0baa4eea.js';
-import './index-73819142.js';
+import './index-51a80699.js';
 import './index-5f9f807a.js';
-import './main-5d1e4bd3.js';
+import './main-0465b2a0.js';
 import './entities-7cc3bf45.js';
 import './stringify-008c8802.js';
 import './slicedToArray-7021e5df.js';
@@ -38,10 +38,10 @@ import './_set-species-cede29f8.js';
 export { default as Segment } from './Segment.js';
 export { default as Beam } from './Beam.js';
 export { default as AdSlot } from './AdSlot.js';
-import './ADInfeed-eae71d07.js';
+import './ADInfeed-205cb7a9.js';
 export { default as DeckContent } from './DeckContent.js';
 import './lodash-17fdfebb.js';
-import './ADlgInfeed-c619fe64.js';
+import './ADlgInfeed-e538f17a.js';
 import './getContentCategory-15dcc413.js';
 import './get-5ee14cda.js';
 export { default as AD } from './AD.js';
@@ -50,7 +50,7 @@ export { default as GridContent } from './GridContent.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
 export { default as ThumbnailCard } from './ThumbnailCard.js';
-import './BlockContent-e9b4ddcf.js';
+import './BlockContent-a614acdf.js';
 import './react-social-icons-a7d5c5c7.js';
 export { default as TaxonomyCard } from './TaxonomyCard.js';
 export { default as RolesDeck } from './RolesDeck.js';
@@ -76,10 +76,10 @@ import './defineProperty-b798470d.js';
 export { default as EventsDeck } from './EventsDeck.js';
 import 'react-bootstrap/Spinner';
 import 'react-bootstrap/Form';
-import './index-ef6d5dcf.js';
+import './index-d2f90501.js';
 import './js.cookie-6874175c.js';
 export { default as CMEDeck } from './CMEDeck.js';
-export { g as getSerializers } from './index-c376cd8e.js';
+export { g as getSerializers } from './index-754010eb.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';
@@ -110,7 +110,7 @@ import './NavFooter-e27bd93b.js';
 import './index.esm-fd746768.js';
 export { default as SocialIcons } from './SocialIcons.js';
 import 'react-bootstrap/FormControl';
-import './SocialSearchComponent-93233334.js';
+import './SocialSearchComponent-7f14e0f3.js';
 export { default as NavMagazine } from './NavMagazine.js';
 export { NavNative } from './NavNative.js';
 export { default as Search } from './Search.js';

package/dist/esm/{main-5d1e4bd3.js → main-0465b2a0.js}

@@ -48,7 +48,7 @@ var getNavigatorInstance = function getNavigatorInstance() {
 };
 var isIOS13Check = function isIOS13Check(type) {
   var nav = getNavigatorInstance();
-  return nav && (nav.platform.includes(type) || nav.platform === 'MacIntel' && nav.maxTouchPoints > 1 && !window.MSStream);
+  return nav && nav.platform && (nav.platform.indexOf(type) !== -1 || nav.platform === 'MacIntel' && nav.maxTouchPoints > 1 && !window.MSStream);
 };
 
 function _typeof(obj) {
@@ -219,12 +219,15 @@ var BROWSER_TYPES = {
   EDGE: "Edge",
   CHROMIUM: "Chromium",
   IE: 'IE',
-  MOBILE_SAFARI: "Mobile Safari"
+  MOBILE_SAFARI: "Mobile Safari",
+  EDGE_CHROMIUM: "Edge Chromium"
 };
 var OS_TYPES = {
   IOS: 'iOS',
   ANDROID: "Android",
-  WINDOWS_PHONE: "Windows Phone"
+  WINDOWS_PHONE: "Windows Phone",
+  WINDOWS: 'Windows',
+  MAC_OS: 'Mac OS'
 };
 var initialData = {
   isMobile: false,
@@ -377,6 +380,14 @@ var isMobileAndTabletType = function isMobileAndTabletType() {
   }
 };
 
+var isEdgeChromiumType = function isEdgeChromiumType() {
+  if (os.name === OS_TYPES.WINDOWS && os.version === '10') {
+    return typeof ua === 'string' && ua.indexOf('Edg/') !== -1;
+  }
+
+  return false;
+};
+
 var isSmartTVType = function isSmartTVType() {
   return device.type === DEVICE_TYPES.SMART_TV;
 };
@@ -397,6 +408,14 @@ var isAndroidType = function isAndroidType() {
   return os.name === OS_TYPES.ANDROID;
 };
 
+var isWindowsType = function isWindowsType() {
+  return os.name === OS_TYPES.WINDOWS;
+};
+
+var isMacOsType = function isMacOsType() {
+  return os.name === OS_TYPES.MAC_OS;
+};
+
 var isWinPhoneType = function isWinPhoneType() {
   return os.name === OS_TYPES.WINDOWS_PHONE;
 };
@@ -444,7 +463,7 @@ var isIEType = function isIEType() {
 var isElectronType = function isElectronType() {
   var nav = getNavigatorInstance();
   var ua = nav && nav.userAgent.toLowerCase();
-  return typeof ua === 'string' ? ua.includes('electron') : false;
+  return typeof ua === 'string' ? /electron/.test(ua) : false;
 };
 
 var getIOS13 = function getIOS13() {
@@ -511,15 +530,15 @@ var getDeviceType = function getDeviceType() {
 var isSmartTV = isSmartTVType();
 var isConsole = isConsoleType();
 var isWearable = isWearableType();
-var isMobileSafari = isMobileSafariType();
+var isMobileSafari = isMobileSafariType() || getIPad13();
 var isChromium = isChromiumType();
-var isMobile = isMobileAndTabletType();
+var isMobile = isMobileAndTabletType() || getIPad13();
 var isMobileOnly = isMobileType();
-var isTablet = isTabletType();
+var isTablet = isTabletType() || getIPad13();
 var isBrowser = isBrowserType();
 var isAndroid = isAndroidType();
 var isWinPhone = isWinPhoneType();
-var isIOS = isIOSType();
+var isIOS = isIOSType() || getIPad13();
 var isChrome = isChromeType();
 var isFirefox = isFirefoxType();
 var isSafari = isSafariType();
@@ -535,7 +554,7 @@ var mobileModel = getMobileModel();
 var engineName = getEngineName();
 var engineVersion = getEngineVersion();
 var getUA = getUseragent();
-var isEdge = isEdgeType();
+var isEdge = isEdgeType() || isEdgeChromiumType();
 var isYandex = isYandexType();
 var deviceType = getDeviceType();
 var isIOS13 = getIOS13();
@@ -543,6 +562,10 @@ var isIPad13 = getIPad13();
 var isIPhone13 = getIphone13();
 var isIPod13 = getIPod13();
 var isElectron = isElectronType();
+var isEdgeChromium = isEdgeChromiumType();
+var isLegacyEdge = isEdgeType();
+var isWindows = isWindowsType();
+var isMacOs = isMacOsType();
 
 var AndroidView = function AndroidView(_ref) {
   var renderWithFragment = _ref.renderWithFragment,
@@ -772,6 +795,7 @@ exports.isChrome = isChrome;
 exports.isChromium = isChromium;
 exports.isConsole = isConsole;
 exports.isEdge = isEdge;
+exports.isEdgeChromium = isEdgeChromium;
 exports.isElectron = isElectron;
 exports.isFirefox = isFirefox;
 exports.isIE = isIE;
@@ -780,6 +804,8 @@ exports.isIOS13 = isIOS13;
 exports.isIPad13 = isIPad13;
 exports.isIPhone13 = isIPhone13;
 exports.isIPod13 = isIPod13;
+exports.isLegacyEdge = isLegacyEdge;
+exports.isMacOs = isMacOs;
 exports.isMobile = isMobile;
 exports.isMobileOnly = isMobileOnly;
 exports.isMobileSafari = isMobileSafari;
@@ -789,6 +815,7 @@ exports.isSmartTV = isSmartTV;
 exports.isTablet = isTablet;
 exports.isWearable = isWearable;
 exports.isWinPhone = isWinPhone;
+exports.isWindows = isWindows;
 exports.isYandex = isYandex;
 exports.mobileModel = mobileModel;
 exports.mobileVendor = mobileVendor;
@@ -824,28 +851,32 @@ var main_23 = main.isChrome;
 var main_24 = main.isChromium;
 var main_25 = main.isConsole;
 var main_26 = main.isEdge;
-var main_27 = main.isElectron;
-var main_28 = main.isFirefox;
-var main_29 = main.isIE;
-var main_30 = main.isIOS;
-var main_31 = main.isIOS13;
-var main_32 = main.isIPad13;
-var main_33 = main.isIPhone13;
-var main_34 = main.isIPod13;
-var main_35 = main.isMobile;
-var main_36 = main.isMobileOnly;
-var main_37 = main.isMobileSafari;
-var main_38 = main.isOpera;
-var main_39 = main.isSafari;
-var main_40 = main.isSmartTV;
-var main_41 = main.isTablet;
-var main_42 = main.isWearable;
-var main_43 = main.isWinPhone;
-var main_44 = main.isYandex;
-var main_45 = main.mobileModel;
-var main_46 = main.mobileVendor;
-var main_47 = main.osName;
-var main_48 = main.osVersion;
-var main_49 = main.withOrientationChange;
-
-export { main_37 as a, main_16 as b, main_35 as c, main_30 as d, main_36 as m };
+var main_27 = main.isEdgeChromium;
+var main_28 = main.isElectron;
+var main_29 = main.isFirefox;
+var main_30 = main.isIE;
+var main_31 = main.isIOS;
+var main_32 = main.isIOS13;
+var main_33 = main.isIPad13;
+var main_34 = main.isIPhone13;
+var main_35 = main.isIPod13;
+var main_36 = main.isLegacyEdge;
+var main_37 = main.isMacOs;
+var main_38 = main.isMobile;
+var main_39 = main.isMobileOnly;
+var main_40 = main.isMobileSafari;
+var main_41 = main.isOpera;
+var main_42 = main.isSafari;
+var main_43 = main.isSmartTV;
+var main_44 = main.isTablet;
+var main_45 = main.isWearable;
+var main_46 = main.isWinPhone;
+var main_47 = main.isWindows;
+var main_48 = main.isYandex;
+var main_49 = main.mobileModel;
+var main_50 = main.mobileVendor;
+var main_51 = main.osName;
+var main_52 = main.osVersion;
+var main_53 = main.withOrientationChange;
+
+export { main_40 as a, main_16 as b, main_38 as c, main_31 as d, main_39 as m };

package/dist/esm/{moment-e2f9b20c.js → moment-12415288.js}

@@ -5612,7 +5612,7 @@ var moment = createCommonjsModule(function (module, exports) {
 
     //! moment.js
 
-    hooks.version = '2.26.0';
+    hooks.version = '2.27.0';
 
     setHookCallback(createLocal);
 

package/dist/esm/timeDifferenceCalc.js

@@ -1,5 +1,5 @@
 import './_commonjsHelpers-0c4b6f40.js';
-import { m as moment } from './moment-e2f9b20c.js';
+import { m as moment } from './moment-12415288.js';
 
 var timeDifferenceCalc = function timeDifferenceCalc(articlePublishedDate) {
   var dateNow = new Date();

package/dist/esm/urlFor.js

@@ -1,5 +1,5 @@
 import './_commonjsHelpers-0c4b6f40.js';
-import { i as imageUrlBuilder } from './index-73819142.js';
+import { i as imageUrlBuilder } from './index-51a80699.js';
 
 // Sanity image auto formating
 function urlFor(client, source) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.694-beta.3",
+  "version": "1.0.695",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",