@mjhls/mjh-framework 1.0.237 → 1.0.239

package/dist/cjs/MasterDeck.js

@@ -1,339 +1,28 @@
 'use strict';
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var React = require('react');
-var React__default = _interopDefault(React);
-require('./_commonjsHelpers-3fc1f64e.js');
-var index = require('./index-0322e486.js');
+require('./_commonjsHelpers-06173234.js');
+require('./_to-object-329a650b.js');
+require('./web.dom.iterable-0998bdc3.js');
+require('./inherits-5b5ca8db.js');
+require('./toConsumableArray-7e4caf3c.js');
+require('./core.get-iterator-method-e049ca4a.js');
+require('./extends-e94dbea5.js');
+require('react');
+require('./index-fa3cec70.js');
 require('prop-types');
-var Container = _interopDefault(require('react-bootstrap/Container'));
-var Row = _interopDefault(require('react-bootstrap/Row'));
+require('react-bootstrap/Container');
+require('react-bootstrap/Row');
 require('react-bootstrap/Col');
 require('react-bootstrap/Card');
-var visibilitySensor = require('./visibility-sensor-8936e703.js');
+require('./visibility-sensor-b72d9527.js');
 require('next/link');
-var Router = require('next/router');
-var Router__default = _interopDefault(Router);
-var debounce = require('./debounce-a963b136.js');
+require('next/router');
+require('./debounce-bbca43c4.js');
 require('react-dom');
-require('./index-a4c53ff4.js');
-var main = require('./main-58839f4e.js');
-var _babelHelpers = require('./_babelHelpers-f321c258.js');
-
-var MasterDeck = function (_React$Component) {
-  _babelHelpers.inherits(MasterDeck, _React$Component);
-
-  function MasterDeck() {
-    var _ref,
-        _this2 = this;
-
-    var _temp, _this, _ret;
-
-    _babelHelpers.classCallCheck(this, MasterDeck);
-
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    return _ret = (_temp = (_this = _babelHelpers.possibleConstructorReturn(this, (_ref = MasterDeck.__proto__ || Object.getPrototypeOf(MasterDeck)).call.apply(_ref, [this].concat(args))), _this), _this.Deck = _this.props.deck, _this.variant = _this.props.variant, _this.mapping = _this.props.mapping, _this.data = _this.props.dataRecord || [], _this.query = _this.props.query, _this.params = _this.props.params, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.rightItems = _this.props.rightItems ? _this.props.rightItems : false, _this.state = {
-      data: _this.data,
-      dataKeptToCompareNewDatarecord: _this.data,
-      per: _this.params ? _this.params.to : 2,
-      page: _this.props.currentPage || 1,
-      from: _this.params ? _this.params.from : 0,
-      to: _this.params ? _this.params.to : 2,
-      total_pages: null,
-      scrolling: true,
-      query: _this.query,
-      currentPage: _this.props.currentPage || 1
-    }, _this.loadMore = debounce.debounce_1(function () {
-      _this.setState(function (state) {
-        var page = state.page,
-            from = state.from,
-            per = state.per,
-            to = state.to;
-
-        return {
-          page: page + 1,
-          from: from + per,
-          to: to + per
-        };
-      }, _this.loadData);
-    }, 0), _this.loadData = function () {
-      var _this$state = _this.state,
-          from = _this$state.from,
-          to = _this$state.to,
-          data = _this$state.data,
-          query = _this$state.query,
-          page = _this$state.page;
-      var _this$props = _this.props,
-          client = _this$props.client,
-          dataHandler = _this$props.dataHandler;
-
-
-      var params = _babelHelpers._extends({}, _this.params, { from: from, to: to });
-
-      if (dataHandler) {
-        var dataHandlerPromise = new Promise(function (resolve, reject) {
-          try {
-            var result = dataHandler(params);
-            resolve(result);
-          } catch (e) {
-            reject(e);
-          }
-        });
-        dataHandlerPromise.then(function (dataArr) {
-          _this.loadDataFinished(data, dataArr, page);
-        });
-      } else {
-        client.fetch(query, params).then(function (dataArr) {
-          _this.loadDataFinished(data, dataArr, page);
-        });
-      }
-    }, _this.loadDataFinished = function (data, dataArr, page) {
-      if (_this.pointer && _this.pointerArray) {
-        var pointer = _this.pointer;
-        dataArr = dataArr[_this.pointerArray][pointer];
-      }
-      dataArr = dataArr.map(function (item) {
-        return _babelHelpers._extends({}, item, {
-          pageNumber: page
-        });
-      });
-
-      _this.setState(function () {
-        if (dataArr.length > 0) {
-          return {
-            data: [].concat(_babelHelpers.toConsumableArray(data), _babelHelpers.toConsumableArray(dataArr)),
-            scrolling: true
-          };
-        } else {
-          return {
-            scrolling: false
-          };
-        }
-      });
-    }, _this.changePageNumber = function (pageNumber) {
-      var _this$props2 = _this.props,
-          seoPaginate = _this$props2.seoPaginate,
-          pageview = _this$props2.pageview,
-          router = _this$props2.router;
-      var currentPage = _this.state.currentPage;
-
-      if (seoPaginate) {
-        var path = router.asPath;
-        var qrIndex = path.indexOf('?');
-        var pathname = router.pathname;
-        var queryString = '';
-
-        if (qrIndex > 0) {
-          path = path.substring(1, qrIndex);
-
-          var partialQS = router.asPath.substring(qrIndex + 1);
-          var partialQSArr = partialQS.split('&');
-
-          // exclude page=xxx from query string
-          partialQSArr.map(function (item) {
-            var itemArr = item.split('=');
-            var key = itemArr[0];
-            var val = itemArr[1];
-
-            if (key !== 'page') {
-              queryString += (queryString.length === 0 ? '' : '&') + key + '=' + val;
-            }
-          });
-        }
-
-        if (queryString.length > 0) {
-          path += '?' + queryString;
-        }
-
-        pageNumber = parseInt(pageNumber);
-
-        if (currentPage !== pageNumber) {
-          index.lib_3.refresh();
-
-          _this.setState({
-            currentPage: pageNumber
-          }, function () {
-            if (path[0] !== '/') {
-              path = '/' + path;
-            }
-
-            var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
-
-            // 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
-            }) */
-
-            if (pageview) {
-              pageview(newPath);
-            }
-
-            router.push(pathname, newPath, {
-              shallow: true
-            });
-          });
-        }
-      }
-    }, _this.cardLoader = function (page, columns, variant) {
-      var numberOfItemsBeforeAd = 6;
-      return React__default.createElement(
-        Row,
-        null,
-        _this.state.data && _this.state.data.map(function (row, index) {
-          var pageNumber = row.pageNumber || _this.state.page;
-
-          return React__default.createElement(
-            React__default.Fragment,
-            { key: index },
-            React__default.createElement(
-              visibilitySensor.VisibilitySensor,
-              {
-                onChange: function onChange(isVisible) {
-                  isVisible && _this.changePageNumber(pageNumber);
-                } },
-              React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client, defaultImage: _this.defaultImage })
-            ),
-            main.main_36 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
-              'div',
-              { style: { margin: '0 auto' } },
-              _this.renderMobileAd(index, numberOfItemsBeforeAd, _this.rightItems)
-            )
-          );
-        })
-      );
-    }, _this.renderMobileAd = function (index, numberOfItemsBeforeAd, rightItems) {
-      var i = ((index + 1) / numberOfItemsBeforeAd - 1) % rightItems.length;
-      return React__default.createElement(
-        'div',
-        { style: { display: 'flex', flex: '1 0 auto', width: '100%', textAlign: 'center', marginBottom: '2rem' } },
-        rightItems[i].component
-      );
-    }, _this.renderManualPagination = function () {
-      var currentPage = _this.state.currentPage;
-
-      return React__default.createElement(
-        'div',
-        { className: 'd-flex justify-content-between' },
-        currentPage && currentPage > 1 && React__default.createElement(
-          'a',
-          { href: '?page=' + (currentPage - 1) },
-          '<< Previous'
-        ),
-        React__default.createElement(
-          'a',
-          { href: '?page=' + (currentPage + 1) },
-          'Next >>'
-        )
-      );
-    }, _temp), _babelHelpers.possibleConstructorReturn(_this, _ret);
-  }
-
-  _babelHelpers.createClass(MasterDeck, [{
-    key: 'componentDidUpdate',
-    value: function componentDidUpdate(prevProps, prevState) {
-      if (this.state.dataKeptToCompareNewDatarecord !== this.props.dataRecord) {
-        // eslint-disable-next-line react/no-did-update-set-state
-        this.setState({
-          data: this.props.dataRecord,
-          dataKeptToCompareNewDatarecord: this.props.dataRecord,
-          per: this.props.params ? this.props.params.to : 2,
-          page: 1,
-          from: this.props.params ? this.props.params.from : 0,
-          to: this.props.params ? this.props.params.to : 2,
-          total_pages: null,
-          scrolling: true,
-          query: this.props.query
-        });
-      }
-    }
-  }, {
-    key: 'componentDidMount',
-    value: function componentDidMount() {
-      // this.loadData();
-    }
-  }, {
-    key: 'render',
-    value: function render() {
-      var _this3 = this;
-
-      var _props = this.props,
-          columns = _props.columns,
-          variant = _props.variant,
-          autoScroll = _props.autoScroll,
-          page = _props.page;
-
+require('./index-be0c82be.js');
+require('./main-d9a1b014.js');
+var MasterDeck = require('./MasterDeck-f8fbac3c.js');
 
-      return React__default.createElement(
-        'div',
-        { className: 'contentDeck' },
-        autoScroll ? React__default.createElement(
-          React__default.Fragment,
-          null,
-          React__default.createElement(
-            visibilitySensor.InfiniteScroll,
-            { dataLength: this.state.data.length, next: this.loadMore, hasMore: this.state.scrolling, scrollThreshold: 0.9 },
-            React__default.createElement(
-              Container,
-              null,
-              this.cardLoader(page, columns, variant)
-            )
-          ),
-          React__default.createElement(
-            'noscript',
-            null,
-            this.renderManualPagination()
-          )
-        ) : React__default.createElement(
-          React__default.Fragment,
-          null,
-          React__default.createElement(
-            Container,
-            null,
-            this.cardLoader(page, columns, variant)
-          ),
-          React__default.createElement(
-            'div',
-            { style: { padding: '0px 10px' } },
-            this.state.scrolling ? React__default.createElement(
-              'button',
-              {
-                style: { margin: 'auto', width: '100%' },
-                onClick: function onClick(e) {
-                  _this3.loadMore();
-                } },
-              'Load More'
-            ) : React__default.createElement(
-              'p',
-              { style: { textAlign: 'center' } },
-              React__default.createElement(
-                'b',
-                null,
-                'End of data'
-              )
-            )
-          ),
-          React__default.createElement(
-            'noscript',
-            null,
-            this.renderManualPagination()
-          )
-        )
-      );
-    }
-  }]);
-  return MasterDeck;
-}(React__default.Component);
 
-var MasterDeck$1 = Router.withRouter(MasterDeck);
 
-module.exports = MasterDeck$1;
+module.exports = MasterDeck.MasterDeck;

package/dist/cjs/{Normal-821546cd.js → Normal-c89b709d.js}

@@ -2,18 +2,18 @@
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
+var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-var _commonjsHelpers = require('./_commonjsHelpers-3fc1f64e.js');
 var PropTypes = _interopDefault(require('prop-types'));
 var Container = _interopDefault(require('react-bootstrap/Container'));
 var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
 var Link = _interopDefault(require('next/link'));
-var main = require('./main-58839f4e.js');
-var _babelHelpers = require('./_babelHelpers-f321c258.js');
-var AdSlot = require('./AdSlot-d87cef08.js');
-var get$1 = require('./get-126b1712.js');
+var main = require('./main-d9a1b014.js');
+var slicedToArray = require('./slicedToArray-e38fb29d.js');
+var AdSlot = require('./AdSlot-1fe1c231.js');
+var get$1 = require('./get-af2516a4.js');
 var reactBootstrap = require('react-bootstrap');
 var index_esm = require('./index.esm-340d3792.js');
 var Button = _interopDefault(require('react-bootstrap/Button'));
@@ -674,8 +674,8 @@ var renderLink = function renderLink(row) {
 };
 
 var SideFooter = function SideFooter(props) {
-  /*
-  useage example: <SideFooter cache={props.cache} logo='/an_mjhls_brand_logo.png' />
+  /*
+  useage example: <SideFooter cache={props.cache} logo='/an_mjhls_brand_logo.png' />
   */
   var _get = get$1.get_1(props, 'cache.siteSettingCache', {}),
       socialLinks = _get.socialLinks,
@@ -886,7 +886,7 @@ var PageFilter = function PageFilter(props) {
       defaultFilter = props.defaultFilter;
 
   var _useState = React.useState(''),
-      _useState2 = _babelHelpers.slicedToArray(_useState, 2),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
       filter = _useState2[0],
       setFilter = _useState2[1];
 
@@ -1079,7 +1079,7 @@ var Search = function Search(props) {
       device = _props$device === undefined ? 'desktop' : _props$device;
 
   var _useState = React.useState(''),
-      _useState2 = _babelHelpers.slicedToArray(_useState, 2),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
       searchKey = _useState2[0],
       setSearchKey = _useState2[1];
 
@@ -1248,15 +1248,15 @@ var SocialNavFooter = function SocialNavFooter(props) {
 };
 
 var NavMagazine = function NavMagazine(props) {
-  /*
-  Example Nav with acceptable props
-    <MagazineNav
-     showLogin
-     logo={props.settings.logo}
-     dataObject={props.cache.mainNavCache}
-     website={website}
-     subNav={props.cache.subNavCache}
-      />
+  /*
+  Example Nav with acceptable props
+   <MagazineNav
+     showLogin
+     logo={props.settings.logo}
+     dataObject={props.cache.mainNavCache}
+     website={website}
+     subNav={props.cache.subNavCache}
+      />
   */
 
   var logo = props.logo,
@@ -1273,12 +1273,12 @@ var NavMagazine = function NavMagazine(props) {
   var navRef = React.useRef(null);
 
   var _useState = React.useState(false),
-      _useState2 = _babelHelpers.slicedToArray(_useState, 2),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
       isSticky = _useState2[0],
       setIsSticky = _useState2[1];
 
   var _useState3 = React.useState(0),
-      _useState4 = _babelHelpers.slicedToArray(_useState3, 2),
+      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
       screenWidth = _useState4[0],
       setScreenWidth = _useState4[1];
 
@@ -1464,10 +1464,10 @@ var NavMagazine = function NavMagazine(props) {
     ),
     React__default.createElement(
       Navbar,
-      { className: main.main_37 ? 'bottom-nav ios-nav' : 'bottom-nav android-nav', variant: 'dark', expand: 'xl', bg: 'primary', sticky: 'top', ref: navRef },
+      { className: main.main_37 ? 'bottom-nav ios-nav' : 'bottom-nav ', variant: 'dark', expand: 'xl', bg: 'primary', sticky: 'top', ref: navRef },
       React__default.createElement(
         Container,
-        { className: 'mobile-nav' },
+        { className: 'mobile-nav android-nav' },
         React__default.createElement(
           'div',
           { className: 'nav-toggle' },
@@ -1554,7 +1554,7 @@ var NavMagazine = function NavMagazine(props) {
           React__default.createElement(
             Nav,
             { className: 'mr-auto' },
-            socialFooterNav ? React__default.createElement(SocialNavFooter, { website: website }) : React__default.createElement(NavFooter$1, { website: website })
+            socialFooterNav ? React__default.createElement(SocialNavFooter, { website: website, showLogo: true }) : React__default.createElement(NavFooter$1, { website: website, showLogo: true })
           )
         )
       )
@@ -1570,15 +1570,15 @@ var NavMagazine = function NavMagazine(props) {
 var MagazineNav = React__default.memo(NavMagazine);
 
 var NavNative = function NavNative(props) {
-  /*
-  Example Nav with acceptable props
-    <MagazineNav
-     showLogin
-     logo={props.settings.logo}
-     dataObject={props.cache.mainNavCache}
-     website={website}
-     subNav={props.cache.subNavCache}
-      />
+  /*
+  Example Nav with acceptable props
+   <MagazineNav
+     showLogin
+     logo={props.settings.logo}
+     dataObject={props.cache.mainNavCache}
+     website={website}
+     subNav={props.cache.subNavCache}
+      />
   */
 
   var logo = props.logo,
@@ -1594,12 +1594,12 @@ var NavNative = function NavNative(props) {
   var navRef = React.useRef(null);
 
   var _useState = React.useState(false),
-      _useState2 = _babelHelpers.slicedToArray(_useState, 2),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
       isSticky = _useState2[0],
       setIsSticky = _useState2[1];
 
   var _useState3 = React.useState(0),
-      _useState4 = _babelHelpers.slicedToArray(_useState3, 2),
+      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
       screenWidth = _useState4[0],
       setScreenWidth = _useState4[1];
 
@@ -1972,15 +1972,15 @@ var NavDvm = function NavDvm(props) {
 };
 
 var HamMagazine = function HamMagazine(props) {
-  /*
-  Example Nav with acceptable props
-  <MagazineNav
-     showLogin
-     logo={props.settings.logo}
-     dataObject={props.cache.mainNavCache}
-     website={website}
-     subNav={props.cache.subNavCache}
-      />
+  /*
+  Example Nav with acceptable props
+  <MagazineNav
+     showLogin
+     logo={props.settings.logo}
+     dataObject={props.cache.mainNavCache}
+     website={website}
+     subNav={props.cache.subNavCache}
+      />
   */
 
   var logo = props.logo,
@@ -1996,19 +1996,24 @@ var HamMagazine = function HamMagazine(props) {
   var navRef = React.useRef(null);
 
   var _useState = React.useState(false),
-      _useState2 = _babelHelpers.slicedToArray(_useState, 2),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
       isSticky = _useState2[0],
       setIsSticky = _useState2[1];
 
   var _useState3 = React.useState(0),
-      _useState4 = _babelHelpers.slicedToArray(_useState3, 2),
+      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
       screenWidth = _useState4[0],
       setScreenWidth = _useState4[1];
 
-  var _useState5 = React.useState(false),
-      _useState6 = _babelHelpers.slicedToArray(_useState5, 2),
-      isOpen = _useState6[0],
-      setIsOpen = _useState6[1];
+  var _useState5 = React.useState(null),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      userAgent = _useState6[0],
+      setUserAgent = _useState6[1];
+
+  var _useState7 = React.useState(false),
+      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
+      isOpen = _useState8[0],
+      setIsOpen = _useState8[1];
 
   React.useEffect(function () {
     document.addEventListener('scroll', trackScrolling);
@@ -2018,17 +2023,25 @@ var HamMagazine = function HamMagazine(props) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  // Initial User agent setup on refresh or on load
+  React.useEffect(function () {
+    setUserAgent(navigator.userAgent.toString());
+  }, []);
+
   React.useEffect(function () {
     setScreenWidth(parseInt(window.innerWidth));
   }, []);
 
+  // Check for change in useragent with change in screen resolution
   React.useEffect(function () {
     var handleResize = function handleResize() {
-      window.location.reload();
-      console.log('Screen size changed. Refreshing page.');
+      if (userAgent && userAgent !== navigator.userAgent.toString()) {
+        console.log('Browser change detected, refreshing');
+        window.location.reload();
+      }
     };
     window.addEventListener('resize', handleResize);
-  }, []);
+  }, [userAgent]);
 
   React.useEffect(function () {
     var navOffsetTop = navRef.current.getBoundingClientRect().top;

package/dist/cjs/PublicationDeck.js

@@ -2,17 +2,17 @@
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
+require('./_commonjsHelpers-06173234.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-require('./_commonjsHelpers-3fc1f64e.js');
 require('prop-types');
 var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
 var Card = _interopDefault(require('react-bootstrap/Card'));
 require('next/link');
 require('react-dom');
-var index$1 = require('./index-a4c53ff4.js');
-var index$2 = require('./index-0d0efcfa.js');
+var index$1 = require('./index-be0c82be.js');
+var index$2 = require('./index-fa0fb52c.js');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 
 var PublicationDeck = function PublicationDeck(props) {