@mjhls/mjh-framework 1.0.688 → 1.0.689-segment

package/dist/esm/NavNative.js

@@ -85,14 +85,26 @@ var NavNative = function NavNative(props) {
     var topNavHeight = document.querySelector('.nav-brands') && document.querySelector('.nav-brands').offsetHeight;
     // Setting the top of the search component based on the offset of navigation component.
     searchRef.current.style.top = (topNavHeight ? topNavHeight + navRef.current.offsetHeight : navRef.current.offsetHeight) + 1 + 'px';
+  }, []);
 
-    var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
-    for (var i = 0; i < segmentLinks.length; i++) {
-      var link = segmentLinks[i];
-      var href = link.getAttribute('href');
-      var newRef = Segment.getURL(href, { needSegmentSupport: true });
-      link.setAttribute('href', newRef);
-    }
+  useEffect(function () {
+
+    var navdropdowns = navRef.current.querySelectorAll('#basic-nav-dropdown');
+    console.log('navdropdowns:', navdropdowns);
+
+    setTimeout(function () {
+
+      var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
+      console.log('segmentLinks:', segmentLinks);
+      for (var i = 0; i < segmentLinks.length; i++) {
+        var link = segmentLinks[i];
+        var href = link.getAttribute('href');
+        var newRef = Segment.getURL(href, { needSegmentSupport: true });
+        console.log('href:', href);
+        console.log('newRef:', newRef);
+        link.setAttribute('href', newRef);
+      }
+    }, 1000);
   }, []);
 
   useEffect(function () {
@@ -414,15 +426,19 @@ var NavNative = function NavNative(props) {
                   { key: 'subnav-' + index },
                   React__default.createElement(
                     NavDropdown,
-                    { key: index, title: row.name, id: 'basic-nav-dropdown' },
+                    { key: index, title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
                     row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
                       if (ddRow.type === 'divider') {
                         return React__default.createElement(NavDropdown.Divider, { key: subIndex });
                       } else {
                         return ddRow.url && ddRow.name ? React__default.createElement(
-                          'a',
-                          { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
-                          ddRow.name
+                          NavDropdown.Item,
+                          null,
+                          React__default.createElement(
+                            NavDropdown.Link,
+                            { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                            ddRow.name
+                          )
                         ) : null;
                       }
                     })

package/dist/esm/NavNormal.js

@@ -31,13 +31,16 @@ var NavNormal = function NavNormal(props) {
   var ref = useRef(null);
 
   useEffect(function () {
-    var segmentLinks = ref.current.querySelectorAll('a[needsegmentsupport="true"]');
-    for (var i = 0; i < segmentLinks.length; i++) {
-      var link = segmentLinks[i];
-      var href = link.getAttribute('href');
-      var newHref = Segment.getURL(href, { needSegmentSupport: true });
-      link.setAttribute('href', newHref);
-    }
+
+    setTimeout(function () {
+      var segmentLinks = ref.current.querySelectorAll('a[needsegmentsupport="true"]');
+      for (var i = 0; i < segmentLinks.length; i++) {
+        var link = segmentLinks[i];
+        var href = link.getAttribute('href');
+        var newHref = Segment.getURL(href, { needSegmentSupport: true });
+        link.setAttribute('href', newHref);
+      }
+    }, 1000);
   }, []);
 
   return React__default.createElement(