@mjhls/mjh-framework 1.0.313 → 1.0.315

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.313
+# mjh-framework v. 1.0.315
 
 > Foundation Framework
 

package/dist/cjs/{Normal-1db1458a.js → Normal-7cd7e351.js}

@@ -1778,7 +1778,10 @@ var AD728x90 = function AD728x90(_ref) {
       _ref$targeting = _ref.targeting,
       targeting = _ref$targeting === undefined ? {} : _ref$targeting,
       _ref$pos = _ref.pos,
-      pos = _ref$pos === undefined ? 'top' : _ref$pos;
+      pos = _ref$pos === undefined ? 'top' : _ref$pos,
+      _ref$fixedPos = _ref.fixedPos,
+      fixedPos = _ref$fixedPos === undefined ? '60px' : _ref$fixedPos;
+
 
   var mobileView = false;
   if (main.main_36) {
@@ -1805,7 +1808,7 @@ var AD728x90 = function AD728x90(_ref) {
         if (window.pageYOffset + (AdOffsetTop - navbar.offsetHeight) > AdOffsetTop) {
           if (adRef.current && adRef.current.style) {
             adRef.current.style.position = 'fixed';
-            adRef.current.style.top = '60px';
+            adRef.current.style.top = fixedPos;
             adRef.current.style.left = '0px';
             adRef.current.style.zIndex = '9999';
             adRef.current.style.width = '100%';

package/dist/cjs/TemplateNormal.js

@@ -20,7 +20,7 @@ require('./react-social-icons-cd0d9d3b.js');
 require('react-bootstrap');
 require('./index.esm-340d3792.js');
 require('react-bootstrap/Button');
-var TemplateNormal = require('./Normal-1db1458a.js');
+var TemplateNormal = require('./Normal-7cd7e351.js');
 require('react-bootstrap/ListGroup');
 require('next/head');
 require('react-bootstrap/Nav');

package/dist/cjs/index.js

@@ -53,7 +53,7 @@ var IssueDeck = require('./IssueDeck.js');
 require('react-bootstrap/Badge');
 var IssueContentDeck = require('./IssueContentDeck.js');
 var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
-var TemplateNormal = require('./Normal-1db1458a.js');
+var TemplateNormal = require('./Normal-7cd7e351.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -3058,7 +3058,7 @@ var ADWelcome = function ADWelcome(_ref) {
     return --timeLeft;
   };
 
-  var _useState = React.useState(calculateTimeLeft(counter + 1)),
+  var _useState = React.useState(counter),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       timeLeft = _useState2[0],
       setTimeLeft = _useState2[1];
@@ -3077,6 +3077,7 @@ var ADWelcome = function ADWelcome(_ref) {
     if (isFound) {
       var parent = document.getElementById('welcome-modal');
       parent.style.display = 'block';
+      calculateTimeLeft(counter + 1);
     } else {
       setFlag(true);
     }
@@ -13902,7 +13903,7 @@ var Breadcrumbs = function Breadcrumbs(_ref) {
       React__default.createElement(
         'style',
         { jsx: 'true' },
-        '\n          .breadcrumb {\n            border: none;\n            background: transparent;\n          }\n          .breadcrumb .breadcrumb-item a {\n            color: var(--primary);\n            font-size: 12px;\n          }\n          .breadcrumb .breadcrumb-item .active{\n            font-size: 12px;\n          }\n          .breadcrumb-item + .breadcrumb-item::before {\n            content: \'' + separator + '\';\n          }\n        '
+        '\n          .breadcrumb {\n            background: transparent;\n            padding-left: 0.25rem;\n          }\n          .breadcrumb .breadcrumb-item + .breadcrumb-item::before {\n            content: \'' + separator + '\';\n          }\n        '
       )
     );
   }
@@ -14000,11 +14001,39 @@ module.exports = { "default": keys, __esModule: true };
 
 var _Object$keys = _commonjsHelpers.unwrapExports(keys$1);
 
+var sortByName = function sortByName(arr) {
+  var items = [].concat(toConsumableArray._toConsumableArray(arr));
+  items.sort(function (a, b) {
+    var nameA = a.name.toUpperCase();
+    var nameB = b.name.toUpperCase();
+    if (nameA < nameB) {
+      return -1;
+    }
+    if (nameA > nameB) {
+      return 1;
+    }
+    return 0;
+  });
+  return items;
+};
+
 var AlphabeticList = function AlphabeticList(_ref) {
   var _ref$dataRecord = _ref.dataRecord,
       dataRecord = _ref$dataRecord === undefined ? [] : _ref$dataRecord;
 
-  var _useState = React.useState({}),
+  var itemsList = {};
+  if (dataRecord && dataRecord.length > 0) {
+    var sortedData = sortByName(dataRecord);
+    sortedData.forEach(function (item) {
+      var firstLetter = item.name.charAt(0).toUpperCase();
+      if (!itemsList[firstLetter]) {
+        itemsList[firstLetter] = [];
+      }
+      itemsList[firstLetter].push(item);
+    });
+  }
+
+  var _useState = React.useState(itemsList),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       dataList = _useState2[0],
       setDataList = _useState2[1];
@@ -14056,36 +14085,6 @@ var AlphabeticList = function AlphabeticList(_ref) {
     );
   };
 
-  var sortByName = function sortByName(arr) {
-    var items = [].concat(toConsumableArray._toConsumableArray(arr));
-    items.sort(function (a, b) {
-      var nameA = a.name.toUpperCase();
-      var nameB = b.name.toUpperCase();
-      if (nameA < nameB) {
-        return -1;
-      }
-      if (nameA > nameB) {
-        return 1;
-      }
-      return 0;
-    });
-    return items;
-  };
-
-  React.useEffect(function () {
-    var itemsList = {};
-    var sortedData = sortByName(dataRecord);
-
-    sortedData.forEach(function (item) {
-      var firstLetter = item.name.charAt(0).toUpperCase();
-      if (!itemsList[firstLetter]) {
-        itemsList[firstLetter] = [];
-      }
-      itemsList[firstLetter].push(item);
-    });
-    setDataList(itemsList);
-  }, [dataRecord]);
-
   React.useEffect(function () {
     itemsRef.current = itemsRef.current.slice(0, _Object$keys(dataList).length);
   }, [dataList]);
@@ -16228,7 +16227,7 @@ var Article = function Article(props) {
   var renderIsiContent = function renderIsiContent(article) {
     var url = article.url.current;
 
-    if (regionalPages.includes(url)) {
+    if (regionalPages && regionalPages.includes(url)) {
       return React__default.createElement(ISIContent, null);
     } else if (nationalPage === url) {
       return React__default.createElement(ISIContent, { national: true });

package/dist/esm/{Normal-a78e40f8.js → Normal-19f6db83.js}

@@ -1773,7 +1773,10 @@ var AD728x90 = function AD728x90(_ref) {
       _ref$targeting = _ref.targeting,
       targeting = _ref$targeting === undefined ? {} : _ref$targeting,
       _ref$pos = _ref.pos,
-      pos = _ref$pos === undefined ? 'top' : _ref$pos;
+      pos = _ref$pos === undefined ? 'top' : _ref$pos,
+      _ref$fixedPos = _ref.fixedPos,
+      fixedPos = _ref$fixedPos === undefined ? '60px' : _ref$fixedPos;
+
 
   var mobileView = false;
   if (main_36) {
@@ -1800,7 +1803,7 @@ var AD728x90 = function AD728x90(_ref) {
         if (window.pageYOffset + (AdOffsetTop - navbar.offsetHeight) > AdOffsetTop) {
           if (adRef.current && adRef.current.style) {
             adRef.current.style.position = 'fixed';
-            adRef.current.style.top = '60px';
+            adRef.current.style.top = fixedPos;
             adRef.current.style.left = '0px';
             adRef.current.style.zIndex = '9999';
             adRef.current.style.width = '100%';

package/dist/esm/TemplateNormal.js

@@ -18,7 +18,7 @@ import './react-social-icons-a7d5c5c7.js';
 import 'react-bootstrap';
 import './index.esm-536609db.js';
 import 'react-bootstrap/Button';
-export { T as default } from './Normal-a78e40f8.js';
+export { T as default } from './Normal-19f6db83.js';
 import 'react-bootstrap/ListGroup';
 import 'next/head';
 import 'react-bootstrap/Nav';

package/dist/esm/index.js

@@ -49,8 +49,8 @@ export { default as IssueDeck } from './IssueDeck.js';
 import 'react-bootstrap/Badge';
 export { default as IssueContentDeck } from './IssueContentDeck.js';
 import Spinner from 'react-bootstrap/Spinner';
-import { M as MdPictureAsPdf } from './Normal-a78e40f8.js';
-export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-a78e40f8.js';
+import { M as MdPictureAsPdf } from './Normal-19f6db83.js';
+export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-19f6db83.js';
 import 'react-bootstrap/ListGroup';
 import Head from 'next/head';
 import Accordion from 'react-bootstrap/Accordion';
@@ -3056,7 +3056,7 @@ var ADWelcome = function ADWelcome(_ref) {
     return --timeLeft;
   };
 
-  var _useState = useState(calculateTimeLeft(counter + 1)),
+  var _useState = useState(counter),
       _useState2 = _slicedToArray(_useState, 2),
       timeLeft = _useState2[0],
       setTimeLeft = _useState2[1];
@@ -3075,6 +3075,7 @@ var ADWelcome = function ADWelcome(_ref) {
     if (isFound) {
       var parent = document.getElementById('welcome-modal');
       parent.style.display = 'block';
+      calculateTimeLeft(counter + 1);
     } else {
       setFlag(true);
     }
@@ -13900,7 +13901,7 @@ var Breadcrumbs = function Breadcrumbs(_ref) {
       React__default.createElement(
         'style',
         { jsx: 'true' },
-        '\n          .breadcrumb {\n            border: none;\n            background: transparent;\n          }\n          .breadcrumb .breadcrumb-item a {\n            color: var(--primary);\n            font-size: 12px;\n          }\n          .breadcrumb .breadcrumb-item .active{\n            font-size: 12px;\n          }\n          .breadcrumb-item + .breadcrumb-item::before {\n            content: \'' + separator + '\';\n          }\n        '
+        '\n          .breadcrumb {\n            background: transparent;\n            padding-left: 0.25rem;\n          }\n          .breadcrumb .breadcrumb-item + .breadcrumb-item::before {\n            content: \'' + separator + '\';\n          }\n        '
       )
     );
   }
@@ -13998,11 +13999,39 @@ module.exports = { "default": keys, __esModule: true };
 
 var _Object$keys = unwrapExports(keys$1);
 
+var sortByName = function sortByName(arr) {
+  var items = [].concat(_toConsumableArray(arr));
+  items.sort(function (a, b) {
+    var nameA = a.name.toUpperCase();
+    var nameB = b.name.toUpperCase();
+    if (nameA < nameB) {
+      return -1;
+    }
+    if (nameA > nameB) {
+      return 1;
+    }
+    return 0;
+  });
+  return items;
+};
+
 var AlphabeticList = function AlphabeticList(_ref) {
   var _ref$dataRecord = _ref.dataRecord,
       dataRecord = _ref$dataRecord === undefined ? [] : _ref$dataRecord;
 
-  var _useState = useState({}),
+  var itemsList = {};
+  if (dataRecord && dataRecord.length > 0) {
+    var sortedData = sortByName(dataRecord);
+    sortedData.forEach(function (item) {
+      var firstLetter = item.name.charAt(0).toUpperCase();
+      if (!itemsList[firstLetter]) {
+        itemsList[firstLetter] = [];
+      }
+      itemsList[firstLetter].push(item);
+    });
+  }
+
+  var _useState = useState(itemsList),
       _useState2 = _slicedToArray(_useState, 2),
       dataList = _useState2[0],
       setDataList = _useState2[1];
@@ -14054,36 +14083,6 @@ var AlphabeticList = function AlphabeticList(_ref) {
     );
   };
 
-  var sortByName = function sortByName(arr) {
-    var items = [].concat(_toConsumableArray(arr));
-    items.sort(function (a, b) {
-      var nameA = a.name.toUpperCase();
-      var nameB = b.name.toUpperCase();
-      if (nameA < nameB) {
-        return -1;
-      }
-      if (nameA > nameB) {
-        return 1;
-      }
-      return 0;
-    });
-    return items;
-  };
-
-  useEffect(function () {
-    var itemsList = {};
-    var sortedData = sortByName(dataRecord);
-
-    sortedData.forEach(function (item) {
-      var firstLetter = item.name.charAt(0).toUpperCase();
-      if (!itemsList[firstLetter]) {
-        itemsList[firstLetter] = [];
-      }
-      itemsList[firstLetter].push(item);
-    });
-    setDataList(itemsList);
-  }, [dataRecord]);
-
   useEffect(function () {
     itemsRef.current = itemsRef.current.slice(0, _Object$keys(dataList).length);
   }, [dataList]);
@@ -16226,7 +16225,7 @@ var Article = function Article(props) {
   var renderIsiContent = function renderIsiContent(article) {
     var url = article.url.current;
 
-    if (regionalPages.includes(url)) {
+    if (regionalPages && regionalPages.includes(url)) {
       return React__default.createElement(ISIContent, null);
     } else if (nationalPage === url) {
       return React__default.createElement(ISIContent, { national: true });

package/package.json

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