@mjhls/mjh-framework 1.0.719 → 1.0.720-beta.0

package/dist/esm/{index-3f5c03b2.js → index-73819142.js}

@@ -58,35 +58,35 @@ function parseSource(source) {
     if (typeof source === 'string' && isUrl(source)) {
         // Someone passed an existing image url?
         image = {
-            asset: { _ref: urlToId(source) },
+            asset: { _ref: urlToId(source) }
         };
     }
     else if (typeof source === 'string') {
         // Just an asset id
         image = {
-            asset: { _ref: source },
+            asset: { _ref: source }
         };
     }
     else if (isRef(source)) {
         // We just got passed an asset directly
         image = {
-            asset: source,
+            asset: source
         };
     }
     else if (isAsset(source)) {
         // If we were passed an image asset document
         image = {
             asset: {
-                _ref: source._id || '',
-            },
+                _ref: source._id || ''
+            }
         };
     }
     else if (isAssetStub(source)) {
         // If we were passed a partial asset (`url`, but no `_id`)
         image = {
             asset: {
-                _ref: urlToId(source.asset.url),
-            },
+                _ref: urlToId(source.asset.url)
+            }
         };
     }
     else if (typeof source.asset === 'object') {
@@ -127,7 +127,7 @@ function applyDefaults(image) {
             left: 0,
             top: 0,
             bottom: 0,
-            right: 0,
+            right: 0
         };
     }
     if (!result.hotspot) {
@@ -135,7 +135,7 @@ function applyDefaults(image) {
             x: 0.5,
             y: 0.5,
             height: 1.0,
-            width: 1.0,
+            width: 1.0
         };
     }
     return result;
@@ -182,8 +182,7 @@ exports.SPEC_NAME_TO_URL_NAME_MAPPINGS = [
     ['crop', 'crop'],
     ['saturation', 'sat'],
     ['auto', 'auto'],
-    ['dpr', 'dpr'],
-    ['pad', 'pad'],
+    ['dpr', 'dpr']
 ];
 function urlForImage(options) {
     var spec = __assign({}, (options || {}));
@@ -202,7 +201,7 @@ function urlForImage(options) {
         left: cropLeft,
         top: cropTop,
         width: Math.round(asset.width - image.crop.right * asset.width - cropLeft),
-        height: Math.round(asset.height - image.crop.bottom * asset.height - cropTop),
+        height: Math.round(asset.height - image.crop.bottom * asset.height - cropTop)
     };
     // Compute hot spot rect in terms of pixel coordinates
     var hotSpotVerticalRadius = (image.hotspot.height * asset.height) / 2;
@@ -213,7 +212,7 @@ function urlForImage(options) {
         left: hotSpotCenterX - hotSpotHorizontalRadius,
         top: hotSpotCenterY - hotSpotVerticalRadius,
         right: hotSpotCenterX + hotSpotHorizontalRadius,
-        bottom: hotSpotCenterY + hotSpotVerticalRadius,
+        bottom: hotSpotCenterY + hotSpotVerticalRadius
     };
     // If irrelevant, or if we are requested to: don't perform crop/fit based on
     // the crop/hotspot.
@@ -295,7 +294,7 @@ function fit(source, spec) {
             left: Math.round(left),
             top: Math.round(top_2),
             width: Math.round(width),
-            height: Math.round(height),
+            height: Math.round(height)
         };
     }
     else {
@@ -317,21 +316,21 @@ function fit(source, spec) {
             left: Math.max(0, Math.floor(left)),
             top: Math.max(0, Math.floor(top_3)),
             width: Math.round(width),
-            height: Math.round(height),
+            height: Math.round(height)
         };
     }
     return {
         width: imgWidth,
         height: imgHeight,
-        rect: cropRect,
+        rect: cropRect
     };
 }
 
 });
 
 unwrapExports(urlForImage_1);
-urlForImage_1.parseSource;
-urlForImage_1.SPEC_NAME_TO_URL_NAME_MAPPINGS;
+var urlForImage_2 = urlForImage_1.parseSource;
+var urlForImage_3 = urlForImage_1.SPEC_NAME_TO_URL_NAME_MAPPINGS;
 
 var builder = createCommonjsModule(function (module, exports) {
 var __assign = (commonjsGlobal && commonjsGlobal.__assign) || function () {
@@ -357,7 +356,7 @@ var urlForImage_1$1 = __importStar(urlForImage_1);
 var validFits = ['clip', 'crop', 'fill', 'fillmax', 'max', 'scale', 'min'];
 var validCrops = ['top', 'bottom', 'left', 'right', 'center', 'focalpoint', 'entropy'];
 var validAutoModes = ['format'];
-function isSanityClientLike(client) {
+function isSanityClient(client) {
     return client ? typeof client.clientConfig === 'object' : false;
 }
 function rewriteSpecName(key) {
@@ -374,14 +373,13 @@ function rewriteSpecName(key) {
 function urlBuilder(options) {
     // Did we get a SanityClient?
     var client = options;
-    if (isSanityClientLike(client)) {
+    if (isSanityClient(client)) {
         // Inherit config from client
-        var _a = client.clientConfig, apiUrl = _a.apiHost, projectId = _a.projectId, dataset = _a.dataset;
-        var apiHost = apiUrl || 'https://api.sanity.io';
+        var _a = client.clientConfig, apiHost = _a.apiHost, projectId = _a.projectId, dataset = _a.dataset;
         return new ImageUrlBuilder(null, {
             baseUrl: apiHost.replace(/^https:\/\/api\./, 'https://cdn.'),
             projectId: projectId,
-            dataset: dataset,
+            dataset: dataset
         });
     }
     // Or just accept the options as given
@@ -394,7 +392,7 @@ var ImageUrlBuilder = /** @class */ (function () {
             ? __assign(__assign({}, (parent.options || {})), (options || {})) : __assign({}, (options || {})); // Copy options
     }
     ImageUrlBuilder.prototype.withOptions = function (options) {
-        var baseUrl = options.baseUrl || this.options.baseUrl;
+        var baseUrl = options.baseUrl || '';
         var newOptions = { baseUrl: baseUrl };
         for (var key in options) {
             if (options.hasOwnProperty(key)) {
@@ -488,7 +486,7 @@ var ImageUrlBuilder = /** @class */ (function () {
     ImageUrlBuilder.prototype.flipHorizontal = function () {
         return this.withOptions({ flipHorizontal: true });
     };
-    // Flip image vertically
+    // Flip image verically
     ImageUrlBuilder.prototype.flipVertical = function () {
         return this.withOptions({ flipVertical: true });
     };
@@ -518,15 +516,11 @@ var ImageUrlBuilder = /** @class */ (function () {
         }
         return this.withOptions({ auto: value });
     };
-    // Specify the number of pixels to pad the image
-    ImageUrlBuilder.prototype.pad = function (pad) {
-        return this.withOptions({ pad: pad });
-    };
     // Gets the url based on the submitted parameters
     ImageUrlBuilder.prototype.url = function () {
         return urlForImage_1$1.default(this.options);
     };
-    // Alias for url()
+    // Synonym for url()
     ImageUrlBuilder.prototype.toString = function () {
         return this.url();
     };
@@ -537,7 +531,7 @@ exports.ImageUrlBuilder = ImageUrlBuilder;
 });
 
 unwrapExports(builder);
-builder.ImageUrlBuilder;
+var builder_1 = builder.ImageUrlBuilder;
 
 var node = createCommonjsModule(function (module) {
 var __importDefault = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {

package/dist/esm/{index-669ff425.js → index-a9e53f80.js}

@@ -1,5 +1,5 @@
 import { c as createCommonjsModule, u as unwrapExports } from './_commonjsHelpers-0c4b6f40.js';
-import React from 'react';
+import React__default from 'react';
 import PropTypes from 'prop-types';
 
 var domain;
@@ -502,7 +502,7 @@ function loadGPTScript() {
 });
 
 unwrapExports(utils);
-utils.loadGPTScript;
+var utils_1 = utils.loadGPTScript;
 
 var manager = createCommonjsModule(function (module, exports) {
 
@@ -530,6 +530,7 @@ var disableInitialLoadEnabled = false;
 var lazyLoadEnabled = false;
 var lazyLoadConfig = null;
 var servePersonalizedAds = true;
+var serveCookies = true;
 var registeredSlots = {};
 var managerAlreadyInitialized = false;
 var globalTargetingArguments = {};
@@ -571,9 +572,15 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
   configurePersonalizedAds: function configurePersonalizedAds(value) {
     servePersonalizedAds = value;
   },
+  configureCookieOption: function configureCookieOption(value) {
+    serveCookies = value;
+  },
   personalizedAdsEnabled: function personalizedAdsEnabled() {
     return servePersonalizedAds;
   },
+  cookiesEnabled: function cookiesEnabled() {
+    return serveCookies;
+  },
   setAdSenseAttribute: function setAdSenseAttribute(key, value) {
     this.setAdSenseAttributes(_defineProperty({}, key, value));
   },
@@ -664,6 +671,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
             });
           });
           pubadsService.setRequestNonPersonalizedAds(_this.personalizedAdsEnabled() ? 0 : 1);
+          pubadsService.setCookieOptions(_this.cookiesEnabled() ? 0 : 1);
         });
       });
     }
@@ -775,13 +783,9 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
 
         googletag.cmd.push(function () {
           googletag.enableServices();
-
-          if (!_this3.disableInitialLoadIsEnabled()) {
-            slotsToInitialize.forEach(function (theSlotId) {
-              googletag.display(theSlotId);
-            });
-          }
-
+          slotsToInitialize.forEach(function (theSlotId) {
+            googletag.display(theSlotId);
+          });
           resolve();
         });
       });
@@ -804,6 +808,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     googletag.cmd.push(function () {
       var pubadsService = googletag.pubads();
       pubadsService.setRequestNonPersonalizedAds(_this5.personalizedAdsEnabled() ? 0 : 1);
+      pubadsService.setCookieOptions(_this5.cookiesEnabled() ? 0 : 1);
 
       var targetingArguments = _this5.getTargetingArguments(); // set global targetting arguments
 
@@ -870,17 +875,25 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     }, slots);
   },
   refresh: function refresh() {
+    var _this6 = this;
+
+    for (var _len4 = arguments.length, slots = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+      slots[_key4] = arguments[_key4];
+    }
+
     if (loadPromise === null) {
       this.load();
     } else {
-      this.gptRefreshAds(Object.keys(this.getRefreshableSlots.apply(this, arguments)));
+      loadPromise.then(function () {
+        _this6.gptRefreshAds(Object.keys(_this6.getRefreshableSlots.apply(_this6, slots)));
+      });
     }
   },
   gptRefreshAds: function gptRefreshAds(slots) {
-    var _this6 = this;
+    var _this7 = this;
 
     return this.getGoogletag().then(function (googletag) {
-      _this6.configureOptions(googletag);
+      _this7.configureOptions(googletag);
 
       googletag.cmd.push(function () {
         var pubadsService = googletag.pubads();
@@ -891,17 +904,17 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   reload: function reload() {
-    var _this7 = this;
+    var _this8 = this;
 
     return this.destroyGPTSlots.apply(this, arguments).then(function () {
-      return _this7.load();
+      return _this8.load();
     });
   },
   destroyGPTSlots: function destroyGPTSlots() {
-    var _this8 = this;
+    var _this9 = this;
 
-    for (var _len4 = arguments.length, slotsToDestroy = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      slotsToDestroy[_key4] = arguments[_key4];
+    for (var _len5 = arguments.length, slotsToDestroy = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+      slotsToDestroy[_key5] = arguments[_key5];
     }
 
     if (slotsToDestroy.length === 0) {
@@ -918,7 +931,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         slots.push(slot);
       }
 
-      _this8.getGoogletag().then(function (googletag) {
+      _this9.getGoogletag().then(function (googletag) {
         googletag.cmd.push(function () {
           if (managerAlreadyInitialized === true) {
             if (slotsToDestroy.length > 0) {
@@ -941,7 +954,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   registerSlot: function registerSlot(_ref) {
-    var _this9 = this;
+    var _this10 = this;
 
     var slotId = _ref.slotId,
         dfpNetworkId = _ref.dfpNetworkId,
@@ -980,7 +993,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
                 gptSlot = slot.gptSlot;
 
             if (loading === false && !gptSlot) {
-              _this9.load(slotId);
+              _this10.load(slotId);
             }
           }
         });
@@ -1027,7 +1040,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Context = void 0;
 
-var _react = _interopRequireDefault(React);
+var _react = _interopRequireDefault(React__default);
 
 var _propTypes = _interopRequireDefault(PropTypes);
 
@@ -1170,6 +1183,8 @@ function (_React$Component) {
     value: function applyConfigs() {
       _manager.default.configurePersonalizedAds(this.props.personalizedAds);
 
+      _manager.default.configureCookieOption(this.props.cookieOption);
+
       _manager.default.configureSingleRequest(this.props.singleRequest);
 
       _manager.default.configureDisableInitialLoad(this.props.disableInitialLoad);
@@ -1266,6 +1281,7 @@ _defineProperty(DFPSlotsProvider, "propTypes", {
   autoReload: _propTypes.default.shape({
     dfpNetworkId: _propTypes.default.bool,
     personalizedAds: _propTypes.default.bool,
+    cookieOption: _propTypes.default.bool,
     singleRequest: _propTypes.default.bool,
     disableInitialLoad: _propTypes.default.bool,
     adUnit: _propTypes.default.bool,
@@ -1277,6 +1293,7 @@ _defineProperty(DFPSlotsProvider, "propTypes", {
   }),
   dfpNetworkId: _propTypes.default.string.isRequired,
   personalizedAds: _propTypes.default.bool,
+  cookieOption: _propTypes.default.bool,
   singleRequest: _propTypes.default.bool,
   disableInitialLoad: _propTypes.default.bool,
   adUnit: _propTypes.default.string,
@@ -1297,6 +1314,7 @@ _defineProperty(DFPSlotsProvider, "defaultProps", {
   autoReload: {
     dfpNetworkId: false,
     personalizedAds: false,
+    cookieOption: false,
     singleRequest: false,
     disableInitialLoad: false,
     adUnit: false,
@@ -1307,6 +1325,7 @@ _defineProperty(DFPSlotsProvider, "defaultProps", {
     lazyLoad: false
   },
   personalizedAds: true,
+  cookieOption: true,
   singleRequest: true,
   disableInitialLoad: false,
   collapseEmptyDivs: null,
@@ -1326,7 +1345,7 @@ if (Context === null) {
 });
 
 unwrapExports(dfpslotsprovider);
-dfpslotsprovider.Context;
+var dfpslotsprovider_1 = dfpslotsprovider.Context;
 
 var adslot = createCommonjsModule(function (module, exports) {
 
@@ -1335,7 +1354,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.AdSlot = void 0;
 
-var _react = _interopRequireDefault(React);
+var _react = _interopRequireDefault(React__default);
 
 var _propTypes = _interopRequireDefault(PropTypes);
 
@@ -1622,7 +1641,7 @@ exports.default = _default;
 });
 
 unwrapExports(adslot);
-adslot.AdSlot;
+var adslot_1 = adslot.AdSlot;
 
 var lib = createCommonjsModule(function (module, exports) {