@mjhls/mjh-framework 1.0.29 → 1.0.31

package/dist/index.js

@@ -2044,7 +2044,7 @@ var DeckQueue = function (_React$Component) {
           var thumbnailURL = get_1(row, 'thumbnail.asset.url', _this2.props.defaultImage);
           return React__default.createElement(
             Col,
-            { md: 12, lg: lgVar, style: { display: 'flex', flex: '1 0 auto' } },
+            { key: index, md: 12, lg: lgVar, style: { display: 'flex', flex: '1 0 auto' } },
             React__default.createElement(
               Link,
               { href: _this2.page + '/[url]', as: _this2.page + '/' + row.url.current },
@@ -2251,6 +2251,8 @@ var TaxonomyCard = function TaxonomyCard(props) {
 };
 
 var Column1 = function Column1(props) {
+  var title = props.title;
+
   return React__default.createElement(
     'section',
     null,
@@ -2259,11 +2261,11 @@ var Column1 = function Column1(props) {
       { className: 'justify-content-md-center' },
       React__default.createElement(
         Col,
-        { className: 'middleCol', style: { marginTop: !props.title && '10px' } },
-        props.title && React__default.createElement(
+        { className: 'middleCol', style: { marginTop: !title && '10px' } },
+        title && React__default.createElement(
           'h1',
           null,
-          props.title
+          title
         ),
         props.children
       )
@@ -2272,7 +2274,8 @@ var Column1 = function Column1(props) {
 };
 
 var Column2 = function Column2(props) {
-  var rightItems = props.rightItems;
+  var rightItems = props.rightItems,
+      title = props.title;
 
 
   return React__default.createElement(
@@ -2283,11 +2286,11 @@ var Column2 = function Column2(props) {
       { className: 'justify-content-md-center' },
       React__default.createElement(
         Col,
-        { md: true, className: 'middleCol', style: { marginTop: !props.title && '10px' } },
-        props.title && React__default.createElement(
+        { md: true, className: 'middleCol', style: { marginTop: !title && '10px' } },
+        title && React__default.createElement(
           'h1',
           null,
-          props.title
+          title
         ),
         props.children
       ),
@@ -2317,6 +2320,25 @@ var LeftNav = function LeftNav(props) {
     return false;
   };
 
+  var renderListGroupItem = function renderListGroupItem(subRow) {
+    if (checkUrlIsExternal(subRow.url)) {
+      return React__default.createElement(
+        'a',
+        { href: subRow.url },
+        subRow.name
+      );
+    }
+    return React__default.createElement(
+      Link,
+      { href: subRow.url || '#' },
+      React__default.createElement(
+        'a',
+        null,
+        subRow.name
+      )
+    );
+  };
+
   return React__default.createElement(
     'section',
     null,
@@ -2337,15 +2359,7 @@ var LeftNav = function LeftNav(props) {
               React__default.createElement(
                 ListGroup.Item,
                 { as: 'li' },
-                React__default.createElement(
-                  Link,
-                  { href: subRow.url || '#' },
-                  React__default.createElement(
-                    'a',
-                    null,
-                    subRow.name
-                  )
-                )
+                renderListGroupItem(subRow)
               )
             );
           } else {
@@ -2355,19 +2369,7 @@ var LeftNav = function LeftNav(props) {
               React__default.createElement(
                 ListGroup.Item,
                 { as: 'li' },
-                checkUrlIsExternal(subRow.url) ? React__default.createElement(
-                  'a',
-                  { target: '_blank', href: subRow.url },
-                  subRow.name
-                ) : React__default.createElement(
-                  Link,
-                  { href: subRow.url || '#' },
-                  React__default.createElement(
-                    'a',
-                    null,
-                    subRow.name
-                  )
-                )
+                renderListGroupItem(subRow)
               )
             );
           }
@@ -2379,8 +2381,8 @@ var LeftNav = function LeftNav(props) {
 
 var Column3 = function Column3(props) {
   var leftItems = props.leftItems,
-      rightItems = props.rightItems;
-
+      rightItems = props.rightItems,
+      title = props.title;
 
   return React__default.createElement(
     'section',
@@ -2395,11 +2397,11 @@ var Column3 = function Column3(props) {
       ),
       React__default.createElement(
         Col,
-        { md: true, className: 'middleCol', style: { maxWidth: '640px', marginTop: !props.title && '10px' } },
-        props.title && React__default.createElement(
+        { md: true, className: 'middleCol', style: { maxWidth: '640px', marginTop: !title && '10px' } },
+        title && React__default.createElement(
           'h1',
           null,
-          props.title
+          title
         ),
         props.children
       ),
@@ -2967,7 +2969,6 @@ var NavDvm = function NavDvm(props) {
       React__default.createElement(
         Container,
         null,
-        React__default.createElement(Nav, { className: 'justify-content-start leftHeader' }),
         React__default.createElement(
           Nav,
           { className: 'justify-content-center', style: { margin: '0 auto' } },
@@ -2984,8 +2985,7 @@ var NavDvm = function NavDvm(props) {
               )
             )
           )
-        ),
-        React__default.createElement(Nav, { className: 'justify-content-end rightHeader' })
+        )
       )
     ),
     React__default.createElement(
@@ -4749,8 +4749,7 @@ var TemplateNormal = function TemplateNormal(props) {
       keywords = props.keywords,
       description = props.description,
       website = props.website,
-      horizontalAD = props.config.horizontalAD,
-      onSearch = props.onSearch;
+      horizontalAD = props.config.horizontalAD;
 
 
   var navigation = function navigation() {
@@ -4796,7 +4795,7 @@ var TemplateNormal = function TemplateNormal(props) {
   return React__default.createElement(
     'section',
     null,
-    React__default.createElement(Header, { title: title, keyword: keywords, description: description }),
+    React__default.createElement(Header, { title: title + ' | ' + website.title, keyword: keywords, description: description }),
     navigation(),
     horizontalAD && horizontalAD.networkID && horizontalAD.adUnit && React__default.createElement(
       Container,