@mjhls/mjh-framework 1.0.426 → 1.0.428

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.426
+# mjh-framework v. 1.0.428
 
 > Foundation Framework 
 

package/dist/cjs/index.js

@@ -14779,16 +14779,7 @@ Publication.getInitialProps = async (ctx) => {
   const {
     query: { year },
   } = ctx
-  const pub = await client.fetch(
-    `*[_type == 'publication'
-        && identifier.current == $publication][0] {
-            ...,
-            'issues': *[_type == 'publication'
-                && is_visible
-                && references(^._id)] | order(year desc, month desc)
-        }`,
-    query
-  )
+  const pub = await client.fetch(getQuery('publication'), query)
   const builder = imageUrlBuilder(client)
   const urlFor = (source) => {
     return builder.image(source)
@@ -14889,7 +14880,12 @@ var PublicationLanding = function PublicationLanding(props) {
                 null,
                 issue.name
               ),
-              React__default.createElement(
+              publication.displayLabel && React__default.createElement(
+                'p',
+                { className: 'badge badge-primary' },
+                publication.displayLabel
+              ),
+              issue.volume && issue.number && React__default.createElement(
                 'p',
                 null,
                 'Volume: ',
@@ -16733,21 +16729,19 @@ var InscreenSensor = function (_React$Component) {
       var _this$props$offSetTop = _this.props.offSetTop,
           offSetTop = _this$props$offSetTop === undefined ? 0 : _this$props$offSetTop;
       var top = rect.top,
-          height = rect.height;
+          bottom = rect.bottom;
 
-      var bottom = top + height;
       var viewHeight = window.innerHeight;
+      var wrpElem = document.getElementsByClassName('inscreen-wrapper');
 
-      if (bottom < offSetTop) {
-        return false;
-      } else if (top > offSetTop && bottom <= viewHeight) {
-        return true;
-      } else if (top < offSetTop && top <= viewHeight && bottom > viewHeight) {
-        return 'top';
-      } else if (top < offSetTop && bottom + offSetTop >= viewHeight) {
+      if (top > 0 && top <= offSetTop) {
+        if (wrpElem.length > 1 && top <= viewHeight && bottom > viewHeight) {
+          return 'top';
+        } else if (wrpElem.length > 1 && bottom < viewHeight) {
+          return 'small-top';
+        }
+      } else if (wrpElem.length > 1 && top < offSetTop && bottom + offSetTop >= viewHeight) {
         return 'bottom';
-      } else {
-        return false;
       }
     };
 
@@ -16775,11 +16769,13 @@ var InscreenSensor = function (_React$Component) {
           _props$className = _props.className,
           className = _props$className === undefined ? '' : _props$className,
           _props$style = _props.style,
-          style = _props$style === undefined ? {} : _props$style;
+          style = _props$style === undefined ? {} : _props$style,
+          _props$id = _props.id,
+          id = _props$id === undefined ? '' : _props$id;
 
       return React__default.createElement(
         'div',
-        { ref: this.wraperRef, className: className, style: style },
+        { ref: this.wraperRef, className: className, style: style, id: id },
         this.props.children
       );
     }
@@ -16878,7 +16874,9 @@ var Article = function Article(props) {
       changeUrl = props.changeUrl,
       shareOptions = props.shareOptions,
       cpModificationRequired = props.cpModificationRequired,
-      authorPrefix = props.authorPrefix;
+      authorPrefix = props.authorPrefix,
+      queueData = props.queueData,
+      lastUrl = props.lastUrl;
 
   var _useState = React.useState(null),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
@@ -17162,29 +17160,30 @@ var Article = function Article(props) {
     shareImage: shareImage,
     shareVia: props.Settings.title
   };
-
   return React__default.createElement(
     React__default.Fragment,
     null,
     React__default.createElement(
       InscreenSensor,
       {
-        offSetTop: 45,
+        offSetTop: 120,
+        className: 'inscreen-wrapper',
+        id: 'article-' + title,
         onChange: function onChange(visible) {
-          if (visible !== false) {
+          if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
             changeUrl(url, visible, meta);
           }
         } },
       React__default.createElement(
         'div',
         null,
-        React__default.createElement(
+        queueData && queueData.length === 1 && React__default.createElement(
           Head,
           null,
           React__default.createElement(
             'title',
             { key: 'title' },
-            shareTitle + ' | ' + props.cache.siteSettingCache.name
+            '' + shareTitle
           ),
           React__default.createElement('meta', { name: 'description', key: 'description', content: shareSummary }),
           passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
@@ -17470,14 +17469,11 @@ var ArticleQueue = function ArticleQueue(props) {
 
   var scrollDirectionDetect = function scrollDirectionDetect(e) {
     var window = e.currentTarget;
+
     if (preVscroll > window.scrollY) {
-      if (!isScrollDown) {
-        isScrollDown = true;
-      }
+      isScrollDown = false;
     } else if (preVscroll < window.scrollY) {
-      if (isScrollDown) {
-        isScrollDown = false;
-      }
+      isScrollDown = true;
     }
     preVscroll = window.scrollY;
   };
@@ -17518,21 +17514,32 @@ var ArticleQueue = function ArticleQueue(props) {
   };
 
   var changeUrl = function changeUrl(path, visibility, meta) {
+    var currentPath = window && window.location && window.location.pathname ? window.location.pathname.replace('/view/', '') : '';
     var newPath = '/view/' + path;
-    if (!isScrollDown) {
-      if (visibility === 'top') {
-        // router.push('/view/[url]', newPath, { shallow: true })
-        window.history.pushState({ page: path }, path, newPath);
-        if (props.pageview) {
-          props.pageview(newPath);
+    if (currentPath !== path) {
+      if (isScrollDown) {
+        if (visibility === 'top') {
+          // router.push('/view/[url]', newPath, { shallow: true })
+          window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          if (props.pageview) {
+            props.pageview(newPath);
+          }
+          refreshAD(path);
+          changeMeta(meta);
+        }
+      } else {
+        if (visibility === 'bottom') {
+          // router.push('/view/[url]', newPath, { shallow: true })
+          window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          if (props.pageview) {
+            props.pageview(newPath);
+          }
+          refreshAD(path);
+          changeMeta(meta);
         }
-        refreshAD(path);
-        changeMeta(meta);
       }
-    } else {
-      if (visibility === 'bottom') {
-        // router.push('/view/[url]', newPath, { shallow: true })
-        window.history.pushState({ page: path }, path, newPath);
+      if (visibility === 'small-top') {
+        window.history.pushState({ page: path }, meta.shareTitle, newPath);
         if (props.pageview) {
           props.pageview(newPath);
         }
@@ -17552,7 +17559,15 @@ var ArticleQueue = function ArticleQueue(props) {
       if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
         article.contextualAD = Ads.getNativeContextualAD(getTargeting(article, 'native-ad'));
       }
-      return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, authorPrfix: authorPrefix, article: article, cpModificationRequired: cpModificationRequired }));
+      return React__default.createElement(Article, _extends$2._extends({
+        key: index
+      }, props, {
+        changeUrl: changeUrl,
+        authorPrfix: authorPrefix,
+        article: article,
+        cpModificationRequired: cpModificationRequired,
+        queueData: queueData
+      }));
     })
   );
 };
@@ -22093,42 +22108,17 @@ var Article$1 = function Article(props) {
       React__default.createElement(
         InscreenSensor,
         {
-          offSetTop: 45,
+          offSetTop: 120,
+          className: 'inscreen-wrapper',
+          id: 'article-' + title,
           onChange: function onChange(visible) {
-            if (visible !== false) {
+            if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
               changeUrl(url, visible, meta);
             }
           } },
         React__default.createElement(
           'div',
           null,
-          React__default.createElement(
-            Head,
-            null,
-            React__default.createElement(
-              'title',
-              { key: 'title' },
-              shareTitle + ' | ' + props.cache.siteSettingCache.name
-            ),
-            React__default.createElement('meta', { name: 'description', key: 'description', content: shareSummary }),
-            passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
-            React__default.createElement('meta', { property: 'og:url', content: shareUrl, key: 'og:url' }),
-            React__default.createElement('meta', { property: 'og:title', content: shareTitle, key: 'og:title' }),
-            React__default.createElement('meta', { property: 'og:image', content: shareImage, key: 'og:image' }),
-            React__default.createElement('meta', { property: 'og:site_name', content: props.Settings.title, key: 'og:site_name' }),
-            React__default.createElement('meta', { property: 'og:description', content: shareSummary, key: 'og:description' }),
-            React__default.createElement('meta', { name: 'twitter:card', content: 'summary', key: 'twitter:card' }),
-            React__default.createElement('meta', { name: 'twitter:title', content: shareTitle, key: 'twitter:title' }),
-            React__default.createElement('meta', { name: 'twitter:image', content: shareImage, key: 'twitter:image' }),
-            React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
-            React__default.createElement('meta', { name: 'twitter:description', content: shareSummary, key: 'twitter:description' }),
-            React__default.createElement(
-              'noscript',
-              null,
-              props.article.seriesDetail && props.article.seriesDetail.prevUrl && React__default.createElement('link', { rel: 'prev', href: props.article.seriesDetail.prevUrl }),
-              props.article.seriesDetail && props.article.seriesDetail.nextUrl && React__default.createElement('link', { rel: 'next', href: props.article.seriesDetail.nextUrl })
-            )
-          ),
           React__default.createElement(
             'div',
             { className: 'video-detail', style: { marginBottom: isCutomPage(props.article) ? '150px' : 0 } },
@@ -22168,7 +22158,16 @@ var Article$1 = function Article(props) {
                     null,
                     source && React__default.createElement(
                       'p',
-                      { style: { display: 'inline-block', padding: '0 .25rem', color: 'var(--franchise-primary, #484848)', borderRadius: '2px', fontWeight: 'bold', border: '2px solid var(--franchise-primary, #484848)' }, className: 'source-label' },
+                      {
+                        style: {
+                          display: 'inline-block',
+                          padding: '0 .25rem',
+                          color: 'var(--franchise-primary, #484848)',
+                          borderRadius: '2px',
+                          fontWeight: 'bold',
+                          border: '2px solid var(--franchise-primary, #484848)'
+                        },
+                        className: 'source-label' },
                       source
                     )
                   ),
@@ -22228,7 +22227,6 @@ var Article$1 = function Article(props) {
             React__default.createElement(
               'p',
               null,
-              React__default.createElement('div', null),
               React__default.createElement(
                 'em',
                 null,
@@ -22461,7 +22459,6 @@ var ArticleQueue$1 = function ArticleQueue(props) {
       setQueueData = _useState2[1];
 
   var refreshAD = function refreshAD(path) {
-
     if (!main.main_36) {
       var activeArticle = queueData.find(function (item) {
         return item.url.current === path;
@@ -22505,14 +22502,11 @@ var ArticleQueue$1 = function ArticleQueue(props) {
 
   var scrollDirectionDetect = function scrollDirectionDetect(e) {
     var window = e.currentTarget;
+
     if (preVscroll > window.scrollY) {
-      if (!isScrollDown) {
-        isScrollDown = true;
-      }
+      isScrollDown = false;
     } else if (preVscroll < window.scrollY) {
-      if (isScrollDown) {
-        isScrollDown = false;
-      }
+      isScrollDown = true;
     }
     preVscroll = window.scrollY;
   };
@@ -22553,21 +22547,32 @@ var ArticleQueue$1 = function ArticleQueue(props) {
   };
 
   var changeUrl = function changeUrl(path, visibility, meta) {
+    var currentPath = window && window.location && window.location.pathname ? window.location.pathname.replace('/view/', '') : '';
     var newPath = '/view/' + path;
-    if (!isScrollDown) {
-      if (visibility === 'top') {
-        // router.push('/view/[url]', newPath, { shallow: true })
-        window.history.pushState({ page: path }, path, newPath);
-        if (props.pageview) {
-          props.pageview(newPath);
+    if (currentPath !== path) {
+      if (isScrollDown) {
+        if (visibility === 'top') {
+          // router.push('/view/[url]', newPath, { shallow: true })
+          window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          if (props.pageview) {
+            props.pageview(newPath);
+          }
+          refreshAD(path);
+          changeMeta(meta);
+        }
+      } else {
+        if (visibility === 'bottom') {
+          // router.push('/view/[url]', newPath, { shallow: true })
+          window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          if (props.pageview) {
+            props.pageview(newPath);
+          }
+          refreshAD(path);
+          changeMeta(meta);
         }
-        refreshAD(path);
-        changeMeta(meta);
       }
-    } else {
-      if (visibility === 'bottom') {
-        // router.push('/view/[url]', newPath, { shallow: true })
-        window.history.pushState({ page: path }, path, newPath);
+      if (visibility === 'small-top') {
+        window.history.pushState({ page: path }, meta.shareTitle, newPath);
         if (props.pageview) {
           props.pageview(newPath);
         }
@@ -22713,7 +22718,13 @@ var View = function View(props) {
       React__default.createElement('meta', { name: 'twitter:title', content: shareOptions.shareTitle, key: 'twitter:title' }),
       React__default.createElement('meta', { name: 'twitter:image', content: shareOptions.shareImage, key: 'twitter:image' }),
       React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
-      React__default.createElement('meta', { name: 'twitter:description', content: shareOptions.shareSummary, key: 'twitter:description' })
+      React__default.createElement('meta', { name: 'twitter:description', content: shareOptions.shareSummary, key: 'twitter:description' }),
+      React__default.createElement(
+        'noscript',
+        null,
+        props.article.seriesDetail && props.article.seriesDetail.prevUrl && React__default.createElement('link', { rel: 'prev', href: props.article.seriesDetail.prevUrl }),
+        props.article.seriesDetail && props.article.seriesDetail.nextUrl && React__default.createElement('link', { rel: 'next', href: props.article.seriesDetail.nextUrl })
+      )
     ),
     !needInfiniteScroll ? React__default.createElement(Article$1, _extends$2._extends({ infiniteScroll: false }, props)) : React__default.createElement(Articles, _extends$2._extends({ infiniteScroll: true }, props))
   );

package/dist/esm/index.js

@@ -14776,16 +14776,7 @@ Publication.getInitialProps = async (ctx) => {
   const {
     query: { year },
   } = ctx
-  const pub = await client.fetch(
-    `*[_type == 'publication'
-        && identifier.current == $publication][0] {
-            ...,
-            'issues': *[_type == 'publication'
-                && is_visible
-                && references(^._id)] | order(year desc, month desc)
-        }`,
-    query
-  )
+  const pub = await client.fetch(getQuery('publication'), query)
   const builder = imageUrlBuilder(client)
   const urlFor = (source) => {
     return builder.image(source)
@@ -14886,7 +14877,12 @@ var PublicationLanding = function PublicationLanding(props) {
                 null,
                 issue.name
               ),
-              React__default.createElement(
+              publication.displayLabel && React__default.createElement(
+                'p',
+                { className: 'badge badge-primary' },
+                publication.displayLabel
+              ),
+              issue.volume && issue.number && React__default.createElement(
                 'p',
                 null,
                 'Volume: ',
@@ -16730,21 +16726,19 @@ var InscreenSensor = function (_React$Component) {
       var _this$props$offSetTop = _this.props.offSetTop,
           offSetTop = _this$props$offSetTop === undefined ? 0 : _this$props$offSetTop;
       var top = rect.top,
-          height = rect.height;
+          bottom = rect.bottom;
 
-      var bottom = top + height;
       var viewHeight = window.innerHeight;
+      var wrpElem = document.getElementsByClassName('inscreen-wrapper');
 
-      if (bottom < offSetTop) {
-        return false;
-      } else if (top > offSetTop && bottom <= viewHeight) {
-        return true;
-      } else if (top < offSetTop && top <= viewHeight && bottom > viewHeight) {
-        return 'top';
-      } else if (top < offSetTop && bottom + offSetTop >= viewHeight) {
+      if (top > 0 && top <= offSetTop) {
+        if (wrpElem.length > 1 && top <= viewHeight && bottom > viewHeight) {
+          return 'top';
+        } else if (wrpElem.length > 1 && bottom < viewHeight) {
+          return 'small-top';
+        }
+      } else if (wrpElem.length > 1 && top < offSetTop && bottom + offSetTop >= viewHeight) {
         return 'bottom';
-      } else {
-        return false;
       }
     };
 
@@ -16772,11 +16766,13 @@ var InscreenSensor = function (_React$Component) {
           _props$className = _props.className,
           className = _props$className === undefined ? '' : _props$className,
           _props$style = _props.style,
-          style = _props$style === undefined ? {} : _props$style;
+          style = _props$style === undefined ? {} : _props$style,
+          _props$id = _props.id,
+          id = _props$id === undefined ? '' : _props$id;
 
       return React__default.createElement(
         'div',
-        { ref: this.wraperRef, className: className, style: style },
+        { ref: this.wraperRef, className: className, style: style, id: id },
         this.props.children
       );
     }
@@ -16875,7 +16871,9 @@ var Article = function Article(props) {
       changeUrl = props.changeUrl,
       shareOptions = props.shareOptions,
       cpModificationRequired = props.cpModificationRequired,
-      authorPrefix = props.authorPrefix;
+      authorPrefix = props.authorPrefix,
+      queueData = props.queueData,
+      lastUrl = props.lastUrl;
 
   var _useState = useState(null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -17159,29 +17157,30 @@ var Article = function Article(props) {
     shareImage: shareImage,
     shareVia: props.Settings.title
   };
-
   return React__default.createElement(
     React__default.Fragment,
     null,
     React__default.createElement(
       InscreenSensor,
       {
-        offSetTop: 45,
+        offSetTop: 120,
+        className: 'inscreen-wrapper',
+        id: 'article-' + title,
         onChange: function onChange(visible) {
-          if (visible !== false) {
+          if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
             changeUrl(url, visible, meta);
           }
         } },
       React__default.createElement(
         'div',
         null,
-        React__default.createElement(
+        queueData && queueData.length === 1 && React__default.createElement(
           Head,
           null,
           React__default.createElement(
             'title',
             { key: 'title' },
-            shareTitle + ' | ' + props.cache.siteSettingCache.name
+            '' + shareTitle
           ),
           React__default.createElement('meta', { name: 'description', key: 'description', content: shareSummary }),
           passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
@@ -17467,14 +17466,11 @@ var ArticleQueue = function ArticleQueue(props) {
 
   var scrollDirectionDetect = function scrollDirectionDetect(e) {
     var window = e.currentTarget;
+
     if (preVscroll > window.scrollY) {
-      if (!isScrollDown) {
-        isScrollDown = true;
-      }
+      isScrollDown = false;
     } else if (preVscroll < window.scrollY) {
-      if (isScrollDown) {
-        isScrollDown = false;
-      }
+      isScrollDown = true;
     }
     preVscroll = window.scrollY;
   };
@@ -17515,21 +17511,32 @@ var ArticleQueue = function ArticleQueue(props) {
   };
 
   var changeUrl = function changeUrl(path, visibility, meta) {
+    var currentPath = window && window.location && window.location.pathname ? window.location.pathname.replace('/view/', '') : '';
     var newPath = '/view/' + path;
-    if (!isScrollDown) {
-      if (visibility === 'top') {
-        // router.push('/view/[url]', newPath, { shallow: true })
-        window.history.pushState({ page: path }, path, newPath);
-        if (props.pageview) {
-          props.pageview(newPath);
+    if (currentPath !== path) {
+      if (isScrollDown) {
+        if (visibility === 'top') {
+          // router.push('/view/[url]', newPath, { shallow: true })
+          window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          if (props.pageview) {
+            props.pageview(newPath);
+          }
+          refreshAD(path);
+          changeMeta(meta);
+        }
+      } else {
+        if (visibility === 'bottom') {
+          // router.push('/view/[url]', newPath, { shallow: true })
+          window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          if (props.pageview) {
+            props.pageview(newPath);
+          }
+          refreshAD(path);
+          changeMeta(meta);
         }
-        refreshAD(path);
-        changeMeta(meta);
       }
-    } else {
-      if (visibility === 'bottom') {
-        // router.push('/view/[url]', newPath, { shallow: true })
-        window.history.pushState({ page: path }, path, newPath);
+      if (visibility === 'small-top') {
+        window.history.pushState({ page: path }, meta.shareTitle, newPath);
         if (props.pageview) {
           props.pageview(newPath);
         }
@@ -17549,7 +17556,15 @@ var ArticleQueue = function ArticleQueue(props) {
       if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
         article.contextualAD = Ads.getNativeContextualAD(getTargeting(article, 'native-ad'));
       }
-      return React__default.createElement(Article, _extends$2({ key: index }, props, { changeUrl: changeUrl, authorPrfix: authorPrefix, article: article, cpModificationRequired: cpModificationRequired }));
+      return React__default.createElement(Article, _extends$2({
+        key: index
+      }, props, {
+        changeUrl: changeUrl,
+        authorPrfix: authorPrefix,
+        article: article,
+        cpModificationRequired: cpModificationRequired,
+        queueData: queueData
+      }));
     })
   );
 };
@@ -22090,42 +22105,17 @@ var Article$1 = function Article(props) {
       React__default.createElement(
         InscreenSensor,
         {
-          offSetTop: 45,
+          offSetTop: 120,
+          className: 'inscreen-wrapper',
+          id: 'article-' + title,
           onChange: function onChange(visible) {
-            if (visible !== false) {
+            if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
               changeUrl(url, visible, meta);
             }
           } },
         React__default.createElement(
           'div',
           null,
-          React__default.createElement(
-            Head,
-            null,
-            React__default.createElement(
-              'title',
-              { key: 'title' },
-              shareTitle + ' | ' + props.cache.siteSettingCache.name
-            ),
-            React__default.createElement('meta', { name: 'description', key: 'description', content: shareSummary }),
-            passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
-            React__default.createElement('meta', { property: 'og:url', content: shareUrl, key: 'og:url' }),
-            React__default.createElement('meta', { property: 'og:title', content: shareTitle, key: 'og:title' }),
-            React__default.createElement('meta', { property: 'og:image', content: shareImage, key: 'og:image' }),
-            React__default.createElement('meta', { property: 'og:site_name', content: props.Settings.title, key: 'og:site_name' }),
-            React__default.createElement('meta', { property: 'og:description', content: shareSummary, key: 'og:description' }),
-            React__default.createElement('meta', { name: 'twitter:card', content: 'summary', key: 'twitter:card' }),
-            React__default.createElement('meta', { name: 'twitter:title', content: shareTitle, key: 'twitter:title' }),
-            React__default.createElement('meta', { name: 'twitter:image', content: shareImage, key: 'twitter:image' }),
-            React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
-            React__default.createElement('meta', { name: 'twitter:description', content: shareSummary, key: 'twitter:description' }),
-            React__default.createElement(
-              'noscript',
-              null,
-              props.article.seriesDetail && props.article.seriesDetail.prevUrl && React__default.createElement('link', { rel: 'prev', href: props.article.seriesDetail.prevUrl }),
-              props.article.seriesDetail && props.article.seriesDetail.nextUrl && React__default.createElement('link', { rel: 'next', href: props.article.seriesDetail.nextUrl })
-            )
-          ),
           React__default.createElement(
             'div',
             { className: 'video-detail', style: { marginBottom: isCutomPage(props.article) ? '150px' : 0 } },
@@ -22165,7 +22155,16 @@ var Article$1 = function Article(props) {
                     null,
                     source && React__default.createElement(
                       'p',
-                      { style: { display: 'inline-block', padding: '0 .25rem', color: 'var(--franchise-primary, #484848)', borderRadius: '2px', fontWeight: 'bold', border: '2px solid var(--franchise-primary, #484848)' }, className: 'source-label' },
+                      {
+                        style: {
+                          display: 'inline-block',
+                          padding: '0 .25rem',
+                          color: 'var(--franchise-primary, #484848)',
+                          borderRadius: '2px',
+                          fontWeight: 'bold',
+                          border: '2px solid var(--franchise-primary, #484848)'
+                        },
+                        className: 'source-label' },
                       source
                     )
                   ),
@@ -22225,7 +22224,6 @@ var Article$1 = function Article(props) {
             React__default.createElement(
               'p',
               null,
-              React__default.createElement('div', null),
               React__default.createElement(
                 'em',
                 null,
@@ -22458,7 +22456,6 @@ var ArticleQueue$1 = function ArticleQueue(props) {
       setQueueData = _useState2[1];
 
   var refreshAD = function refreshAD(path) {
-
     if (!main_36) {
       var activeArticle = queueData.find(function (item) {
         return item.url.current === path;
@@ -22502,14 +22499,11 @@ var ArticleQueue$1 = function ArticleQueue(props) {
 
   var scrollDirectionDetect = function scrollDirectionDetect(e) {
     var window = e.currentTarget;
+
     if (preVscroll > window.scrollY) {
-      if (!isScrollDown) {
-        isScrollDown = true;
-      }
+      isScrollDown = false;
     } else if (preVscroll < window.scrollY) {
-      if (isScrollDown) {
-        isScrollDown = false;
-      }
+      isScrollDown = true;
     }
     preVscroll = window.scrollY;
   };
@@ -22550,21 +22544,32 @@ var ArticleQueue$1 = function ArticleQueue(props) {
   };
 
   var changeUrl = function changeUrl(path, visibility, meta) {
+    var currentPath = window && window.location && window.location.pathname ? window.location.pathname.replace('/view/', '') : '';
     var newPath = '/view/' + path;
-    if (!isScrollDown) {
-      if (visibility === 'top') {
-        // router.push('/view/[url]', newPath, { shallow: true })
-        window.history.pushState({ page: path }, path, newPath);
-        if (props.pageview) {
-          props.pageview(newPath);
+    if (currentPath !== path) {
+      if (isScrollDown) {
+        if (visibility === 'top') {
+          // router.push('/view/[url]', newPath, { shallow: true })
+          window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          if (props.pageview) {
+            props.pageview(newPath);
+          }
+          refreshAD(path);
+          changeMeta(meta);
+        }
+      } else {
+        if (visibility === 'bottom') {
+          // router.push('/view/[url]', newPath, { shallow: true })
+          window.history.pushState({ page: path }, meta.shareTitle, newPath);
+          if (props.pageview) {
+            props.pageview(newPath);
+          }
+          refreshAD(path);
+          changeMeta(meta);
         }
-        refreshAD(path);
-        changeMeta(meta);
       }
-    } else {
-      if (visibility === 'bottom') {
-        // router.push('/view/[url]', newPath, { shallow: true })
-        window.history.pushState({ page: path }, path, newPath);
+      if (visibility === 'small-top') {
+        window.history.pushState({ page: path }, meta.shareTitle, newPath);
         if (props.pageview) {
           props.pageview(newPath);
         }
@@ -22710,7 +22715,13 @@ var View = function View(props) {
       React__default.createElement('meta', { name: 'twitter:title', content: shareOptions.shareTitle, key: 'twitter:title' }),
       React__default.createElement('meta', { name: 'twitter:image', content: shareOptions.shareImage, key: 'twitter:image' }),
       React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
-      React__default.createElement('meta', { name: 'twitter:description', content: shareOptions.shareSummary, key: 'twitter:description' })
+      React__default.createElement('meta', { name: 'twitter:description', content: shareOptions.shareSummary, key: 'twitter:description' }),
+      React__default.createElement(
+        'noscript',
+        null,
+        props.article.seriesDetail && props.article.seriesDetail.prevUrl && React__default.createElement('link', { rel: 'prev', href: props.article.seriesDetail.prevUrl }),
+        props.article.seriesDetail && props.article.seriesDetail.nextUrl && React__default.createElement('link', { rel: 'next', href: props.article.seriesDetail.nextUrl })
+      )
     ),
     !needInfiniteScroll ? React__default.createElement(Article$1, _extends$2({ infiniteScroll: false }, props)) : React__default.createElement(Articles, _extends$2({ infiniteScroll: true }, props))
   );

package/package.json

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