@mjhls/mjh-framework 1.0.310 → 1.0.312

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.310
+# mjh-framework v. 1.0.312
 
 > Foundation Framework
 

package/dist/cjs/VideoSeriesListing.js

@@ -18,7 +18,7 @@ var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('react-dom');
 require('./index-fa0fb52c.js');
-var YoutubeGroup = require('./YoutubeGroup-44b6c266.js');
+var YoutubeGroup = require('./YoutubeGroup-93aa7a6c.js');
 var index_esm = require('./index.esm-340d3792.js');
 
 var VideoSeriesListing = function (_React$Component) {

package/dist/cjs/{YoutubeGroup-44b6c266.js → YoutubeGroup-93aa7a6c.js}

@@ -499,6 +499,7 @@ GROQ query -
 */
 var YoutubeGroup = function YoutubeGroup(props) {
   // Props should be an array of objects containing Thumbnail, title, and URL
+  var innerSlider = React.useRef(null);
 
   React.useEffect(function () {
     //IE11 Polyfill
@@ -510,27 +511,33 @@ var YoutubeGroup = function YoutubeGroup(props) {
   function scrollSlider(e, direction) {
     var slide = e.target.parentElement;
     var scrollOffset = slide.scrollLeft;
-    var viewableWidth = slide.clientWidth > 700 ? 3 * (document.querySelector('.tile').scrollWidth + 8) : document.querySelector('.tile').scrollWidth + 8;
+    var viewableWidth = slide.clientWidth;
     var scrollDirection = void 0;
+
     if (direction === 'next') {
       scrollDirection = scrollOffset + viewableWidth;
+
+      if (scrollDirection > innerSlider.current.offsetWidth) {
+        scrollDirection = 0;
+      }
     }
     if (direction === 'prev') {
       scrollDirection = scrollOffset - viewableWidth;
-    }
 
-    if (slide.clientWidth <= scrollDirection) {
-      scrollDirection = 0;
+      if (scrollOffset === 0) {
+        scrollDirection = innerSlider.current.offsetWidth;
+      }
     }
-
     slide.scrollTo({
       left: scrollDirection,
       behavior: 'smooth'
     });
   }
+
   function handleClick(url, vidIndex) {
     props.setState(url, vidIndex);
   }
+
   var _props$current = props.current,
       current = _props$current === undefined ? '' : _props$current;
 
@@ -557,7 +564,7 @@ var YoutubeGroup = function YoutubeGroup(props) {
       ),
       React__default.createElement(
         'div',
-        { className: 'row__inner' },
+        { ref: innerSlider, className: 'row__inner' },
         props.dataset && props.dataset.map(function (video, index) {
           // If there is a current prop, means this will overlay a currently playing video
           if (current !== '') {

package/dist/cjs/YoutubeGroup.js

@@ -6,7 +6,7 @@ require('prop-types');
 require('next/link');
 require('react-dom');
 require('./index-fa0fb52c.js');
-var YoutubeGroup = require('./YoutubeGroup-44b6c266.js');
+var YoutubeGroup = require('./YoutubeGroup-93aa7a6c.js');
 
 
 

package/dist/cjs/index.js

@@ -41,7 +41,7 @@ var ThumbnailCard = require('./ThumbnailCard.js');
 var TaxonomyCard = require('./TaxonomyCard-a8a64f98.js');
 require('./react-social-icons-cd0d9d3b.js');
 var GroupDeck = require('./GroupDeck.js');
-var YoutubeGroup = require('./YoutubeGroup-44b6c266.js');
+var YoutubeGroup = require('./YoutubeGroup-93aa7a6c.js');
 var reactBootstrap = require('react-bootstrap');
 var QueueDeckExpanded = require('./QueueDeckExpanded.js');
 var index_esm = require('./index.esm-340d3792.js');
@@ -16170,6 +16170,21 @@ var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
   }
 };
 
+var get_content_placement_url = function get_content_placement_url(cp) {
+  var cp_url = '';
+  if (cp.ancestor && typeof cp.ancestor === 'string') {
+    cp_url += (cp_url === '' ? '' : '/') + cp.ancestor;
+  }
+
+  if (!cp.ancestor && cp.parent && typeof cp.parent === 'string') {
+    console.log('cp.parent:', cp.parent);
+    cp_url += (cp_url === '' ? '' : '/') + cp.parent;
+  }
+
+  cp_url += (cp_url === '' ? '' : '/') + cp.path;
+  return cp_url;
+};
+
 var Article = function Article(props) {
   var client = props.client,
       pageview = props.pageview,
@@ -16193,7 +16208,8 @@ var Article = function Article(props) {
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
       changeUrl = props.changeUrl,
-      shareOptions = props.shareOptions;
+      shareOptions = props.shareOptions,
+      cpModificationRequired = props.cpModificationRequired;
 
 
   var urlFor = function urlFor(source) {
@@ -16232,6 +16248,7 @@ var Article = function Article(props) {
   var shareSummary = summary;
   var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
   var siteName = props.website.title;
+
   return React__default.createElement(
     React__default.Fragment,
     null,
@@ -16322,7 +16339,10 @@ var Article = function Article(props) {
               Dropdown.Menu,
               null,
               content_placement.length > 0 ? content_placement.map(function (cp, index) {
-                var href = '/' + cp.path;
+                var cp_url = cpModificationRequired ? get_content_placement_url(cp) : cp.path;
+                var href = '/' + cp_url;
+                console.log('cp:', cp);
+                console.log('href:', href);
                 return React__default.createElement(
                   Dropdown.Item,
                   { key: index, href: href },
@@ -16382,7 +16402,9 @@ var ArticleQueue = function ArticleQueue(props) {
       _props$sponsoredTaxon = props.sponsoredTaxonomies,
       sponsoredTaxonomies = _props$sponsoredTaxon === undefined ? [] : _props$sponsoredTaxon,
       _props$maxListLength = props.maxListLength,
-      maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength;
+      maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength,
+      _props$cpModification = props.cpModificationRequired,
+      cpModificationRequired = _props$cpModification === undefined ? false : _props$cpModification;
 
   var _useState = React.useState(''),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
@@ -16462,8 +16484,13 @@ var ArticleQueue = function ArticleQueue(props) {
     var content_placement_urls = [];
     if (content_placement && prevUrl && prevUrl.length) {
       content_placement.forEach(function (item) {
-        if (includes_1(prevUrl, item.path)) {
-          content_placement_urls.push(item.path);
+        var path = item.path;
+        if (cpModificationRequired) {
+          path = get_content_placement_url(item);
+        }
+
+        if (includes_1(prevUrl, path)) {
+          content_placement_urls.push(path);
         }
       });
     }
@@ -16471,7 +16498,7 @@ var ArticleQueue = function ArticleQueue(props) {
     if (content_placement) {
       if (content_placement_urls.length === 0) {
         content_placement_urls = content_placement.map(function (item) {
-          return item.path;
+          return cpModificationRequired ? get_content_placement_url(item) : item.path;
         });
       }
     } else {
@@ -16644,7 +16671,7 @@ var ArticleQueue = function ArticleQueue(props) {
       visibilitySensor.InfiniteScroll,
       { dataLength: queueData.length, next: loadmore, scrollThreshold: 0.8, hasMore: true },
       queueData.map(function (article, index) {
-        return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, article: article }));
+        return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
       })
     );
   } else {

package/dist/esm/VideoSeriesListing.js

@@ -12,7 +12,7 @@ import 'next/link';
 import { withRouter } from 'next/router';
 import 'react-dom';
 import './index-5f9f807a.js';
-import { Y as YoutubeGroup } from './YoutubeGroup-a3ea5e8e.js';
+import { Y as YoutubeGroup } from './YoutubeGroup-e7e16d0e.js';
 import { a as IoIosArrowForward } from './index.esm-536609db.js';
 
 var VideoSeriesListing = function (_React$Component) {

package/dist/esm/{YoutubeGroup-a3ea5e8e.js → YoutubeGroup-e7e16d0e.js}

@@ -1,5 +1,5 @@
 import { c as createCommonjsModule, a as commonjsGlobal } from './_commonjsHelpers-0c4b6f40.js';
-import React__default, { useEffect } from 'react';
+import React__default, { useRef, useEffect } from 'react';
 import 'next/link';
 import { L as LazyLoad } from './index-5f9f807a.js';
 
@@ -494,6 +494,7 @@ GROQ query -
 */
 var YoutubeGroup = function YoutubeGroup(props) {
   // Props should be an array of objects containing Thumbnail, title, and URL
+  var innerSlider = useRef(null);
 
   useEffect(function () {
     //IE11 Polyfill
@@ -505,27 +506,33 @@ var YoutubeGroup = function YoutubeGroup(props) {
   function scrollSlider(e, direction) {
     var slide = e.target.parentElement;
     var scrollOffset = slide.scrollLeft;
-    var viewableWidth = slide.clientWidth > 700 ? 3 * (document.querySelector('.tile').scrollWidth + 8) : document.querySelector('.tile').scrollWidth + 8;
+    var viewableWidth = slide.clientWidth;
     var scrollDirection = void 0;
+
     if (direction === 'next') {
       scrollDirection = scrollOffset + viewableWidth;
+
+      if (scrollDirection > innerSlider.current.offsetWidth) {
+        scrollDirection = 0;
+      }
     }
     if (direction === 'prev') {
       scrollDirection = scrollOffset - viewableWidth;
-    }
 
-    if (slide.clientWidth <= scrollDirection) {
-      scrollDirection = 0;
+      if (scrollOffset === 0) {
+        scrollDirection = innerSlider.current.offsetWidth;
+      }
     }
-
     slide.scrollTo({
       left: scrollDirection,
       behavior: 'smooth'
     });
   }
+
   function handleClick(url, vidIndex) {
     props.setState(url, vidIndex);
   }
+
   var _props$current = props.current,
       current = _props$current === undefined ? '' : _props$current;
 
@@ -552,7 +559,7 @@ var YoutubeGroup = function YoutubeGroup(props) {
       ),
       React__default.createElement(
         'div',
-        { className: 'row__inner' },
+        { ref: innerSlider, className: 'row__inner' },
         props.dataset && props.dataset.map(function (video, index) {
           // If there is a current prop, means this will overlay a currently playing video
           if (current !== '') {

package/dist/esm/YoutubeGroup.js

@@ -4,4 +4,4 @@ import 'prop-types';
 import 'next/link';
 import 'react-dom';
 import './index-5f9f807a.js';
-export { Y as default } from './YoutubeGroup-a3ea5e8e.js';
+export { Y as default } from './YoutubeGroup-e7e16d0e.js';

package/dist/esm/index.js

@@ -36,8 +36,8 @@ export { T as TaxonomyCard } from './TaxonomyCard-ea494c28.js';
 import './react-social-icons-a7d5c5c7.js';
 import GroupDeck from './GroupDeck.js';
 export { default as GroupDeck } from './GroupDeck.js';
-import { g as getYoutubeId } from './YoutubeGroup-a3ea5e8e.js';
-export { Y as YoutubeGroup } from './YoutubeGroup-a3ea5e8e.js';
+import { g as getYoutubeId } from './YoutubeGroup-e7e16d0e.js';
+export { Y as YoutubeGroup } from './YoutubeGroup-e7e16d0e.js';
 import { Spinner as Spinner$1, Container as Container$1, Row as Row$1, Col as Col$1, Carousel, Table, Figure as Figure$1, Button as Button$1, ProgressBar, Card, Form } from 'react-bootstrap';
 export { default as QueueDeckExpanded } from './QueueDeckExpanded.js';
 import { I as IoMdArrowDropdown } from './index.esm-536609db.js';
@@ -16168,6 +16168,21 @@ var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
   }
 };
 
+var get_content_placement_url = function get_content_placement_url(cp) {
+  var cp_url = '';
+  if (cp.ancestor && typeof cp.ancestor === 'string') {
+    cp_url += (cp_url === '' ? '' : '/') + cp.ancestor;
+  }
+
+  if (!cp.ancestor && cp.parent && typeof cp.parent === 'string') {
+    console.log('cp.parent:', cp.parent);
+    cp_url += (cp_url === '' ? '' : '/') + cp.parent;
+  }
+
+  cp_url += (cp_url === '' ? '' : '/') + cp.path;
+  return cp_url;
+};
+
 var Article = function Article(props) {
   var client = props.client,
       pageview = props.pageview,
@@ -16191,7 +16206,8 @@ var Article = function Article(props) {
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
       changeUrl = props.changeUrl,
-      shareOptions = props.shareOptions;
+      shareOptions = props.shareOptions,
+      cpModificationRequired = props.cpModificationRequired;
 
 
   var urlFor = function urlFor(source) {
@@ -16230,6 +16246,7 @@ var Article = function Article(props) {
   var shareSummary = summary;
   var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
   var siteName = props.website.title;
+
   return React__default.createElement(
     React__default.Fragment,
     null,
@@ -16320,7 +16337,10 @@ var Article = function Article(props) {
               Dropdown.Menu,
               null,
               content_placement.length > 0 ? content_placement.map(function (cp, index) {
-                var href = '/' + cp.path;
+                var cp_url = cpModificationRequired ? get_content_placement_url(cp) : cp.path;
+                var href = '/' + cp_url;
+                console.log('cp:', cp);
+                console.log('href:', href);
                 return React__default.createElement(
                   Dropdown.Item,
                   { key: index, href: href },
@@ -16380,7 +16400,9 @@ var ArticleQueue = function ArticleQueue(props) {
       _props$sponsoredTaxon = props.sponsoredTaxonomies,
       sponsoredTaxonomies = _props$sponsoredTaxon === undefined ? [] : _props$sponsoredTaxon,
       _props$maxListLength = props.maxListLength,
-      maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength;
+      maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength,
+      _props$cpModification = props.cpModificationRequired,
+      cpModificationRequired = _props$cpModification === undefined ? false : _props$cpModification;
 
   var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -16460,8 +16482,13 @@ var ArticleQueue = function ArticleQueue(props) {
     var content_placement_urls = [];
     if (content_placement && prevUrl && prevUrl.length) {
       content_placement.forEach(function (item) {
-        if (includes_1(prevUrl, item.path)) {
-          content_placement_urls.push(item.path);
+        var path = item.path;
+        if (cpModificationRequired) {
+          path = get_content_placement_url(item);
+        }
+
+        if (includes_1(prevUrl, path)) {
+          content_placement_urls.push(path);
         }
       });
     }
@@ -16469,7 +16496,7 @@ var ArticleQueue = function ArticleQueue(props) {
     if (content_placement) {
       if (content_placement_urls.length === 0) {
         content_placement_urls = content_placement.map(function (item) {
-          return item.path;
+          return cpModificationRequired ? get_content_placement_url(item) : item.path;
         });
       }
     } else {
@@ -16642,7 +16669,7 @@ var ArticleQueue = function ArticleQueue(props) {
       InfiniteScroll,
       { dataLength: queueData.length, next: loadmore, scrollThreshold: 0.8, hasMore: true },
       queueData.map(function (article, index) {
-        return React__default.createElement(Article, _extends$2({ key: index }, props, { changeUrl: changeUrl, article: article }));
+        return React__default.createElement(Article, _extends$2({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
       })
     );
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.310",
+  "version": "1.0.312",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",