@mjhls/mjh-framework 1.0.455 → 1.0.457

package/dist/esm/{getTargeting-02118961.js → getTargeting-8f4bd5db.js}

@@ -50,8 +50,6 @@ var getTargeting = function getTargeting(props) {
   context = context && context.split('?')[0];
   context = context && context.split('&')[0];
   var content_placement_urls = [];
-  //  New variable to store document group
-  var document_group_urls = [];
   if (content_placement && prevUrl && prevUrl.length) {
     content_placement.forEach(function (item) {
       var path = item.path;
@@ -70,32 +68,21 @@ var getTargeting = function getTargeting(props) {
     });
   }
 
-  //  Comparing document group with previous url to store in 'document_group_urls'.
-  if (document_group && prevUrl && prevUrl.length) {
-    var previous_url_to_check = prevUrl;
-    if (prevUrl.includes('?')) {
-      previous_url_to_check = prevUrl.split('?')[0];
+  if (content_placement) {
+    if (content_placement_urls.length === 0) {
+      content_placement_urls = content_placement.map(function (item) {
+        return cpModificationRequired ? getContentPlacementUrl(item) : item.path;
+      });
     }
-
-    if (previous_url_to_check.endsWith(document_group)) {
-      document_group_urls.push(document_group);
-    }
-  }
-
-  //  Updating condition to set content_placement only when 'document_group_urls' and 'content_placement_urls' is empty.
-  if (content_placement && content_placement_urls.length === 0 && document_group_urls.length === 0) {
-    content_placement_urls = content_placement.map(function (item) {
-      return cpModificationRequired ? getContentPlacementUrl(item) : item.path;
-    });
+  } else {
+    content_placement_urls = ['/'];
   }
-
   var articleKeywords = [].concat(_toConsumableArray(internalTag), _toConsumableArray(userDefinedTag), _toConsumableArray(SponsorshipTag), _toConsumableArray(seoTag));
   var targeting = {
     tags: articleKeywords,
-    //  making sure either 'document_group' or 'content_placement' is returned in targeting.
-    document_group: content_placement_urls && content_placement_urls.length ? '' : document_group_urls,
+    document_group: [document_group],
     document_url: [url],
-    content_placement: document_group_urls && document_group_urls.length ? '' : content_placement_urls
+    content_placement: content_placement_urls
   };
 
   if (article.issue && article.issue.path) {

package/dist/esm/getTargeting.js

@@ -6,4 +6,4 @@ import './from-2c0a5f49.js';
 import './toConsumableArray-8712d678.js';
 import './_object-pie-33c40e79.js';
 import './extends-6e00b262.js';
-export { g as default } from './getTargeting-02118961.js';
+export { g as default } from './getTargeting-8f4bd5db.js';

package/dist/esm/{index-73819142.js → index-51a80699.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,7 +182,7 @@ exports.SPEC_NAME_TO_URL_NAME_MAPPINGS = [
     ['crop', 'crop'],
     ['saturation', 'sat'],
     ['auto', 'auto'],
-    ['dpr', 'dpr']
+    ['dpr', 'dpr'],
 ];
 function urlForImage(options) {
     var spec = __assign({}, (options || {}));
@@ -201,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;
@@ -212,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.
@@ -294,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 {
@@ -316,13 +316,13 @@ 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,
     };
 }
 
@@ -375,11 +375,12 @@ function urlBuilder(options) {
     var client = options;
     if (isSanityClient(client)) {
         // Inherit config from client
-        var _a = client.clientConfig, apiHost = _a.apiHost, projectId = _a.projectId, dataset = _a.dataset;
+        var _a = client.clientConfig, apiUrl = _a.apiHost, projectId = _a.projectId, dataset = _a.dataset;
+        var apiHost = apiUrl || 'https://api.sanity.io';
         return new ImageUrlBuilder(null, {
             baseUrl: apiHost.replace(/^https:\/\/api\./, 'https://cdn.'),
             projectId: projectId,
-            dataset: dataset
+            dataset: dataset,
         });
     }
     // Or just accept the options as given
@@ -392,7 +393,7 @@ var ImageUrlBuilder = /** @class */ (function () {
             ? __assign(__assign({}, (parent.options || {})), (options || {})) : __assign({}, (options || {})); // Copy options
     }
     ImageUrlBuilder.prototype.withOptions = function (options) {
-        var baseUrl = options.baseUrl || '';
+        var baseUrl = options.baseUrl || this.options.baseUrl;
         var newOptions = { baseUrl: baseUrl };
         for (var key in options) {
             if (options.hasOwnProperty(key)) {
@@ -520,7 +521,7 @@ var ImageUrlBuilder = /** @class */ (function () {
     ImageUrlBuilder.prototype.url = function () {
         return urlForImage_1$1.default(this.options);
     };
-    // Synonym for url()
+    // Alias for url()
     ImageUrlBuilder.prototype.toString = function () {
         return this.url();
     };

package/dist/esm/index.js

@@ -19,16 +19,16 @@ import 'react-bootstrap/Container';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'react-bootstrap/Card';
-import './moment-e2f9b20c.js';
+import './moment-49ae13fa.js';
 import 'next/router';
 import './isSymbol-c1b9be80.js';
 import './debounce-8cd9e09c.js';
 import './index.es-29c1cef5.js';
 import 'react-dom';
 import './visibility-sensor-0baa4eea.js';
-import './index-73819142.js';
+import './index-51a80699.js';
 import './index-5f9f807a.js';
-import './main-d7ee6151.js';
+import './main-adf6ec37.js';
 import './entities-7cc3bf45.js';
 import './slicedToArray-f1e40361.js';
 import './stringify-e30bc114.js';
@@ -38,10 +38,10 @@ import './promise-53143c9a.js';
 export { default as Beam } from './Beam.js';
 export { default as Segment } from './Segment.js';
 export { default as AdSlot } from './AdSlot.js';
-import './ADInfeed-24924eab.js';
+import './ADInfeed-08192400.js';
 export { default as DeckContent } from './DeckContent.js';
 import './lodash-17fdfebb.js';
-import './ADlgInfeed-019d6cd9.js';
+import './ADlgInfeed-a90cf553.js';
 import './_arrayMap-a8dd2b2c.js';
 import './get-ae817b75.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';
 import './smoothscroll-4b699764.js';
@@ -154,7 +154,7 @@ import 'swr';
 import 'passport-local';
 import 'mysql';
 export { default as View } from './View.js';
-export { g as getTargeting } from './getTargeting-02118961.js';
+export { g as getTargeting } from './getTargeting-8f4bd5db.js';
 export { default as urlFor } from './urlFor.js';
 export { default as getKeywords } from './getKeywords.js';
 export { default as getQuery } from './getQuery.js';

package/dist/esm/{main-d7ee6151.js → main-adf6ec37.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.indexOf(type) !== -1 || nav.platform === 'MacIntel' && nav.maxTouchPoints > 1 && !window.MSStream);
 };
 
 function _typeof(obj) {
@@ -444,7 +444,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 +511,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();

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

@@ -4398,7 +4398,7 @@ var moment = createCommonjsModule(function (module, exports) {
             eras = this.localeData().eras();
         for (i = 0, l = eras.length; i < l; ++i) {
             // truncate time
-            val = this.startOf('day').valueOf();
+            val = this.clone().startOf('day').valueOf();
 
             if (eras[i].since <= val && val <= eras[i].until) {
                 return eras[i].name;
@@ -4418,7 +4418,7 @@ var moment = createCommonjsModule(function (module, exports) {
             eras = this.localeData().eras();
         for (i = 0, l = eras.length; i < l; ++i) {
             // truncate time
-            val = this.startOf('day').valueOf();
+            val = this.clone().startOf('day').valueOf();
 
             if (eras[i].since <= val && val <= eras[i].until) {
                 return eras[i].narrow;
@@ -4438,7 +4438,7 @@ var moment = createCommonjsModule(function (module, exports) {
             eras = this.localeData().eras();
         for (i = 0, l = eras.length; i < l; ++i) {
             // truncate time
-            val = this.startOf('day').valueOf();
+            val = this.clone().startOf('day').valueOf();
 
             if (eras[i].since <= val && val <= eras[i].until) {
                 return eras[i].abbr;
@@ -4461,7 +4461,7 @@ var moment = createCommonjsModule(function (module, exports) {
             dir = eras[i].since <= eras[i].until ? +1 : -1;
 
             // truncate time
-            val = this.startOf('day').valueOf();
+            val = this.clone().startOf('day').valueOf();
 
             if (
                 (eras[i].since <= val && val <= eras[i].until) ||
@@ -5612,7 +5612,7 @@ var moment = createCommonjsModule(function (module, exports) {
 
     //! moment.js
 
-    hooks.version = '2.26.0';
+    hooks.version = '2.28.0';
 
     setHookCallback(createLocal);
 

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';
 
 function urlFor(client, source) {
     return imageUrlBuilder(client).image(source);

package/package.json

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