@mjhls/mjh-framework 1.0.215 → 1.0.217

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- # mjh-framework v. 1.0.215
2
+ # mjh-framework v. 1.0.217
3
3
 
4
4
 
5
5
 
@@ -201,7 +201,7 @@ var MasterDeck = function (_React$Component) {
201
201
  onChange: function onChange(isVisible) {
202
202
  isVisible && _this.changePageNumber(pageNumber);
203
203
  } },
204
- React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client })
204
+ React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client, defaultImage: defaultImage })
205
205
  ),
206
206
  main.main_36 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
207
207
  'div',
@@ -178,9 +178,12 @@ var VideoSeriesListing = function (_React$Component) {
178
178
  'div',
179
179
  null,
180
180
  seriesData && seriesData.map(function (docSeries, index) {
181
- docSeries.body[0].videos.map(function (singleVideo, indexInner) {
182
- singleVideo.link = '/view/' + docSeries.url.current + '?seriesVid=' + (indexInner + 1);
183
- });
181
+ if (docSeries.body.length > 0 && docSeries.body[0].videos) {
182
+ docSeries.body[0].videos.map(function (singleVideo, indexInner) {
183
+ singleVideo.link = '/view/' + docSeries.url.current + '?seriesVid=' + (indexInner + 1);
184
+ });
185
+ }
186
+
184
187
  return React__default.createElement(
185
188
  'div',
186
189
  { key: index, counter: itemCounter++ },
@@ -198,7 +201,11 @@ var VideoSeriesListing = function (_React$Component) {
198
201
  )
199
202
  )
200
203
  ),
201
- React__default.createElement(YoutubeGroup.YoutubeGroup, _babelHelpers._extends({ key: index, dataset: docSeries.body[0].videos }, _this.props))
204
+ docSeries.body.length > 0 && docSeries.body[0].videos ? React__default.createElement(YoutubeGroup.YoutubeGroup, _babelHelpers._extends({ key: index, dataset: docSeries.body[0].videos }, _this.props)) : React__default.createElement(
205
+ 'p',
206
+ null,
207
+ 'No Video Found.'
208
+ )
202
209
  );
203
210
  })
204
211
  );
package/dist/cjs/index.js CHANGED
@@ -10403,16 +10403,11 @@ var Leads = function Leads(_ref) {
10403
10403
  );
10404
10404
  };
10405
10405
 
10406
- var urlFor$2 = function urlFor(source, builder) {
10406
+ var urlFor$2 = function urlFor(source, client) {
10407
+ var builder = index$1.imageUrlBuilder(client);
10407
10408
  return builder.image(source);
10408
10409
  };
10409
10410
 
10410
- var onChangeSlide$1 = function onChangeSlide(selectedIndex, router) {
10411
- var pageNumber = selectedIndex + 1;
10412
- var href = '/view/' + router.query.url + '/?page=' + pageNumber;
10413
- Router__default.push(router.pathname, pageNumber > 1 ? href : '/view/' + router.query.url, { shallow: true });
10414
- };
10415
-
10416
10411
  var Slideshow$1 = function Slideshow(_ref) {
10417
10412
  var slides = _ref.node.slides,
10418
10413
  client = _ref.client,
@@ -10420,37 +10415,40 @@ var Slideshow$1 = function Slideshow(_ref) {
10420
10415
  getSerializers = _ref.getSerializers;
10421
10416
 
10422
10417
  var router = Router.useRouter();
10418
+ var pageNumber = router && router.asPath && router.asPath.split('?page=')[1];
10423
10419
 
10424
- var _useState = React.useState(0),
10420
+ var _useState = React.useState(!pageNumber || isNaN(pageNumber) || pageNumber > slides.length ? 0 : pageNumber - 1),
10425
10421
  _useState2 = _babelHelpers.slicedToArray(_useState, 2),
10426
10422
  carouselIndex = _useState2[0],
10427
10423
  setCarouselIndex = _useState2[1];
10428
10424
 
10429
- var builder = index$1.imageUrlBuilder(client);
10430
-
10431
- React.useEffect(function () {
10432
- var itemArr = router.asPath.split('?page=');
10433
- var pageNumber = parseInt(itemArr[1]);
10434
- if (!pageNumber || isNaN(pageNumber) || pageNumber > slides.length) {
10435
- setCarouselIndex(0);
10436
- } else {
10437
- setCarouselIndex(parseInt(itemArr[1]) - 1);
10438
- }
10439
- }, [router]);
10425
+ // useEffect(() => {
10426
+ // let itemArr = router.asPath.split('?page=')
10427
+ // let pageNumber = parseInt(itemArr[1])
10428
+ // if (!pageNumber || isNaN(pageNumber) || pageNumber > slides.length) {
10429
+ // setCarouselIndex(0)
10430
+ // } else {
10431
+ // setCarouselIndex(parseInt(itemArr[1]) - 1)
10432
+ // }
10433
+ // }, [router])
10440
10434
 
10441
10435
  React.useEffect(function () {
10442
10436
  index.lib_3.refresh();
10443
- if (pageview) pageview(router.asPath);
10437
+ // if (pageview) pageview(router.asPath)
10444
10438
  }, [router]);
10445
10439
 
10440
+ var onChangeSlide = function onChangeSlide(selectedIndex) {
10441
+ var pageNumber = selectedIndex + 1;
10442
+ var href = '/view/' + router.query.url + '/?page=' + pageNumber;
10443
+ router.push(router.pathname, pageNumber > 1 ? href : '/view/' + router.query.url, { shallow: true });
10444
+ };
10445
+
10446
10446
  return React__default.createElement(
10447
10447
  'div',
10448
10448
  { className: 'mt-3 mb-3' },
10449
10449
  React__default.createElement(
10450
10450
  reactBootstrap.Carousel,
10451
- { activeIndex: carouselIndex, onSelect: function onSelect(selectedIndex, e) {
10452
- return onChangeSlide$1(selectedIndex, router);
10453
- } },
10451
+ { activeIndex: carouselIndex, onSelect: onChangeSlide },
10454
10452
  slides && slides.map(function (slide) {
10455
10453
  if (slide.slideshowImage && slide.slideshowImage.asset) {
10456
10454
  return React__default.createElement(
@@ -10459,7 +10457,7 @@ var Slideshow$1 = function Slideshow(_ref) {
10459
10457
  React__default.createElement(
10460
10458
  'a',
10461
10459
  { href: slide.slideshowImage.link && slide.slideshowImage.link, target: slide.slideshowImage.blank ? '_blank' : '_self' },
10462
- React__default.createElement('img', { src: urlFor$2(slide.slideshowImage, builder).url(), alt: slide.slideshowImage.alt || 'slideshow image', style: { width: '100%' } })
10460
+ React__default.createElement('img', { src: urlFor$2(slide.slideshowImage, client).url(), alt: slide.slideshowImage.alt || 'slideshow image', style: { width: '100%' } })
10463
10461
  ),
10464
10462
  React__default.createElement(
10465
10463
  'div',
@@ -195,7 +195,7 @@ var MasterDeck = function (_React$Component) {
195
195
  onChange: function onChange(isVisible) {
196
196
  isVisible && _this.changePageNumber(pageNumber);
197
197
  } },
198
- React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client })
198
+ React__default.createElement(_this2.Deck, { data: row, variant: variant, index: index, client: _this.props.client, defaultImage: defaultImage })
199
199
  ),
200
200
  main_36 && _this.rightItems && (index + 1) % numberOfItemsBeforeAd === 0 && React__default.createElement(
201
201
  'div',
@@ -172,9 +172,12 @@ var VideoSeriesListing = function (_React$Component) {
172
172
  'div',
173
173
  null,
174
174
  seriesData && seriesData.map(function (docSeries, index) {
175
- docSeries.body[0].videos.map(function (singleVideo, indexInner) {
176
- singleVideo.link = '/view/' + docSeries.url.current + '?seriesVid=' + (indexInner + 1);
177
- });
175
+ if (docSeries.body.length > 0 && docSeries.body[0].videos) {
176
+ docSeries.body[0].videos.map(function (singleVideo, indexInner) {
177
+ singleVideo.link = '/view/' + docSeries.url.current + '?seriesVid=' + (indexInner + 1);
178
+ });
179
+ }
180
+
178
181
  return React__default.createElement(
179
182
  'div',
180
183
  { key: index, counter: itemCounter++ },
@@ -192,7 +195,11 @@ var VideoSeriesListing = function (_React$Component) {
192
195
  )
193
196
  )
194
197
  ),
195
- React__default.createElement(YoutubeGroup, _extends({ key: index, dataset: docSeries.body[0].videos }, _this.props))
198
+ docSeries.body.length > 0 && docSeries.body[0].videos ? React__default.createElement(YoutubeGroup, _extends({ key: index, dataset: docSeries.body[0].videos }, _this.props)) : React__default.createElement(
199
+ 'p',
200
+ null,
201
+ 'No Video Found.'
202
+ )
196
203
  );
197
204
  })
198
205
  );
package/dist/esm/index.js CHANGED
@@ -10401,16 +10401,11 @@ var Leads = function Leads(_ref) {
10401
10401
  );
10402
10402
  };
10403
10403
 
10404
- var urlFor$2 = function urlFor(source, builder) {
10404
+ var urlFor$2 = function urlFor(source, client) {
10405
+ var builder = imageUrlBuilder(client);
10405
10406
  return builder.image(source);
10406
10407
  };
10407
10408
 
10408
- var onChangeSlide$1 = function onChangeSlide(selectedIndex, router) {
10409
- var pageNumber = selectedIndex + 1;
10410
- var href = '/view/' + router.query.url + '/?page=' + pageNumber;
10411
- Router.push(router.pathname, pageNumber > 1 ? href : '/view/' + router.query.url, { shallow: true });
10412
- };
10413
-
10414
10409
  var Slideshow$1 = function Slideshow(_ref) {
10415
10410
  var slides = _ref.node.slides,
10416
10411
  client = _ref.client,
@@ -10418,37 +10413,40 @@ var Slideshow$1 = function Slideshow(_ref) {
10418
10413
  getSerializers = _ref.getSerializers;
10419
10414
 
10420
10415
  var router = useRouter();
10416
+ var pageNumber = router && router.asPath && router.asPath.split('?page=')[1];
10421
10417
 
10422
- var _useState = useState(0),
10418
+ var _useState = useState(!pageNumber || isNaN(pageNumber) || pageNumber > slides.length ? 0 : pageNumber - 1),
10423
10419
  _useState2 = slicedToArray(_useState, 2),
10424
10420
  carouselIndex = _useState2[0],
10425
10421
  setCarouselIndex = _useState2[1];
10426
10422
 
10427
- var builder = imageUrlBuilder(client);
10428
-
10429
- useEffect(function () {
10430
- var itemArr = router.asPath.split('?page=');
10431
- var pageNumber = parseInt(itemArr[1]);
10432
- if (!pageNumber || isNaN(pageNumber) || pageNumber > slides.length) {
10433
- setCarouselIndex(0);
10434
- } else {
10435
- setCarouselIndex(parseInt(itemArr[1]) - 1);
10436
- }
10437
- }, [router]);
10423
+ // useEffect(() => {
10424
+ // let itemArr = router.asPath.split('?page=')
10425
+ // let pageNumber = parseInt(itemArr[1])
10426
+ // if (!pageNumber || isNaN(pageNumber) || pageNumber > slides.length) {
10427
+ // setCarouselIndex(0)
10428
+ // } else {
10429
+ // setCarouselIndex(parseInt(itemArr[1]) - 1)
10430
+ // }
10431
+ // }, [router])
10438
10432
 
10439
10433
  useEffect(function () {
10440
10434
  lib_3.refresh();
10441
- if (pageview) pageview(router.asPath);
10435
+ // if (pageview) pageview(router.asPath)
10442
10436
  }, [router]);
10443
10437
 
10438
+ var onChangeSlide = function onChangeSlide(selectedIndex) {
10439
+ var pageNumber = selectedIndex + 1;
10440
+ var href = '/view/' + router.query.url + '/?page=' + pageNumber;
10441
+ router.push(router.pathname, pageNumber > 1 ? href : '/view/' + router.query.url, { shallow: true });
10442
+ };
10443
+
10444
10444
  return React__default.createElement(
10445
10445
  'div',
10446
10446
  { className: 'mt-3 mb-3' },
10447
10447
  React__default.createElement(
10448
10448
  Carousel,
10449
- { activeIndex: carouselIndex, onSelect: function onSelect(selectedIndex, e) {
10450
- return onChangeSlide$1(selectedIndex, router);
10451
- } },
10449
+ { activeIndex: carouselIndex, onSelect: onChangeSlide },
10452
10450
  slides && slides.map(function (slide) {
10453
10451
  if (slide.slideshowImage && slide.slideshowImage.asset) {
10454
10452
  return React__default.createElement(
@@ -10457,7 +10455,7 @@ var Slideshow$1 = function Slideshow(_ref) {
10457
10455
  React__default.createElement(
10458
10456
  'a',
10459
10457
  { href: slide.slideshowImage.link && slide.slideshowImage.link, target: slide.slideshowImage.blank ? '_blank' : '_self' },
10460
- React__default.createElement('img', { src: urlFor$2(slide.slideshowImage, builder).url(), alt: slide.slideshowImage.alt || 'slideshow image', style: { width: '100%' } })
10458
+ React__default.createElement('img', { src: urlFor$2(slide.slideshowImage, client).url(), alt: slide.slideshowImage.alt || 'slideshow image', style: { width: '100%' } })
10461
10459
  ),
10462
10460
  React__default.createElement(
10463
10461
  'div',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.215",
3
+ "version": "1.0.217",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",