@mjhls/mjh-framework 1.0.687 → 1.0.688

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/HamMagazine.js +30 -6
  3. package/dist/cjs/NavDvm.js +20 -7
  4. package/dist/cjs/NavMagazine.js +14 -6
  5. package/dist/cjs/NavNative.js +14 -6
  6. package/dist/esm/HamMagazine.js +30 -6
  7. package/dist/esm/NavDvm.js +21 -8
  8. package/dist/esm/NavMagazine.js +14 -6
  9. package/dist/esm/NavNative.js +14 -6
  10. package/package.json +1 -1
package/README.md CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- # mjh-framework v. 1.0.687
2
+ # mjh-framework v. 1.0.688
3
3
 
4
4
  > Foundation Framework
5
5
 
package/dist/cjs/HamMagazine.js CHANGED
@@ -113,6 +113,14 @@ var HamMagazine = function HamMagazine(props) {
113
113
 
114
114
  // Initial screenwidth setup on refresh or on load
115
115
  setScreenWidth(parseInt(window.innerWidth));
116
+
117
+ var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
118
+ for (var i = 0; i < segmentLinks.length; i++) {
119
+ var link = segmentLinks[i];
120
+ var href = link.getAttribute('href');
121
+ var newRef = Segment.getURL(href, { needSegmentSupport: true });
122
+ link.setAttribute('href', newRef);
123
+ }
116
124
  }, []);
117
125
 
118
126
  // Check for browser resize
@@ -402,7 +410,8 @@ var HamMagazine = function HamMagazine(props) {
402
410
  'a',
403
411
  {
404
412
  key: subIndex,
405
- href: Segment.getURL(ddRow.url, ddRow),
413
+ needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
414
+ href: ddRow.url,
406
415
  target: ddRow.blank ? '_blank' : '_self',
407
416
  rel: 'noopener noreferrer',
408
417
  className: 'dropdown-item' },
@@ -424,7 +433,8 @@ var HamMagazine = function HamMagazine(props) {
424
433
  'a',
425
434
  {
426
435
  key: subIndex,
427
- href: Segment.getURL(ddRow.url, ddRow),
436
+ needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
437
+ href: ddRow.url,
428
438
  target: ddRow.blank ? '_blank' : '_self',
429
439
  rel: 'noopener noreferrer',
430
440
  className: 'dropdown-item' },
@@ -438,7 +448,13 @@ var HamMagazine = function HamMagazine(props) {
438
448
  } else {
439
449
  return row.url && row.name ? React__default.createElement(
440
450
  'a',
441
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', rel: 'noopener noreferrer', className: 'nav-link' },
451
+ { key: index,
452
+ needsegmentsupport: row.needSegmentSupport ? 'true' : '',
453
+ href: row.url,
454
+ target: row.blank ? '_blank' : '_self',
455
+ rel: 'noopener noreferrer',
456
+ className: 'nav-link'
457
+ },
442
458
  row.name
443
459
  ) : null;
444
460
  }
@@ -476,7 +492,8 @@ var HamMagazine = function HamMagazine(props) {
476
492
  'a',
477
493
  {
478
494
  key: subIndex,
479
- href: Segment.getURL(ddRow.url, ddRow),
495
+ needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
496
+ href: ddRow.url,
480
497
  target: ddRow.blank ? '_blank' : '_self',
481
498
  rel: 'noopener noreferrer',
482
499
  className: 'dropdown-item nav-link' },
@@ -497,7 +514,8 @@ var HamMagazine = function HamMagazine(props) {
497
514
  'a',
498
515
  {
499
516
  key: subIndex,
500
- href: Segment.getURL(ddRow.url, ddRow),
517
+ needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
518
+ href: ddRow.url,
501
519
  target: ddRow.blank ? '_blank' : '_self',
502
520
  rel: 'noopener noreferrer',
503
521
  className: 'dropdown-item' },
@@ -511,7 +529,13 @@ var HamMagazine = function HamMagazine(props) {
511
529
  } else {
512
530
  return row.url && row.name ? React__default.createElement(
513
531
  'a',
514
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', rel: 'noopener noreferrer', className: 'nav-link' },
532
+ { key: index,
533
+ needsegmentsupport: row.needSegmentSupport ? 'true' : '',
534
+ href: row.url,
535
+ target: row.blank ? '_blank' : '_self',
536
+ rel: 'noopener noreferrer',
537
+ className: 'nav-link'
538
+ },
515
539
  row.name
516
540
  ) : null;
517
541
  }
package/dist/cjs/NavDvm.js CHANGED
@@ -36,28 +36,41 @@ var NavDvm = function NavDvm(props) {
36
36
  website = _props$website === undefined ? {} : _props$website;
37
37
 
38
38
 
39
+ var sfRef = React.useRef(null);
40
+
41
+ React.useEffect(function () {
42
+ // this adds ?eKey=xxx or ?anonymousid=xxx for forms that's outside - eg) formstack forms
43
+ // for tracking same user
44
+ var segmentLinks = sfRef.current.querySelectorAll('a[needsegmentsupport="true"]');
45
+ for (var i = 0; i < segmentLinks.length; i++) {
46
+ var link = segmentLinks[i];
47
+ var href = link.getAttribute('href');
48
+ var newRef = Segment.getURL(href, { needSegmentSupport: true });
49
+ link.setAttribute('href', newRef);
50
+ }
51
+ }, []);
52
+
39
53
  var getLink = function getLink(url, className, name, key, blank) {
40
54
  var needSegmentSupport = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
41
55
 
42
- url = Segment.getURL(url, { needSegmentSupport: needSegmentSupport });
43
56
  if (url && (url.includes('https://') || url.includes('http://'))) {
44
57
  return React__default.createElement(
45
58
  'a',
46
- { target: blank ? '_blank' : '_self', key: key, href: url || '#', className: className },
59
+ { target: blank ? '_blank' : '_self', needsegmentsupport: needSegmentSupport ? 'true' : '', key: key, href: url || '#', className: className },
47
60
  name
48
61
  );
49
62
  }
50
63
 
51
64
  return React__default.createElement(
52
65
  'a',
53
- { key: key, href: url || '#', target: blank ? '_blank' : '_self', className: className },
66
+ { key: key, href: url || '#', needsegmentsupport: needSegmentSupport ? 'true' : '', target: blank ? '_blank' : '_self', className: className },
54
67
  name
55
68
  );
56
69
  };
57
70
 
58
71
  return React__default.createElement(
59
72
  React__default.Fragment,
60
- null,
73
+ { ref: sfRef },
61
74
  React__default.createElement(
62
75
  Navbar,
63
76
  { className: 'top-nav', expand: 'xl' },
@@ -157,7 +170,7 @@ var NavDvm = function NavDvm(props) {
157
170
  if (ddRow.url && ddRow.name) {
158
171
  return ddRow.url && ddRow.name ? React__default.createElement(
159
172
  'a',
160
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
173
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
161
174
  ddRow.name
162
175
  ) : null;
163
176
  } else return null;
@@ -177,7 +190,7 @@ var NavDvm = function NavDvm(props) {
177
190
  if (ddRow.url && ddRow.name) {
178
191
  return ddRow.url && ddRow.name ? React__default.createElement(
179
192
  'a',
180
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
193
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
181
194
  ddRow.name
182
195
  ) : null;
183
196
  } else return null;
@@ -189,7 +202,7 @@ var NavDvm = function NavDvm(props) {
189
202
  } else {
190
203
  return row.url && row.name ? React__default.createElement(
191
204
  'a',
192
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
205
+ { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
193
206
  row.name
194
207
  ) : null;
195
208
  }
package/dist/cjs/NavMagazine.js CHANGED
@@ -115,6 +115,14 @@ var NavMagazine = function NavMagazine(props) {
115
115
 
116
116
  // Initial screenwidth setup on refresh or on load
117
117
  setScreenWidth(parseInt(window.innerWidth));
118
+
119
+ var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
120
+ for (var i = 0; i < segmentLinks.length; i++) {
121
+ var link = segmentLinks[i];
122
+ var href = link.getAttribute('href');
123
+ var newRef = Segment.getURL(href, { needSegmentSupport: true });
124
+ link.setAttribute('href', newRef);
125
+ }
118
126
  }, []);
119
127
 
120
128
  // Check for browser resize
@@ -423,7 +431,7 @@ var NavMagazine = function NavMagazine(props) {
423
431
  if (ddRow.url && ddRow.name) {
424
432
  return ddRow.url && ddRow.name ? React__default.createElement(
425
433
  'a',
426
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
434
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
427
435
  ddRow.name
428
436
  ) : null;
429
437
  } else return null;
@@ -443,7 +451,7 @@ var NavMagazine = function NavMagazine(props) {
443
451
  if (ddRow.url && ddRow.name) {
444
452
  return ddRow.url && ddRow.name ? React__default.createElement(
445
453
  'a',
446
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
454
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
447
455
  ddRow.name
448
456
  ) : null;
449
457
  } else return null;
@@ -455,7 +463,7 @@ var NavMagazine = function NavMagazine(props) {
455
463
  } else {
456
464
  return row.url && row.name ? React__default.createElement(
457
465
  'a',
458
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
466
+ { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
459
467
  row.name
460
468
  ) : null;
461
469
  }
@@ -491,7 +499,7 @@ var NavMagazine = function NavMagazine(props) {
491
499
  } else {
492
500
  return ddRow.url && ddRow.name ? React__default.createElement(
493
501
  'a',
494
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
502
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
495
503
  ddRow.name
496
504
  ) : null;
497
505
  }
@@ -509,7 +517,7 @@ var NavMagazine = function NavMagazine(props) {
509
517
  } else {
510
518
  return ddRow.url && ddRow.name ? React__default.createElement(
511
519
  'a',
512
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
520
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
513
521
  ddRow.name
514
522
  ) : null;
515
523
  }
@@ -520,7 +528,7 @@ var NavMagazine = function NavMagazine(props) {
520
528
  } else {
521
529
  return row.url && row.name ? React__default.createElement(
522
530
  'a',
523
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
531
+ { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
524
532
  row.name
525
533
  ) : null;
526
534
  }
package/dist/cjs/NavNative.js CHANGED
@@ -92,6 +92,14 @@ var NavNative = function NavNative(props) {
92
92
  var topNavHeight = document.querySelector('.nav-brands') && document.querySelector('.nav-brands').offsetHeight;
93
93
  // Setting the top of the search component based on the offset of navigation component.
94
94
  searchRef.current.style.top = (topNavHeight ? topNavHeight + navRef.current.offsetHeight : navRef.current.offsetHeight) + 1 + 'px';
95
+
96
+ var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
97
+ for (var i = 0; i < segmentLinks.length; i++) {
98
+ var link = segmentLinks[i];
99
+ var href = link.getAttribute('href');
100
+ var newRef = Segment.getURL(href, { needSegmentSupport: true });
101
+ link.setAttribute('href', newRef);
102
+ }
95
103
  }, []);
96
104
 
97
105
  React.useEffect(function () {
@@ -361,7 +369,7 @@ var NavNative = function NavNative(props) {
361
369
  if (ddRow.url && ddRow.name) {
362
370
  return ddRow.url && ddRow.name ? React__default.createElement(
363
371
  'a',
364
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
372
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
365
373
  ddRow.name
366
374
  ) : null;
367
375
  } else return null;
@@ -381,7 +389,7 @@ var NavNative = function NavNative(props) {
381
389
  if (ddRow.url && ddRow.name) {
382
390
  return ddRow.url && ddRow.name ? React__default.createElement(
383
391
  'a',
384
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
392
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
385
393
  ddRow.name
386
394
  ) : null;
387
395
  } else return null;
@@ -393,7 +401,7 @@ var NavNative = function NavNative(props) {
393
401
  } else {
394
402
  return row.url && row.name ? React__default.createElement(
395
403
  'a',
396
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
404
+ { key: index, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
397
405
  row.name
398
406
  ) : null;
399
407
  }
@@ -420,7 +428,7 @@ var NavNative = function NavNative(props) {
420
428
  } else {
421
429
  return ddRow.url && ddRow.name ? React__default.createElement(
422
430
  'a',
423
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
431
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
424
432
  ddRow.name
425
433
  ) : null;
426
434
  }
@@ -438,7 +446,7 @@ var NavNative = function NavNative(props) {
438
446
  } else {
439
447
  return ddRow.url && ddRow.name ? React__default.createElement(
440
448
  'a',
441
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
449
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
442
450
  ddRow.name
443
451
  ) : null;
444
452
  }
@@ -449,7 +457,7 @@ var NavNative = function NavNative(props) {
449
457
  } else {
450
458
  return row.url && row.name ? React__default.createElement(
451
459
  'a',
452
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
460
+ { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
453
461
  row.name
454
462
  ) : null;
455
463
  }
package/dist/esm/HamMagazine.js CHANGED
@@ -106,6 +106,14 @@ var HamMagazine = function HamMagazine(props) {
106
106
 
107
107
  // Initial screenwidth setup on refresh or on load
108
108
  setScreenWidth(parseInt(window.innerWidth));
109
+
110
+ var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
111
+ for (var i = 0; i < segmentLinks.length; i++) {
112
+ var link = segmentLinks[i];
113
+ var href = link.getAttribute('href');
114
+ var newRef = Segment.getURL(href, { needSegmentSupport: true });
115
+ link.setAttribute('href', newRef);
116
+ }
109
117
  }, []);
110
118
 
111
119
  // Check for browser resize
@@ -395,7 +403,8 @@ var HamMagazine = function HamMagazine(props) {
395
403
  'a',
396
404
  {
397
405
  key: subIndex,
398
- href: Segment.getURL(ddRow.url, ddRow),
406
+ needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
407
+ href: ddRow.url,
399
408
  target: ddRow.blank ? '_blank' : '_self',
400
409
  rel: 'noopener noreferrer',
401
410
  className: 'dropdown-item' },
@@ -417,7 +426,8 @@ var HamMagazine = function HamMagazine(props) {
417
426
  'a',
418
427
  {
419
428
  key: subIndex,
420
- href: Segment.getURL(ddRow.url, ddRow),
429
+ needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
430
+ href: ddRow.url,
421
431
  target: ddRow.blank ? '_blank' : '_self',
422
432
  rel: 'noopener noreferrer',
423
433
  className: 'dropdown-item' },
@@ -431,7 +441,13 @@ var HamMagazine = function HamMagazine(props) {
431
441
  } else {
432
442
  return row.url && row.name ? React__default.createElement(
433
443
  'a',
434
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', rel: 'noopener noreferrer', className: 'nav-link' },
444
+ { key: index,
445
+ needsegmentsupport: row.needSegmentSupport ? 'true' : '',
446
+ href: row.url,
447
+ target: row.blank ? '_blank' : '_self',
448
+ rel: 'noopener noreferrer',
449
+ className: 'nav-link'
450
+ },
435
451
  row.name
436
452
  ) : null;
437
453
  }
@@ -469,7 +485,8 @@ var HamMagazine = function HamMagazine(props) {
469
485
  'a',
470
486
  {
471
487
  key: subIndex,
472
- href: Segment.getURL(ddRow.url, ddRow),
488
+ needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
489
+ href: ddRow.url,
473
490
  target: ddRow.blank ? '_blank' : '_self',
474
491
  rel: 'noopener noreferrer',
475
492
  className: 'dropdown-item nav-link' },
@@ -490,7 +507,8 @@ var HamMagazine = function HamMagazine(props) {
490
507
  'a',
491
508
  {
492
509
  key: subIndex,
493
- href: Segment.getURL(ddRow.url, ddRow),
510
+ needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
511
+ href: ddRow.url,
494
512
  target: ddRow.blank ? '_blank' : '_self',
495
513
  rel: 'noopener noreferrer',
496
514
  className: 'dropdown-item' },
@@ -504,7 +522,13 @@ var HamMagazine = function HamMagazine(props) {
504
522
  } else {
505
523
  return row.url && row.name ? React__default.createElement(
506
524
  'a',
507
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', rel: 'noopener noreferrer', className: 'nav-link' },
525
+ { key: index,
526
+ needsegmentsupport: row.needSegmentSupport ? 'true' : '',
527
+ href: row.url,
528
+ target: row.blank ? '_blank' : '_self',
529
+ rel: 'noopener noreferrer',
530
+ className: 'nav-link'
531
+ },
508
532
  row.name
509
533
  ) : null;
510
534
  }
package/dist/esm/NavDvm.js CHANGED
@@ -5,7 +5,7 @@ import './_library-528f1934.js';
5
5
  import './_iter-detect-59409a32.js';
6
6
  import './core.get-iterator-method-54d2e411.js';
7
7
  import './web.dom.iterable-8956f9a5.js';
8
- import React__default from 'react';
8
+ import React__default, { useRef, useEffect } from 'react';
9
9
  import Container from 'react-bootstrap/Container';
10
10
  import './slicedToArray-7021e5df.js';
11
11
  import './asyncToGenerator-7c654f36.js';
@@ -29,28 +29,41 @@ var NavDvm = function NavDvm(props) {
29
29
  website = _props$website === undefined ? {} : _props$website;
30
30
 
31
31
 
32
+ var sfRef = useRef(null);
33
+
34
+ useEffect(function () {
35
+ // this adds ?eKey=xxx or ?anonymousid=xxx for forms that's outside - eg) formstack forms
36
+ // for tracking same user
37
+ var segmentLinks = sfRef.current.querySelectorAll('a[needsegmentsupport="true"]');
38
+ for (var i = 0; i < segmentLinks.length; i++) {
39
+ var link = segmentLinks[i];
40
+ var href = link.getAttribute('href');
41
+ var newRef = Segment.getURL(href, { needSegmentSupport: true });
42
+ link.setAttribute('href', newRef);
43
+ }
44
+ }, []);
45
+
32
46
  var getLink = function getLink(url, className, name, key, blank) {
33
47
  var needSegmentSupport = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
34
48
 
35
- url = Segment.getURL(url, { needSegmentSupport: needSegmentSupport });
36
49
  if (url && (url.includes('https://') || url.includes('http://'))) {
37
50
  return React__default.createElement(
38
51
  'a',
39
- { target: blank ? '_blank' : '_self', key: key, href: url || '#', className: className },
52
+ { target: blank ? '_blank' : '_self', needsegmentsupport: needSegmentSupport ? 'true' : '', key: key, href: url || '#', className: className },
40
53
  name
41
54
  );
42
55
  }
43
56
 
44
57
  return React__default.createElement(
45
58
  'a',
46
- { key: key, href: url || '#', target: blank ? '_blank' : '_self', className: className },
59
+ { key: key, href: url || '#', needsegmentsupport: needSegmentSupport ? 'true' : '', target: blank ? '_blank' : '_self', className: className },
47
60
  name
48
61
  );
49
62
  };
50
63
 
51
64
  return React__default.createElement(
52
65
  React__default.Fragment,
53
- null,
66
+ { ref: sfRef },
54
67
  React__default.createElement(
55
68
  Navbar,
56
69
  { className: 'top-nav', expand: 'xl' },
@@ -150,7 +163,7 @@ var NavDvm = function NavDvm(props) {
150
163
  if (ddRow.url && ddRow.name) {
151
164
  return ddRow.url && ddRow.name ? React__default.createElement(
152
165
  'a',
153
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
166
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
154
167
  ddRow.name
155
168
  ) : null;
156
169
  } else return null;
@@ -170,7 +183,7 @@ var NavDvm = function NavDvm(props) {
170
183
  if (ddRow.url && ddRow.name) {
171
184
  return ddRow.url && ddRow.name ? React__default.createElement(
172
185
  'a',
173
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
186
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
174
187
  ddRow.name
175
188
  ) : null;
176
189
  } else return null;
@@ -182,7 +195,7 @@ var NavDvm = function NavDvm(props) {
182
195
  } else {
183
196
  return row.url && row.name ? React__default.createElement(
184
197
  'a',
185
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
198
+ { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
186
199
  row.name
187
200
  ) : null;
188
201
  }
package/dist/esm/NavMagazine.js CHANGED
@@ -108,6 +108,14 @@ var NavMagazine = function NavMagazine(props) {
108
108
 
109
109
  // Initial screenwidth setup on refresh or on load
110
110
  setScreenWidth(parseInt(window.innerWidth));
111
+
112
+ var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
113
+ for (var i = 0; i < segmentLinks.length; i++) {
114
+ var link = segmentLinks[i];
115
+ var href = link.getAttribute('href');
116
+ var newRef = Segment.getURL(href, { needSegmentSupport: true });
117
+ link.setAttribute('href', newRef);
118
+ }
111
119
  }, []);
112
120
 
113
121
  // Check for browser resize
@@ -416,7 +424,7 @@ var NavMagazine = function NavMagazine(props) {
416
424
  if (ddRow.url && ddRow.name) {
417
425
  return ddRow.url && ddRow.name ? React__default.createElement(
418
426
  'a',
419
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
427
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
420
428
  ddRow.name
421
429
  ) : null;
422
430
  } else return null;
@@ -436,7 +444,7 @@ var NavMagazine = function NavMagazine(props) {
436
444
  if (ddRow.url && ddRow.name) {
437
445
  return ddRow.url && ddRow.name ? React__default.createElement(
438
446
  'a',
439
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
447
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
440
448
  ddRow.name
441
449
  ) : null;
442
450
  } else return null;
@@ -448,7 +456,7 @@ var NavMagazine = function NavMagazine(props) {
448
456
  } else {
449
457
  return row.url && row.name ? React__default.createElement(
450
458
  'a',
451
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
459
+ { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
452
460
  row.name
453
461
  ) : null;
454
462
  }
@@ -484,7 +492,7 @@ var NavMagazine = function NavMagazine(props) {
484
492
  } else {
485
493
  return ddRow.url && ddRow.name ? React__default.createElement(
486
494
  'a',
487
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
495
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
488
496
  ddRow.name
489
497
  ) : null;
490
498
  }
@@ -502,7 +510,7 @@ var NavMagazine = function NavMagazine(props) {
502
510
  } else {
503
511
  return ddRow.url && ddRow.name ? React__default.createElement(
504
512
  'a',
505
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
513
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
506
514
  ddRow.name
507
515
  ) : null;
508
516
  }
@@ -513,7 +521,7 @@ var NavMagazine = function NavMagazine(props) {
513
521
  } else {
514
522
  return row.url && row.name ? React__default.createElement(
515
523
  'a',
516
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
524
+ { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
517
525
  row.name
518
526
  ) : null;
519
527
  }
package/dist/esm/NavNative.js CHANGED
@@ -85,6 +85,14 @@ var NavNative = function NavNative(props) {
85
85
  var topNavHeight = document.querySelector('.nav-brands') && document.querySelector('.nav-brands').offsetHeight;
86
86
  // Setting the top of the search component based on the offset of navigation component.
87
87
  searchRef.current.style.top = (topNavHeight ? topNavHeight + navRef.current.offsetHeight : navRef.current.offsetHeight) + 1 + 'px';
88
+
89
+ var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
90
+ for (var i = 0; i < segmentLinks.length; i++) {
91
+ var link = segmentLinks[i];
92
+ var href = link.getAttribute('href');
93
+ var newRef = Segment.getURL(href, { needSegmentSupport: true });
94
+ link.setAttribute('href', newRef);
95
+ }
88
96
  }, []);
89
97
 
90
98
  useEffect(function () {
@@ -354,7 +362,7 @@ var NavNative = function NavNative(props) {
354
362
  if (ddRow.url && ddRow.name) {
355
363
  return ddRow.url && ddRow.name ? React__default.createElement(
356
364
  'a',
357
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
365
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
358
366
  ddRow.name
359
367
  ) : null;
360
368
  } else return null;
@@ -374,7 +382,7 @@ var NavNative = function NavNative(props) {
374
382
  if (ddRow.url && ddRow.name) {
375
383
  return ddRow.url && ddRow.name ? React__default.createElement(
376
384
  'a',
377
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
385
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
378
386
  ddRow.name
379
387
  ) : null;
380
388
  } else return null;
@@ -386,7 +394,7 @@ var NavNative = function NavNative(props) {
386
394
  } else {
387
395
  return row.url && row.name ? React__default.createElement(
388
396
  'a',
389
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
397
+ { key: index, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
390
398
  row.name
391
399
  ) : null;
392
400
  }
@@ -413,7 +421,7 @@ var NavNative = function NavNative(props) {
413
421
  } else {
414
422
  return ddRow.url && ddRow.name ? React__default.createElement(
415
423
  'a',
416
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
424
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
417
425
  ddRow.name
418
426
  ) : null;
419
427
  }
@@ -431,7 +439,7 @@ var NavNative = function NavNative(props) {
431
439
  } else {
432
440
  return ddRow.url && ddRow.name ? React__default.createElement(
433
441
  'a',
434
- { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
442
+ { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
435
443
  ddRow.name
436
444
  ) : null;
437
445
  }
@@ -442,7 +450,7 @@ var NavNative = function NavNative(props) {
442
450
  } else {
443
451
  return row.url && row.name ? React__default.createElement(
444
452
  'a',
445
- { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
453
+ { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
446
454
  row.name
447
455
  ) : null;
448
456
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.687",
3
+ "version": "1.0.688",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",