@mjhls/mjh-framework 1.0.169 → 1.0.171

package/dist/index.js

@@ -14807,7 +14807,7 @@ var SideFooter = function SideFooter(props) {
   /*
   useage example: <SideFooter cache={props.cache} logo='/an_mjhls_brand_logo.png' />
   */
-  var _get = get_1(props, 'cache.siteSettingCache', {}),
+  var _get = get_1(props, 'website.cache.siteSettingCache', {}),
       socialLinks = _get.socialLinks,
       footerLinks = _get.footerLinks,
       name = _get.name;
@@ -15077,7 +15077,8 @@ var Column3 = function Column3(props) {
       getParams = props.getParams,
       filters = props.filters,
       defaultFilter = props.defaultFilter,
-      showRightAd = props.showRightAd;
+      showRightAd = props.showRightAd,
+      logo = props.logo;
 
 
   return React__default.createElement(
@@ -15134,7 +15135,7 @@ var Column3 = function Column3(props) {
               row.component
             );
           }),
-          website && website.sideFooterContent && website.sideFooterContent.length && !website.showFooterOnLeftSide && React__default.createElement(SideFooter, { website: website })
+          website && website.sideFooterContent && website.sideFooterContent.length && !website.showFooterOnLeftSide && React__default.createElement(SideFooter, { website: website, logo: logo })
         )
       )
     )
@@ -16344,7 +16345,7 @@ var HamMagazine = function HamMagazine(props) {
 
   return React__default.createElement(
     'header',
-    { className: isOpen ? 'nav-open' : 'nav-close', style: { zIndex: '9999' } },
+    { className: !main_36 && isOpen ? 'nav-open' : 'nav-close', style: { zIndex: '9999' } },
     React__default.createElement(
       Navbar,
       { expand: 'md' },
@@ -16493,7 +16494,7 @@ var HamMagazine = function HamMagazine(props) {
         ),
         React__default.createElement(
           'div',
-          { className: 'hamburger-menu-list', style: { width: '100%', maxHeight: '70vh', overflow: 'auto' } },
+          { className: 'hamburger-menu-list', style: { width: '100%', maxHeight: '80vh' } },
           subNav && React__default.createElement(
             Navbar.Collapse,
             { id: 'basic-navbar-sub' },
@@ -16551,7 +16552,7 @@ var HamMagazine = function HamMagazine(props) {
             ),
             React__default.createElement(
               Nav,
-              { className: 'mr-auto' },
+              { className: 'mr-auto web-nav' },
               dataObject && dataObject.map(function (row, index) {
                 if (row.subQuery && row.subQuery.length > 0) {
                   return row.name ? React__default.createElement(
@@ -16566,7 +16567,7 @@ var HamMagazine = function HamMagazine(props) {
                           { key: subIndex, href: ddRow.url },
                           React__default.createElement(
                             'a',
-                            { target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                            { target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item nav-link' },
                             ddRow.name
                           )
                         ) : null;
@@ -16739,6 +16740,15 @@ var TemplateNormal = function TemplateNormal(props) {
         return React__default.createElement(NavNative, { logo: website.logo, dataObject: config.navItems, subNav: config.leftItems, website: website });
       case 'dvm':
         return React__default.createElement(NavDvm, { logo: website.logo, dataObject: config.navItems, mobileLogo: website.logo, subNav: config.leftItems, website: website });
+      case 'hamburgerNav':
+        return React__default.createElement(HamMagazine, {
+          socialFooterNav: true,
+          logo: website.logo,
+          dataObject: config.navItems,
+          mobileLogo: website.logo,
+          subNav: config.leftItems,
+          website: website.siteSettingCache
+        });
       default:
         return React__default.createElement('noNav', null);
     }
@@ -16775,7 +16785,8 @@ var TemplateNormal = function TemplateNormal(props) {
             getParams: filterParams,
             filters: filters,
             defaultFilter: defaultFilter,
-            showRightAd: showRightAd },
+            showRightAd: showRightAd,
+            logo: website.brandLogo },
           props.children
         );
       default:
@@ -16891,11 +16902,15 @@ var FigureComponent = function FigureComponent(_ref) {
       alt = node$$1.alt,
       blank = node$$1.blank,
       link = node$$1.link,
-      _node$widthP = node$$1.widthP,
-      widthP = _node$widthP === undefined ? '30' : _node$widthP,
       _node$alignment = node$$1.alignment,
       alignment = _node$alignment === undefined ? 'center' : _node$alignment;
+  var _node$widthP = node$$1.widthP,
+      widthP = _node$widthP === undefined ? 'auto' : _node$widthP;
+
 
+  if (client.clientConfig.defaultImageSize && widthP == 'auto') {
+    widthP = client.clientConfig.defaultImageSize;
+  }
 
   var figureMargin = void 0;
   if (imgFloat === 'none') {