@mjhls/mjh-framework 1.0.220 → 1.0.222

package/dist/esm/index.js

@@ -16,10 +16,11 @@ import './index-3c1ee9ab.js';
 import { m as main_35, a as main_36 } from './main-dea495b7.js';
 import { h as html_decode_1, c as clean_html_1 } from './entities-e85d3a4a.js';
 import { s as slicedToArray, _ as _extends$2, t as toConsumableArray, i as inherits$2, c as createClass, a as classCallCheck, p as possibleConstructorReturn } from './_babelHelpers-67c05996.js';
+import { D as DFPAdSlot } from './AdSlot-b67f8534.js';
+export { D as AdSlot } from './AdSlot-b67f8534.js';
 export { default as DeckContent } from './DeckContent.js';
 import './get-b074314b.js';
-import { A as AD } from './GridContent-214acb61.js';
-export { A as AD, G as GridContent } from './GridContent-214acb61.js';
+export { A as AD, G as GridContent } from './GridContent-e5cdc9da.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
 export { default as ThumbnailCard } from './ThumbnailCard.js';
@@ -39,8 +40,8 @@ export { default as PublicationDeck } from './PublicationDeck.js';
 export { default as IssueDeck } from './IssueDeck.js';
 import 'react-bootstrap/Badge';
 export { default as IssueContentDeck } from './IssueContentDeck.js';
-import { D as DFPAdSlot, M as MdPictureAsPdf, T as TemplateNormal } from './Normal-be430fa9.js';
-export { A as AD728x90, D as AdSlot, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-be430fa9.js';
+import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-4f059950.js';
+export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-4f059950.js';
 import 'react-bootstrap/ListGroup';
 import Head from 'next/head';
 import Accordion from 'react-bootstrap/Accordion';
@@ -10184,13 +10185,13 @@ var Poll = function Poll(_ref) {
         return React__default.createElement(
           'div',
           { key: choice._key },
-          React__default.createElement('input', { type: 'radio', id: 'male', name: choice._type, value: choice._key, onChange: function onChange(e) {
-              return setSelectedChoice(e.target.value);
-            } }),
           React__default.createElement(
             'label',
             { className: 'pl-2' },
-            choice.choiceText
+            React__default.createElement('input', { type: 'radio', id: 'male', name: choice._type, value: choice._key, onChange: function onChange(e) {
+                return setSelectedChoice(e.target.value);
+              } }),
+            ' ' + choice.choiceText
           )
         );
       }),
@@ -10489,7 +10490,7 @@ var NativeAd = function NativeAd(props) {
   return React__default.createElement(
     'div',
     { className: 'native-ad-wrapper', style: { textAlign: 'center' } },
-    React__default.createElement(AD, { networkID: networkID, adUnit: adUnit, slotId: slotId, targeting: targeting, className: className, sizes: sizes, sizeMapping: sizeMapping })
+    React__default.createElement(DFPAdSlot, { networkID: networkID, adUnit: adUnit, slotId: slotId, targeting: targeting, className: className, sizes: sizes, sizeMapping: sizeMapping })
   );
 };
 
@@ -12233,84 +12234,97 @@ var Article = function Article(props) {
 
   var siteName = props.website.title;
   return React__default.createElement(
-    InscreenSensor,
-    {
-      offSetTop: 45,
-      onChange: function onChange(visible) {
-        if (visible !== false) {
-          changeUrl(url, visible);
-        }
-      } },
+    React__default.Fragment,
+    null,
     React__default.createElement(
-      'div',
-      null,
-      React__default.createElement(
-        Head,
-        null,
-        passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' })
-      ),
-      React__default.createElement(
-        'h1',
-        { className: 'page-title' },
-        title
-      ),
+      InscreenSensor,
+      {
+        offSetTop: 45,
+        onChange: function onChange(visible) {
+          if (visible !== false) {
+            changeUrl(url, visible);
+          }
+        } },
       React__default.createElement(
         'div',
-        { className: 'video-detail', style: { marginBottom: isCutomPage(props.article) ? '150px' : 0 } },
+        null,
         React__default.createElement(
-          'div',
+          Head,
           null,
-          moment(published).format('LL')
+          passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' })
         ),
         React__default.createElement(
-          'div',
-          { className: 'mb-3' },
-          authorDetails && authorDetails.map(function (authorDetail, index) {
-            return React__default.createElement(
-              'div',
-              { key: index },
-              renderAuthor(authorDetail.displayName, authorDetail.url, index, authorDetails.length)
-            );
-          })
+          'h1',
+          { className: 'page-title' },
+          title
         ),
         React__default.createElement(
-          'p',
-          null,
-          React__default.createElement(SocialShare$1, {
-            shareUrl: shareUrl,
-            shareTitle: shareTitle,
-            shareVia: shareVia,
-            shareSummary: shareSummary,
-            shareSubject: shareSubject,
-            shareImage: shareImage,
-            size: 32,
-            siteName: siteName,
-            twitterSiteName: twitterSiteName
-          })
-        ),
-        React__default.createElement(
-          'p',
-          null,
+          'div',
+          { className: 'video-detail', style: { marginBottom: isCutomPage(props.article) ? '150px' : 0 } },
           React__default.createElement(
-            'em',
+            'div',
             null,
-            summary
+            moment(published).format('LL')
           ),
-          React__default.createElement('br', null),
-          React__default.createElement('br', null)
+          React__default.createElement(
+            'div',
+            { className: 'mb-3' },
+            authorDetails && authorDetails.map(function (authorDetail, index) {
+              return React__default.createElement(
+                'div',
+                { key: index },
+                renderAuthor(authorDetail.displayName, authorDetail.url, index, authorDetails.length)
+              );
+            })
+          ),
+          React__default.createElement(
+            'p',
+            null,
+            React__default.createElement(SocialShare$1, {
+              shareUrl: shareUrl,
+              shareTitle: shareTitle,
+              shareVia: shareVia,
+              shareSummary: shareSummary,
+              shareSubject: shareSubject,
+              shareImage: shareImage,
+              size: 32,
+              siteName: siteName,
+              twitterSiteName: twitterSiteName
+            })
+          ),
+          React__default.createElement(
+            'p',
+            null,
+            React__default.createElement(
+              'em',
+              null,
+              summary
+            ),
+            React__default.createElement('br', null),
+            React__default.createElement('br', null)
+          ),
+          React__default.createElement(
+            'div',
+            { className: 'block-content' },
+            React__default.createElement(BlockContent, _extends$2({
+              serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true),
+              blocks: articleBody,
+              imageOptions: { w: 320, h: 240, fit: 'max' }
+            }, client.config()))
+          )
         ),
-        React__default.createElement(
-          'div',
-          { className: 'block-content' },
-          React__default.createElement(BlockContent, _extends$2({
-            serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true),
-            blocks: articleBody,
-            imageOptions: { w: 320, h: 240, fit: 'max' }
-          }, client.config()))
-        )
-      ),
-      renderIsiContent(props.article)
-    )
+        renderIsiContent(props.article)
+      )
+    ),
+    sMobileOnly && React__default.createElement('hr', { className: 'add-seperater' }),
+    main_36 && props.article.Ads.map(function (ad, index) {
+      return React__default.createElement(
+        'div',
+        { key: index, id: 'addid-' + index, style: { display: 'flex', flex: '1 0 auto' } },
+        ad.component
+      );
+    }),
+    React__default.createElement('hr', { className: 'article-seperater' })
   );
 };
 
@@ -12334,6 +12348,8 @@ var ArticleQueue = function (_React$Component) {
 
     var targeting = _this.getTargeting(_this.props.article);
     var metaDescription = description ? description : summary ? summary : _this.getFirstLine(_this.props.article);
+    var article = _this.props.article;
+    article.Ads = _this.props.Ads.getRightItems(targeting);
 
     _this.state = {
       config: {
@@ -12347,7 +12363,7 @@ var ArticleQueue = function (_React$Component) {
       },
       title: _this.props.article.title,
       summary: metaDescription,
-      queueData: [_this.props.article],
+      queueData: [article],
       relatedArticles: [],
       keywords: []
     }, _this.preVscroll = 0;
@@ -12364,9 +12380,14 @@ var ArticleQueue = function (_React$Component) {
   }, {
     key: 'componentDidUpdate',
     value: function componentDidUpdate(prevProps) {
-      if (prevProps.relatedArticles != this.props.relatedArticles) {
-        var relatedArticles = this.props.relatedArticles;
+      var _this2 = this;
 
+      if (prevProps.relatedArticles != this.props.relatedArticles) {
+        var relatedArticles = this.props.relatedArticles.map(function (article) {
+          var targeting = _this2.getTargeting(_this2.props.article);
+          var Ads = _this2.props.Ads.getRightItems(targeting);
+          return _extends$2({}, article, { Ads: Ads });
+        });
         var queueData = [].concat(toConsumableArray(this.state.queueData));
         if (prevProps.relatedArticles.length == 0) {
           queueData.push(relatedArticles.shift());
@@ -12385,7 +12406,7 @@ var ArticleQueue = function (_React$Component) {
   }, {
     key: 'render',
     value: function render() {
-      var _this2 = this;
+      var _this3 = this;
 
       var _state = this.state,
           config = _state.config,
@@ -12401,19 +12422,19 @@ var ArticleQueue = function (_React$Component) {
 
       return React__default.createElement(
         TemplateNormal,
-        { config: config, website: website, keywords: keywords, description: summary, title: title, showRightAd: true },
+        { config: config, website: website, keywords: keywords, description: summary, title: title, showRightAd: !main_36 },
         React__default.createElement(
           InfiniteScroll,
           { dataLength: queueData.length, next: this.loadmore, scrollThreshold: '200px', hasMore: true },
           queueData.map(function (article, index) {
             return React__default.createElement(Article, _extends$2({
               key: index,
-              urlFor: _this2.urlFor,
-              isCutomPage: _this2.isCutomPage,
-              renderIsiContent: _this2.renderIsiContent
-            }, _this2.props, {
+              urlFor: _this3.urlFor,
+              isCutomPage: _this3.isCutomPage,
+              renderIsiContent: _this3.renderIsiContent
+            }, _this3.props, {
               shareOptions: shareOptions,
-              changeUrl: _this2.changeUrl,
+              changeUrl: _this3.changeUrl,
               article: article
             }));
           })
@@ -12425,37 +12446,37 @@ var ArticleQueue = function (_React$Component) {
 }(React__default.Component);
 
 var _initialiseProps = function _initialiseProps() {
-  var _this3 = this;
+  var _this4 = this;
 
   this.scrollDirectionDetect = function (e) {
     var window = e.currentTarget;
-    var isScrollDown = _this3.isScrollDown;
+    var isScrollDown = _this4.isScrollDown;
 
 
-    if (_this3.preVscroll > window.scrollY) {
+    if (_this4.preVscroll > window.scrollY) {
       if (!isScrollDown) {
-        _this3.isScrollDown = true;
+        _this4.isScrollDown = true;
       }
-    } else if (_this3.preVscroll < window.scrollY) {
+    } else if (_this4.preVscroll < window.scrollY) {
       if (isScrollDown) {
-        _this3.isScrollDown = false;
+        _this4.isScrollDown = false;
       }
     }
-    _this3.preVscroll = window.scrollY;
+    _this4.preVscroll = window.scrollY;
   };
 
   this.loadmore = function () {
-    var queueData = [].concat(toConsumableArray(_this3.state.queueData));
-    var relatedArticles = [].concat(toConsumableArray(_this3.state.relatedArticles));
+    var queueData = [].concat(toConsumableArray(_this4.state.queueData));
+    var relatedArticles = [].concat(toConsumableArray(_this4.state.relatedArticles));
     if (relatedArticles.length > 0) {
       queueData.push(relatedArticles.shift());
-      _this3.setState({ queueData: queueData, relatedArticles: relatedArticles });
+      _this4.setState({ queueData: queueData, relatedArticles: relatedArticles });
     }
   };
 
   this.isCutomPage = function (article) {
     var url = article.url.current;
-    var _props2 = _this3.props,
+    var _props2 = _this4.props,
         regionalPages = _props2.regionalPages,
         nationalPage = _props2.nationalPage;
 
@@ -12463,7 +12484,7 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.urlFor = function (source) {
-    return imageUrlBuilder(_this3.props.client).image(source);
+    return imageUrlBuilder(_this4.props.client).image(source);
   };
 
   this.getTargeting = function (article) {
@@ -12488,7 +12509,7 @@ var _initialiseProps = function _initialiseProps() {
         content_placement = article.content_placement;
 
     var context = url;
-    var localHistory = _this3.props.historyCookie ? JSON.parse(_this3.props.historyCookie) : [];
+    var localHistory = _this4.props.historyCookie ? JSON.parse(_this4.props.historyCookie) : [];
     if (!context && localHistory) {
       context = localHistory[localHistory.length - 1];
     }
@@ -12527,7 +12548,7 @@ var _initialiseProps = function _initialiseProps() {
     var _article$taxonomyMapp = article.taxonomyMapping,
         taxonomyMapping = _article$taxonomyMapp === undefined ? [] : _article$taxonomyMapp;
 
-    if (_this3.props.checkSponsered) {
+    if (_this4.props.checkSponsered) {
 
       return taxonomyMapping.some(function (item) {
         return item._ref === 'ict_taxonomy_735_sponsoredresources';
@@ -12539,7 +12560,7 @@ var _initialiseProps = function _initialiseProps() {
 
   this.renderIsiContent = function (article) {
     var url = article.url.current;
-    var _props3 = _this3.props,
+    var _props3 = _this4.props,
         ISIContent = _props3.iSIContent,
         regionalPages = _props3.regionalPages,
         nationalPage = _props3.nationalPage;
@@ -12573,7 +12594,7 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.refreshAdd = function (path) {
-    var article = _this3.state.queueData.find(function (item) {
+    var article = _this4.state.queueData.find(function (item) {
       return item.url.current == path;
     });
     var title = article.title,
@@ -12593,47 +12614,47 @@ var _initialiseProps = function _initialiseProps() {
     var description = _article$seo.meta_description;
 
     var keywords = [].concat(toConsumableArray(internalTag), toConsumableArray(userDefinedTag), toConsumableArray(SponsorshipTag), toConsumableArray(seoTag));
-    var config = _extends$2({}, _this3.state.config);
-    var targeting = _this3.getTargeting(article);
+    var config = _extends$2({}, _this4.state.config);
+    var targeting = _this4.getTargeting(article);
     var rightItems = [];
 
-    if (_this3.checkSponseredArticle(article)) {
+    if (_this4.checkSponseredArticle(article)) {
       rightItems = [];
     } else {
-      rightItems = _this3.props.Ads.getRightItems(targeting);
+      rightItems = _this4.props.Ads.getRightItems(targeting);
     }
-    var horizontalAD = _this3.props.Ads.getHorizontal(targeting);
+    var horizontalAD = _this4.props.Ads.getHorizontal(targeting);
     config.rightItems = rightItems;
     config.horizontalAD = horizontalAD;
-    var metaDescription = description ? description : summary ? summary : _this3.getFirstLine(article);
-    _this3.setState({ config: config, title: title, summary: metaDescription }, function () {
+    var metaDescription = description ? description : summary ? summary : _this4.getFirstLine(article);
+    _this4.setState({ config: config, title: title, summary: metaDescription }, function () {
       lib_3.refresh();
     });
   };
 
   this.changeUrl = function (path, visibility) {
-    var isScrollDown = _this3.isScrollDown;
+    var isScrollDown = _this4.isScrollDown;
 
     var newPath = '/view/' + path;
     if (!isScrollDown) {
       if (visibility == 'top') {
         // Router.push('/view/[url]', newPath, {shallow:true})
         window.history.pushState({ page: path }, path, newPath);
-        if (_this3.props.pageview) {
-          _this3.props.pageview(newPath);
+        if (_this4.props.pageview) {
+          _this4.props.pageview(newPath);
         }
 
-        _this3.refreshAdd(path);
+        _this4.refreshAdd(path);
       }
     } else {
       if (visibility == 'bottom') {
         // Router.push('/view/[url]', newPath, {shallow:true})
         window.history.pushState({ page: path }, path, newPath);
-        if (_this3.props.pageview) {
-          _this3.props.pageview(newPath);
+        if (_this4.props.pageview) {
+          _this4.props.pageview(newPath);
         }
 
-        _this3.refreshAdd(path);
+        _this4.refreshAdd(path);
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.220",
+  "version": "1.0.222",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",
@@ -57,7 +57,7 @@
     "gh-pages": "^1.2.0",
     "lodash": "^4.17.15",
     "moment": "^2.24.0",
-    "next": "^9.1.5",
+    "next": "^9.2.0",
     "react": "^16.12.0",
     "react-bootstrap": "^1.0.0-beta.16",
     "react-device-detect": "^1.11.14",