@mjhls/mjh-framework 1.0.541 → 1.0.543-canari

package/dist/cjs/NavNative.js

@@ -20,17 +20,16 @@ require('./stringify-7c5aff47.js');
 require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 var Segment = require('./beam-d22818d3.js');
-var reactSocialIcons = require('./react-social-icons-cd0d9d3b.js');
-var iconBase = require('./iconBase-68959171.js');
-var Button = _interopDefault(require('react-bootstrap/Button'));
+require('./react-social-icons-cd0d9d3b.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'));
+require('react-bootstrap/Form');
+require('react-bootstrap/FormControl');
+var Search = require('./Search.js');
 var NavFooter = require('./NavFooter-76c913e3.js');
 var SocialNavFooter = require('./SocialNavFooter-9a07520f.js');
-var index_esm$2 = require('./index.esm-0e5c6a9e.js');
-var Form = _interopDefault(require('react-bootstrap/Form'));
-var FormControl = _interopDefault(require('react-bootstrap/FormControl'));
 
 var NavNative = function NavNative(props) {
   /*
@@ -56,8 +55,6 @@ var NavNative = function NavNative(props) {
       socialFooterNav = _props$socialFooterNa === undefined ? false : _props$socialFooterNa;
 
   var navRef = React.useRef(null);
-  //  reference to mobile search component
-  var searchRef = React.useRef(null);
 
   var _useState = React.useState(false),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
@@ -70,12 +67,6 @@ var NavNative = function NavNative(props) {
       setScreenWidth = _useState4[1];
 
   React.useEffect(function () {
-    // handling the top mast component
-    var topNavHeight = document.querySelector('.nav-brands') && document.querySelector('.nav-brands').offsetHeight;
-
-    // Setting the top of the search component based on the offset of navigation component.
-    searchRef.current.style.top = (topNavHeight ? topNavHeight + navRef.current.offsetHeight : navRef.current.offsetHeight) + 1 + 'px';
-
     document.addEventListener('scroll', trackScrolling);
     return function () {
       document.removeEventListener('scroll', trackScrolling);
@@ -97,148 +88,6 @@ var NavNative = function NavNative(props) {
     }
   };
 
-  // Search Term
-
-  var _useState5 = React.useState(''),
-      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
-      searchKey = _useState6[0],
-      setSearchKey = _useState6[1];
-
-  // Search function
-
-
-  var submitSearch = function submitSearch(e) {
-    e.preventDefault();
-    window.location.href = '/search?searchTerm=' + searchKey;
-  };
-
-  // Toggling class of an element.Can't use toggle() as IE doesn't support toggle()
-  var toggleClass = function toggleClass(selector, type, addOn) {
-    if (type === 'id') {
-      var searchBar = document.getElementById(selector);
-      if (searchBar && searchBar.classList && searchBar.classList.contains(addOn)) {
-        searchBar.classList.remove(addOn);
-      } else if (searchBar && searchBar.classList) {
-        searchBar.classList.add(addOn);
-      }
-    } else if (type === 'class') {
-      var searchBtn = document.getElementsByClassName(selector)[0];
-      if (searchBtn && searchBtn.classList && searchBtn.classList.contains(addOn)) {
-        searchBtn.classList.remove(addOn);
-      } else if (searchBtn && searchBtn.classList) {
-        searchBtn.classList.add(addOn);
-      }
-    }
-  };
-
-  // Search Component
-  var socialSearchComponent = function socialSearchComponent(type) {
-    if (type === 'mobile') {
-      return React__default.createElement(
-        'div',
-        { id: 'search-content-mobile' },
-        React__default.createElement(
-          'div',
-          { id: 'search-bar-mobile', ref: searchRef },
-          React__default.createElement(
-            Form,
-            { inline: true, onSubmit: function onSubmit(e) {
-                return submitSearch(e);
-              } },
-            React__default.createElement(FormControl, { placeholder: 'Search', type: 'text', value: searchKey, onChange: function onChange(e) {
-                return setSearchKey(e.target.value);
-              } }),
-            React__default.createElement(
-              Button,
-              { variant: 'primary', style: { backgroundColor: 'var(--primary)' }, onClick: function onClick(e) {
-                  return submitSearch(e);
-                } },
-              'Search'
-            )
-          )
-        ),
-        React__default.createElement(
-          iconBase.IconContext.Provider,
-          { value: { color: 'white', className: 'search-btn-mobile', size: '50px' } },
-          React__default.createElement(index_esm$2.GoSearch, {
-            onClick: function onClick() {
-              var navToggle = document.getElementsByClassName('navbar-toggler')[0];
-              if (navToggle && navToggle.classList && !navToggle.classList.contains('collapsed')) {
-                var nav = document.querySelectorAll('.navbar-collapse');
-                for (var i = 0; i < nav.length; i++) {
-                  if (nav[i] && nav[i].classList) nav[i].classList.remove('show');
-                }
-                if (navToggle && navToggle.classList) navToggle.classList.add('collapsed');
-              }
-
-              toggleClass('search-bar-mobile', 'id', 'show');
-              toggleClass('search-btn-mobile', 'class', 'active-search');
-            }
-          })
-        ),
-        React__default.createElement(
-          'style',
-          { jsx: 'true' },
-          '\n            #search-content-mobile {\n              display: flex;\n            }\n            @media screen and (min-width: 1192px) {\n              #search-content-mobile {\n                display: none;\n              }\n            }\n            #search-content-mobile .search-btn-mobile {\n              padding: 5px;\n              position: absolute;\n              right: 4%;\n              height: 45px;\n              width: 45px;\n              margin-top: 4px;\n              cursor: pointer;\n              top: -20%;\n            }\n            #search-content-mobile #search-bar-mobile {\n              position: fixed;\n              display: none;\n              background-color: #60bdcd;\n              left: 0px;\n              width: 100%;\n              border-radius: 5px;\n              padding: 10px;\n            }\n            #search-content-mobile #search-bar-mobile .form-inline {\n              margin-top: 0px;\n              width: 100% !important;\n            }\n            #search-content-mobile #search-bar-mobile .form-inline .form-control {\n              width: 78%;\n              border-radius: 5px;\n              height: 45px;\n            }\n            #search-content-mobile #search-bar-mobile .form-inline .btn {\n              width: 20%;\n              border-radius: 5px;\n              background-color: #040c5a;\n              height: 45px;\n              margin-left: 5px;\n              padding: 1px;\n            }\n            .show {\n              display: block !important;\n            }\n            .active-search {\n              border-radius: 5px;\n              background-color: #60bdcd;\n              border: 1px solid var(--secondary);\n            }\n          '
-        )
-      );
-    } else if (type === 'desktop') {
-      return React__default.createElement(
-        'div',
-        { id: 'search-content-desktop' },
-        React__default.createElement(
-          'div',
-          { id: 'search-bar-desktop' },
-          React__default.createElement(
-            Form,
-            { inline: true, onSubmit: function onSubmit(e) {
-                return submitSearch(e);
-              } },
-            React__default.createElement(FormControl, { placeholder: 'Search', type: 'text', value: searchKey, onChange: function onChange(e) {
-                return setSearchKey(e.target.value);
-              } }),
-            React__default.createElement(
-              Button,
-              { variant: 'primary', style: { backgroundColor: 'var(--primary)' }, onClick: function onClick(e) {
-                  return submitSearch(e);
-                } },
-              'Search'
-            )
-          )
-        ),
-        React__default.createElement(
-          iconBase.IconContext.Provider,
-          { value: { color: 'white', className: 'search-btn-desktop', size: '50px' } },
-          React__default.createElement(index_esm$2.GoSearch, {
-            onClick: function onClick() {
-              toggleClass('search-bar-desktop', 'id', 'show');
-              toggleClass('search-btn-desktop', 'class', 'active-search');
-            }
-          })
-        ),
-        website && website.socialLinks && website.socialLinks.length !== 0 && React__default.createElement(
-          'div',
-          { id: 'social-tab-desktop' },
-          website.socialLinks && website.socialLinks.map(function (row, index) {
-            return React__default.createElement(reactSocialIcons.reactSocialIcons_1, {
-              target: row.blank ? '_blank' : '_self',
-              rel: 'noopener noreferrer',
-              key: index,
-              index: index,
-              url: row.url,
-              style: { width: 25, height: 25, marginRight: 3 }
-            });
-          })
-        ),
-        React__default.createElement(
-          'style',
-          { jsx: 'true' },
-          '\n            #social-tab-desktops {\n              position: relative;\n              display: flex;\n              left: 0px;\n            }\n            @media screen and (max-width: 1191px) {\n              #search-content-desktop {\n                display: none !important;\n              }\n            }\n            @media screen and (min-width: 992px) {\n              .mobile-nav {\n                width: 100% !important;\n              }\n            }\n            #search-content-desktop {\n              display: flex;\n              padding-top: 1px;\n              height: 35px;\n              position: absolute;\n              right: 5%;\n            }\n            #search-content-desktop .search-btn-desktop {\n              padding: 5px;\n              height: 30px;\n              width: 30px;\n              margin: -1px 5px 0px 0px;\n              cursor: pointer;\n            }\n\n            #search-content-desktop #search-bar-desktop {\n              display: none;\n              background-color: #60bdcd;\n              position: relative;\n              width: 400px;\n              border-radius: 5px;\n              height: 48px;\n              top: 50px;\n            }\n            #search-content-desktop #search-bar-desktop .form-inline {\n              padding: 5px;\n            }\n            #search-content-desktop #search-bar-desktop .form-inline .form-control {\n              width: 78%;\n              border-radius: 5px;\n            }\n            #search-content-desktop #search-bar-desktop .form-inline .btn {\n              width: 20%;\n              border-radius: 5px;\n              padding: 7px;\n              margin-left: 5px;\n            }\n            .show {\n              display: block !important;\n            }\n            .active-search {\n              border-radius: 5px;\n              background-color: #60bdcd;\n              border: 1px solid var(--secondary);\n            }\n          '
-        )
-      );
-    }
-  };
-
   return React__default.createElement(
     React__default.Fragment,
     null,
@@ -266,45 +115,19 @@ var NavNative = function NavNative(props) {
         ),
         React__default.createElement(
           'div',
-          { className: 'nav-toggle', style: { width: 'auto' } },
-          React__default.createElement(Navbar.Toggle, {
-            'aria-controls': 'basic-navbar-nav',
-            onClick: function onClick() {
-              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');
-              }
-            }
-          }),
+          { className: 'nav-toggle' },
+          React__default.createElement(Navbar.Toggle, { 'aria-controls': 'basic-navbar-nav' }),
           React__default.createElement(
             Navbar.Brand,
             { id: 'nav-mobile-md', className: 'nav-mobile-logo' },
             React__default.createElement(
               'a',
               { href: '/' },
-              mobileLogo && screenWidth < 1200 ? React__default.createElement('img', { src: mobileLogo, style: { height: '40px' }, alt: website.title ? website.title : website.name ? website.name : 'Website Logo' }) : React__default.createElement('img', { src: logo, className: 'logo', style: { height: '40px' }, alt: website.title ? website.title : website.name ? website.name : 'Website Logo' })
+              mobileLogo && screenWidth < 1200 ? React__default.createElement('img', { src: mobileLogo, alt: website.title ? website.title : website.name ? website.name : 'Website Logo' }) : React__default.createElement('img', { src: logo, className: 'logo', style: { height: '50px' }, alt: website.title ? website.title : website.name ? website.name : 'Website Logo' })
             )
-          )
-        ),
-        React__default.createElement(
-          'div',
-          { className: 'site-logo-wrapper', style: { display: 'none' } },
-          React__default.createElement(
-            'a',
-            { href: '/' },
-            React__default.createElement('img', { src: logo })
           ),
-          React__default.createElement(
-            'style',
-            { jsx: 'true' },
-            '\n              @media screen and (max-width: 1191px) {\n                .site-logo-wrapper {\n                  display: block !important;\n                  margin: auto;\n                  margin-top: 10px;\n                }\n                .site-logo-wrapper img {\n                  object-fit: contain;\n                  max-height: 45px;\n                }\n                .nav-mobile-logo {\n                  display: none !important;\n                }\n              }\n              @media screen and (max-width: 420px) {\n                .site-logo-wrapper img {\n                  max-width: 200px;\n                }\n              }\n            '
-          )
+          React__default.createElement(Search, { device: 'mobile' })
         ),
-        socialSearchComponent('mobile'),
         subNav && React__default.createElement(
           Navbar.Collapse,
           { id: 'basic-navbar-sub' },
@@ -419,7 +242,8 @@ var NavNative = function NavNative(props) {
                 ) : null;
               }
             })
-          )
+          ),
+          React__default.createElement(Search, { device: 'mobile' })
         ),
         website && React__default.createElement(
           Navbar.Collapse,
@@ -429,8 +253,7 @@ var NavNative = function NavNative(props) {
             { className: 'mr-auto' },
             socialFooterNav ? React__default.createElement(SocialNavFooter.SocialNavFooter, { website: website }) : React__default.createElement(NavFooter.NavFooter, { website: website })
           )
-        ),
-        socialSearchComponent('desktop')
+        )
       )
     ),
     React__default.createElement(
@@ -445,7 +268,7 @@ var NavNative = function NavNative(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\n        #nav-mobile-sm {\n          display: none;\n        }\n\n        @media screen and (max-width: 1192px) {\n          .mobile-nav .nav-toggle {\n            display: flex;\n            justify-content: space-between;\n          }\n          .nav-mobile-logo {\n            margin-left: 1.5rem;\n          }\n          #nav-mobile-md {\n            margin-right: auto;\n          }\n          .nav-mobile-logo img {\n            height: 48px !important;\n          }\n          .nav-mobile-logo img {\n            height: 38px !important;\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\n          .navbar-expand-lg .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            padding-left: 0.5rem;\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            /* To break text into next line */\n            white-space: inherit !important;\n            margin-bottom: 5px;\n          }\n          .navbar .mobile-nav .dropdown-menu {\n            background: inherit;\n            border: none;\n            direction: rtl;\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\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        @media screen and (min-width: 992px) {\n          #search-content-mobile {\n            position: absolute;\n            right: 4%;\n            top: 10%;\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          .mobile-nav .nav-toggle .form-inline {\n            display: none;\n          }\n        }\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            flex: 1 1 auto;\n            margin-left: 0.25rem;\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          #nav-mobile-md {\n            display: none;\n          }\n          #nav-mobile-sm {\n            display: inline-block;\n            margin: 0 auto 0.5rem;\n          }\n          .nav-toggle {\n            margin: 0.5rem 0;\n            padding: 0 0.5rem;\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        #nav-mobile-sm {\n          display: none;\n        }\n\n        @media screen and (max-width: 1191px) {\n          .mobile-nav .nav-toggle {\n            width: 100%;\n            display: flex;\n            justify-content: space-between;\n          }\n          .nav-mobile-logo {\n            margin-left: 1.5rem;\n          }\n          #nav-mobile-md {\n            margin-right: auto;\n          }\n          .nav-mobile-logo img {\n            height: 48px !important;\n          }\n          .nav-mobile-logo img {\n            height: 38px !important;\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\n          .navbar-expand-lg .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            padding-left: 0.5rem;\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            /* To break text into next line */\n            white-space: inherit !important;\n            margin-bottom: 5px;\n          }\n          .navbar .mobile-nav .dropdown-menu {\n            background: inherit;\n            border: none;\n            direction: rtl;\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\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        @media screen and (min-width: 1191px) {\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        }\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            flex: 1 1 auto;\n            margin-left: 0.25rem;\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          #nav-mobile-md {\n            display: none;\n          }\n          #nav-mobile-sm {\n            display: inline-block;\n            margin: 0 auto 0.5rem;\n          }\n          .nav-toggle {\n            margin: 0.5rem 0;\n            padding: 0 0.5rem;\n          }\n        }\n      '
     )
   );
 };

package/dist/cjs/NavNormal.js

@@ -12,23 +12,21 @@ require('./_iter-detect-4d0352f8.js');
 require('./web.dom.iterable-43c3e277.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-require('prop-types');
 var Container = _interopDefault(require('react-bootstrap/Container'));
-var slicedToArray = require('./slicedToArray-8063ee51.js');
+require('./slicedToArray-8063ee51.js');
 require('./stringify-7c5aff47.js');
 require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 var Segment = require('./beam-d22818d3.js');
-var reactSocialIcons = require('./react-social-icons-cd0d9d3b.js');
-var iconBase = require('./iconBase-68959171.js');
-var Button = _interopDefault(require('react-bootstrap/Button'));
+require('./iconBase-637d3f1e.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 index_esm$2 = require('./index.esm-0e5c6a9e.js');
-var Form = _interopDefault(require('react-bootstrap/Form'));
-var FormControl = _interopDefault(require('react-bootstrap/FormControl'));
+var index_esm$1 = require('./index.esm-c0d8b44b.js');
+require('react-bootstrap/Form');
+require('react-bootstrap/FormControl');
+var Search = require('./Search.js');
 
 var NavNormal = function NavNormal(props) {
   var logo = props.logo,
@@ -38,63 +36,6 @@ var NavNormal = function NavNormal(props) {
 
 
   var ref = React.useRef(null);
-  //  reference to mobile search component
-  var searchRef = React.useRef(null);
-  //  reference to navigation component
-  var navRef = React.useRef(null);
-  //  reference to desktop search component
-
-  var _useState = React.useState(''),
-      _useState2 = slicedToArray._slicedToArray(_useState, 2),
-      searchKey = _useState2[0],
-      setSearchKey = _useState2[1];
-
-  React.useEffect(function () {
-    // Setting the top of the search component based on the offset of navigation component.
-    searchRef.current.style.top = navRef.current.offsetHeight + 1 + 'px';
-  }, []);
-
-  React.useEffect(function () {
-    // Making the search and navbar Sticky on scroll
-    var navOffsetTop = document.getElementById('navbar-normal').offsetTop;
-    if (window.pageYOffset > navOffsetTop) {
-      if (navRef.current && navRef.current.style) {
-        navRef.current.style.position = 'fixed';
-        navRef.current.style.top = 0;
-        navRef.current.style.width = '100%';
-        navRef.current.style.zIndex = '99999';
-        searchRef.current.style.position = 'fixed';
-        searchRef.current.style.top = navRef.current.offsetHeight + 1 + 'px';
-        searchRef.current.style.zIndex = '99999';
-        searchRef.current.style.width = '100%';
-      }
-    }
-    var stickyNav = window.addEventListener('scroll', function () {
-      if (window.pageYOffset > navOffsetTop) {
-        if (navRef.current && navRef.current.style) {
-          navRef.current.style.position = 'fixed';
-          navRef.current.style.top = 0;
-          navRef.current.style.width = '100%';
-          navRef.current.style.zIndex = '99999';
-          searchRef.current.style.position = 'fixed';
-          searchRef.current.style.top = navRef.current.offsetHeight + 1 + 'px';
-          searchRef.current.style.zIndex = '99999';
-          searchRef.current.style.width = '100%';
-        }
-      } else {
-        if (navRef.current && navRef.current.style) {
-          navRef.current.style.position = 'relative';
-          navRef.current.style.top = '';
-          searchRef.current.style.position = 'fixed';
-          searchRef.current.style.top = navRef.current.offsetHeight + 1 + 'px';
-          searchRef.current.style.width = '100%';
-        }
-      }
-    });
-    return function () {
-      window.removeEventListener('scroll', stickyNav);
-    };
-  }, []);
 
   React.useEffect(function () {
     Segment.Segment.init(); // auto init if not done yet
@@ -107,139 +48,6 @@ var NavNormal = function NavNormal(props) {
     }
   }, []);
 
-  // Search function
-  var submitSearch = function submitSearch(e) {
-    e.preventDefault();
-    window.location.href = '/search?searchTerm=' + searchKey;
-  };
-
-  // Toggling class of an element.Can't use toggle() as IE doesn't support toggle()
-  var toggleClass = function toggleClass(selector, type, addOn) {
-    if (type === 'id') {
-      var searchBar = document.getElementById(selector);
-      if (searchBar && searchBar.classList && searchBar.classList.contains(addOn)) {
-        searchBar.classList.remove(addOn);
-      } else if (searchBar && searchBar.classList) {
-        searchBar.classList.add(addOn);
-      }
-    } else if (type === 'class') {
-      var searchBtn = document.getElementsByClassName(selector)[0];
-      if (searchBtn && searchBtn.classList && searchBtn.classList.contains(addOn)) {
-        searchBtn.classList.remove(addOn);
-      } else if (searchBtn && searchBtn.classList) {
-        searchBtn.classList.add(addOn);
-      }
-    }
-  };
-
-  // Search Component
-  var socialSearchComponent = function socialSearchComponent(type) {
-    if (type === 'mobile') {
-      return React__default.createElement(
-        'div',
-        { id: 'search-content-mobile' },
-        React__default.createElement(
-          'div',
-          { id: 'search-bar-mobile', ref: searchRef },
-          React__default.createElement(
-            Form,
-            { inline: true, onSubmit: function onSubmit(e) {
-                return submitSearch(e);
-              } },
-            React__default.createElement(FormControl, { placeholder: 'Search', type: 'text', value: searchKey, onChange: function onChange(e) {
-                return setSearchKey(e.target.value);
-              } }),
-            React__default.createElement(
-              Button,
-              { variant: 'primary', style: { backgroundColor: 'var(--primary)' }, onClick: function onClick(e) {
-                  return submitSearch(e);
-                } },
-              'Search'
-            )
-          )
-        ),
-        React__default.createElement(
-          iconBase.IconContext.Provider,
-          { value: { color: 'white', className: 'search-btn-mobile', size: '50px' } },
-          React__default.createElement(index_esm$2.GoSearch, {
-            onClick: function onClick() {
-              var navToggle = document.getElementsByClassName('navbar-toggler')[0];
-              if (navToggle && navToggle.classList && !navToggle.classList.contains('collapsed')) {
-                var nav = document.querySelectorAll('.navbar-collapse');
-                for (var i = 0; i < nav.length; i++) {
-                  if (nav[i] && nav[i].classList) nav[i].classList.remove('show');
-                }
-                if (navToggle && navToggle.classList) navToggle.classList.add('collapsed');
-              }
-
-              toggleClass('search-bar-mobile', 'id', 'show');
-              toggleClass('search-btn-mobile', 'class', 'active-search');
-            }
-          })
-        ),
-        React__default.createElement(
-          'style',
-          { jsx: 'true' },
-          '\n            #search-content-mobile {\n              display: flex;\n            }\n            @media screen and (min-width: 1200px) {\n              #search-content-mobile {\n                display: none;\n              }\n            }\n            #search-content-mobile .search-btn-mobile {\n              padding: 5px;\n              position: absolute;\n              right: 4%;\n              height: 45px;\n              width: 45px;\n              margin-top: 4px;\n              cursor: pointer;\n              top: 10%;\n            }\n            #search-content-mobile #search-bar-mobile {\n              position: fixed;\n              display: none;\n              background-color: #60bdcd;\n              left: 0px;\n              width: 100%;\n              border-radius: 5px;\n              padding: 10px;\n            }\n            #search-content-mobile #search-bar-mobile .form-inline {\n              margin-top: 0px;\n              width: 100% !important;\n            }\n            #search-content-mobile #search-bar-mobile .form-inline .form-control {\n              width: 78%;\n              border-radius: 5px;\n              height: 45px;\n            }\n            #search-content-mobile #search-bar-mobile .form-inline .btn {\n              width: 20%;\n              border-radius: 5px;\n              background-color: #040c5a;\n              height: 45px;\n              margin-left: 5px;\n            }\n            .show {\n              display: block !important;\n            }\n            .active-search {\n              border-radius: 5px;\n              background-color: #60bdcd;\n              border: 1px solid var(--secondary);\n            }\n          '
-        )
-      );
-    } else if (type === 'desktop') {
-      return React__default.createElement(
-        'div',
-        { id: 'search-content-desktop' },
-        React__default.createElement(
-          'div',
-          { id: 'search-bar-desktop' },
-          React__default.createElement(
-            Form,
-            { inline: true, onSubmit: function onSubmit(e) {
-                return submitSearch(e);
-              } },
-            React__default.createElement(FormControl, { placeholder: 'Search', type: 'text', value: searchKey, onChange: function onChange(e) {
-                return setSearchKey(e.target.value);
-              } }),
-            React__default.createElement(
-              Button,
-              { variant: 'primary', style: { backgroundColor: 'var(--primary)' }, onClick: function onClick(e) {
-                  return submitSearch(e);
-                } },
-              'Search'
-            )
-          )
-        ),
-        React__default.createElement(
-          iconBase.IconContext.Provider,
-          { value: { color: 'white', className: 'search-btn-desktop', size: '50px' } },
-          React__default.createElement(index_esm$2.GoSearch, {
-            onClick: function onClick() {
-              toggleClass('search-bar-desktop', 'id', 'show');
-              toggleClass('search-btn-desktop', 'class', 'active-search');
-            }
-          })
-        ),
-        website && website.siteSettingCache && website.siteSettingCache.socialLinks && website.siteSettingCache.socialLinks.length !== 0 && React__default.createElement(
-          'div',
-          { id: 'social-tab-desktop' },
-          website.siteSettingCache.socialLinks && website.siteSettingCache.socialLinks.map(function (row, index) {
-            return React__default.createElement(reactSocialIcons.reactSocialIcons_1, {
-              target: row.blank ? '_blank' : '_self',
-              rel: 'noopener noreferrer',
-              key: index,
-              index: index,
-              url: row.url,
-              style: { width: 25, height: 25, marginRight: 3 }
-            });
-          })
-        ),
-        React__default.createElement(
-          'style',
-          { jsx: 'true' },
-          '\n            #social-tab-desktops {\n              position: relative;\n              display: flex;\n              left: 0px;\n            }\n            @media screen and (max-width: 1199px) {\n              #search-content-desktop {\n                display: none !important;\n              }\n            }\n            #search-content-desktop {\n              display: flex;\n              padding-top: 1px;\n              height: 35px;\n              position: absolute;\n              right: 5%;\n            }\n            #search-content-desktop .search-btn-desktop {\n              padding: 5px;\n              height: 30px;\n              width: 30px;\n              margin: -1px 5px 0px 0px;\n              cursor: pointer;\n            }\n\n            #search-content-desktop #search-bar-desktop {\n              display: none;\n              top: 45px;\n              background-color: #60bdcd;\n              position: relative;\n              width: 400px;\n              border-radius: 5px;\n              height: 48px;\n            }\n            #search-content-desktop #search-bar-desktop .form-inline {\n              padding: 5px;\n            }\n            #search-content-desktop #search-bar-desktop .form-inline .form-control {\n              width: 78%;\n              border-radius: 5px;\n            }\n            #search-content-desktop #search-bar-desktop .form-inline .btn {\n              width: 20%;\n              border-radius: 5px;\n              padding: 7px;\n              margin-left: 5px;\n              padding: 1px;\n            }\n            .show {\n              display: block !important;\n            }\n            .active-search {\n              border-radius: 5px;\n              background-color: #60bdcd;\n              border: 1px solid var(--secondary);\n            }\n          '
-        )
-      );
-    }
-  };
-
   return React__default.createElement(
     'section',
     { ref: ref },
@@ -263,37 +71,11 @@ var NavNormal = function NavNormal(props) {
     ),
     React__default.createElement(
       Navbar,
-      { id: 'navbar-normal', variant: 'dark', expand: 'lg', bg: 'primary', ref: navRef },
+      { variant: 'dark', expand: 'lg', bg: 'primary' },
       React__default.createElement(
         Container,
         null,
-        React__default.createElement(Navbar.Toggle, {
-          'aria-controls': 'basic-navbar-nav',
-          onClick: function onClick() {
-            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');
-            }
-          }
-        }),
-        React__default.createElement(
-          'div',
-          { className: 'site-logo-wrapper', style: { display: 'none' } },
-          React__default.createElement(
-            'a',
-            { href: '/' },
-            React__default.createElement('img', { src: logo })
-          ),
-          React__default.createElement(
-            'style',
-            { jsx: 'true' },
-            '\n              @media screen and (max-width: 1199px) {\n                .site-logo-wrapper {\n                  display: block !important;\n                  margin: auto;\n                  margin-top: 10px;\n                }\n                #desktop-logo {\n                  display: none;\n                }\n                .site-logo-wrapper img {\n                  object-fit: contain;\n                  max-height: 45px;\n                }\n                .nav-mobile-logo {\n                  display: none !important;\n                }\n                @media screen and (max-width: 420px) {\n                  .site-logo-wrapper img {\n                    max-width: 200px;\n                  }\n                }\n              }\n            '
-          )
-        ),
+        React__default.createElement(Navbar.Toggle, { 'aria-controls': 'basic-navbar-nav' }),
         React__default.createElement(
           Navbar.Collapse,
           { id: 'basic-navbar-nav' },
@@ -328,8 +110,7 @@ var NavNormal = function NavNormal(props) {
             })
           )
         ),
-        socialSearchComponent('mobile'),
-        socialSearchComponent('desktop')
+        React__default.createElement(Search, null)
       )
     ),
     React__default.createElement(

package/dist/cjs/OncliveHero.js

@@ -7,9 +7,9 @@ var React = require('react');
 var React__default = _interopDefault(React);
 var moment = require('./moment-66a6a284.js');
 var index$1 = require('./index-b5eb3ff8.js');
-require('./iconBase-68959171.js');
+require('./iconBase-637d3f1e.js');
 require('react-bootstrap/Badge');
-require('./index.esm-89fabc47.js');
+require('./index.esm-25423c2f.js');
 
 var OncliveHero = function OncliveHero(props) {
   var client = props.client;

package/dist/cjs/PdfDownload.js

@@ -4,8 +4,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var React = require('react');
 var React__default = _interopDefault(React);
-require('./iconBase-68959171.js');
-var index_esm$1 = require('./index.esm-66ffa47a.js');
+require('./iconBase-637d3f1e.js');
+var index_esm$1 = require('./index.esm-c0d8b44b.js');
 
 var PdfDownload = function PdfDownload(props) {
   return React__default.createElement(

package/dist/cjs/TemplateNormal.js

@@ -30,8 +30,8 @@ require('./_arrayMap-3b4a0f75.js');
 require('./get-5dfcdc33.js');
 require('./react-social-icons-cd0d9d3b.js');
 require('react-bootstrap');
-require('./iconBase-68959171.js');
-require('./index.esm-fbd1f7e9.js');
+require('./iconBase-637d3f1e.js');
+require('./index.esm-fcdbd2c6.js');
 require('react-bootstrap/Button');
 var Column1 = require('./Column1.js');
 require('./SideFooter.js');
@@ -48,12 +48,12 @@ var Header = require('./Header.js');
 require('react-bootstrap/Nav');
 require('react-bootstrap/Navbar');
 require('react-bootstrap/NavDropdown');
-require('./index.esm-66ffa47a.js');
-require('./NavFooter-76c913e3.js');
-require('./SocialNavFooter-9a07520f.js');
-require('./index.esm-0e5c6a9e.js');
+require('./index.esm-c0d8b44b.js');
 require('react-bootstrap/Form');
 require('react-bootstrap/FormControl');
+require('./Search.js');
+require('./NavFooter-76c913e3.js');
+require('./SocialNavFooter-9a07520f.js');
 var NavMagazine = require('./NavMagazine.js');
 var NavNative = require('./NavNative.js');
 var NavNormal = require('./NavNormal.js');
@@ -98,7 +98,7 @@ var TemplateNormal = function TemplateNormal(props) {
   var navigation = function navigation() {
     switch (config.navComponent) {
       case 'normal':
-        return React__default.createElement(NavNormal.NavNormal, { logo: website.logo, dataObject: config.navItems, website: website });
+        return React__default.createElement(NavNormal.NavNormal, { logo: website.logo, dataObject: config.navItems });
       case 'magazine':
         return React__default.createElement(NavMagazine.default, { logo: website.logo, mobileLogo: website.mobileLogo, dataObject: config.navItems, subNav: config.leftItems, website: website });
       case 'native':