@mjhls/mjh-framework 1.0.397 → 1.0.399

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.397
+# mjh-framework v. 1.0.399
 
 
 > Foundation Framework

package/dist/cjs/{Figure-c49ee0f8.js → Figure-17002404.js}

@@ -33,9 +33,15 @@ var FigureComponent = function FigureComponent(props) {
       openImgSrc = _useState4[0],
       setOpenImgSrc = _useState4[1];
 
+  if (typeof window === 'undefined') return null;
+
   var node = props.node,
       client = props.client,
       contextualADFlag = props.contextualADFlag;
+
+
+  if (!node.asset) return null;
+
   var caption = node.caption,
       alt = node.alt,
       blank = node.blank,
@@ -43,28 +49,23 @@ var FigureComponent = function FigureComponent(props) {
       _node$alignment = node.alignment,
       alignment = _node$alignment === undefined ? 'center' : _node$alignment,
       _node$class_name = node.class_name,
-      class_name = _node$class_name === undefined ? 'd-block' : _node$class_name;
+      class_name = _node$class_name === undefined ? 'd-block' : _node$class_name,
+      _node$disableTextWrap = node.disableTextWrap,
+      disableTextWrap = _node$disableTextWrap === undefined ? false : _node$disableTextWrap;
   var _node$widthP = node.widthP,
       widthP = _node$widthP === undefined ? 'auto' : _node$widthP;
 
 
-  if (typeof window === 'undefined') {
-    return null;
-  }
-
   var screenWidth = window.innerWidth;
 
   if (client.clientConfig && client.clientConfig.defaultImageSize && widthP === 'auto') {
     widthP = client.clientConfig.defaultImageSize;
   }
 
-  var imageFloat = null;
+  var imageFloat = 'none';
   if (screenWidth > 1000) {
     var align = ['center', 'top'].includes(alignment.toLowerCase()) ? 'none' : alignment.toLowerCase();
     imageFloat = align;
-  } else {
-    var _align = ['center', 'top'].includes(alignment.toLowerCase()) ? 'none' : alignment.toLowerCase();
-    imageFloat = _align;
   }
 
   var figureMargin = null;
@@ -93,24 +94,30 @@ var FigureComponent = function FigureComponent(props) {
     imageWidth = '100%';
   }
 
-  if (!node.asset) return null;
+  var figureStyle = disableTextWrap ? { maxWidth: '100%' } : {
+    width: imageWidth,
+    maxWidth: '100%',
+    clear: 'both',
+    float: imageFloat,
+    margin: figureMargin
+  };
 
   return React__default.createElement(
     React__default.Fragment,
     null,
-    imageWidth !== null && imageFloat !== null && React__default.createElement(
+    React__default.createElement(
       reactBootstrap.Figure,
-      { className: '' + class_name, style: { width: imageWidth, maxWidth: '100%', clear: 'both', float: imageFloat, margin: figureMargin } },
+      { className: '' + class_name, style: figureStyle },
       link ? React__default.createElement(
         'a',
         { target: blank ? '_blank' : '_self', href: link },
-        React__default.createElement(reactBootstrap.Figure.Image, { style: { width: '100%' }, className: 'figure-image', src: urlFor(node, client).url(), alt: alt && alt }),
+        React__default.createElement(reactBootstrap.Figure.Image, { style: { maxWidth: '100%' }, className: 'figure-image', src: urlFor(node, client).url(), alt: alt && alt }),
         caption && React__default.createElement('div', { dangerouslySetInnerHTML: { __html: '<span class=\'figure-caption\'>' + caption + '</span>' } })
       ) : React__default.createElement(
         React__default.Fragment,
         null,
         React__default.createElement(reactBootstrap.Figure.Image, {
-          style: { width: '100%' },
+          style: { maxWidth: '100%', cursor: 'pointer' },
           className: 'figure-image',
           src: urlFor(node, client).url(),
           alt: alt && alt,

package/dist/cjs/index.js

@@ -6425,7 +6425,9 @@ var Media = function Media(_ref) {
       alt = node.alt,
       className = node.class,
       _node$widthP = node.widthP,
-      widthP = _node$widthP === undefined ? 'auto' : _node$widthP;
+      widthP = _node$widthP === undefined ? 'auto' : _node$widthP,
+      _node$disableTextWrap = node.disableTextWrap,
+      disableTextWrap = _node$disableTextWrap === undefined ? false : _node$disableTextWrap;
 
   var builder = index.imageUrlBuilder(client);
 
@@ -6447,49 +6449,58 @@ var Media = function Media(_ref) {
     }
   }, []);
 
-  var screenWidth = window.innerWidth;
-  var imageFloat = 'none';
-  if (screenWidth > 1000) {
-    var align = ['center', 'top'].includes(alignment.toLowerCase()) ? 'none' : alignment.toLowerCase();
-    imageFloat = align;
-  }
+  if (!uploadDoc || !uploadDoc.asset) return null;
 
-  var imageMargin = null;
-  if (imageFloat === 'none') {
-    imageMargin = '0 auto 1rem';
-  }
-  if (imageFloat === 'left') {
-    imageMargin = '0 1.5rem 1.5rem 0';
-  }
-  if (imageFloat === 'right') {
-    imageMargin = '0 0 1.5rem 1.5rem';
-  }
+  if (poster && poster.asset) {
+    var screenWidth = window.innerWidth;
 
-  var imageWidth = null;
-  if (screenWidth > 1000) {
-    if (widthP === 'auto') {
-      if (imageFloat === 'none') {
-        imageWidth = 'auto';
+    var imageFloat = 'none';
+    if (screenWidth > 1000) {
+      var align = ['center', 'top'].includes(alignment.toLowerCase()) ? 'none' : alignment.toLowerCase();
+      imageFloat = align;
+    }
+
+    var imageMargin = null;
+    if (imageFloat === 'none') {
+      imageMargin = '0 auto 1rem';
+    }
+    if (imageFloat === 'left') {
+      imageMargin = '0 1.5rem 1.5rem 0';
+    }
+    if (imageFloat === 'right') {
+      imageMargin = '0 0 1.5rem 1.5rem';
+    }
+
+    var imageWidth = null;
+    if (screenWidth > 1000) {
+      if (widthP === 'auto') {
+        if (imageFloat === 'none') {
+          imageWidth = 'auto';
+        } else {
+          imageWidth = '30%';
+        }
       } else {
-        imageWidth = '30%';
+        imageWidth = widthP + '%';
       }
     } else {
-      imageWidth = widthP + '%';
+      imageWidth = '100%';
     }
-  } else {
-    imageWidth = '100%';
-  }
 
-  if (!uploadDoc || !uploadDoc.asset) return null;
+    var figureStyle = disableTextWrap ? { maxWidth: '100%' } : {
+      width: imageWidth,
+      maxWidth: '100%',
+      clear: 'both',
+      float: imageFloat,
+      margin: imageMargin
+    };
 
-  if (poster && poster.asset && imageFloat && imageMargin && imageWidth) {
     return React__default.createElement(
       reactBootstrap.Figure,
-      { className: 'd-block ' + className, style: { width: imageWidth, maxWidth: '100%', clear: 'both', float: imageFloat, margin: imageMargin } },
+      { className: 'd-block ' + className, style: figureStyle },
       React__default.createElement(
         'a',
         { href: uploadDoc.asset.url, target: blank ? '_blank' : '_self' },
-        React__default.createElement(reactBootstrap.Figure.Image, _extends$2._extends({ className: 'media-image', style: { width: '100%' }, src: urlFor(poster).url() }, alt && { alt: alt })),
+        React__default.createElement(reactBootstrap.Figure.Image, _extends$2._extends({ className: 'media-image', style: { maxWidth: '100%' }, src: urlFor(poster).url() }, alt && { alt: alt })),
         caption && React__default.createElement(
           reactBootstrap.Figure.Caption,
           { className: 'media-caption' },
@@ -14283,7 +14294,7 @@ var MultiFigure = function MultiFigure(props) {
 };
 
 var Figure = dynamic(function () {
-  return Promise.resolve().then(function () { return require('./Figure-c49ee0f8.js'); });
+  return Promise.resolve().then(function () { return require('./Figure-17002404.js'); });
 }, { ssr: false });
 
 var checkUrlIsExternal = function checkUrlIsExternal(url) {
@@ -22288,7 +22299,9 @@ var getDocumentGroupUrl = function getDocumentGroupUrl(docGroup) {
   }
   var url = void 0;
   if (docGroup.path.includes('/')) {
-    return docGroup.path;
+    console.log(docGroup);
+    console.log(docGroup.path);
+    return "/" + docGroup.path;
   }
 
   if (docGroup.parent) {

package/dist/esm/{Figure-7ba30e53.js → Figure-bce2ae9c.js}

@@ -28,9 +28,15 @@ var FigureComponent = function FigureComponent(props) {
       openImgSrc = _useState4[0],
       setOpenImgSrc = _useState4[1];
 
+  if (typeof window === 'undefined') return null;
+
   var node = props.node,
       client = props.client,
       contextualADFlag = props.contextualADFlag;
+
+
+  if (!node.asset) return null;
+
   var caption = node.caption,
       alt = node.alt,
       blank = node.blank,
@@ -38,28 +44,23 @@ var FigureComponent = function FigureComponent(props) {
       _node$alignment = node.alignment,
       alignment = _node$alignment === undefined ? 'center' : _node$alignment,
       _node$class_name = node.class_name,
-      class_name = _node$class_name === undefined ? 'd-block' : _node$class_name;
+      class_name = _node$class_name === undefined ? 'd-block' : _node$class_name,
+      _node$disableTextWrap = node.disableTextWrap,
+      disableTextWrap = _node$disableTextWrap === undefined ? false : _node$disableTextWrap;
   var _node$widthP = node.widthP,
       widthP = _node$widthP === undefined ? 'auto' : _node$widthP;
 
 
-  if (typeof window === 'undefined') {
-    return null;
-  }
-
   var screenWidth = window.innerWidth;
 
   if (client.clientConfig && client.clientConfig.defaultImageSize && widthP === 'auto') {
     widthP = client.clientConfig.defaultImageSize;
   }
 
-  var imageFloat = null;
+  var imageFloat = 'none';
   if (screenWidth > 1000) {
     var align = ['center', 'top'].includes(alignment.toLowerCase()) ? 'none' : alignment.toLowerCase();
     imageFloat = align;
-  } else {
-    var _align = ['center', 'top'].includes(alignment.toLowerCase()) ? 'none' : alignment.toLowerCase();
-    imageFloat = _align;
   }
 
   var figureMargin = null;
@@ -88,24 +89,30 @@ var FigureComponent = function FigureComponent(props) {
     imageWidth = '100%';
   }
 
-  if (!node.asset) return null;
+  var figureStyle = disableTextWrap ? { maxWidth: '100%' } : {
+    width: imageWidth,
+    maxWidth: '100%',
+    clear: 'both',
+    float: imageFloat,
+    margin: figureMargin
+  };
 
   return React__default.createElement(
     React__default.Fragment,
     null,
-    imageWidth !== null && imageFloat !== null && React__default.createElement(
+    React__default.createElement(
       Figure$1,
-      { className: '' + class_name, style: { width: imageWidth, maxWidth: '100%', clear: 'both', float: imageFloat, margin: figureMargin } },
+      { className: '' + class_name, style: figureStyle },
       link ? React__default.createElement(
         'a',
         { target: blank ? '_blank' : '_self', href: link },
-        React__default.createElement(Figure$1.Image, { style: { width: '100%' }, className: 'figure-image', src: urlFor(node, client).url(), alt: alt && alt }),
+        React__default.createElement(Figure$1.Image, { style: { maxWidth: '100%' }, className: 'figure-image', src: urlFor(node, client).url(), alt: alt && alt }),
         caption && React__default.createElement('div', { dangerouslySetInnerHTML: { __html: '<span class=\'figure-caption\'>' + caption + '</span>' } })
       ) : React__default.createElement(
         React__default.Fragment,
         null,
         React__default.createElement(Figure$1.Image, {
-          style: { width: '100%' },
+          style: { maxWidth: '100%', cursor: 'pointer' },
           className: 'figure-image',
           src: urlFor(node, client).url(),
           alt: alt && alt,

package/dist/esm/index.js

@@ -6422,7 +6422,9 @@ var Media = function Media(_ref) {
       alt = node.alt,
       className = node.class,
       _node$widthP = node.widthP,
-      widthP = _node$widthP === undefined ? 'auto' : _node$widthP;
+      widthP = _node$widthP === undefined ? 'auto' : _node$widthP,
+      _node$disableTextWrap = node.disableTextWrap,
+      disableTextWrap = _node$disableTextWrap === undefined ? false : _node$disableTextWrap;
 
   var builder = imageUrlBuilder(client);
 
@@ -6444,49 +6446,58 @@ var Media = function Media(_ref) {
     }
   }, []);
 
-  var screenWidth = window.innerWidth;
-  var imageFloat = 'none';
-  if (screenWidth > 1000) {
-    var align = ['center', 'top'].includes(alignment.toLowerCase()) ? 'none' : alignment.toLowerCase();
-    imageFloat = align;
-  }
+  if (!uploadDoc || !uploadDoc.asset) return null;
 
-  var imageMargin = null;
-  if (imageFloat === 'none') {
-    imageMargin = '0 auto 1rem';
-  }
-  if (imageFloat === 'left') {
-    imageMargin = '0 1.5rem 1.5rem 0';
-  }
-  if (imageFloat === 'right') {
-    imageMargin = '0 0 1.5rem 1.5rem';
-  }
+  if (poster && poster.asset) {
+    var screenWidth = window.innerWidth;
 
-  var imageWidth = null;
-  if (screenWidth > 1000) {
-    if (widthP === 'auto') {
-      if (imageFloat === 'none') {
-        imageWidth = 'auto';
+    var imageFloat = 'none';
+    if (screenWidth > 1000) {
+      var align = ['center', 'top'].includes(alignment.toLowerCase()) ? 'none' : alignment.toLowerCase();
+      imageFloat = align;
+    }
+
+    var imageMargin = null;
+    if (imageFloat === 'none') {
+      imageMargin = '0 auto 1rem';
+    }
+    if (imageFloat === 'left') {
+      imageMargin = '0 1.5rem 1.5rem 0';
+    }
+    if (imageFloat === 'right') {
+      imageMargin = '0 0 1.5rem 1.5rem';
+    }
+
+    var imageWidth = null;
+    if (screenWidth > 1000) {
+      if (widthP === 'auto') {
+        if (imageFloat === 'none') {
+          imageWidth = 'auto';
+        } else {
+          imageWidth = '30%';
+        }
       } else {
-        imageWidth = '30%';
+        imageWidth = widthP + '%';
       }
     } else {
-      imageWidth = widthP + '%';
+      imageWidth = '100%';
     }
-  } else {
-    imageWidth = '100%';
-  }
 
-  if (!uploadDoc || !uploadDoc.asset) return null;
+    var figureStyle = disableTextWrap ? { maxWidth: '100%' } : {
+      width: imageWidth,
+      maxWidth: '100%',
+      clear: 'both',
+      float: imageFloat,
+      margin: imageMargin
+    };
 
-  if (poster && poster.asset && imageFloat && imageMargin && imageWidth) {
     return React__default.createElement(
       Figure$1,
-      { className: 'd-block ' + className, style: { width: imageWidth, maxWidth: '100%', clear: 'both', float: imageFloat, margin: imageMargin } },
+      { className: 'd-block ' + className, style: figureStyle },
       React__default.createElement(
         'a',
         { href: uploadDoc.asset.url, target: blank ? '_blank' : '_self' },
-        React__default.createElement(Figure$1.Image, _extends$2({ className: 'media-image', style: { width: '100%' }, src: urlFor(poster).url() }, alt && { alt: alt })),
+        React__default.createElement(Figure$1.Image, _extends$2({ className: 'media-image', style: { maxWidth: '100%' }, src: urlFor(poster).url() }, alt && { alt: alt })),
         caption && React__default.createElement(
           Figure$1.Caption,
           { className: 'media-caption' },
@@ -14280,7 +14291,7 @@ var MultiFigure = function MultiFigure(props) {
 };
 
 var Figure = dynamic(function () {
-  return import('./Figure-7ba30e53.js');
+  return import('./Figure-bce2ae9c.js');
 }, { ssr: false });
 
 var checkUrlIsExternal = function checkUrlIsExternal(url) {
@@ -22285,7 +22296,9 @@ var getDocumentGroupUrl = function getDocumentGroupUrl(docGroup) {
   }
   var url = void 0;
   if (docGroup.path.includes('/')) {
-    return docGroup.path;
+    console.log(docGroup);
+    console.log(docGroup.path);
+    return "/" + docGroup.path;
   }
 
   if (docGroup.parent) {

package/package.json

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