@mjhls/mjh-framework 1.0.847 → 1.0.848

package/README.md

@@ -1,4 +1,4 @@
-# mjh-framework v. 1.0.847
+# mjh-framework v. 1.0.848
 
 [![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 

package/dist/cjs/View.js

@@ -1387,6 +1387,8 @@ var Article = React.forwardRef(function (props, ref) {
 var _this$1 = undefined;
 
 var ArticleQueue = function ArticleQueue(props) {
+  var router = Router.useRouter();
+
   var _props$prevUrl = props.prevUrl,
       prevUrl = _props$prevUrl === undefined ? '/' : _props$prevUrl,
       Ads = props.Ads,
@@ -1571,6 +1573,34 @@ var ArticleQueue = function ArticleQueue(props) {
     };
   }();
 
+  var currentPath = router && router.asPath;
+  var seoLinks = props.cache.seoManager && props.cache.seoManager.filter(function (eachDocument) {
+    return eachDocument.urlSeo == currentPath;
+  });
+
+  var metaDescriptionSanity = seoLinks && seoLinks.length == 1 && seoLinks[0].metaDescription;
+  var metaTitleSanity = seoLinks && seoLinks.length == 1 && seoLinks[0].metaTitle;
+  // let urlSeo = seoLinks && seoLinks.length ==1 && seoLinks[0].urlSeo
+
+  var changeMetaFromSanity = function changeMetaFromSanity(metaDescription, metaTitle, oldMeta) {
+    document.title = metaTitle;
+    //this was throwing an error if there was no description, doing a check for the description meta
+    if (document.querySelector('meta[name="description"]')) document.querySelector('meta[name="description"]').setAttribute('content', metaDescription);
+    document.querySelector('meta[name="keywords"]').setAttribute('content', oldMeta.shareKeywords);
+    document.querySelector('meta[property="og:url"]').setAttribute('content', oldMeta.shareUrl);
+    document.querySelector('meta[property="og:title"]').setAttribute('content', metaTitle);
+    document.querySelector('meta[property="og:site_name"]').setAttribute('content', oldMeta.shareVia);
+    document.querySelector('meta[property="og:description"]').setAttribute('content', metaDescription);
+    document.querySelector('meta[name="twitter:title"]').setAttribute('content', metaTitle);
+    document.querySelector('meta[name="twitter:image"]').setAttribute('content', oldMeta.shareImage);
+    document.querySelector('meta[name="twitter:site"]').setAttribute('content', oldMeta.shareVia);
+    //this was throwing an error if there was no description, doing a check for the description meta
+    if (document.querySelector('meta[name="twitter:description"]')) document.querySelector('meta[name="twitter:description"]').setAttribute('content', metaDescription);
+    if (canonicalTag) {
+      document.querySelector('link[rel="canonical"]').setAttribute('href', oldMeta.shareUrl);
+    }
+  };
+
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
     //this was throwing an error if there was no description, doing a check for the description meta
@@ -1600,7 +1630,12 @@ var ArticleQueue = function ArticleQueue(props) {
     });
     // Change URL and do other changes
     window.history.pushState({ page: path }, meta.shareTitle, newPath);
-    changeMeta(meta);
+
+    if (metaDescriptionSanity && metaTitleSanity && currentPath == newPath) {
+      changeMetaFromSanity(metaDescriptionSanity, metaTitleSanity, meta);
+    } else {
+      changeMeta(meta);
+    }
     if (props.setCustomDimensions) {
       props.setCustomDimensions(activeArticle, '200', prevUrl);
     }
@@ -1757,6 +1792,13 @@ var View = function View(props) {
     meta_description = seriesShareOptions && seriesShareOptions.seriesSummary ? '' + seriesShareOptions.seriesSummary + (currentPage > 0 ? ' | Page ' + currentPage : '') : '';
   }
 
+  var currentPath = router && router.asPath;
+  var seoLinks = props.cache.seoManager && props.cache.seoManager.filter(function (eachDocument) {
+    return eachDocument.urlSeo == currentPath;
+  });
+
+  var metaDescriptionSanity = seoLinks && seoLinks.length == 1 && seoLinks[0].metaDescription;
+  var metaTitleSanity = seoLinks && seoLinks.length == 1 && seoLinks[0].metaTitle;
   return React__default['default'].createElement(
     React__default['default'].Fragment,
     null,
@@ -1766,9 +1808,9 @@ var View = function View(props) {
       React__default['default'].createElement(
         'title',
         { key: 'title' },
-        seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article && article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + article.title + (currentPage > 0 ? ' | Page ' + currentPage : '')
+        metaTitleSanity ? '' + metaTitleSanity + (currentPage > 0 ? ' | Page ' + currentPage : '') : seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article && article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + article.title + (currentPage > 0 ? ' | Page ' + currentPage : '')
       ),
-      meta_description && React__default['default'].createElement('meta', { name: 'description', key: 'description', content: meta_description }),
+      metaDescriptionSanity ? React__default['default'].createElement('meta', { name: 'description', key: 'description', content: metaDescriptionSanity }) : meta_description && React__default['default'].createElement('meta', { name: 'description', key: 'description', content: meta_description }),
       React__default['default'].createElement('meta', { name: 'keywords', content: getKeywords(article).join(','), key: 'keywords' }),
       passwordLock && React__default['default'].createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
       React__default['default'].createElement('meta', {
@@ -1778,7 +1820,7 @@ var View = function View(props) {
       }),
       React__default['default'].createElement('meta', {
         property: 'og:title',
-        content: seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
+        content: metaTitleSanity ? '' + metaTitleSanity + (currentPage > 0 ? ' | Page ' + currentPage : '') : seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
         key: 'og:title'
       }),
       React__default['default'].createElement('meta', {
@@ -1787,11 +1829,11 @@ var View = function View(props) {
         key: 'og:image'
       }),
       React__default['default'].createElement('meta', { property: 'og:site_name', content: props.Settings.title, key: 'og:site_name' }),
-      React__default['default'].createElement('meta', { property: 'og:description', content: meta_description, key: 'og:description' }),
+      metaDescriptionSanity ? React__default['default'].createElement('meta', { property: 'og:description', key: 'og:description', content: metaDescriptionSanity }) : meta_description && React__default['default'].createElement('meta', { property: 'og:description', key: 'og:description', content: meta_description }),
       React__default['default'].createElement('meta', { name: 'twitter:card', content: 'summary', key: 'twitter:card' }),
       React__default['default'].createElement('meta', {
         name: 'twitter:title',
-        content: seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
+        content: metaTitleSanity ? '' + metaTitleSanity + (currentPage > 0 ? ' | Page ' + currentPage : '') : seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
         key: 'twitter:title'
       }),
       React__default['default'].createElement('meta', {
@@ -1800,7 +1842,7 @@ var View = function View(props) {
         key: 'twitter:image'
       }),
       React__default['default'].createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
-      React__default['default'].createElement('meta', { name: 'twitter:description', content: meta_description, key: 'twitter:description' }),
+      metaDescriptionSanity ? React__default['default'].createElement('meta', { name: 'twitter:description', key: 'twitter:description', content: metaDescriptionSanity }) : meta_description && React__default['default'].createElement('meta', { name: 'twitter:description', key: 'twitter:description', content: meta_description }),
       canonicalTag && React__default['default'].createElement('link', {
         rel: 'canonical',
         href: seriesShareOptions && seriesShareOptions.seriesUrl ? shareOptions.shareUrl + seriesShareOptions.seriesUrl : shareOptions.shareUrl,

package/dist/esm/View.js

@@ -1377,6 +1377,8 @@ var Article = forwardRef(function (props, ref) {
 var _this$1 = undefined;
 
 var ArticleQueue = function ArticleQueue(props) {
+  var router = useRouter();
+
   var _props$prevUrl = props.prevUrl,
       prevUrl = _props$prevUrl === undefined ? '/' : _props$prevUrl,
       Ads = props.Ads,
@@ -1561,6 +1563,34 @@ var ArticleQueue = function ArticleQueue(props) {
     };
   }();
 
+  var currentPath = router && router.asPath;
+  var seoLinks = props.cache.seoManager && props.cache.seoManager.filter(function (eachDocument) {
+    return eachDocument.urlSeo == currentPath;
+  });
+
+  var metaDescriptionSanity = seoLinks && seoLinks.length == 1 && seoLinks[0].metaDescription;
+  var metaTitleSanity = seoLinks && seoLinks.length == 1 && seoLinks[0].metaTitle;
+  // let urlSeo = seoLinks && seoLinks.length ==1 && seoLinks[0].urlSeo
+
+  var changeMetaFromSanity = function changeMetaFromSanity(metaDescription, metaTitle, oldMeta) {
+    document.title = metaTitle;
+    //this was throwing an error if there was no description, doing a check for the description meta
+    if (document.querySelector('meta[name="description"]')) document.querySelector('meta[name="description"]').setAttribute('content', metaDescription);
+    document.querySelector('meta[name="keywords"]').setAttribute('content', oldMeta.shareKeywords);
+    document.querySelector('meta[property="og:url"]').setAttribute('content', oldMeta.shareUrl);
+    document.querySelector('meta[property="og:title"]').setAttribute('content', metaTitle);
+    document.querySelector('meta[property="og:site_name"]').setAttribute('content', oldMeta.shareVia);
+    document.querySelector('meta[property="og:description"]').setAttribute('content', metaDescription);
+    document.querySelector('meta[name="twitter:title"]').setAttribute('content', metaTitle);
+    document.querySelector('meta[name="twitter:image"]').setAttribute('content', oldMeta.shareImage);
+    document.querySelector('meta[name="twitter:site"]').setAttribute('content', oldMeta.shareVia);
+    //this was throwing an error if there was no description, doing a check for the description meta
+    if (document.querySelector('meta[name="twitter:description"]')) document.querySelector('meta[name="twitter:description"]').setAttribute('content', metaDescription);
+    if (canonicalTag) {
+      document.querySelector('link[rel="canonical"]').setAttribute('href', oldMeta.shareUrl);
+    }
+  };
+
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
     //this was throwing an error if there was no description, doing a check for the description meta
@@ -1590,7 +1620,12 @@ var ArticleQueue = function ArticleQueue(props) {
     });
     // Change URL and do other changes
     window.history.pushState({ page: path }, meta.shareTitle, newPath);
-    changeMeta(meta);
+
+    if (metaDescriptionSanity && metaTitleSanity && currentPath == newPath) {
+      changeMetaFromSanity(metaDescriptionSanity, metaTitleSanity, meta);
+    } else {
+      changeMeta(meta);
+    }
     if (props.setCustomDimensions) {
       props.setCustomDimensions(activeArticle, '200', prevUrl);
     }
@@ -1747,6 +1782,13 @@ var View = function View(props) {
     meta_description = seriesShareOptions && seriesShareOptions.seriesSummary ? '' + seriesShareOptions.seriesSummary + (currentPage > 0 ? ' | Page ' + currentPage : '') : '';
   }
 
+  var currentPath = router && router.asPath;
+  var seoLinks = props.cache.seoManager && props.cache.seoManager.filter(function (eachDocument) {
+    return eachDocument.urlSeo == currentPath;
+  });
+
+  var metaDescriptionSanity = seoLinks && seoLinks.length == 1 && seoLinks[0].metaDescription;
+  var metaTitleSanity = seoLinks && seoLinks.length == 1 && seoLinks[0].metaTitle;
   return React.createElement(
     React.Fragment,
     null,
@@ -1756,9 +1798,9 @@ var View = function View(props) {
       React.createElement(
         'title',
         { key: 'title' },
-        seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article && article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + article.title + (currentPage > 0 ? ' | Page ' + currentPage : '')
+        metaTitleSanity ? '' + metaTitleSanity + (currentPage > 0 ? ' | Page ' + currentPage : '') : seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article && article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + article.title + (currentPage > 0 ? ' | Page ' + currentPage : '')
       ),
-      meta_description && React.createElement('meta', { name: 'description', key: 'description', content: meta_description }),
+      metaDescriptionSanity ? React.createElement('meta', { name: 'description', key: 'description', content: metaDescriptionSanity }) : meta_description && React.createElement('meta', { name: 'description', key: 'description', content: meta_description }),
       React.createElement('meta', { name: 'keywords', content: getKeywords(article).join(','), key: 'keywords' }),
       passwordLock && React.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
       React.createElement('meta', {
@@ -1768,7 +1810,7 @@ var View = function View(props) {
       }),
       React.createElement('meta', {
         property: 'og:title',
-        content: seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
+        content: metaTitleSanity ? '' + metaTitleSanity + (currentPage > 0 ? ' | Page ' + currentPage : '') : seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
         key: 'og:title'
       }),
       React.createElement('meta', {
@@ -1777,11 +1819,11 @@ var View = function View(props) {
         key: 'og:image'
       }),
       React.createElement('meta', { property: 'og:site_name', content: props.Settings.title, key: 'og:site_name' }),
-      React.createElement('meta', { property: 'og:description', content: meta_description, key: 'og:description' }),
+      metaDescriptionSanity ? React.createElement('meta', { property: 'og:description', key: 'og:description', content: metaDescriptionSanity }) : meta_description && React.createElement('meta', { property: 'og:description', key: 'og:description', content: meta_description }),
       React.createElement('meta', { name: 'twitter:card', content: 'summary', key: 'twitter:card' }),
       React.createElement('meta', {
         name: 'twitter:title',
-        content: seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
+        content: metaTitleSanity ? '' + metaTitleSanity + (currentPage > 0 ? ' | Page ' + currentPage : '') : seriesShareOptions && seriesShareOptions.seriesTitle ? '' + seriesShareOptions.seriesTitle + (currentPage > 0 ? ' | Page ' + currentPage : '') : article.seo && article.seo.seo_title ? '' + article.seo.seo_title + (currentPage > 0 ? ' | Page ' + currentPage : '') : '' + shareOptions.shareTitle + (currentPage > 0 ? ' | Page ' + currentPage : ''),
         key: 'twitter:title'
       }),
       React.createElement('meta', {
@@ -1790,7 +1832,7 @@ var View = function View(props) {
         key: 'twitter:image'
       }),
       React.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
-      React.createElement('meta', { name: 'twitter:description', content: meta_description, key: 'twitter:description' }),
+      metaDescriptionSanity ? React.createElement('meta', { name: 'twitter:description', key: 'twitter:description', content: metaDescriptionSanity }) : meta_description && React.createElement('meta', { name: 'twitter:description', key: 'twitter:description', content: meta_description }),
       canonicalTag && React.createElement('link', {
         rel: 'canonical',
         href: seriesShareOptions && seriesShareOptions.seriesUrl ? shareOptions.shareUrl + seriesShareOptions.seriesUrl : shareOptions.shareUrl,

package/package.json

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