@swisspost/internet-header 1.15.12 → 1.15.14

package/dist/cjs/index.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const postInternetHeader = require('./post-internet-header-73538cc1.js');
+const postInternetHeader = require('./post-internet-header-47db5e7d.js');
 const postInternetBreadcrumbs = require('./post-internet-breadcrumbs-ba6c9c31.js');
 const postInternetFooter = require('./post-internet-footer-69042a11.js');
 const postSkiplinks = require('./post-skiplinks-894eb1ca.js');
@@ -10,7 +10,7 @@ const postMetaNavigation = require('./post-meta-navigation-f92f8f4c.js');
 const postLanguageSwitch = require('./post-language-switch-f5f3d5bf.js');
 const postLogo = require('./post-logo-bcf3b0a3.js');
 const postMainNavigation = require('./post-main-navigation-c228865d.js');
-const postSearch = require('./post-search-b188f1a0.js');
+const postSearch = require('./post-search-5990da07.js');
 const postKlpLoginWidget = require('./post-klp-login-widget-c7da014b.js');
 require('./index-ecd8c9bb.js');
 require('./index-fbcc9ff3.js');

package/dist/cjs/{post-internet-header-73538cc1.js → post-internet-header-47db5e7d.js}

@@ -12,7 +12,7 @@ const if_component = require('./if.component-31542061.js');
 /**
  * Activate the current route based on the config and the match mode
  * @param config Main Navigation Config
- * @param activeRouteProp Match mode
+ * @param activeRouteProp Match mode or custom URL to compare against
  * @returns Modified Main Navigation Config
  */
 const markActiveRoute = (config, activeRouteProp) => {
@@ -20,26 +20,28 @@ const markActiveRoute = (config, activeRouteProp) => {
     if (activeRouteProp === false) {
         return config;
     }
-    // Set compare URL and check if activeRouteProp is valid
-    let compareUrl;
+    // Set reference URL to compare nav items against
+    let referenceUrl;
+    let isRelativeReference = false;
     config = resetOverrideConfig(config);
     if (activeRouteProp === 'auto' || activeRouteProp === 'exact') {
         // Check if an active route is already configured, set override to that and return
         if (hasActivePortalRoute(config)) {
             return resetActiveStateToPortalConfig(config);
         }
-        compareUrl = new URL(window.location.href);
+        referenceUrl = new URL(window.location.href);
     }
     else {
         try {
-            compareUrl = new URL(activeRouteProp, document.location.origin);
+            isRelativeReference = activeRouteProp.startsWith('/') || activeRouteProp.startsWith('./');
+            referenceUrl = new URL(activeRouteProp, window.location.href);
         }
         catch (error) {
             console.warn(`Active Route: ${activeRouteProp} is not a valid URL. Navigation highlighting has been disabled.`);
             return config;
         }
     }
-    const scoreList = compileScoreList(config, compareUrl, activeRouteProp);
+    const scoreList = compileScoreList(config, referenceUrl, activeRouteProp, isRelativeReference);
     if (scoreList.length === 0) {
         // No match found or already active links defined
         return config;
@@ -73,13 +75,13 @@ const resetOverrideConfig = (config) => {
     });
 };
 /**
- * Compile a list of scores based on the map mode, sorted in descending order
+ * Compile a list of scores based on how well nav items match the reference URL
  * @param config Main Nav Config
- * @param compareUrl Current Browser URL or a custom URL
+ * @param referenceUrl URL to compare nav items against (window.location or custom)
  * @param activeRouteProp Match mode
  * @returns A list of scored URLs if any matched
  */
-const compileScoreList = (config, compareUrl, activeRouteProp) => {
+const compileScoreList = (config, referenceUrl, activeRouteProp, isRelativeReference) => {
     // Flag to check if the Portal set any active links or if there are any exact matches
     let hadAnyActiveLink = false;
     const scoreList = [];
@@ -88,7 +90,8 @@ const compileScoreList = (config, compareUrl, activeRouteProp) => {
         .forEach(mainNav => {
         var _a;
         try {
-            const score = compareRoutes(compareUrl, new URL(mainNav.url), activeRouteProp);
+            const navItemUrl = new URL(mainNav.url);
+            const score = compareRoutes(referenceUrl, navItemUrl, isRelativeReference, activeRouteProp);
             hadAnyActiveLink = updateScoreList(scoreList, score, { main: mainNav, score }, hadAnyActiveLink);
         }
         catch (_b) {
@@ -104,8 +107,8 @@ const compileScoreList = (config, compareUrl, activeRouteProp) => {
                     return;
                 }
                 try {
-                    const url = new URL(linklist.url);
-                    const score = compareRoutes(compareUrl, url, activeRouteProp);
+                    const flyoutNavUrl = new URL(linklist.url);
+                    const score = compareRoutes(referenceUrl, flyoutNavUrl, isRelativeReference, activeRouteProp);
                     hadAnyActiveLink = updateScoreList(scoreList, score, { main: mainNav, sub: linklist, score }, hadAnyActiveLink);
                 }
                 catch (_a) {
@@ -130,46 +133,48 @@ function updateScoreList(scoreList, score, scoreListItem, hadAnyActiveLink) {
     return hadActiveLink;
 }
 /**
- * Compare two URLs for similarity based on a match mode
- * @param baseUrl Browser URL
- * @param compareUrl Navigatgion URL
+ * Compare a nav item URL against the reference URL for similarity
+ * @param referenceUrl URL we're comparing against (from window.location or custom)
+ * @param navItemUrl URL from the navigation item
  * @param matchMode exact or auto matching
- * @returns Score
+ * @returns Score indicating how well the URLs match
  */
-const compareRoutes = (baseUrl, compareUrl, matchMode) => {
-    // One url is not defined or they don't share the same orign
-    if (baseUrl === null || compareUrl === null || baseUrl.origin !== compareUrl.origin) {
+const compareRoutes = (referenceUrl, navItemUrl, isRelativeReference, matchMode) => {
+    if (referenceUrl === null || navItemUrl === null) {
+        return 0;
+    }
+    // Only compare origins if reference URL is not relative
+    if (!isRelativeReference && referenceUrl.origin !== navItemUrl.origin) {
         return 0;
     }
-    const baseUrlPath = baseUrl.pathname.toLocaleLowerCase();
-    const compareUrlPath = compareUrl.pathname.toLocaleLowerCase();
-    // Exact match, origin and pathname are the same
-    if (baseUrlPath === compareUrlPath) {
+    const referenceUrlPath = referenceUrl.pathname.toLocaleLowerCase();
+    const navItemUrlPath = navItemUrl.pathname.toLocaleLowerCase();
+    // Exact match, pathname is the same
+    if (referenceUrlPath === navItemUrlPath) {
         return Infinity;
     }
-    // The basepath is longer than the comparison, a match is impossible
-    if (baseUrl.pathname.length < compareUrl.pathname.length) {
+    // The reference path is shorter than nav item path, a match is impossible
+    if (referenceUrl.pathname.length < navItemUrl.pathname.length) {
         return 0;
     }
     if (matchMode === 'auto') {
-        const baseSegments = [
-            baseUrl.origin.toLocaleLowerCase(),
-            ...baseUrlPath.split('/').filter(x => x !== null && x !== ''),
+        const referenceSegments = [
+            referenceUrl.origin.toLocaleLowerCase(),
+            ...referenceUrlPath.split('/').filter(x => x !== null && x !== ''),
         ];
-        const compareSegments = [
-            compareUrl.origin.toLocaleLowerCase(),
-            ...compareUrlPath.split('/').filter(x => x !== null && x !== ''),
+        const navItemSegments = [
+            navItemUrl.origin.toLocaleLowerCase(),
+            ...navItemUrlPath.split('/').filter(x => x !== null && x !== ''),
         ];
-        const score = getSimilarityScore(baseSegments, compareSegments);
-        // If only some segments match, but not the whole smaller array, it's not a match
-        return Math.min(baseSegments.length, compareSegments.length) === score ? score : 0;
+        const score = getSimilarityScore(referenceSegments, navItemSegments);
+        return Math.min(referenceSegments.length, navItemSegments.length) === score ? score : 0;
     }
     return 0;
 };
 /**
  * Check how many items in an array match
- * @param a Base array
- * @param b Compare array
+ * @param a Reference array
+ * @param b Nav item array to compare
  * @returns Score
  */
 const getSimilarityScore = (a, b) => {
@@ -368,7 +373,7 @@ const setMainNavigationIds = (navMainEntities) => {
 };
 
 const name = "@swisspost/internet-header";
-const version = "1.15.12";
+const version = "1.15.14";
 const description = "The header for client facing applications.";
 const author = "Swiss Post <design-system@post.ch>";
 const license = "Apache-2.0";
@@ -409,7 +414,7 @@ const scripts = {
 	generate: "stencil generate"
 };
 const dependencies = {
-	"@swisspost/design-system-styles": "workspace:8.9.4",
+	"@swisspost/design-system-styles": "workspace:9.0.0",
 	"body-scroll-lock": "4.0.0-beta.0",
 	"iframe-resizer": "4.4.5",
 	jquery: "3.7.1",