@mjhls/mjh-framework 1.0.541 → 1.0.543-canari

package/dist/esm/VideoSeriesListing.js

@@ -25,8 +25,8 @@ import './index-5f9f807a.js';
 import './slicedToArray-f1e40361.js';
 import './smoothscroll-4b699764.js';
 import YoutubeGroup from './YoutubeGroup.js';
-import './iconBase-602d52fe.js';
-import { I as IoIosArrowForward } from './index.esm-4b1d94b7.js';
+import './iconBase-6ee2f2fb.js';
+import { I as IoIosArrowForward } from './index.esm-b97cf389.js';
 
 var VideoSeriesListing = function (_React$Component) {
   _inherits(VideoSeriesListing, _React$Component);

package/dist/esm/View.js

@@ -316,22 +316,38 @@ var Article = function Article(props) {
       visibleFlag = _useState4[0],
       setVisibleFlag = _useState4[1];
 
-  var summary = getArticleSummary(props.article);
-
-  var _useState5 = useState(1),
+  var _useState5 = useState(false),
       _useState6 = _slicedToArray(_useState5, 2),
-      auth = _useState6[0],
-      setAuth = _useState6[1];
+      adPageLoaded = _useState6[0],
+      setAdPageLoaded = _useState6[1];
+
+  var scrollCheck = function scrollCheck() {
+    setAdPageLoaded(true);
+  };
+
+  useEffect(function () {
+    window.addEventListener('scroll', scrollCheck);
+    return function () {
+      return window.removeEventListener('scroll', scrollCheck);
+    };
+  }, []);
 
-  var _useState7 = useState(''),
+  var summary = getArticleSummary(props.article);
+
+  var _useState7 = useState(1),
       _useState8 = _slicedToArray(_useState7, 2),
-      passwordKey = _useState8[0],
-      setPasswordKey = _useState8[1];
+      auth = _useState8[0],
+      setAuth = _useState8[1];
 
-  var _useState9 = useState(body),
+  var _useState9 = useState(''),
       _useState10 = _slicedToArray(_useState9, 2),
-      articleBody = _useState10[0],
-      setArticleBody = _useState10[1];
+      passwordKey = _useState10[0],
+      setPasswordKey = _useState10[1];
+
+  var _useState11 = useState(body),
+      _useState12 = _slicedToArray(_useState11, 2),
+      articleBody = _useState12[0],
+      setArticleBody = _useState12[1];
 
   var isCutomPage = function isCutomPage(article) {
     var url = article.url.current;
@@ -774,7 +790,7 @@ var Article = function Article(props) {
             React__default.createElement(
               'div',
               { className: 'ad-box', style: { textAlign: 'center' } },
-              main_39 && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
+              main_39 && adPageLoaded && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
                 if (index === 0) {
                   return React__default.createElement(
                     'div',
@@ -829,7 +845,7 @@ var Article = function Article(props) {
           renderIsiContent(props.article)
         )
       ),
-      main_39 && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
+      main_39 && adPageLoaded && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
         if (index > 0) {
           return React__default.createElement(
             'div',

package/dist/esm/getQuery.js

@@ -1,5 +1,5 @@
 import './_commonjsHelpers-0c4b6f40.js';
-import { m as moment } from './moment-12415288.js';
+import './moment-12415288.js';
 
 var getQuery = function getQuery(type) {
   var conditions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -7,10 +7,10 @@ var getQuery = function getQuery(type) {
 
   //Added feature to include additional conditions and parameters for site level operations
   //Site level conditions should start with && (logical AND), and site level params should end with , (comma) in order to execute query
-  var today = moment().utc().format();
+
   switch (type) {
     case 'related':
-      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && published <= \'' + today + '\'\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[$index]{\n                  ' + params + '\n                  title,\n                  published,\n                  \'showPublished\':select(contentCategory->name !=\'Webcasts\' => true,false),\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                    documentGroup-> {\n                      name,\n                      thumbnail,\n                      parent->{...,parent->},\n                    \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
+      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && published <= now()\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[$index]{\n                  ' + params + '\n                  title,\n                  published,\n                  \'showPublished\':select(contentCategory->name !=\'Webcasts\' => true,false),\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                    documentGroup-> {\n                      name,\n                      thumbnail,\n                      parent->{...,parent->},\n                    \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
     case 'article':
       return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          \'showPublished\':select(contentCategory->name !=\'Webcasts\' => true,false),\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          "authorDetails": authorMapping[]->{ displayName, url },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                            documentGroup-> {\n                              name,\n                              thumbnail,\n                              parent->{...,parent->},\n                            \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
     case 'publication':

package/dist/esm/{iconBase-602d52fe.js → iconBase-6ee2f2fb.js}

@@ -78,4 +78,4 @@ function IconBase(props) {
   }) : elem(DefaultContext);
 }
 
-export { GenIcon as G, IconContext as I };
+export { GenIcon as G };

package/dist/esm/{index.esm-b08f4b04.js → index.esm-9d6faf80.js}

@@ -1,4 +1,4 @@
-import { G as GenIcon } from './iconBase-602d52fe.js';
+import { G as GenIcon } from './iconBase-6ee2f2fb.js';
 
 // THIS FILE IS AUTO GENERATED
 var MdEmail = function (props) {

package/dist/esm/{index.esm-9a4c8813.js → index.esm-a7ad65ba.js}

@@ -1,4 +1,4 @@
-import { G as GenIcon } from './iconBase-602d52fe.js';
+import { G as GenIcon } from './iconBase-6ee2f2fb.js';
 
 // THIS FILE IS AUTO GENERATED
 var FaLongArrowAltRight = function (props) {

package/dist/esm/{index.esm-4b1d94b7.js → index.esm-b97cf389.js}

@@ -1,4 +1,4 @@
-import { G as GenIcon } from './iconBase-602d52fe.js';
+import { G as GenIcon } from './iconBase-6ee2f2fb.js';
 
 // THIS FILE IS AUTO GENERATED
 var IoIosArrowForward = function (props) {

package/dist/esm/index.js

@@ -57,8 +57,8 @@ export { default as GroupDeck } from './GroupDeck.js';
 export { default as YoutubeGroup } from './YoutubeGroup.js';
 import 'react-bootstrap';
 export { default as QueueDeckExpanded } from './QueueDeckExpanded.js';
-import './iconBase-602d52fe.js';
-import './index.esm-4b1d94b7.js';
+import './iconBase-6ee2f2fb.js';
+import './index.esm-b97cf389.js';
 export { default as VideoSeriesListing } from './VideoSeriesListing.js';
 export { default as MasterDeck } from './MasterDeck.js';
 import 'react-bootstrap/Button';
@@ -97,15 +97,14 @@ export { default as VideoSeriesFilter } from './VideoSeriesFilter.js';
 import 'react-bootstrap/Nav';
 import 'react-bootstrap/Navbar';
 import 'react-bootstrap/NavDropdown';
-import './index.esm-b08f4b04.js';
-import './NavFooter-e27bd93b.js';
-import './SocialNavFooter-4fb16720.js';
-import './index.esm-16536e81.js';
+import './index.esm-9d6faf80.js';
 import 'react-bootstrap/Form';
 import 'react-bootstrap/FormControl';
+export { default as Search } from './Search.js';
+import './NavFooter-e27bd93b.js';
+import './SocialNavFooter-4fb16720.js';
 export { default as NavMagazine } from './NavMagazine.js';
 export { NavNative } from './NavNative.js';
-export { default as Search } from './Search.js';
 export { NavNormal } from './NavNormal.js';
 export { NavDvm } from './NavDvm.js';
 export { HamMagazine } from './HamMagazine.js';
@@ -129,7 +128,7 @@ export { default as PdfDownload } from './PdfDownload.js';
 import 'react-bootstrap/DropdownButton';
 import 'react-bootstrap/Dropdown';
 export { default as RelatedTopicsDropdown } from './RelatedTopicsDropdown.js';
-import './index.esm-9a4c8813.js';
+import './index.esm-a7ad65ba.js';
 export { default as Ustream } from './Ustream.js';
 export { default as HighlightenVideo } from './HighlightenVideo.js';
 export { default as PublicationLanding } from './PublicationLanding.js';

package/package.json

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

package/dist/cjs/index.esm-0e5c6a9e.js

@@ -1,11 +0,0 @@
-'use strict';
-
-var iconBase = require('./iconBase-68959171.js');
-
-// THIS FILE IS AUTO GENERATED
-var GoSearch = function (props) {
-  return iconBase.GenIcon({"tag":"svg","attr":{"viewBox":"0 0 16 16"},"child":[{"tag":"path","attr":{"fillRule":"evenodd","d":"M15.7 13.3l-3.81-3.83A5.93 5.93 0 0 0 13 6c0-3.31-2.69-6-6-6S1 2.69 1 6s2.69 6 6 6c1.3 0 2.48-.41 3.47-1.11l3.83 3.81c.19.2.45.3.7.3.25 0 .52-.09.7-.3a.996.996 0 0 0 0-1.41v.01zM7 10.7c-2.59 0-4.7-2.11-4.7-4.7 0-2.59 2.11-4.7 4.7-4.7 2.59 0 4.7 2.11 4.7 4.7 0 2.59-2.11 4.7-4.7 4.7z"}}]})(props);
-};
-GoSearch.displayName = "GoSearch";
-
-exports.GoSearch = GoSearch;

package/dist/esm/index.esm-16536e81.js

@@ -1,9 +0,0 @@
-import { G as GenIcon } from './iconBase-602d52fe.js';
-
-// THIS FILE IS AUTO GENERATED
-var GoSearch = function (props) {
-  return GenIcon({"tag":"svg","attr":{"viewBox":"0 0 16 16"},"child":[{"tag":"path","attr":{"fillRule":"evenodd","d":"M15.7 13.3l-3.81-3.83A5.93 5.93 0 0 0 13 6c0-3.31-2.69-6-6-6S1 2.69 1 6s2.69 6 6 6c1.3 0 2.48-.41 3.47-1.11l3.83 3.81c.19.2.45.3.7.3.25 0 .52-.09.7-.3a.996.996 0 0 0 0-1.41v.01zM7 10.7c-2.59 0-4.7-2.11-4.7-4.7 0-2.59 2.11-4.7 4.7-4.7 2.59 0 4.7 2.11 4.7 4.7 0 2.59-2.11 4.7-4.7 4.7z"}}]})(props);
-};
-GoSearch.displayName = "GoSearch";
-
-export { GoSearch as G };