@mjhls/mjh-framework 1.0.619 → 1.0.621

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.619
+# mjh-framework v. 1.0.621
 
 > Foundation Framework 
 

package/dist/cjs/AccordionPanel.js

@@ -10,7 +10,7 @@ var React = require('react');
 var React__default = _interopDefault(React);
 var slicedToArray = require('./slicedToArray-8063ee51.js');
 require('./iconBase-68959171.js');
-var index_esm = require('./index.esm-fbd1f7e9.js');
+var index_esm = require('./index.esm-876ca9ff.js');
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
 var AccordionToggle = require('react-bootstrap/AccordionToggle');
 

package/dist/cjs/ArticleSeriesListing.js

@@ -33,7 +33,7 @@ require('./slicedToArray-8063ee51.js');
 require('./smoothscroll-95231a70.js');
 var YoutubeGroup = require('./YoutubeGroup.js');
 require('./iconBase-68959171.js');
-var index_esm = require('./index.esm-fbd1f7e9.js');
+var index_esm = require('./index.esm-876ca9ff.js');
 
 var ArticleSeriesListing = function (_React$Component) {
   inherits._inherits(ArticleSeriesListing, _React$Component);

package/dist/cjs/HamMagazine.js

@@ -22,17 +22,18 @@ require('./_set-species-4458e975.js');
 var Segment = require('./beam-d22818d3.js');
 require('./react-social-icons-cd0d9d3b.js');
 require('./iconBase-68959171.js');
-var index_esm = require('./index.esm-fbd1f7e9.js');
+var index_esm = require('./index.esm-876ca9ff.js');
 require('react-bootstrap/Button');
 var Nav = _interopDefault(require('react-bootstrap/Nav'));
 var Navbar = _interopDefault(require('react-bootstrap/Navbar'));
 var NavDropdown = _interopDefault(require('react-bootstrap/NavDropdown'));
 var index_esm$1 = require('./index.esm-66ffa47a.js');
 var NavFooter = require('./NavFooter-76c913e3.js');
-var SocialNavFooter = require('./SocialNavFooter-9a07520f.js');
+var index_esm$2 = require('./index.esm-d1259b34.js');
+require('./SocialIcons.js');
 require('react-bootstrap/Form');
 require('react-bootstrap/FormControl');
-var Search = require('./Search.js');
+var SocialSearchComponent = require('./SocialSearchComponent-5cbde5e0.js');
 
 var HamMagazine = function HamMagazine(props) {
   /*
@@ -46,6 +47,7 @@ var HamMagazine = function HamMagazine(props) {
       />
   */
 
+  // Setting 'socialIconVariant' as 'light' as default to make the social icons and search icon black
   var logo = props.logo,
       mobileLogo = props.mobileLogo,
       dataObject = props.dataObject,
@@ -55,7 +57,11 @@ var HamMagazine = function HamMagazine(props) {
       _props$showLogin = props.showLogin,
       showLogin = _props$showLogin === undefined ? false : _props$showLogin,
       _props$socialFooterNa = props.socialFooterNav,
-      socialFooterNav = _props$socialFooterNa === undefined ? false : _props$socialFooterNa;
+      socialFooterNav = _props$socialFooterNa === undefined ? false : _props$socialFooterNa,
+      _props$socialIconVari = props.socialIconVariant,
+      socialIconVariant = _props$socialIconVari === undefined ? 'light' : _props$socialIconVari,
+      invertedLogo = props.invertedLogo,
+      settings = props.settings;
 
   var navRef = React.useRef(null);
   var topNavRef = React.useRef(null);
@@ -85,19 +91,31 @@ var HamMagazine = function HamMagazine(props) {
       resolution = _useState10[0],
       setResolution = _useState10[1];
 
-  React.useEffect(function () {
-    document.addEventListener('scroll', trackScrolling);
-    return function () {
-      document.removeEventListener('scroll', trackScrolling);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  var _useState11 = React.useState(true),
+      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
+      isDesktop = _useState12[0],
+      setIsDesktop = _useState12[1];
+
+  var _useState13 = React.useState(0),
+      _useState14 = slicedToArray._slicedToArray(_useState13, 2),
+      topOffset = _useState14[0],
+      setTopOffset = _useState14[1];
 
-  // Initial User agent setup on refresh or on load
   React.useEffect(function () {
+    // Check for desktop or mobile device
+    if (window && window.innerWidth < 1200) setIsDesktop(false);
+
+    // Hiding light-nav with logo on mobile devices
+    if (window && window.innerWidth < 1200 && topNavRef) topNavRef.current.style.display = 'none';
+
+    // Initial User agent setup on refresh or on load
     setUserAgent(navigator.userAgent.toString());
+
+    // Initial screenwidth setup on refresh or on load
+    setScreenWidth(parseInt(window.innerWidth));
   }, []);
 
+  // Check for browser resize
   React.useEffect(function () {
     if (resolution === 0) {
       setResolution(window.innerWidth);
@@ -118,10 +136,6 @@ var HamMagazine = function HamMagazine(props) {
     window.addEventListener('resize', handleResize);
   }, [resolution]);
 
-  React.useEffect(function () {
-    setScreenWidth(parseInt(window.innerWidth));
-  }, []);
-
   // Check for change in useragent with change in screen resolution
   React.useEffect(function () {
     var handleResize = function handleResize() {
@@ -133,34 +147,37 @@ var HamMagazine = function HamMagazine(props) {
     window.addEventListener('resize', handleResize);
   }, [userAgent]);
 
+  //  Handling navigation and logo position on scroll
   React.useEffect(function () {
-    var navOffsetTop = document.getElementById('navbar-ham').offsetTop;
+    var navOffsetTop = document.getElementById('navbar-ham') && document.getElementById('navbar-ham').offsetTop;
     var adSection = document.querySelector('.AD728x90');
+    var navLinks = document.getElementById('nav-links');
+    var mastNav = document.querySelector('.nav-brands');
+    if (mastNav && mastNav.offsetHeight) setTopOffset(mastNav.offsetHeight - 3);
+
     if (window.pageYOffset > navOffsetTop) {
       if (navRef.current && navRef.current.style) {
-        topNavRef.current.style.paddingBottom = navRef.current.offsetHeight + 'px';
         navRef.current.style.position = 'fixed';
-        navRef.current.style.top = 0;
-        navRef.current.style.width = '100%';
-        navRef.current.style.zIndex = '99999';
+        if (mastNav && mastNav.offsetHeight) navRef.current.style.top = mastNav.offsetHeight;
       }
     }
     var stickyNav = window.addEventListener('scroll', function () {
       if (window.pageYOffset > navOffsetTop) {
         if (navRef.current && navRef.current.style) {
-          topNavRef.current.style.paddingBottom = navRef.current.offsetHeight + 'px';
           navRef.current.style.position = 'fixed';
-          navRef.current.style.top = 0;
-          navRef.current.style.width = '100%';
-          navRef.current.style.zIndex = '99999';
+          if (mastNav && mastNav.offsetHeight) navRef.current.style.top = mastNav.offsetHeight;
         }
+        setIsSticky(true);
+        navLinks.style.margin = 'auto';
       } else {
         if (navRef.current && navRef.current.style) {
           topNavRef.current.style.paddingBottom = '0';
           navRef.current.style.position = 'relative';
-          navRef.current.style.top = '';
           if (adSection) adSection.style.marginTop = '';
+          if (mastNav && mastNav.offsetHeight) navRef.current.style.top = mastNav.offsetHeight;
         }
+        setIsSticky(false);
+        navLinks.style.margin = '0px auto 0px 0px';
       }
     });
     return function () {
@@ -168,16 +185,6 @@ var HamMagazine = function HamMagazine(props) {
     };
   }, []);
 
-  var trackScrolling = function trackScrolling() {
-    var offsetTop = navRef.current.getBoundingClientRect().top;
-
-    if (offsetTop <= 0) {
-      setIsSticky(true);
-    } else {
-      setIsSticky(false);
-    }
-  };
-
   var handleLogin = function handleLogin(e) {
     if (typeof GCN !== 'undefined' && GCN && GCN.onecount) {
       GCN.onecount.login();
@@ -196,7 +203,7 @@ var HamMagazine = function HamMagazine(props) {
 
   return React__default.createElement(
     'header',
-    { className: !main.main_39 && isOpen ? 'nav-open' : 'nav-close', style: { zIndex: '99999' } },
+    { className: !main.main_39 && isOpen ? 'nav-open' : 'nav-close', style: { zIndex: '999999' } },
     React__default.createElement(
       Navbar,
       { expand: 'md', ref: topNavRef },
@@ -312,24 +319,46 @@ var HamMagazine = function HamMagazine(props) {
     ),
     React__default.createElement(
       Navbar,
-      { id: 'navbar-ham', variant: 'dark', expand: 'xl', bg: 'primary', ref: navRef, style: { width: '100%' } },
+      { id: 'navbar-ham', variant: 'dark', expand: 'xl', bg: 'primary', ref: navRef, style: { width: '100%', display: 'flex', top: topOffset, overflow: 'auto' } },
       React__default.createElement(
         Container,
         { className: 'mobile-nav' },
         React__default.createElement(
           'div',
-          { className: 'nav-toggle' },
+          { className: 'nav-toggle', style: { display: 'flex' } },
           React__default.createElement(Navbar.Toggle, {
             'aria-controls': 'basic-navbar-nav',
             onClick: function onClick() {
+              // Set overflow fix for iPhones safari browsers
+              if (main.main_40) {
+                var mainNav = document.querySelector('#navbar-ham');
+                if (mainNav && mainNav.style) mainNav.style.overflow = 'auto';
+              }
+              var searchBar = document.getElementById('search-bar-mobile');
+              var searchBtn = document.getElementsByClassName('search-btn-mobile');
+              if (searchBar && searchBar.classList) {
+                searchBar.classList.remove('show');
+              }
+              if (searchBtn && searchBtn[0].classList) {
+                searchBtn[0].classList.remove('active-search');
+              }
               setIsOpen(!isOpen);
             }
           }),
-          React__default.createElement(Search, { device: 'mobile' })
+          !isDesktop && React__default.createElement(
+            'div',
+            { className: 'site-logo-wrapper', style: { margin: 'auto' } },
+            React__default.createElement(
+              'a',
+              { href: '/' },
+              React__default.createElement('img', { src: invertedLogo ? invertedLogo : logo, style: { padding: '0px ', objectFit: 'contain', maxHeight: '45px' } })
+            )
+          ),
+          !isDesktop && React__default.createElement(SocialSearchComponent.SocialSearchComponent, { type: 'mobile', socialIconVariant: socialIconVariant, website: website, navID: 'navbar-ham' })
         ),
         React__default.createElement(
           'div',
-          { className: 'hamburger-menu-list', style: { width: '100%', maxHeight: '80vh' } },
+          { className: 'hamburger-menu-list', style: { width: '100%', maxHeight: '85vh' } },
           subNav && React__default.createElement(
             Navbar.Collapse,
             { id: 'basic-navbar-sub' },
@@ -399,14 +428,18 @@ var HamMagazine = function HamMagazine(props) {
           React__default.createElement(
             Navbar.Collapse,
             { id: 'basic-navbar-nav' },
-            isSticky && React__default.createElement(
-              'a',
-              { href: '/' },
-              React__default.createElement(index_esm.IoIosHome, { size: 20, className: 'sticky-home', color: '#fff' })
+            isSticky && invertedLogo && isDesktop && React__default.createElement(
+              Nav.Item,
+              { className: 'nav-mobile-logo' },
+              React__default.createElement(
+                'a',
+                { href: '/' },
+                React__default.createElement('img', { src: invertedLogo, className: 'mobile-logo', style: { height: '38px' }, alt: website.title ? website.title : website.name ? website.name : 'Website Logo' })
+              )
             ),
             React__default.createElement(
               Nav,
-              { className: 'mr-auto web-nav' },
+              { id: 'nav-links', style: { marginRight: 'auto' } },
               dataObject && dataObject.map(function (row, index) {
                 if (row.subQuery && row.subQuery.length > 0) {
                   return row.name ? React__default.createElement(
@@ -464,7 +497,7 @@ var HamMagazine = function HamMagazine(props) {
                 }
               })
             ),
-            React__default.createElement(Search, { device: 'mobile' })
+            isDesktop && React__default.createElement(SocialSearchComponent.SocialSearchComponent, { type: 'desktop', socialIconVariant: socialIconVariant, website: website, navID: 'navbar-ham' })
           ),
           website && React__default.createElement(
             Navbar.Collapse,
@@ -472,7 +505,7 @@ var HamMagazine = function HamMagazine(props) {
             React__default.createElement(
               Nav,
               { className: 'mr-auto' },
-              socialFooterNav ? React__default.createElement(SocialNavFooter.SocialNavFooter, { website: website, showLogo: true }) : React__default.createElement(NavFooter.NavFooter, { website: website, showLogo: true })
+              socialFooterNav ? React__default.createElement(index_esm$2.SocialNavFooter, { website: website, showLogo: true }) : React__default.createElement(NavFooter.NavFooter, { website: website, showLogo: true })
             )
           )
         )
@@ -490,7 +523,7 @@ var HamMagazine = function HamMagazine(props) {
     React__default.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .sticky-home {\n          position: relative;\n          top: -3px;\n          left: -6px;\n          cursor: pointer;\n        }\n        .nav-item svg {\n          margin-bottom: 2px;\n        }\n        #nav-login,\n        #nav-logout,\n        #nav-register {\n          padding: 0.5rem;\n          cursor: pointer;\n        }\n        #nav-mobile-login,\n        #nav-mobile-logout,\n        #nav-mobile-register {\n          display: none;\n        }\n        #nav-mobile-logout,\n        #nav-mobile-login {\n          position: absolute;\n          right: 1rem;\n        }\n        #nav-mobile-register {\n          position: absolute;\n          left: 1rem;\n        }\n        @media screen and (max-width: 376px) {\n          .mobile-nav .nav-toggle .form-inline .mobile-search {\n            width: 60%;\n          }\n          .mobile-nav .nav-toggle .form-inline {\n            width: 70%;\n          }\n        }\n        @media screen and (max-width: 328px) {\n          .mobile-nav .nav-toggle .form-inline .mobile-search {\n            margin-right: 5px;\n          }\n        }\n        @media screen and (max-width: 767px) {\n          .logo {\n            width: 100%;\n            padding-left: 10px;\n            padding-right: 10px;\n          }\n        }\n        @media screen and (max-width: 1199px) {\n          .nav-open {\n            position: relative;\n          }\n\n          .mobile-nav .nav-toggle {\n            width: 100%;\n          }\n\n          .android-nav {\n            max-height: 80vh;\n          }\n\n          .ios-nav {\n            max-height: none;\n          }\n\n          .navbar.bg-primary {\n            overflow: auto;\n          }\n\n          .mobile-nav .nav-toggle .navbar-toggler {\n            float: left;\n            height: 45px;\n          }\n          .mobile-nav .nav-toggle .form-inline {\n            float: right;\n            margin: 4px 0px 0px 0px;\n          }\n          .mobile-nav .form-inline .mobile-search {\n            width: auto;\n          }\n          .sticky-home {\n            display: none;\n          }\n          .dropdown-menu {\n            max-height: 315px;\n            overflow: auto;\n          }\n          ::-webkit-scrollbar {\n            width: 10px;\n          }\n          ::-webkit-scrollbar-thumb {\n            border-radius: 4px;\n            background-color: rgba(214, 214, 214, 0.8);\n            box-shadow: 0 0 1px rgba(255, 255, 255, 0.5);\n            -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, 0.5);\n          }\n          .navbar-expand-xl .show#basic-navbar-sub {\n            display: block;\n          }\n          .navbar .mobile-nav .navbar-collapse.show {\n            padding-bottom: 10px;\n            border-bottom: 0.5px solid white;\n          }\n          .navbar .mobile-nav .navbar-collapse .form-inline {\n            display: none;\n          }\n          .navbar .mobile-nav .navbar-collapse {\n            margin-top: 15px;\n          }\n          .navbar .mobile-nav .navbar-collapse:last-child {\n            border-bottom: none;\n            margin-bottom: 0px;\n            padding-bottom: 0px;\n            margin-top: 0px;\n            padding-top: 10px;\n          }\n          .navbar .mobile-nav .navbar-collapse .nav-footer ul {\n            list-style-type: none;\n            padding: inherit;\n            margin-bottom: 0rem;\n          }\n          .navbar .mobile-nav .navbar-collapse .nav-footer .nav-link {\n            text-transform: capitalize !important;\n            font-weight: 300;\n          }\n          .navbar .mobile-nav .dropdown-item:focus {\n            background-color: #696969;\n          }\n          .navbar .mobile-nav .dropdown-menu .dropdown-item {\n            color: white;\n          }\n          .navbar .mobile-nav .dropdown-menu {\n            background: inherit;\n            border: none;\n          }\n          .navbar .mobile-nav .dropdown-menu.show {\n            max-height: 100px;\n          }\n        }\n        @media screen and (min-width: 1200px) {\n          #basic-navbar-sub {\n            display: none !important;\n          }\n          .navbar .mobile-nav .dropdown-menu .dropdown-item {\n            color: #696969;\n          }\n          .navbar .mobile-nav .dropdown-menu {\n            background: white;\n            border: 1 px solid #708090;\n          }\n          .mobile-nav .nav-toggle .form-inline {\n            display: none;\n          }\n          .navbar.bg-primary {\n            z-index: 3000000 !important;\n          }\n        }\n        @media screen and (max-width: 1199px) {\n          #nav-mobile-login,\n          #nav-mobile-logout,\n          #nav-mobile-register {\n            display: block;\n          }\n          .navbar-top {\n            flex-direction: row;\n            justify-content: space-around !important;\n            align-items: center;\n            padding-left: 0.25rem;\n            padding-right: 0.25rem;\n            width: 100%;\n          }\n        }\n      '
+      '\n        .sticky-home {\n          position: relative;\n          top: -3px;\n          left: -6px;\n          cursor: pointer;\n        }\n        .nav-item svg {\n          margin-bottom: 2px;\n        }\n        #nav-login,\n        #nav-logout,\n        #nav-register {\n          padding: 0.5rem;\n          cursor: pointer;\n        }\n        #nav-mobile-login,\n        #nav-mobile-logout,\n        #nav-mobile-register {\n          display: none;\n        }\n        #nav-mobile-logout,\n        #nav-mobile-login {\n          position: absolute;\n          right: 1rem;\n        }\n        #nav-mobile-register {\n          position: absolute;\n          left: 1rem;\n        }\n\n        @media screen and (max-width: 767px) {\n          .logo {\n            width: 100%;\n            padding-left: 10px;\n            padding-right: 10px;\n          }\n        }\n        @media screen and (max-width: 1199px) {\n          .mobile-nav .nav-toggle {\n            width: 100%;\n          }\n          .nav-open {\n            position: relative;\n          }\n\n          .mobile-nav .nav-toggle {\n            width: 100%;\n          }\n\n          .android-nav {\n            max-height: 80vh;\n          }\n\n          .ios-nav {\n            max-height: none;\n          }\n\n          .mobile-nav .nav-toggle .navbar-toggler {\n            float: left;\n            height: 45px;\n          }\n          .mobile-nav .form-inline .mobile-search {\n            width: auto;\n          }\n          .sticky-home {\n            display: none;\n          }\n          .dropdown-menu {\n            max-height: 315px;\n            overflow: auto;\n          }\n          ::-webkit-scrollbar {\n            width: 10px;\n          }\n          ::-webkit-scrollbar-thumb {\n            border-radius: 4px;\n            background-color: rgba(214, 214, 214, 0.8);\n            box-shadow: 0 0 1px rgba(255, 255, 255, 0.5);\n            -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, 0.5);\n          }\n          .navbar-expand-xl .show#basic-navbar-sub {\n            display: block;\n          }\n          .navbar .mobile-nav .navbar-collapse.show {\n            padding-bottom: 10px;\n            border-bottom: 0.5px solid white;\n          }\n          .navbar .mobile-nav .navbar-collapse .form-inline {\n            display: none;\n          }\n          .navbar .mobile-nav .navbar-collapse {\n            margin-top: 15px;\n          }\n          .navbar .mobile-nav .navbar-collapse:last-child {\n            border-bottom: none;\n            margin-bottom: 0px;\n            padding-bottom: 0px;\n            margin-top: 0px;\n            padding-top: 10px;\n          }\n          .navbar .mobile-nav .navbar-collapse .nav-footer ul {\n            list-style-type: none;\n            padding: inherit;\n            margin-bottom: 0rem;\n          }\n          .navbar .mobile-nav .navbar-collapse .nav-footer .nav-link {\n            text-transform: capitalize !important;\n            font-weight: 300;\n          }\n          .navbar .mobile-nav .dropdown-item:focus {\n            background-color: #696969;\n          }\n          .navbar .mobile-nav .dropdown-menu .dropdown-item {\n            color: white;\n            white-space: inherit !important;\n            margin-bottom: 5px;\n          }\n          .navbar .mobile-nav .dropdown-menu {\n            background: inherit;\n            border: none;\n          }\n          .navbar .mobile-nav .dropdown-menu.show {\n            max-height: 100px;\n          }\n        }\n        @media screen and (min-width: 1200px) {\n          #navbar-ham {\n            overflow: visible !important;\n          }\n          #basic-navbar-sub {\n            display: none !important;\n          }\n          .navbar .mobile-nav .dropdown-menu .dropdown-item {\n            color: #696969;\n          }\n          .navbar .mobile-nav .dropdown-menu {\n            background: white;\n            border: 1 px solid #708090;\n          }\n\n          .navbar.bg-primary {\n            z-index: 3000000 !important;\n          }\n        }\n        @media screen and (max-width: 1199px) {\n          #nav-mobile-login,\n          #nav-mobile-logout,\n          #nav-mobile-register {\n            display: block;\n          }\n          .navbar-top {\n            flex-direction: row;\n            justify-content: space-around !important;\n            align-items: center;\n            padding-left: 0.25rem;\n            padding-right: 0.25rem;\n            width: 100%;\n          }\n        }\n      '
     )
   );
 };