@mjhls/mjh-framework 1.0.537 → 1.0.540

package/dist/esm/MasterDeck.js

@@ -13,30 +13,30 @@ import './web.dom.iterable-46c95e52.js';
 import './typeof-5f046efd.js';
 import './_is-array-dd5523d6.js';
 import React__default from 'react';
-import { l as lib_3 } from './index-3f4dd6f2.js';
+import { l as lib_3 } from './index-93ec3c59.js';
 import 'prop-types';
 import Container from 'react-bootstrap/Container';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'react-bootstrap/Card';
-import './moment-e2f9b20c.js';
+import './moment-12415288.js';
 import { withRouter } from 'next/router';
 import './isSymbol-b7b7434f.js';
 import { d as debounce_1 } from './debounce-048d9cb6.js';
-import { I as InfiniteScroll } from './index.es-29c1cef5.js';
+import { I as InfiniteScroll } from './index.es-938a3a58.js';
 import 'react-dom';
 import { V as VisibilitySensor } from './visibility-sensor-0baa4eea.js';
-import './index-73819142.js';
-import { m as main_36 } from './main-d7ee6151.js';
+import './index-51a80699.js';
+import { m as main_39 } from './main-7255814e.js';
 import './slicedToArray-f1e40361.js';
 import './stringify-e30bc114.js';
 import { _ as _Promise } from './asyncToGenerator-0379e924.js';
 import './_set-species-6f64f1c1.js';
 import './beam-a25bd8fd.js';
 import './AdSlot.js';
-import { A as ADInfeed } from './ADInfeed-2eb234ae.js';
+import { A as ADInfeed } from './ADInfeed-27674dc6.js';
 import { l as lodash } from './lodash-17fdfebb.js';
-import { A as ADlgInfeed } from './ADlgInfeed-17c13711.js';
+import { A as ADlgInfeed } from './ADlgInfeed-43060a77.js';
 
 var MasterDeck = function (_React$Component) {
   _inherits(MasterDeck, _React$Component);
@@ -188,14 +188,14 @@ var MasterDeck = function (_React$Component) {
             }
 
             // please leave this for later debug purpose : Yong Jun.
-            /* console.log('page change reported', {
-              currentPage: currentPage,
-              pageNumber: pageNumber,
-              pathname: pathname,
-              path: path,
-              newPath: newPath,
-              firstPage: pageNumber === 1,
-              queryString: queryString
+            /* console.log('page change reported', {
+              currentPage: currentPage,
+              pageNumber: pageNumber,
+              pathname: pathname,
+              path: path,
+              newPath: newPath,
+              firstPage: pageNumber === 1,
+              queryString: queryString
             }) */
 
             if (pageview) {
@@ -250,13 +250,6 @@ var MasterDeck = function (_React$Component) {
         !_this.state.dataRemapped && _this.setState({ dataRemapped: true }); // To detect if appending of insights ads are completed
       }
 
-      // set dataRemap to true as there are no infeed or BI ads or window width is less than limit
-      _this.componentDidUpdate = function () {
-        if (typeof window !== 'undefined' && (!lgInfeedAd || !brandInsightAd || window.innerWidth < 1400) && !_this.state.dataRemapped) {
-          !_this.state.dataRemapped && _this.setState({ dataRemapped: true });
-        }
-      };
-
       //  Integrating infeed AD
       if (showBI && brandInsightAd) {
         //  Checking lgInfeedAd flag in desktop view ( window >= 1400px ).
@@ -320,7 +313,7 @@ var MasterDeck = function (_React$Component) {
                 React__default.Fragment,
                 { key: index },
                 React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client, defaultImage: _this.defaultImage }),
-                main_36 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
+                main_39 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
                   'div',
                   { className: 'ad-container', style: { margin: '0 auto' } },
                   _this.renderMobileAd(index, numberOfItemsBeforeAd, _this.rightItems)
@@ -406,6 +399,10 @@ var MasterDeck = function (_React$Component) {
           query: this.props.query
         });
       }
+      // set dataRemap to true as there are no infeed or BI ads or window width is less than limit
+      if (typeof window !== 'undefined' && (!this.props.lgInfeedAd || !this.props.brandInsightAd || window.innerWidth < 1400) && !this.state.dataRemapped) {
+        !this.state.dataRemapped && this.setState({ dataRemapped: true });
+      }
     }
   }, {
     key: 'componentDidMount',

package/dist/esm/NavDvm.js

@@ -4,30 +4,84 @@ import './core.get-iterator-method-f5c0d66a.js';
 import './_library-528f1934.js';
 import './_iter-detect-6e099a34.js';
 import './web.dom.iterable-46c95e52.js';
-import React__default from 'react';
+import React__default, { useRef, useState, useEffect } from 'react';
+import 'prop-types';
 import Container from 'react-bootstrap/Container';
-import './slicedToArray-f1e40361.js';
+import { _ as _slicedToArray } from './slicedToArray-f1e40361.js';
 import './stringify-e30bc114.js';
 import './asyncToGenerator-0379e924.js';
 import './_set-species-6f64f1c1.js';
 import { S as Segment } from './beam-a25bd8fd.js';
-import 'react-bootstrap/Button';
+import { r as reactSocialIcons_1 } from './react-social-icons-a7d5c5c7.js';
+import { I as IconContext } from './iconBase-602d52fe.js';
+import Button from 'react-bootstrap/Button';
 import Nav from 'react-bootstrap/Nav';
 import Navbar from 'react-bootstrap/Navbar';
 import NavDropdown from 'react-bootstrap/NavDropdown';
-import 'react-bootstrap/Form';
-import 'react-bootstrap/FormControl';
-import Search from './Search.js';
 import { N as NavFooter } from './NavFooter-e27bd93b.js';
+import { G as GoSearch } from './index.esm-16536e81.js';
+import Form from 'react-bootstrap/Form';
+import FormControl from 'react-bootstrap/FormControl';
 
 var NavDvm = function NavDvm(props) {
   var logo = props.logo,
       mobileLogo = props.mobileLogo,
       dataObject = props.dataObject,
       subNav = props.subNav,
-      _props$website = props.website,
-      website = _props$website === undefined ? {} : _props$website;
+      website = props.website;
+  //  reference to mobile search component
 
+  var searchRef = useRef(null);
+  // Search Term
+
+  var _useState = useState(''),
+      _useState2 = _slicedToArray(_useState, 2),
+      searchKey = _useState2[0],
+      setSearchKey = _useState2[1];
+  //  reference to navigation component
+
+
+  var navRef = useRef(null);
+  var relNavRef = useRef(null);
+
+  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';
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(function () {
+    // Making the search and navbar Sticky on scroll
+    var navOffsetTop = document.getElementById('navbar-dvm').offsetTop;
+    if (window.pageYOffset > navOffsetTop) {
+      if (navRef.current && navRef.current.style) {
+        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) {
+          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) {
+          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);
+    };
+  }, []);
 
   var getLink = function getLink(url, className, name, key, blank) {
     var needSegmentSupport = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
@@ -48,6 +102,139 @@ var NavDvm = function NavDvm(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(
+          IconContext.Provider,
+          { value: { color: 'white', className: 'search-btn-mobile', size: '50px' } },
+          React__default.createElement(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: -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            }\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(
+          IconContext.Provider,
+          { value: { color: 'white', className: 'search-btn-desktop', size: '50px' } },
+          React__default.createElement(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_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              background-color: #60bdcd;\n              position: relative;\n              width: 400px;\n              border-radius: 5px;\n              height: 48px;\n              top: 45px;\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(
     React__default.Fragment,
     null,
@@ -74,16 +261,29 @@ var NavDvm = function NavDvm(props) {
     ),
     React__default.createElement(
       Navbar,
-      { className: 'bottom-nav', variant: 'dark', expand: 'xl', bg: 'primary', sticky: 'top' },
+      { id: 'navbar-dvm', className: 'bottom-nav', variant: 'dark', expand: 'xl', bg: 'primary', sticky: 'top', ref: navRef },
       React__default.createElement(
         Container,
-        { className: 'mobile-nav position-relative' },
+        { className: 'mobile-nav position-relative', ref: relNavRef },
         mobileLogo && React__default.createElement(
           'a',
           { href: '/', className: 'mobile-logo' },
           React__default.createElement('img', { src: mobileLogo })
         ),
-        React__default.createElement(Navbar.Toggle, { 'aria-controls': 'basic-navbar-nav' }),
+        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');
+            }
+          }
+        }),
+        socialSearchComponent('mobile'),
         React__default.createElement(
           Navbar.Collapse,
           { id: 'basic-navbar-nav' },
@@ -126,8 +326,7 @@ var NavDvm = function NavDvm(props) {
                 return getLink(row.url, 'nav-link', row.name, index, row.blank, row.needSegmentSupport);
               }
             })
-          ),
-          React__default.createElement(Search, null)
+          )
         ),
         subNav && React__default.createElement(
           Navbar.Collapse,
@@ -197,7 +396,8 @@ var NavDvm = function NavDvm(props) {
             { className: 'mr-auto' },
             React__default.createElement(NavFooter, { website: website })
           )
-        )
+        ),
+        socialSearchComponent('desktop')
       )
     ),
     React__default.createElement(
@@ -212,7 +412,7 @@ var NavDvm = function NavDvm(props) {
     React__default.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .mobile-logo {\n          display: none;\n          position: absolute;\n          left: 50%;\n          top: 0;\n          height: 40px;\n          transform: translateX(-50%);\n        }\n        .mobile-logo img {\n          height: 100%;\n        }\n        @media screen and (max-width: 1192px) {\n          .mobile-logo {\n            display: block;\n          }\n          .top-nav {\n            display: none;\n          }\n          .navbar-expand-lg .show#basic-navbar-sub {\n            display: block;\n          }\n          .navbar .mobile-nav .navbar-collapse.show {\n            padding-bottom: 20px;\n            border-bottom: 0.5px solid white;\n            margin-bottom: 15px;\n          }\n          .navbar .mobile-nav .navbar-collapse .form-inline {\n            margin: 5px 0px;\n          }\n          .navbar .mobile-nav .navbar-collapse:last-child {\n            border-bottom: none;\n            margin-bottom: 0px;\n            padding-bottom: 0px;\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        }\n        @media screen and (max-width: 991px) {\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        }\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        }\n      '
+      '\n        .mobile-logo {\n          display: none;\n          position: absolute;\n          left: 50%;\n          top: 0;\n          height: 40px;\n          transform: translateX(-50%);\n        }\n        .mobile-logo img {\n          height: 100%;\n        }\n        @media screen and (max-width: 1199px) {\n          .mobile-logo {\n            display: block;\n          }\n          .top-nav {\n            display: none;\n          }\n          .navbar-expand-lg .show#basic-navbar-sub {\n            display: block;\n          }\n          .navbar .mobile-nav .navbar-collapse.show {\n            padding-bottom: 20px;\n            border-bottom: 0.5px solid white;\n            margin-bottom: 15px;\n          }\n          .navbar .mobile-nav .navbar-collapse .form-inline {\n            margin: 5px 0px;\n          }\n          .navbar .mobile-nav .navbar-collapse:last-child {\n            border-bottom: none;\n            margin-bottom: 0px;\n            padding-bottom: 0px;\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          }\n        }\n        @media screen and (max-width: 991px) {\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        }\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        }\n      '
     )
   );
 };