From 975fdecff0c906c0d62a13c87e8043d72434e382 Mon Sep 17 00:00:00 2001
From: Mark Woodard <mark.c.woodard@gmail.com>
Date: Mon, 16 Dec 2024 00:25:52 -0600
Subject: [PATCH] fix for automaticscrollspy  offset for navigations outside of
 headers

---
 includes/assets/js/kb-navigation-block.min.js | 2 +-
 src/assets/js/kb-navigation-block.js          | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/includes/assets/js/kb-navigation-block.min.js b/includes/assets/js/kb-navigation-block.min.js
index dc73c1ae9..f8425caa2 100644
--- a/includes/assets/js/kb-navigation-block.min.js
+++ b/includes/assets/js/kb-navigation-block.min.js
@@ -1 +1 @@
-(function(){const a=function(a){if(a instanceof HTMLElement){var b=a.getBoundingClientRect();return{top:b.top+window.pageYOffset,left:b.left+window.pageXOffset,right:b.right+window.pageXOffset}}return{top:null,left:null,right:null}},b=function(a,c=null,d=!1){const e=a.querySelector(".kb-nav-dropdown-toggle-btn"),f=a.querySelector("ul.sub-menu");let g=a.classList.contains("menu-item--toggled-on");if(void 0!==c&&"boolean"==typeof c&&(g=!c),e.setAttribute("aria-expanded",(!g).toString()),g){setTimeout(function(){a.classList.remove("menu-item--toggled-on"),f.classList.remove("toggle-show")},5);var h=a.querySelectorAll(".menu-item--toggled-on");for(let a=0;a<h.length;a++)b(h[a],!1)}else{if(!d){var j=a.parentNode.querySelectorAll("li.menu-item--toggled-on");for(let a=0;a<j.length;a++)b(j[a],!1)}a.classList.add("menu-item--toggled-on"),f.classList.add("toggle-show")}},c=function(b){var c=b.querySelectorAll(".menu-item-has-children");if(c.length)for(let b=0;b<c.length;b++)c[b].addEventListener("mouseenter",function(){if(c[b].querySelector("ul.sub-menu")){var d=c[b].querySelector("ul.sub-menu"),e=a(d),f=e.left,g=e.right,h=d.offsetWidth,i=window.innerWidth;f+h<=i||d.classList.add("sub-menu-right-edge"),0<=g-h||d.classList.add("sub-menu-left-edge")}})},d=function(){document.addEventListener("click",function(a){const c=document.querySelectorAll(".menu-item--toggled-on");c.forEach(c=>{c.contains(a.target)||b(c,!1)})})},e=function(a){const c=a.querySelectorAll(".kb-navigation .sub-menu");if(c.length)for(let d=0;d<c.length;d++)c[d].parentNode.querySelector(".kb-nav-dropdown-toggle-btn").addEventListener("click",function(f){f.preventDefault(),b(c[d].parentNode,null,a.classList.contains("is-vertical"))}),c[d].parentNode.classList.contains("kb-nav-link-sub-click")&&c[d].parentNode.querySelector(":scope > .kb-link-wrap > a").addEventListener("click",function(f){f.preventDefault(),b(c[d].parentNode,null,a.classList.contains("is-vertical"))}),c[d].parentNode.addEventListener("mouseleave",function(c){a.classList.contains("is-vertical")||c.target.classList.contains("kb-nav-link-sub-click")||b(c.target,!1)}),c[d].parentNode.querySelector("a").addEventListener("focus",function(f){if(!a.classList.contains("is-vertical")){var e=f.target.parentNode.parentNode.querySelectorAll("li.menu-item--toggled-on");for(let a=0;a<e.length;a++)c[d].parentNode!==e[a]&&b(e[a],!1)}}),c[d].addEventListener("keydown",function(f){if(!a.classList.contains("is-vertical")){if(9===f.keyCode){var e="ul.toggle-show > li > .kb-link-wrap > a, ul.toggle-show > li > .kb-link-wrap > .kb-nav-dropdown-toggle-btn";c[d].parentNode.classList.contains("kadence-menu-mega-enabled")&&(e="a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex=\"0\"], [contenteditable]");var g=Array.from(c[d].querySelectorAll(e));f.shiftKey?document.activeElement===g[0]&&b(c[d].parentNode,!1):document.activeElement===g[g.length-1]&&(b(c[d].parentNode,!1),setTimeout(function(){c[d].parentNode.querySelector(".kb-nav-dropdown-toggle-btn").focus()},5))}27===f.keyCode&&(b(c[d].parentNode,!1),c[d].parentNode.querySelector(".kb-nav-dropdown-toggle-btn").focus())}}),c[d].parentNode.classList.add("menu-item--has-toggle")},f=function(a){if(a.length)for(let c=0;c<a.length;c++){const d=a[c];var b=!1;1024<=window.innerWidth?d.classList.contains("navigation-desktop-orientation-vertical")&&(b=!0):1024>window.innerWidth&&768<=window.innerWidth?d.classList.contains("navigation-tablet-orientation-vertical")&&(b=!0):768>window.innerWidth&&d.classList.contains("navigation-mobile-orientation-vertical")&&(b=!0),b?(d.classList.remove("is-horizontal"),d.classList.add("is-vertical")):(d.classList.remove("is-vertical"),d.classList.add("is-horizontal"))}},g=function(){var a=null;a=1024<window.innerWidth?document.querySelectorAll(".wp-block-kadence-navigation.navigation-desktop-orientation-horizontal .kb-menu-mega-width-full > ul.sub-menu"):768<window.innerWidth?document.querySelectorAll(".wp-block-kadence-navigation.navigation-tablet-orientation-horizontal .kb-menu-mega-width-tablet-full > ul.sub-menu"):document.querySelectorAll(".wp-block-kadence-navigation.navigation-mobile-orientation-horizontal .kb-menu-mega-width-mobile-full > ul.sub-menu");for(let c=0;c<a.length;c++){var b=a[c].parentNode;a[c].style.setProperty("--kb-nav-dropdown-width",window.innerWidth+"px"),a[c].style.setProperty("--kb-nav-dropdown-show-left",-1*Math.abs(b.getBoundingClientRect().left).toString()+"px"),a[c].style.setProperty("--kb-nav-dropdown-hide-transform-x","0"),a[c].style.setProperty("--kb-nav-dropdown-show-transform-x","0")}},h=function(){var a=null;if(a=1024<window.innerWidth?document.querySelectorAll(".wp-block-kadence-navigation.navigation-desktop-orientation-horizontal .kb-menu-mega-width-content > ul.sub-menu"):768<window.innerWidth?document.querySelectorAll(".wp-block-kadence-navigation.navigation-tablet-orientation-horizontal .kb-menu-mega-width-tablet-content > ul.sub-menu"):document.querySelectorAll(".wp-block-kadence-navigation.navigation-mobile-orientation-horizontal .kb-menu-mega-width-mobile-content > ul.sub-menu"),a?.length)for(let g=0;g<a.length;g++){var b=a[g].parentNode,c=a[g].closest(".kadence-header-row-inner");if(c){var d=getComputedStyle(c),e=parseFloat(d.paddingLeft)+parseFloat(d.paddingRight),f=parseFloat(c.getBoundingClientRect().left)+parseFloat(d.paddingLeft);a[g].style.setProperty("--kb-nav-dropdown-width",c.offsetWidth-e+"px"),a[g].style.setProperty("--kb-nav-dropdown-show-left",-1*Math.abs(b.getBoundingClientRect().left-f).toString()+"px")}else a[g].style.setProperty("--kb-nav-dropdown-width","var(--wp--style--global--content-size, 100%)"),a[g].style.setProperty("--kb-nav-dropdown-show-left","calc( (((100vw - var(--wp--style--global--content-size, 100%)) / 2) - "+Math.abs(b.getBoundingClientRect().left).toString()+"px))");a[g].style.setProperty("--kb-nav-dropdown-hide-transform-x","0"),a[g].style.setProperty("--kb-nav-dropdown-show-transform-x","0")}},i=function(){const a=document.querySelectorAll(".menu-item");a.forEach(function(a){const b=a.querySelector("a");b?.href&&b.href.includes("#")&&(window.location.href==b.href?a.classList.add("current-menu-item"):a.classList.remove("current-menu-item"))})};(function(){var a=document.querySelectorAll(".wp-block-kadence-navigation");if(!a.length)return;for(let b=0;b<a.length;b++)e(a[b]),c(a[b]);let b;window.addEventListener("resize",()=>{clearTimeout(b),b=setTimeout(()=>{f(a)},200)}),f(a),d()})(),function(){var a=document.querySelectorAll(".wp-block-kadence-navigation .kb-menu-mega-width-full > ul.sub-menu");if(!a.length)return;let b;window.addEventListener("resize",()=>{clearTimeout(b),b=setTimeout(()=>{g()},200)}),g()}(),function(){var a=document.querySelectorAll(".wp-block-kadence-navigation .kb-menu-mega-width-content > ul.sub-menu");if(!a.length)return;let b;window.addEventListener("resize",()=>{clearTimeout(b),b=setTimeout(()=>{h()},200)}),h()}(),function(){var a=document.querySelectorAll(".kb-off-canvas-inner .wp-block-kadence-navigation .menu-item-has-children");if(a.length)for(let d=0;d<a.length;d++){var c=a[d].querySelector(".current-menu-item");c&&b(a[d],!0)}}(),function(){""!=window.location.hash&&i(),window.onhashchange=function(){i()}}(),function(){if("function"==typeof Gumshoe){var a=document.querySelectorAll(".wp-block-kadence-navigation[data-scroll-spy=\"1\"]");if(!a.length)return;a.forEach(function(a){var b=parseInt(a.getAttribute("data-scroll-spy-offset")),c=null;if(!b)var c=a.closest(".wp-block-kadence-header-row");new Gumshoe("."+a.classList[0]+" .kb-navigation a",{nested:!0,nestedClass:"current-menu-ancestor",navClass:"current-menu-item",offset:b?b:function(){return c?.getBoundingClientRect().height}})})}}()})();
\ No newline at end of file
+(function(){const a=function(a){if(a instanceof HTMLElement){var b=a.getBoundingClientRect();return{top:b.top+window.pageYOffset,left:b.left+window.pageXOffset,right:b.right+window.pageXOffset}}return{top:null,left:null,right:null}},b=function(a,c=null,d=!1){const e=a.querySelector(".kb-nav-dropdown-toggle-btn"),f=a.querySelector("ul.sub-menu");let g=a.classList.contains("menu-item--toggled-on");if(void 0!==c&&"boolean"==typeof c&&(g=!c),e.setAttribute("aria-expanded",(!g).toString()),g){setTimeout(function(){a.classList.remove("menu-item--toggled-on"),f.classList.remove("toggle-show")},5);var h=a.querySelectorAll(".menu-item--toggled-on");for(let a=0;a<h.length;a++)b(h[a],!1)}else{if(!d){var j=a.parentNode.querySelectorAll("li.menu-item--toggled-on");for(let a=0;a<j.length;a++)b(j[a],!1)}a.classList.add("menu-item--toggled-on"),f.classList.add("toggle-show")}},c=function(b){var c=b.querySelectorAll(".menu-item-has-children");if(c.length)for(let b=0;b<c.length;b++)c[b].addEventListener("mouseenter",function(){if(c[b].querySelector("ul.sub-menu")){var d=c[b].querySelector("ul.sub-menu"),e=a(d),f=e.left,g=e.right,h=d.offsetWidth,i=window.innerWidth;f+h<=i||d.classList.add("sub-menu-right-edge"),0<=g-h||d.classList.add("sub-menu-left-edge")}})},d=function(){document.addEventListener("click",function(a){const c=document.querySelectorAll(".menu-item--toggled-on");c.forEach(c=>{c.contains(a.target)||b(c,!1)})})},e=function(a){const c=a.querySelectorAll(".kb-navigation .sub-menu");if(c.length)for(let d=0;d<c.length;d++)c[d].parentNode.querySelector(".kb-nav-dropdown-toggle-btn").addEventListener("click",function(f){f.preventDefault(),b(c[d].parentNode,null,a.classList.contains("is-vertical"))}),c[d].parentNode.classList.contains("kb-nav-link-sub-click")&&c[d].parentNode.querySelector(":scope > .kb-link-wrap > a").addEventListener("click",function(f){f.preventDefault(),b(c[d].parentNode,null,a.classList.contains("is-vertical"))}),c[d].parentNode.addEventListener("mouseleave",function(c){a.classList.contains("is-vertical")||c.target.classList.contains("kb-nav-link-sub-click")||b(c.target,!1)}),c[d].parentNode.querySelector("a").addEventListener("focus",function(f){if(!a.classList.contains("is-vertical")){var e=f.target.parentNode.parentNode.querySelectorAll("li.menu-item--toggled-on");for(let a=0;a<e.length;a++)c[d].parentNode!==e[a]&&b(e[a],!1)}}),c[d].addEventListener("keydown",function(f){if(!a.classList.contains("is-vertical")){if(9===f.keyCode){var e="ul.toggle-show > li > .kb-link-wrap > a, ul.toggle-show > li > .kb-link-wrap > .kb-nav-dropdown-toggle-btn";c[d].parentNode.classList.contains("kadence-menu-mega-enabled")&&(e="a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex=\"0\"], [contenteditable]");var g=Array.from(c[d].querySelectorAll(e));f.shiftKey?document.activeElement===g[0]&&b(c[d].parentNode,!1):document.activeElement===g[g.length-1]&&(b(c[d].parentNode,!1),setTimeout(function(){c[d].parentNode.querySelector(".kb-nav-dropdown-toggle-btn").focus()},5))}27===f.keyCode&&(b(c[d].parentNode,!1),c[d].parentNode.querySelector(".kb-nav-dropdown-toggle-btn").focus())}}),c[d].parentNode.classList.add("menu-item--has-toggle")},f=function(a){if(a.length)for(let c=0;c<a.length;c++){const d=a[c];var b=!1;1024<=window.innerWidth?d.classList.contains("navigation-desktop-orientation-vertical")&&(b=!0):1024>window.innerWidth&&768<=window.innerWidth?d.classList.contains("navigation-tablet-orientation-vertical")&&(b=!0):768>window.innerWidth&&d.classList.contains("navigation-mobile-orientation-vertical")&&(b=!0),b?(d.classList.remove("is-horizontal"),d.classList.add("is-vertical")):(d.classList.remove("is-vertical"),d.classList.add("is-horizontal"))}},g=function(){var a=null;a=1024<window.innerWidth?document.querySelectorAll(".wp-block-kadence-navigation.navigation-desktop-orientation-horizontal .kb-menu-mega-width-full > ul.sub-menu"):768<window.innerWidth?document.querySelectorAll(".wp-block-kadence-navigation.navigation-tablet-orientation-horizontal .kb-menu-mega-width-tablet-full > ul.sub-menu"):document.querySelectorAll(".wp-block-kadence-navigation.navigation-mobile-orientation-horizontal .kb-menu-mega-width-mobile-full > ul.sub-menu");for(let c=0;c<a.length;c++){var b=a[c].parentNode;a[c].style.setProperty("--kb-nav-dropdown-width",window.innerWidth+"px"),a[c].style.setProperty("--kb-nav-dropdown-show-left",-1*Math.abs(b.getBoundingClientRect().left).toString()+"px"),a[c].style.setProperty("--kb-nav-dropdown-hide-transform-x","0"),a[c].style.setProperty("--kb-nav-dropdown-show-transform-x","0")}},h=function(){var a=null;if(a=1024<window.innerWidth?document.querySelectorAll(".wp-block-kadence-navigation.navigation-desktop-orientation-horizontal .kb-menu-mega-width-content > ul.sub-menu"):768<window.innerWidth?document.querySelectorAll(".wp-block-kadence-navigation.navigation-tablet-orientation-horizontal .kb-menu-mega-width-tablet-content > ul.sub-menu"):document.querySelectorAll(".wp-block-kadence-navigation.navigation-mobile-orientation-horizontal .kb-menu-mega-width-mobile-content > ul.sub-menu"),a?.length)for(let g=0;g<a.length;g++){var b=a[g].parentNode,c=a[g].closest(".kadence-header-row-inner");if(c){var d=getComputedStyle(c),e=parseFloat(d.paddingLeft)+parseFloat(d.paddingRight),f=parseFloat(c.getBoundingClientRect().left)+parseFloat(d.paddingLeft);a[g].style.setProperty("--kb-nav-dropdown-width",c.offsetWidth-e+"px"),a[g].style.setProperty("--kb-nav-dropdown-show-left",-1*Math.abs(b.getBoundingClientRect().left-f).toString()+"px")}else a[g].style.setProperty("--kb-nav-dropdown-width","var(--wp--style--global--content-size, 100%)"),a[g].style.setProperty("--kb-nav-dropdown-show-left","calc( (((100vw - var(--wp--style--global--content-size, 100%)) / 2) - "+Math.abs(b.getBoundingClientRect().left).toString()+"px))");a[g].style.setProperty("--kb-nav-dropdown-hide-transform-x","0"),a[g].style.setProperty("--kb-nav-dropdown-show-transform-x","0")}},i=function(){const a=document.querySelectorAll(".menu-item");a.forEach(function(a){const b=a.querySelector("a");b?.href&&b.href.includes("#")&&(window.location.href==b.href?a.classList.add("current-menu-item"):a.classList.remove("current-menu-item"))})};(function(){var a=document.querySelectorAll(".wp-block-kadence-navigation");if(!a.length)return;for(let b=0;b<a.length;b++)e(a[b]),c(a[b]);let b;window.addEventListener("resize",()=>{clearTimeout(b),b=setTimeout(()=>{f(a)},200)}),f(a),d()})(),function(){var a=document.querySelectorAll(".wp-block-kadence-navigation .kb-menu-mega-width-full > ul.sub-menu");if(!a.length)return;let b;window.addEventListener("resize",()=>{clearTimeout(b),b=setTimeout(()=>{g()},200)}),g()}(),function(){var a=document.querySelectorAll(".wp-block-kadence-navigation .kb-menu-mega-width-content > ul.sub-menu");if(!a.length)return;let b;window.addEventListener("resize",()=>{clearTimeout(b),b=setTimeout(()=>{h()},200)}),h()}(),function(){var a=document.querySelectorAll(".kb-off-canvas-inner .wp-block-kadence-navigation .menu-item-has-children");if(a.length)for(let d=0;d<a.length;d++){var c=a[d].querySelector(".current-menu-item");c&&b(a[d],!0)}}(),function(){""!=window.location.hash&&i(),window.onhashchange=function(){i()}}(),function(){if("function"==typeof Gumshoe){var a=document.querySelectorAll(".wp-block-kadence-navigation[data-scroll-spy=\"1\"]");if(!a.length)return;a.forEach(function(a){var b=parseInt(a.getAttribute("data-scroll-spy-offset")),c=null;if(!b)var c=a.closest(".wp-block-kadence-header-row");new Gumshoe("."+a.classList[0]+" .kb-navigation a",{nested:!0,nestedClass:"current-menu-ancestor",navClass:"current-menu-item",offset:b?b:c?function(){return c?.getBoundingClientRect().height}:0})})}}()})();
\ No newline at end of file
diff --git a/src/assets/js/kb-navigation-block.js b/src/assets/js/kb-navigation-block.js
index ab125b379..b00ba0e0c 100644
--- a/src/assets/js/kb-navigation-block.js
+++ b/src/assets/js/kb-navigation-block.js
@@ -466,9 +466,11 @@
 					navClass: 'current-menu-item',
 					offset: offsetManual
 						? offsetManual
-						: function () {
+						: offsetTarget
+						? function () {
 								return offsetTarget?.getBoundingClientRect().height;
-						  },
+						  }
+						: 0,
 				});
 			});
 		}