RubyGems - jekyll-vitepress-theme - Versions diffs - 1.4.0 → 1.4.1 - Mend

jekyll-vitepress-theme 1.4.0 → 1.4.1

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 (6) hide show

checksums.yaml +4 -4
data/_layouts/default.html +2 -1
data/assets/css/vitepress-core.css +11 -0
data/assets/js/vitepress-theme.js +87 -35
data/lib/jekyll/vitepress_theme/version.rb +1 -1
metadata +1 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f175074cdc25f3c9545388ece6e5140ac1b31e514641a6c1ab66612b996ba5fc
-  data.tar.gz: 98d3593dae2959af719fe81d7b01cba9d7a8ca739cb6bd573d9a710d653b96be
+  metadata.gz: fce5780a829b36447736605a77a6597ae45840f199316745147581831999028b
+  data.tar.gz: b978b7657d6cc550eee63fac3597f4902378e6758581b167f0e8b321a6f23709
 SHA512:
-  metadata.gz: 44d14ac6e9e6785003b8e9d99e53961f6a6b8c0d4559f5e77f5ee4ff159ff69cc412a03377ce70d6087db59b795ee86f01fcd3816c0b00aea3c1c76040f4d6b5
-  data.tar.gz: 1ea58cd6c5e5f2326bf166bbebd6fb6aed35c851ede6a8715116f32a5c24409f176df8794efff35d3070ab484553d7317e371c9f6b237fc7ff0359a299cdf9ec
+  metadata.gz: 05a4d648a549d787d714753a244e0ca34454492b9a910976e3f4806ea1675e479e5eb84d6d0814c754b2099bd47ce2ebcfeb49532511f689afde5d9251c2793c
+  data.tar.gz: 0dc9df51ea6b3a896d1ba48f86b2db5c19e682aac304f713233c966af76d21760f8b63d2a2543707ca680270d6712bfa847a5a1294d82ba8da912efa86dfa514

data/_layouts/default.html CHANGED Viewed

@@ -4,7 +4,8 @@
   {% assign theme = site.jekyll_vitepress %}
   {% assign behavior = theme.behavior %}
   {% assign page_theme = page.jekyll_vitepress %}
-  <body data-vp-scroll-offset="{{ behavior.scroll_offset | default: 134 }}">
+  {% assign scroll_offset = behavior.scroll_offset | default: 134 %}
+  <body data-vp-scroll-offset="{{ scroll_offset }}" style="--vp-scroll-offset: {{ scroll_offset }}px;">
     {% assign is_home = false %}
     {% if page.layout == 'home' or page.url == '/' %}
       {% assign is_home = true %}

data/assets/css/vitepress-core.css CHANGED Viewed

@@ -1306,6 +1306,15 @@ html:not(.dark) .shiki span {
   outline: none;
 }
+.vp-doc h1[id],
+.vp-doc h2[id],
+.vp-doc h3[id],
+.vp-doc h4[id],
+.vp-doc h5[id],
+.vp-doc h6[id] {
+  scroll-margin-top: calc(var(--vp-scroll-offset, 134px) - var(--vp-heading-anchor-offset, 0px));
+}
 .vp-doc h1 {
   letter-spacing: -0.02em;
   line-height: 40px;
@@ -1313,6 +1322,8 @@ html:not(.dark) .shiki span {
 }
 .vp-doc h2 {
+  --vp-heading-anchor-offset: 24px;
   margin: 48px 0 16px;
   border-top: 1px solid var(--vp-c-divider);
   padding-top: 24px;

data/assets/js/vitepress-theme.js CHANGED Viewed

@@ -1320,12 +1320,20 @@
     return;
   }
+  function getHeadingLabel(heading) {
+    var clone = heading.cloneNode(true);
+    clone.querySelectorAll('.header-anchor').forEach(function (anchor) {
+      anchor.remove();
+    });
+    return clone.textContent ? clone.textContent.trim() : heading.id;
+  }
   content.querySelectorAll('h1[id], h2[id], h3[id], h4[id], h5[id], h6[id]').forEach(function (heading) {
     if (heading.querySelector('.header-anchor')) {
       return;
     }
-    var title = heading.textContent ? heading.textContent.trim() : heading.id;
+    var title = getHeadingLabel(heading);
     var anchor = document.createElement('a');
     anchor.className = 'header-anchor';
     anchor.href = '#' + heading.id;
@@ -1409,7 +1417,7 @@
       var li = document.createElement('li');
       var link = document.createElement('a');
-      var label = entry.heading.textContent ? entry.heading.textContent.trim() : entry.heading.id;
+      var label = getHeadingLabel(entry.heading);
       link.className = 'outline-link';
       link.href = '#' + entry.heading.id;
@@ -1536,38 +1544,38 @@
     return 134;
   }
-  function scrollToHashWithOffset(hash, smooth) {
+  function getHashTarget(hash) {
     if (!hash) {
-      return;
+      return null;
     }
-    var target = null;
+    var id = hash.slice(1);
     try {
-      target = document.getElementById(decodeURIComponent(hash).slice(1));
+      id = decodeURIComponent(id);
     } catch (error) {
-      target = null;
+      id = hash.slice(1);
     }
+    return document.getElementById(id);
+  }
+  function scrollToHash(hash, smooth) {
+    var target = getHashTarget(hash);
     if (!target) {
-      return;
+      return false;
     }
-    var targetTop = window.scrollY +
-      target.getBoundingClientRect().top -
-      getConfiguredScrollOffset() +
-      (parseInt(window.getComputedStyle(target).paddingTop, 10) || 0);
     var reduceMotion = window.matchMedia('(prefers-reduced-motion: reduce)').matches;
     var behavior = 'auto';
-    if (!reduceMotion && smooth && Math.abs(targetTop - window.scrollY) <= window.innerHeight) {
+    if (!reduceMotion && smooth && Math.abs(target.getBoundingClientRect().top) <= window.innerHeight) {
       behavior = 'smooth';
     }
-    window.scrollTo({ left: 0, top: targetTop, behavior: behavior });
+    target.scrollIntoView({ block: 'start', inline: 'nearest', behavior: behavior });
     target.focus({ preventScroll: true });
     if (document.activeElement === target || target.hasAttribute('tabindex')) {
-      return;
+      return true;
     }
     var restoreTabindex = function () {
@@ -1581,51 +1589,98 @@
     if (document.activeElement !== target) {
       restoreTabindex();
     }
+    return true;
   }
-  function handleOutlineLinkClick(event) {
+  function getSamePageHash(link) {
+    if (!link) {
+      return null;
+    }
+    var href = link.getAttribute('href');
+    if (!href || href === '#') {
+      return null;
+    }
+    if (href.charAt(0) === '#') {
+      return href;
+    }
+    var url;
+    try {
+      url = new URL(href, window.location.href);
+    } catch (error) {
+      return null;
+    }
+    if (url.origin !== window.location.origin ||
+      normalizePathname(url.pathname) !== normalizePathname(window.location.pathname) ||
+      url.search !== window.location.search ||
+      !url.hash) {
+      return null;
+    }
+    return url.hash;
+  }
+  function handleHashLinkClick(event) {
+    if (event.defaultPrevented || (typeof event.button === 'number' && event.button !== 0) ||
+      event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
+      return;
+    }
     var link = event.currentTarget;
     if (!link) {
       return;
     }
-    var hash = link.getAttribute('href');
-    if (!hash || hash.charAt(0) !== '#') {
+    var target = link.getAttribute('target');
+    if (target && target !== '_self') {
+      return;
+    }
+    var hash = getSamePageHash(link);
+    if (!hash || !getHashTarget(hash)) {
       return;
     }
     event.preventDefault();
     if (window.history && typeof window.history.pushState === 'function') {
+      if (window.location.hash === hash) {
+        scrollToHash(hash, true);
+        return;
+      }
       window.history.pushState(null, '', hash);
     } else {
       window.location.hash = hash;
     }
-    scrollToHashWithOffset(hash, true);
+    scrollToHash(hash, true);
   }
-  function bindOutlineLinkHandlers() {
-    document.querySelectorAll('.outline-link').forEach(function (link) {
-      if (link.hasAttribute('data-vp-bound')) {
+  function bindHashLinkHandlers() {
+    document.querySelectorAll('.outline-link, .vp-doc a[href]').forEach(function (link) {
+      if (link.hasAttribute('data-vp-hash-bound') || !getSamePageHash(link)) {
         return;
       }
-      link.setAttribute('data-vp-bound', 'true');
-      link.addEventListener('click', handleOutlineLinkClick);
+      link.setAttribute('data-vp-hash-bound', 'true');
+      link.addEventListener('click', handleHashLinkClick);
     });
   }
-  bindOutlineLinkHandlers();
+  bindHashLinkHandlers();
   if (window.location.hash) {
     window.requestAnimationFrame(function () {
-      scrollToHashWithOffset(window.location.hash, false);
+      scrollToHash(window.location.hash, false);
     });
   }
   window.addEventListener('hashchange', function () {
     if (window.location.hash) {
-      scrollToHashWithOffset(window.location.hash, false);
+      scrollToHash(window.location.hash, false);
     }
   });
@@ -1646,10 +1701,7 @@
   }
   function getOutlineScrollOffset() {
-    var styles = window.getComputedStyle(root);
-    var navHeight = parseFloat(styles.getPropertyValue('--vp-nav-height')) || 0;
-    var layoutTopHeight = parseFloat(styles.getPropertyValue('--vp-layout-top-height')) || 0;
-    return navHeight + layoutTopHeight;
+    return getConfiguredScrollOffset();
   }
   function activateOutlineHash(activeHash) {
@@ -1854,7 +1906,7 @@
         return;
       }
-      var title = heading.textContent ? heading.textContent.trim() : heading.id;
+      var title = getHeadingLabel(heading);
       var anchor = document.createElement('a');
       anchor.className = 'header-anchor';
       anchor.href = '#' + heading.id;
@@ -1936,7 +1988,7 @@
       localOutlineItems.hidden = true;
     }
-    bindOutlineLinkHandlers();
+    bindHashLinkHandlers();
     syncLocalOutlineViewportHeight();
     syncActiveHeading();
   }
@@ -1971,7 +2023,7 @@
       refreshDocPageState();
       if (window.location.hash) {
-        scrollToHashWithOffset(window.location.hash, false);
+        scrollToHash(window.location.hash, false);
       } else {
         window.scrollTo({ top: 0, left: 0, behavior: 'auto' });
         activateOutlineHash(null);

data/lib/jekyll/vitepress_theme/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Jekyll
   module VitePressTheme
-    VERSION = "1.4.0".freeze
+    VERSION = "1.4.1".freeze
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-vitepress-theme
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Carmine Paolino