@mjhls/mjh-framework 1.0.221 → 1.0.223

package/dist/cjs/index.js

@@ -13,26 +13,27 @@ require('react-bootstrap/Container');
 require('react-bootstrap/Row');
 require('react-bootstrap/Col');
 require('react-bootstrap/Card');
-var visibilitySensor = require('./visibility-sensor-bea3105d.js');
+var visibilitySensor = require('./visibility-sensor-59b2685c.js');
 var Link = _interopDefault(require('next/link'));
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('./debounce-a963b136.js');
 require('react-dom');
-var index$1 = require('./index-a4c53ff4.js');
+var index$1 = require('./index-eb596973.js');
 require('./index-0d0efcfa.js');
-var main = require('./main-58839f4e.js');
+var main = require('./main-c1bd47fe.js');
 var entities = require('./entities-3e0b4a16.js');
 var _babelHelpers = require('./_babelHelpers-f321c258.js');
+var AdSlot = require('./AdSlot-d87cef08.js');
 var DeckContent = require('./DeckContent.js');
 require('./get-126b1712.js');
-var GridContent = require('./GridContent-089aa22c.js');
+var GridContent = require('./GridContent-8b0ebfec.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
 var ThumbnailCard = require('./ThumbnailCard.js');
-var TaxonomyCard = require('./TaxonomyCard-d97685e2.js');
+var TaxonomyCard = require('./TaxonomyCard-f24d8ec9.js');
 var GroupDeck = require('./GroupDeck.js');
-var YoutubeGroup = require('./YoutubeGroup-ad994d02.js');
+var YoutubeGroup = require('./YoutubeGroup-d2d9e57c.js');
 var reactBootstrap = require('react-bootstrap');
 var QueueDeckExpanded = require('./QueueDeckExpanded.js');
 var index_esm = require('./index.esm-340d3792.js');
@@ -43,7 +44,7 @@ var PublicationDeck = require('./PublicationDeck.js');
 var IssueDeck = require('./IssueDeck.js');
 require('react-bootstrap/Badge');
 var IssueContentDeck = require('./IssueContentDeck.js');
-var TemplateNormal = require('./Normal-47d9e184.js');
+var TemplateNormal = require('./Normal-78631b6e.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -202,7 +203,7 @@ var AD300x250 = function AD300x250(_ref) {
       _ref$targeting = _ref.targeting,
       targeting = _ref$targeting === undefined ? {} : _ref$targeting;
 
-  return React__default.createElement(TemplateNormal.DFPAdSlot, {
+  return React__default.createElement(AdSlot.DFPAdSlot, {
     networkID: networkID,
     adUnit: adUnit,
     slotId: slotId,
@@ -219,7 +220,7 @@ var AD300x250x600 = function AD300x250x600(_ref) {
       _ref$targeting = _ref.targeting,
       targeting = _ref$targeting === undefined ? {} : _ref$targeting;
 
-  return React__default.createElement(TemplateNormal.DFPAdSlot, {
+  return React__default.createElement(AdSlot.DFPAdSlot, {
     networkID: networkID,
     adUnit: adUnit,
     className: 'AD300x250',
@@ -10491,7 +10492,7 @@ var NativeAd = function NativeAd(props) {
   return React__default.createElement(
     'div',
     { className: 'native-ad-wrapper', style: { textAlign: 'center' } },
-    React__default.createElement(GridContent.AD, { networkID: networkID, adUnit: adUnit, slotId: slotId, targeting: targeting, className: className, sizes: sizes, sizeMapping: sizeMapping })
+    React__default.createElement(AdSlot.DFPAdSlot, { networkID: networkID, adUnit: adUnit, slotId: slotId, targeting: targeting, className: className, sizes: sizes, sizeMapping: sizeMapping })
   );
 };
 
@@ -11202,16 +11203,16 @@ var RelatedTopicsDropdown = function RelatedTopicsDropdown(_ref) {
       _ref$className = _ref.className,
       className = _ref$className === undefined ? '' : _ref$className;
 
-  /*
-  Props accepted - parentTaxonomy(required, object), subTaxonomy(required, array), page(optional), exclude(optional), variant(optional), className(optional)
-  example:
-  <RelatedTopicDropdown 
-      page='/clinical' 
-      exclude="clinical" 
-      className='mb-3' 
-      parentTaxonomy={props.parentTaxonomy} 
-      subTaxonomies={props.subTaxonomies} 
-  />
+  /*
+  Props accepted - parentTaxonomy(required, object), subTaxonomy(required, array), page(optional), exclude(optional), variant(optional), className(optional)
+  example:
+  <RelatedTopicDropdown 
+      page='/clinical' 
+      exclude="clinical" 
+      className='mb-3' 
+      parentTaxonomy={props.parentTaxonomy} 
+      subTaxonomies={props.subTaxonomies} 
+  />
   */
   if (subTaxonomies.length === 0 && parentTaxonomy) {
     if (parentTaxonomy.identifier == exclude) {
@@ -11249,19 +11250,19 @@ var RelatedTopicsDropdown = function RelatedTopicsDropdown(_ref) {
   }
 };
 
-/*
-This dropdown is used inside Article body to display related content placement pages
- sample usage: <ArticleDetailDropdown contentPlacement={content_placement} exclude={['News',]} />
-
- in article query, need to add '...' to content_placement to retreive additional info needed
-
- 'content_placement': taxonomyMapping[]-> {
-    ...,
-    'ancestor': parent->parent->identifier,
-    'parent': parent->identifier,
-    'path': identifier
-  }
-
+/*
+This dropdown is used inside Article body to display related content placement pages
+ sample usage: <ArticleDetailDropdown contentPlacement={content_placement} exclude={['News',]} />
+
+ in article query, need to add '...' to content_placement to retreive additional info needed
+
+ 'content_placement': taxonomyMapping[]-> {
+    ...,
+    'ancestor': parent->parent->identifier,
+    'parent': parent->identifier,
+    'path': identifier
+  }
+
 */
 
 var ArticleDetailDropdown = function ArticleDetailDropdown(props) {
@@ -11932,34 +11933,34 @@ var YahooHero = function YahooHero(props) {
   );
 };
 
-/*
-Sample query
-                let references = ''
-                if(article.taxonomyMapping.length > 0){
-                    article.taxonomyMapping.forEach((ref, index) => {
-                    references = references + `references('${ref._ref}') `
-                    if(index+1 !== article.taxonomyMapping.length){
-                        references = references + ` && `
-                    }
-                    })
-                }
-                
-                const relatedArticlesQuery = `*[!(_id in path("drafts.**")) && _type == "article" && title !='${article.title}' && defined(title) && is_visible == true && ( references('article.documentGroup._id') || ${references} ) && published <= '${today}'] | order(published desc) [0...4] {
-                    ...,
-                    title,
-                    summary,
-                    thumbnail,
-                    url,
-                    published,
-                    authorMapping[]->,
-                    contentCategory->
-                }`
-                const relatedArticles = await client.fetch(relatedArticlesQuery)
-
-Sample usage
-            <RelatedContent dataRecord={props.relatedArticles} client={client} showAuthor showPublished reverse/>
-
-
+/*
+Sample query
+                let references = ''
+                if(article.taxonomyMapping.length > 0){
+                    article.taxonomyMapping.forEach((ref, index) => {
+                    references = references + `references('${ref._ref}') `
+                    if(index+1 !== article.taxonomyMapping.length){
+                        references = references + ` && `
+                    }
+                    })
+                }
+                
+                const relatedArticlesQuery = `*[!(_id in path("drafts.**")) && _type == "article" && title !='${article.title}' && defined(title) && is_visible == true && ( references('article.documentGroup._id') || ${references} ) && published <= '${today}'] | order(published desc) [0...4] {
+                    ...,
+                    title,
+                    summary,
+                    thumbnail,
+                    url,
+                    published,
+                    authorMapping[]->,
+                    contentCategory->
+                }`
+                const relatedArticles = await client.fetch(relatedArticlesQuery)
+
+Sample usage
+            <RelatedContent dataRecord={props.relatedArticles} client={client} showAuthor showPublished reverse/>
+
+
 */
 var RelatedContent = function RelatedContent(props) {
   var client = props.client,
@@ -12026,21 +12027,21 @@ var RelatedContent = function RelatedContent(props) {
   );
 };
 
-/*
-Example usage - targetedonc.com/latest-conference
-const query = `*[!(_id in path("drafts.**")) && _type == "article" && defined(title) && is_visible == true && published <= '${today}' && references('b49d36b8-aa56-4183-a2bc-1568c229fb72') ] | order(published desc) [$from...$to] {
-                    ...,
-                    title,
-                    summary,
-                    thumbnail,
-                    url,
-                    published,
-                    documentGroup->,
-                    contentCategory->,
-                    'pageNumber': ${currentPage}
-                  }`
-
-  const posts = await client.fetch(query, params)
+/*
+Example usage - targetedonc.com/latest-conference
+const query = `*[!(_id in path("drafts.**")) && _type == "article" && defined(title) && is_visible == true && published <= '${today}' && references('b49d36b8-aa56-4183-a2bc-1568c229fb72') ] | order(published desc) [$from...$to] {
+                    ...,
+                    title,
+                    summary,
+                    thumbnail,
+                    url,
+                    published,
+                    documentGroup->,
+                    contentCategory->,
+                    'pageNumber': ${currentPage}
+                  }`
+
+  const posts = await client.fetch(query, params)
 */
 
 var ConferenceArticleCard = function ConferenceArticleCard(props) {
@@ -12235,84 +12236,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,
-          visibilitySensor.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
+            visibilitySensor.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(TaxonomyCard.BlockContent, _babelHelpers._extends({
+              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(TaxonomyCard.BlockContent, _babelHelpers._extends({
-            serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true),
-            blocks: articleBody,
-            imageOptions: { w: 320, h: 240, fit: 'max' }
-          }, client.config()))
-        )
-      ),
-      renderIsiContent(props.article)
-    )
+        renderIsiContent(props.article)
+      )
+    ),
+    main.main_36 && React__default.createElement('hr', { className: 'add-seperater' }),
+    main.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' })
   );
 };
 
@@ -12336,6 +12350,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: {
@@ -12349,7 +12365,7 @@ var ArticleQueue = function (_React$Component) {
       },
       title: _this.props.article.title,
       summary: metaDescription,
-      queueData: [_this.props.article],
+      queueData: [article],
       relatedArticles: [],
       keywords: []
     }, _this.preVscroll = 0;
@@ -12366,9 +12382,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 _babelHelpers._extends({}, article, { Ads: Ads });
+        });
         var queueData = [].concat(_babelHelpers.toConsumableArray(this.state.queueData));
         if (prevProps.relatedArticles.length == 0) {
           queueData.push(relatedArticles.shift());
@@ -12387,7 +12408,7 @@ var ArticleQueue = function (_React$Component) {
   }, {
     key: 'render',
     value: function render() {
-      var _this2 = this;
+      var _this3 = this;
 
       var _state = this.state,
           config = _state.config,
@@ -12403,19 +12424,19 @@ var ArticleQueue = function (_React$Component) {
 
       return React__default.createElement(
         TemplateNormal.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.main_36 },
         React__default.createElement(
           visibilitySensor.InfiniteScroll,
           { dataLength: queueData.length, next: this.loadmore, scrollThreshold: '200px', hasMore: true },
           queueData.map(function (article, index) {
             return React__default.createElement(Article, _babelHelpers._extends({
               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
             }));
           })
@@ -12427,37 +12448,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(_babelHelpers.toConsumableArray(_this3.state.queueData));
-    var relatedArticles = [].concat(_babelHelpers.toConsumableArray(_this3.state.relatedArticles));
+    var queueData = [].concat(_babelHelpers.toConsumableArray(_this4.state.queueData));
+    var relatedArticles = [].concat(_babelHelpers.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;
 
@@ -12465,7 +12486,7 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.urlFor = function (source) {
-    return index$1.imageUrlBuilder(_this3.props.client).image(source);
+    return index$1.imageUrlBuilder(_this4.props.client).image(source);
   };
 
   this.getTargeting = function (article) {
@@ -12490,7 +12511,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];
     }
@@ -12529,7 +12550,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';
@@ -12541,7 +12562,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;
@@ -12575,7 +12596,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,
@@ -12595,52 +12616,53 @@ var _initialiseProps = function _initialiseProps() {
     var description = _article$seo.meta_description;
 
     var keywords = [].concat(_babelHelpers.toConsumableArray(internalTag), _babelHelpers.toConsumableArray(userDefinedTag), _babelHelpers.toConsumableArray(SponsorshipTag), _babelHelpers.toConsumableArray(seoTag));
-    var config = _babelHelpers._extends({}, _this3.state.config);
-    var targeting = _this3.getTargeting(article);
+    var config = _babelHelpers._extends({}, _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 () {
       index.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);
       }
     }
   };
 };
 
+exports.AdSlot = AdSlot.DFPAdSlot;
 exports.DeckContent = DeckContent;
 exports.AD = GridContent.AD;
 exports.GridContent = GridContent.GridContent;
@@ -12656,7 +12678,6 @@ exports.PublicationDeck = PublicationDeck;
 exports.IssueDeck = IssueDeck;
 exports.IssueContentDeck = IssueContentDeck;
 exports.AD728x90 = TemplateNormal.AD728x90;
-exports.AdSlot = TemplateNormal.DFPAdSlot;
 exports.Column1 = TemplateNormal.Column1;
 exports.Column2 = TemplateNormal.Column2;
 exports.Column3 = TemplateNormal.Column3;

package/dist/cjs/{main-58839f4e.js → main-c1bd47fe.js}

@@ -53,7 +53,7 @@ var getNavigatorInstance = function getNavigatorInstance() {
 };
 var isIOS13Check = function isIOS13Check(type) {
   var nav = getNavigatorInstance();
-  return nav && (nav.platform.includes(type) || nav.platform === 'MacIntel' && nav.maxTouchPoints > 1 && !window.MSStream);
+  return nav && (nav.platform.indexOf(type) !== -1 || nav.platform === 'MacIntel' && nav.maxTouchPoints > 1 && !window.MSStream);
 };
 
 function _typeof(obj) {
@@ -449,7 +449,7 @@ var isIEType = function isIEType() {
 var isElectronType = function isElectronType() {
   var nav = getNavigatorInstance();
   var ua = nav && nav.userAgent.toLowerCase();
-  return typeof ua === 'string' ? ua.includes('electron') : false;
+  return typeof ua === 'string' ? /electron/.test(ua) : false;
 };
 
 var getIOS13 = function getIOS13() {
@@ -516,15 +516,15 @@ var getDeviceType = function getDeviceType() {
 var isSmartTV = isSmartTVType();
 var isConsole = isConsoleType();
 var isWearable = isWearableType();
-var isMobileSafari = isMobileSafariType();
+var isMobileSafari = isMobileSafariType() || getIPad13();
 var isChromium = isChromiumType();
-var isMobile = isMobileAndTabletType();
+var isMobile = isMobileAndTabletType() || getIPad13();
 var isMobileOnly = isMobileType();
-var isTablet = isTabletType();
+var isTablet = isTabletType() || getIPad13();
 var isBrowser = isBrowserType();
 var isAndroid = isAndroidType();
 var isWinPhone = isWinPhoneType();
-var isIOS = isIOSType();
+var isIOS = isIOSType() || getIPad13();
 var isChrome = isChromeType();
 var isFirefox = isFirefoxType();
 var isSafari = isSafariType();