@mjhls/mjh-framework 1.0.956 → 1.0.957-test

package/README.md

@@ -1,4 +1,4 @@
-# mjh-framework v. 1.0.956
+# mjh-framework v. 1.0.957
 
 [![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/EventsDeck.js

@@ -63,7 +63,9 @@ var currentTime = index.momentTimezone().toISOString();
 var itemsPerPage = 200;
 
 var EventsDeck = function EventsDeck(_ref) {
-  var rightItems = _ref.rightItems,
+  var _ref$emptyMsg = _ref.emptyMsg,
+      emptyMsg = _ref$emptyMsg === undefined ? 'No events found' : _ref$emptyMsg,
+      rightItems = _ref.rightItems,
       _ref$filter = _ref.filter,
       filter = _ref$filter === undefined ? 'start gt \'' + currentTime + '\' and status eq \'Active\'' : _ref$filter,
       _ref$hardCodedEvents = _ref.hardCodedEvents,
@@ -616,7 +618,8 @@ var EventsDeck = function EventsDeck(_ref) {
         React__default['default'].createElement(
           'div',
           null,
-          'No events found '
+          emptyMsg,
+          ' '
         )
       );
     }
@@ -845,7 +848,8 @@ var EventsDeck = function EventsDeck(_ref) {
       React__default['default'].createElement(
         'div',
         null,
-        'No events found '
+        emptyMsg,
+        ' '
       )
     );
   }

package/dist/cjs/View.js

@@ -950,8 +950,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
       _props$authorImgHeigh = props.authorImgHeight,
       authorImgHeight = _props$authorImgHeigh === undefined ? 270 : _props$authorImgHeigh;
       props.active;
-      var containerHeight = props.containerHeight,
-      _props$refreshFlag = props.refreshFlag,
+      var _props$refreshFlag = props.refreshFlag,
       refreshFlag = _props$refreshFlag === undefined ? false : _props$refreshFlag,
       disqusConfig = props.disqusConfig,
       showDisqus = props.showDisqus,
@@ -1037,10 +1036,20 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
       articleBody = _useState10[0],
       setArticleBody = _useState10[1];
 
-  var _useState11 = React.useState(true),
-      _useState12 = slicedToArray._slicedToArray(_useState11, 2);
-      _useState12[0];
-      var setPreviewAd = _useState12[1];
+  var _useState11 = React.useState(0),
+      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
+      containerHeight = _useState12[0],
+      setContainerHeight = _useState12[1];
+
+  var _useState13 = React.useState(true),
+      _useState14 = slicedToArray._slicedToArray(_useState13, 2);
+      _useState14[0];
+      var setPreviewAd = _useState14[1];
+
+  var _useState15 = React.useState(props.index === 0),
+      _useState16 = slicedToArray._slicedToArray(_useState15, 2),
+      isFirstArticle = _useState16[0],
+      setIsFirstArticle = _useState16[1];
 
   React.useEffect(function () {
     var path = window && window.location && window.location.search;
@@ -1048,6 +1057,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
     setPreviewAd(path.split('&').some(function (param) {
       return param.includes('creativeId');
     }));
+    setContainerHeight(window.innerHeight);
   }, []);
 
   var isCutomPage = function isCutomPage(article) {
@@ -1549,9 +1559,10 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
         visibilitySensor.VisibilitySensor,
         {
           partialVisibility: true,
-          offset: { bottom: triggerOffset, top: containerHeight },
+          offset: { bottom: triggerOffset, top: containerHeight && containerHeight },
           onChange: function onChange(isVisible) {
-            if (isVisible && queueData && queueData.length > 1) {
+            console.log(isFirstArticle, 'first');
+            if (isVisible && !isFirstArticle) {
               var pageviewProperties = _extends._extends({}, targeting, {
                 category: article && article.category ? article.category.name : ''
               });
@@ -1560,6 +1571,10 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
                 return true;
               });
             }
+            if (isFirstArticle) {
+
+              setIsFirstArticle(false);
+            }
           } },
         React__default['default'].createElement(
           'div',
@@ -1842,7 +1857,8 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
     return detail();
   }
 }), function (prevProps, nextProps) {
-  return prevProps.article === nextProps.article;
+  if (prevProps.article._id === nextProps.article._id) return true;
+  return false;
 });
 
 var _this$1 = undefined;
@@ -2089,6 +2105,7 @@ var ArticleQueue = function ArticleQueue(props) {
   };
 
   var onChangeArticle = function onChangeArticle(path, meta, pageviewProperties) {
+
     var newPath = '/view/' + path;
     var activeArticle = queueData.find(function (item) {
       return item.url.current === path;

package/dist/esm/EventsDeck.js

@@ -50,7 +50,9 @@ var currentTime = momentTimezone().toISOString();
 var itemsPerPage = 200;
 
 var EventsDeck = function EventsDeck(_ref) {
-  var rightItems = _ref.rightItems,
+  var _ref$emptyMsg = _ref.emptyMsg,
+      emptyMsg = _ref$emptyMsg === undefined ? 'No events found' : _ref$emptyMsg,
+      rightItems = _ref.rightItems,
       _ref$filter = _ref.filter,
       filter = _ref$filter === undefined ? 'start gt \'' + currentTime + '\' and status eq \'Active\'' : _ref$filter,
       _ref$hardCodedEvents = _ref.hardCodedEvents,
@@ -603,7 +605,8 @@ var EventsDeck = function EventsDeck(_ref) {
         React__default.createElement(
           'div',
           null,
-          'No events found '
+          emptyMsg,
+          ' '
         )
       );
     }
@@ -832,7 +835,8 @@ var EventsDeck = function EventsDeck(_ref) {
       React__default.createElement(
         'div',
         null,
-        'No events found '
+        emptyMsg,
+        ' '
       )
     );
   }

package/dist/esm/View.js

@@ -939,8 +939,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
       _props$authorImgHeigh = props.authorImgHeight,
       authorImgHeight = _props$authorImgHeigh === undefined ? 270 : _props$authorImgHeigh;
       props.active;
-      var containerHeight = props.containerHeight,
-      _props$refreshFlag = props.refreshFlag,
+      var _props$refreshFlag = props.refreshFlag,
       refreshFlag = _props$refreshFlag === undefined ? false : _props$refreshFlag,
       disqusConfig = props.disqusConfig,
       showDisqus = props.showDisqus,
@@ -1026,10 +1025,20 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
       articleBody = _useState10[0],
       setArticleBody = _useState10[1];
 
-  var _useState11 = useState(true),
-      _useState12 = _slicedToArray(_useState11, 2);
-      _useState12[0];
-      var setPreviewAd = _useState12[1];
+  var _useState11 = useState(0),
+      _useState12 = _slicedToArray(_useState11, 2),
+      containerHeight = _useState12[0],
+      setContainerHeight = _useState12[1];
+
+  var _useState13 = useState(true),
+      _useState14 = _slicedToArray(_useState13, 2);
+      _useState14[0];
+      var setPreviewAd = _useState14[1];
+
+  var _useState15 = useState(props.index === 0),
+      _useState16 = _slicedToArray(_useState15, 2),
+      isFirstArticle = _useState16[0],
+      setIsFirstArticle = _useState16[1];
 
   useEffect(function () {
     var path = window && window.location && window.location.search;
@@ -1037,6 +1046,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
     setPreviewAd(path.split('&').some(function (param) {
       return param.includes('creativeId');
     }));
+    setContainerHeight(window.innerHeight);
   }, []);
 
   var isCutomPage = function isCutomPage(article) {
@@ -1538,9 +1548,10 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
         VisibilitySensor,
         {
           partialVisibility: true,
-          offset: { bottom: triggerOffset, top: containerHeight },
+          offset: { bottom: triggerOffset, top: containerHeight && containerHeight },
           onChange: function onChange(isVisible) {
-            if (isVisible && queueData && queueData.length > 1) {
+            console.log(isFirstArticle, 'first');
+            if (isVisible && !isFirstArticle) {
               var pageviewProperties = _extends({}, targeting, {
                 category: article && article.category ? article.category.name : ''
               });
@@ -1549,6 +1560,10 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
                 return true;
               });
             }
+            if (isFirstArticle) {
+
+              setIsFirstArticle(false);
+            }
           } },
         React__default.createElement(
           'div',
@@ -1831,7 +1846,8 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
     return detail();
   }
 }), function (prevProps, nextProps) {
-  return prevProps.article === nextProps.article;
+  if (prevProps.article._id === nextProps.article._id) return true;
+  return false;
 });
 
 var _this$1 = undefined;
@@ -2078,6 +2094,7 @@ var ArticleQueue = function ArticleQueue(props) {
   };
 
   var onChangeArticle = function onChangeArticle(path, meta, pageviewProperties) {
+
     var newPath = '/view/' + path;
     var activeArticle = queueData.find(function (item) {
       return item.url.current === path;

package/package.json

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