@mjhls/mjh-framework 1.0.691-beta.9 → 1.0.692

package/dist/cjs/{index-bc377510.js → index-59436c13.js}

@@ -9,26 +9,27 @@ var inherits = require('./inherits-513d81cd.js');
 var _typeof$1 = require('./typeof-725500bc.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-var index = require('./index-099d45ae.js');
+var index = require('./index-2d0a4911.js');
 var PropTypes = require('prop-types');
 var PropTypes__default = _interopDefault(PropTypes);
 var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
-var moment = require('./moment-575fe24c.js');
+var moment = require('./moment-66a6a284.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
-var index$1 = require('./index-39beccb3.js');
+var index$1 = require('./index-b5eb3ff8.js');
 var index$2 = require('./index-da796b8c.js');
-var main = require('./main-03ffa84c.js');
+var main = require('./main-b6c96c8d.js');
 var entities = require('./entities-310b46ee.js');
 var slicedToArray = require('./slicedToArray-8f385299.js');
 var Segment = require('./Segment.js');
 var Beam = require('./Beam.js');
 var AdSlot = require('./AdSlot.js');
-var BlockContent = require('./BlockContent-80b15fac.js');
+var BlockContent = require('./BlockContent-88f69acd.js');
 var smoothscroll = require('./smoothscroll-95231a70.js');
 var GroupDeck = require('./GroupDeck.js');
 var reactBootstrap = require('react-bootstrap');
+var index_esm = require('./index.esm-90433435.js');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 var util = require('./util-f2c1b65b.js');
 var brightcoveReactPlayerLoader_es = require('./brightcove-react-player-loader.es-156bd4d6.js');
@@ -7505,7 +7506,7 @@ var Poll = function Poll(_ref) {
   );
 };
 
-var numberOfPaginations = main.main_35 ? 4 : 10;
+var numberOfPaginations = main.main_38 ? 4 : 10;
 
 var Quiz = function Quiz(_ref) {
   var quizzes = _ref.quizzes,
@@ -7618,7 +7619,7 @@ var Quiz = function Quiz(_ref) {
   var renderPagination = function renderPagination() {
     return React__default.createElement(
       Pagination,
-      { className: 'p-0 m-0', size: main.main_35 && 'sm' },
+      { className: 'p-0 m-0', size: main.main_38 && 'sm' },
       React__default.createElement(Pagination.First, { onClick: function onClick() {
           return changePage('first');
         }, disabled: currentPage === 1 }),
@@ -8026,6 +8027,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
     return null;
   }
   nodes.seriesTitle = !nodes.seriesTitle ? 'Learning Objectives' : nodes.seriesTitle;
+  var today = moment.moment().utc().format();
 
   var authorPrefix = 'authors';
   var builder = index$1.imageUrlBuilder(client);
@@ -8036,28 +8038,38 @@ var ArticleSeries = function ArticleSeries(_ref) {
 
   var refArray = React.useRef([]);
   var adRefArray = React.useRef([]);
+  var articleContainerRef = React.useRef(null);
+  var arrowRef = React.useRef(null);
 
-  var _ref2 = main.main_36 ? React.useState(100) : React.useState(-25),
-      _ref3 = slicedToArray._slicedToArray(_ref2, 2),
-      NavoffsetTop = _ref3[0],
-      setNavoffsetTop = _ref3[1];
+  var _useState = React.useState(0),
+      _useState2 = slicedToArray._slicedToArray(_useState, 2),
+      contentWidth = _useState2[0],
+      setContentWidth = _useState2[1];
+
+  var upArrowClicked = false;
+
+  var Articles = nodes.articles.filter(function (article) {
+    if ((article.is_visible === true || !article.hasOwnProperty('is_visible')) && today >= article.published) {
+      return article;
+    }
+  });
 
   var PrevNextCards = function PrevNextCards(show, articleNum) {
     var articles = [];
     if (articleNum >= 0) {
       if (articleNum == 0) {
-        articles.push(nodes.articles[1]);
-      } else if (articleNum == nodes.articles.length - 1) {
-        articles.push(nodes.articles[articleNum - 1]);
+        articles.push(Articles[1]);
+      } else if (articleNum == Articles.length - 1) {
+        articles.push(Articles[articleNum - 1]);
       } else {
-        articles.push(nodes.articles[articleNum - 1]);
-        articles.push(nodes.articles[articleNum + 1]);
+        articles.push(Articles[articleNum - 1]);
+        articles.push(Articles[articleNum + 1]);
       }
     } else {
-      articles = [].concat(toConsumableArray._toConsumableArray(nodes.articles));
+      articles = [].concat(toConsumableArray._toConsumableArray(Articles));
     }
     return articles.map(function (article, index) {
-      if (!article) return null;
+      if (!article || !article.is_visible && article.hasOwnProperty('is_visible') || today < article.published) return null;
       var showReading = show ? 'showReading' : '';
       var articleLabel = articles.length == 1 && articleNum != 0 || articles.length > 1 && index == 0 ? 'Previous' : 'Next';
       return React__default.createElement(
@@ -8097,35 +8109,35 @@ var ArticleSeries = function ArticleSeries(_ref) {
     });
   };
 
-  var _ref4 = router && router.asPath && router.asPath.split('?')[1] ? React.useState(router.asPath.split('=')[1]) : React.useState(null),
-      _ref5 = slicedToArray._slicedToArray(_ref4, 2),
-      selectedArticle = _ref5[0],
-      setSelectedArticle = _ref5[1];
-
-  var _useState = React.useState(false),
-      _useState2 = slicedToArray._slicedToArray(_useState, 2),
-      firstLoad = _useState2[0],
-      setFirstLoad = _useState2[1];
+  var _ref2 = router && router.asPath && router.asPath.split('?')[1] ? React.useState(router.asPath.split('=')[1]) : React.useState(null),
+      _ref3 = slicedToArray._slicedToArray(_ref2, 2),
+      selectedArticle = _ref3[0],
+      setSelectedArticle = _ref3[1];
 
-  var _useState3 = React.useState(null),
+  var _useState3 = React.useState(false),
       _useState4 = slicedToArray._slicedToArray(_useState3, 2),
-      currentURL = _useState4[0],
-      setCurrentURL = _useState4[1];
+      firstLoad = _useState4[0],
+      setFirstLoad = _useState4[1];
 
   var _useState5 = React.useState(null),
       _useState6 = slicedToArray._slicedToArray(_useState5, 2),
-      currentTitle = _useState6[0],
-      setCurrentTitle = _useState6[1];
+      currentURL = _useState6[0],
+      setCurrentURL = _useState6[1];
 
   var _useState7 = React.useState(null),
       _useState8 = slicedToArray._slicedToArray(_useState7, 2),
-      currentSummary = _useState8[0],
-      setCurrentSummary = _useState8[1];
+      currentTitle = _useState8[0],
+      setCurrentTitle = _useState8[1];
 
   var _useState9 = React.useState(null),
       _useState10 = slicedToArray._slicedToArray(_useState9, 2),
-      currentThumbnail = _useState10[0],
-      setCurrentThumbnail = _useState10[1];
+      currentSummary = _useState10[0],
+      setCurrentSummary = _useState10[1];
+
+  var _useState11 = React.useState(null),
+      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
+      currentThumbnail = _useState12[0],
+      setCurrentThumbnail = _useState12[1];
 
   var articleCardClickHandler = function articleCardClickHandler(e) {
     e.preventDefault();
@@ -8133,15 +8145,6 @@ var ArticleSeries = function ArticleSeries(_ref) {
     setSelectedArticle(articleClicked);
     scrollToArticle(articleClicked);
   };
-
-  React.useEffect(function () {
-    try {
-      if (main.main_36) {
-        setNavoffsetTop(document.getElementById('navbar-ham').offsetHeight - 15);
-      }
-    } catch (e) {}
-  }, []);
-
   var scrollToArticle = function scrollToArticle(id) {
     var localArticleID = id ? id : selectedArticle;
     var findArticle = function findArticle(ref) {
@@ -8153,8 +8156,12 @@ var ArticleSeries = function ArticleSeries(_ref) {
     var indexOfRef = refArray.current.findIndex(findArticle);
 
     if (indexOfRef >= 0) {
-      //refArray.current[indexOfRef].wraperRef.current.scrollIntoView({ behavior: 'smooth' })
-      window.scrollTo({ top: refArray.current[indexOfRef].wraperRef.current.offsetTop - NavoffsetTop, behavior: 'smooth' });
+      var newOffsetTop = !firstLoad ? refArray.current[indexOfRef].wraperRef.current.offsetTop : refArray.current[indexOfRef].wraperRef.current.offsetTop + document.getElementsByTagName('header')[0].clientHeight;
+      console.dir(refArray.current[indexOfRef].wraperRef.current);
+      console.log(document.getElementsByTagName('header')[0].clientHeight);
+      console.log(refArray.current[indexOfRef].wraperRef.current.offsetTop);
+      window.scrollTo({ top: newOffsetTop, behavior: 'smooth' });
+      //refArray.current[indexOfRef].wraperRef.current.scrollIntoView({ behavior: 'smooth', block: 'start' })
     }
     setFirstLoad(true);
   };
@@ -8202,13 +8209,24 @@ var ArticleSeries = function ArticleSeries(_ref) {
 
   var scrollDirectionDetect = function scrollDirectionDetect(e) {
     var window = e.currentTarget;
-
     if (preVscroll > window.scrollY) {
       isScrollDown = false;
-    } else if (preVscroll < window.scrollY) {
+      if (window.scrollY > articleContainerRef.current.offsetTop) {
+        arrowRef.current.classList.add('showArrow');
+        arrowRef.current.classList.remove('hideArrow');
+      }
+    } else if (preVscroll > window.scrollY) {
       isScrollDown = true;
     }
     preVscroll = window.scrollY;
+    setContentWidth(articleContainerRef.current.offsetWidth);
+    if (preVscroll <= articleContainerRef.current.offsetTop) {
+      arrowRef.current.classList.remove('showArrow');
+      arrowRef.current.classList.add('hideArrow');
+    }
+    if (window.scrollY === 0 && upArrowClicked === true) {
+      upArrowClicked = false;
+    }
   };
 
   React.useEffect(function () {
@@ -8218,18 +8236,18 @@ var ArticleSeries = function ArticleSeries(_ref) {
     };
   });
 
-  React.useEffect(function () {
+  React.useLayoutEffect(function () {
+    console.log('useLayoutEffect');
     if (!firstLoad) {
-      if (main.main_36) {
+      if (main.main_39) {
         grabLoadedAds();
       } else {
         scrollToArticle();
       }
     }
-  }, []);
+  });
 
   var grabLoadedAds = function grabLoadedAds() {
-    console.dir(index.lib_3);
     index.lib_3.getGoogletag().then(function (googletag) {
       var checkIfReady = window.setInterval(function () {
         if (window.googletag && googletag.pubadsReady) {
@@ -8244,7 +8262,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
     //const activeArticle = path
     //let targeting = getTargeting({ article: activeArticle, cpModificationRequired, position: props.position, prevUrl })
 
-    if (!main.main_36) {
+    if (!main.main_39) {
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           index.lib_3.refresh();
@@ -8252,7 +8270,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
       });
     }
     //Refresh leaderboard ad on mobile
-    if (main.main_36) {
+    if (main.main_39) {
       var leaderboardSlotId = '';
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
@@ -8262,9 +8280,26 @@ var ArticleSeries = function ArticleSeries(_ref) {
     }
   };
 
+  var handleArrowClick = function handleArrowClick() {
+    isScrollDown = true;
+    upArrowClicked = true;
+    arrowRef.current.classList.add('hideArrow');
+    arrowRef.current.classList.remove('showArrow');
+    window.scrollTo({ top: 0, behavior: 'smooth' });
+    window.history.pushState({}, '', router.asPath.split('?')[0]);
+    document.title = nodes.seriesTitle;
+  };
+
   return React__default.createElement(
     React__default.Fragment,
     null,
+    React__default.createElement(
+      'div',
+      { ref: arrowRef, className: 'scrollToTopArrow hideArrow', onClick: function onClick() {
+          return handleArrowClick();
+        } },
+      React__default.createElement(index_esm.IoIosArrowDropupCircle, null)
+    ),
     React__default.createElement('hr', { className: 'article-seperater my-4' }),
     React__default.createElement(
       'div',
@@ -8284,7 +8319,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
     React__default.createElement(
       'div',
       { className: 'ad-box', style: { textAlign: 'center' } },
-      main.main_36 && Ads.map(function (ad, index) {
+      main.main_39 && Ads.map(function (ad, index) {
         if (index === 0) {
           return React__default.createElement(
             'div',
@@ -8308,8 +8343,8 @@ var ArticleSeries = function ArticleSeries(_ref) {
     ),
     React__default.createElement(
       'div',
-      { className: 'article-container', style: { marginBottom: '2rem' } },
-      nodes.articles.map(function (article, index) {
+      { ref: articleContainerRef, className: 'article-container', style: { marginBottom: '2rem' } },
+      Articles.map(function (article, index) {
         return React__default.createElement(
           'div',
           { key: article.title },
@@ -8324,8 +8359,10 @@ var ArticleSeries = function ArticleSeries(_ref) {
                 return refArray.current[index] = ele;
               },
               onChange: function onChange(visible) {
-                if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
-                  onChangeArticle(article.param.current, visible, article.title, article.summary, urlFor(article.thumbnail.asset).url());
+                if (!upArrowClicked) {
+                  if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
+                    onChangeArticle(article.param.current, visible, article.title, article.summary, urlFor(article.thumbnail.asset).url());
+                  }
                 }
               } },
             React__default.createElement(
@@ -8380,26 +8417,30 @@ var ArticleSeries = function ArticleSeries(_ref) {
                 }, client.config())),
                 React__default.createElement('hr', { className: 'article-seperater my-4' })
               ),
-              React__default.createElement(
-                'div',
-                { className: 'objective-prevNext-Wrapper' },
-                React__default.createElement(
-                  'h5',
-                  { className: 'objective-title' },
-                  nodes.seriesTitle
-                ),
+              Articles.length > 1 && React__default.createElement(
+                React__default.Fragment,
+                null,
                 React__default.createElement(
                   'div',
-                  { className: 'prevNextWrapper' },
-                  PrevNextCards(true, index)
-                )
-              ),
-              React__default.createElement('hr', { className: 'article-seperater' })
+                  { className: 'objective-prevNext-Wrapper' },
+                  React__default.createElement(
+                    'h5',
+                    { className: 'objective-title' },
+                    nodes.seriesTitle
+                  ),
+                  React__default.createElement(
+                    'div',
+                    { className: 'prevNextWrapper' },
+                    PrevNextCards(true, index)
+                  )
+                ),
+                React__default.createElement('hr', { className: 'article-seperater' })
+              )
             ),
             React__default.createElement(
               'div',
               { className: 'ad-box', style: { textAlign: 'center' } },
-              main.main_36 && nodes.articles.length - 1 !== index && Ads.map(function (ad, innerIndex) {
+              main.main_39 && Articles.length - 1 !== index && Ads.map(function (ad, innerIndex) {
                 if (innerIndex === 0) {
                   return React__default.createElement(
                     'div',
@@ -8427,7 +8468,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
       React__default.createElement(
         'style',
         { jsx: 'true' },
-        '\n          .block-content > div p {\n            padding: 0;\n          }\n\n          h2.article-title {\n            padding: 0;\n            font-weight: 500;\n          }\n          h4.article-title {\n            padding: 0;\n            font-weight: 500;\n          }\n          h4.prevNext-title {\n            padding: 0;\n            font-size: 1rem;\n            font-weight: 500;\n          }\n          .article-wrapper {\n            border: 1px solid #252525;\n            border-radius: 5px;\n            padding: 1rem 1rem 0 1rem;\n            margin-bottom: 1rem;\n          }\n          .prevNext-reading {\n            margin-top: -10px;\n            width: 75%;\n            text-align: center;\n            background: white;\n            border: 1px solid #252525;\n            align-self: center;\n            display: none;\n          }\n          .showReading {\n            display: block;\n          }\n          .author-details-wrapper a {\n            color: #252525;\n          }\n          .objective-prevNext-Wrapper {\n            display: flex;\n            flex-direction: column;\n            justify-content: center;\n          }\n          .objective-title {\n            padding: 0 !important;\n          }\n          .prevNext-thumbnail {\n            display: flex;\n            flex-direction: column;\n            min-width: 225px;\n            max-width: 225px;\n            overflow: hidden;\n            align-items: center;\n            object-fit: contain;\n            border-radius: 15px;\n          }\n          .prevNext-thumbnail img {\n            height: 125px;\n            object-fit: contain;\n            border-radius: 15px;\n          }\n          .prevNext-summary {\n            text-align: center;\n          }\n          .prevNext-publishDate {\n            font-size: 0.75rem;\n            margin-top: 0.5rem;\n          }\n          .prevNext-title {\n            padding: 0 !important;\n            line-height: 1 !important;\n            font-weight: 500;\n          }\n          .prevNextWrapper {\n            display: flex;\n            flex-direction: row;\n            justify-content: space-evenly;\n            flex-wrap: wrap;\n          }\n          .prevNextWrapper a {\n            display: flex;\n            flex-direction: column;\n            color: #252525;\n            align-items: center;\n          }\n          .prevNextCards {\n            max-width: 250px;\n            margin-bottom: 1rem;\n          }\n          @media only screen and (max-width: 568px) {\n            .prevNextWrapper {\n              flex-direction: column;\n              align-items: center;\n            }\n            .prevNextCards {\n              margin-bottom: 2rem;\n            }\n          }\n          @media only screen and (max-width: 568px) {\n          }\n        '
+        '\n          .scrollToTopArrow {\n            position: fixed;\n            top: 150px;\n            display: flex;\n            justify-content: center;\n            width: ' + contentWidth + 'px;\n            opacity: 0;\n            z-index: 99999999999;\n            cursor: pointer;\n          }\n          .showArrow {\n            opacity: 1;\n          }\n          .hideArrow {\n            opacity: 0;\n          }\n          .scrollToTopArrow > svg {\n            min-height: 50px;\n            min-width: 50px;\n            max-height: 50px;\n            max-width: 50px;\n          }\n          .block-content > div p {\n            padding: 0;\n          }\n\n          h2.article-title {\n            padding: 0;\n            font-weight: 500;\n          }\n          h4.article-title {\n            padding: 0;\n            font-weight: 500;\n          }\n          h4.prevNext-title {\n            padding: 0;\n            font-size: 1rem;\n            font-weight: 500;\n          }\n          .article-wrapper {\n            border: 1px solid #252525;\n            border-radius: 5px;\n            padding: 1rem 1rem 0 1rem;\n            margin-bottom: 1rem;\n          }\n          .prevNext-reading {\n            margin-top: -10px;\n            width: 75%;\n            text-align: center;\n            background: white;\n            border: 1px solid #252525;\n            align-self: center;\n            display: none;\n          }\n          .showReading {\n            display: block;\n          }\n          .author-details-wrapper a {\n            color: #252525;\n          }\n          .objective-prevNext-Wrapper {\n            display: flex;\n            flex-direction: column;\n            justify-content: center;\n          }\n          .objective-title {\n            padding: 0 !important;\n          }\n          .prevNext-thumbnail {\n            display: flex;\n            flex-direction: column;\n            min-width: 225px;\n            max-width: 225px;\n            overflow: hidden;\n            align-items: center;\n            object-fit: contain;\n            border-radius: 15px;\n          }\n          .prevNext-thumbnail img {\n            height: 125px;\n            object-fit: contain;\n            border-radius: 15px;\n          }\n          .prevNext-summary {\n            text-align: center;\n          }\n          .prevNext-publishDate {\n            font-size: 0.75rem;\n            margin-top: 0.5rem;\n          }\n          .prevNext-title {\n            padding: 0 !important;\n            line-height: 1 !important;\n            font-weight: 500;\n          }\n          .prevNextWrapper {\n            display: flex;\n            flex-direction: row;\n            justify-content: space-evenly;\n            flex-wrap: wrap;\n          }\n          .prevNextWrapper a {\n            display: flex;\n            flex-direction: column;\n            color: #252525;\n            align-items: center;\n          }\n          .prevNextCards {\n            max-width: 250px;\n            margin-bottom: 1rem;\n          }\n          @media only screen and (max-width: 568px) {\n            .prevNextWrapper {\n              flex-direction: column;\n              align-items: center;\n            }\n            .prevNextCards {\n              margin-bottom: 2rem;\n            }\n          }\n          @media only screen and (max-width: 568px) {\n          }\n        '
       )
     )
   );

package/dist/cjs/{index-3294d3bc.js → index-5be2866f.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
-var moment = require('./moment-575fe24c.js');
+var moment = require('./moment-66a6a284.js');
 
 var momentTimezone = _commonjsHelpers.createCommonjsModule(function (module) {
 //! moment-timezone.js

package/dist/cjs/{index-39beccb3.js → index-b5eb3ff8.js}

@@ -60,35 +60,35 @@ function parseSource(source) {
     if (typeof source === 'string' && isUrl(source)) {
         // Someone passed an existing image url?
         image = {
-            asset: { _ref: urlToId(source) }
+            asset: { _ref: urlToId(source) },
         };
     }
     else if (typeof source === 'string') {
         // Just an asset id
         image = {
-            asset: { _ref: source }
+            asset: { _ref: source },
         };
     }
     else if (isRef(source)) {
         // We just got passed an asset directly
         image = {
-            asset: source
+            asset: source,
         };
     }
     else if (isAsset(source)) {
         // If we were passed an image asset document
         image = {
             asset: {
-                _ref: source._id || ''
-            }
+                _ref: source._id || '',
+            },
         };
     }
     else if (isAssetStub(source)) {
         // If we were passed a partial asset (`url`, but no `_id`)
         image = {
             asset: {
-                _ref: urlToId(source.asset.url)
-            }
+                _ref: urlToId(source.asset.url),
+            },
         };
     }
     else if (typeof source.asset === 'object') {
@@ -129,7 +129,7 @@ function applyDefaults(image) {
             left: 0,
             top: 0,
             bottom: 0,
-            right: 0
+            right: 0,
         };
     }
     if (!result.hotspot) {
@@ -137,7 +137,7 @@ function applyDefaults(image) {
             x: 0.5,
             y: 0.5,
             height: 1.0,
-            width: 1.0
+            width: 1.0,
         };
     }
     return result;
@@ -184,7 +184,7 @@ exports.SPEC_NAME_TO_URL_NAME_MAPPINGS = [
     ['crop', 'crop'],
     ['saturation', 'sat'],
     ['auto', 'auto'],
-    ['dpr', 'dpr']
+    ['dpr', 'dpr'],
 ];
 function urlForImage(options) {
     var spec = __assign({}, (options || {}));
@@ -203,7 +203,7 @@ function urlForImage(options) {
         left: cropLeft,
         top: cropTop,
         width: Math.round(asset.width - image.crop.right * asset.width - cropLeft),
-        height: Math.round(asset.height - image.crop.bottom * asset.height - cropTop)
+        height: Math.round(asset.height - image.crop.bottom * asset.height - cropTop),
     };
     // Compute hot spot rect in terms of pixel coordinates
     var hotSpotVerticalRadius = (image.hotspot.height * asset.height) / 2;
@@ -214,7 +214,7 @@ function urlForImage(options) {
         left: hotSpotCenterX - hotSpotHorizontalRadius,
         top: hotSpotCenterY - hotSpotVerticalRadius,
         right: hotSpotCenterX + hotSpotHorizontalRadius,
-        bottom: hotSpotCenterY + hotSpotVerticalRadius
+        bottom: hotSpotCenterY + hotSpotVerticalRadius,
     };
     // If irrelevant, or if we are requested to: don't perform crop/fit based on
     // the crop/hotspot.
@@ -296,7 +296,7 @@ function fit(source, spec) {
             left: Math.round(left),
             top: Math.round(top_2),
             width: Math.round(width),
-            height: Math.round(height)
+            height: Math.round(height),
         };
     }
     else {
@@ -318,13 +318,13 @@ function fit(source, spec) {
             left: Math.max(0, Math.floor(left)),
             top: Math.max(0, Math.floor(top_3)),
             width: Math.round(width),
-            height: Math.round(height)
+            height: Math.round(height),
         };
     }
     return {
         width: imgWidth,
         height: imgHeight,
-        rect: cropRect
+        rect: cropRect,
     };
 }
 
@@ -382,7 +382,7 @@ function urlBuilder(options) {
         return new ImageUrlBuilder(null, {
             baseUrl: apiHost.replace(/^https:\/\/api\./, 'https://cdn.'),
             projectId: projectId,
-            dataset: dataset
+            dataset: dataset,
         });
     }
     // Or just accept the options as given
@@ -395,7 +395,7 @@ var ImageUrlBuilder = /** @class */ (function () {
             ? __assign(__assign({}, (parent.options || {})), (options || {})) : __assign({}, (options || {})); // Copy options
     }
     ImageUrlBuilder.prototype.withOptions = function (options) {
-        var baseUrl = options.baseUrl || '';
+        var baseUrl = options.baseUrl || this.options.baseUrl;
         var newOptions = { baseUrl: baseUrl };
         for (var key in options) {
             if (options.hasOwnProperty(key)) {
@@ -523,7 +523,7 @@ var ImageUrlBuilder = /** @class */ (function () {
     ImageUrlBuilder.prototype.url = function () {
         return urlForImage_1$1.default(this.options);
     };
-    // Synonym for url()
+    // Alias for url()
     ImageUrlBuilder.prototype.toString = function () {
         return this.url();
     };