@abreen/tada 1.19.4 → 1.19.5

package/build/superlink-plugin.ts

@@ -8,6 +8,8 @@ const CARET = 0x5e;
 const OPEN_PAREN = 0x28;
 const CLOSE_PAREN = 0x29;
 const NEWLINE = 0x0a;
+const LESS_THAN = 0x3c;
+const RAW_ANCHOR_OPEN = /^<a[\s>]/i;
 
 // Renders `[Title][Description](/destination.html)` as a two-line superlink.
 // It must run before the built-in `link` rule, which would otherwise
@@ -27,6 +29,46 @@ export default function superlinkPlugin(
     return pos;
   }
 
+  // Whether a `<…>` construct (an autolink or inline HTML) renders an anchor.
+  // It is parsed alone with a throwaway `env`, and nothing in it can reach the
+  // superlink rule again.
+  function isAnchorMarkup(state: StateInline, markup: string): boolean {
+    const tokens: StateInline['tokens'] = [];
+    state.md.inline.parse(markup, state.md, {}, tokens);
+    return tokens.some(
+      token =>
+        token.type === 'link_open' ||
+        (token.type === 'html_inline' && RAW_ANCHOR_OPEN.test(token.content)),
+    );
+  }
+
+  // `parseLinkLabel` rejects bracketed links but not autolinks (`<https://…>`)
+  // or raw `<a>` tags. An anchor inside the superlink anchor is invalid HTML:
+  // the parser closes the outer one early, stranding the description.
+  //
+  // This walks the label the way `parseLinkLabel` does, with the silent
+  // `skipToken`, so the state's position cache keeps the work linear and rules
+  // that register things in `env`, such as inline footnotes, do not run.
+  function labelHasAnchor(
+    state: StateInline,
+    start: number,
+    end: number,
+  ): boolean {
+    const oldPos = state.pos;
+    let found = false;
+    state.pos = start;
+    while (state.pos < end && !found) {
+      const pos = state.pos;
+      state.md.inline.skipToken(state);
+      found =
+        state.src.charCodeAt(pos) === LESS_THAN &&
+        state.pos - pos > 1 &&
+        isAnchorMarkup(state, state.src.slice(pos, state.pos));
+    }
+    state.pos = oldPos;
+    return found;
+  }
+
   function pushPart(
     state: StateInline,
     name: 'title' | 'description',
@@ -115,6 +157,14 @@ export default function superlinkPlugin(
       return false;
     }
 
+    // Last, so labels are only scanned when everything else already matches
+    if (
+      labelHasAnchor(state, titleStart, titleEnd) ||
+      labelHasAnchor(state, descriptionStart, descriptionEnd)
+    ) {
+      return false;
+    }
+
     if (!silent) {
       const external = isExternalHref(href, siteVariables);
       const open = state.push('superlink_open', 'a', 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abreen/tada",
-  "version": "1.19.4",
+  "version": "1.19.5",
   "type": "module",
   "description": "A static site generator",
   "license": "MIT",
@@ -68,7 +68,7 @@
     "fontkit": "^2.0.4",
     "front-matter": "^4.0.2",
     "java-parser": "^3.0.1",
-    "katex": "^0.16.45",
+    "katex": "^0.18.2",
     "lodash": "^4.18.1",
     "markdown-it": "^14.1.1",
     "markdown-it-anchor": "^9.2.0",
@@ -82,6 +82,9 @@
     "sharp": "^0.35.3",
     "shiki": "^4.0.2"
   },
+  "overrides": {
+    "katex": "^0.18.2"
+  },
   "lint-staged": {
     "*.{ts,js}": "prettier --write",
     "src/**/*.scss": [

package/src/navigate/runtime.ts

@@ -11,25 +11,14 @@ import { swapHeaderTitle } from '../header';
 export const NAVIGATION_EVENT = 'tada:navigation';
 
 const LOADING_CURSOR_DELAY = 400;
-const HOLD_SCROLL_FRAMES = 6;
-const HOLD_SCROLL_RELEASE_EVENTS = [
-  'wheel',
-  'touchstart',
-  'keydown',
-  'pointerdown',
-] as const;
 
 let currentAbortController: AbortController | null = null;
 let historyIndex = 0;
 let currentPath = '';
 let applyingFragment = false;
-let fragmentTargetRequest = 0;
 
 const scrollByIndex = new Map<number, number>();
 const scrollByLocation = new Map<string, number>();
-// Stylesheets the navigator added that have not loaded or failed yet. Those in
-// the initial document have settled before the deferred client script runs.
-const pendingStylesheets = new Map<Element, Promise<void>>();
 
 type Direction = 'forward' | 'back';
 
@@ -78,19 +67,7 @@ function updateHead(document: Document, newDoc: Document): void {
 
   for (const link of newDoc.querySelectorAll('link[rel="stylesheet"]')) {
     if (!existingHrefs.has(link.getAttribute('href'))) {
-      const clone = link.cloneNode(true) as Element;
-      pendingStylesheets.set(
-        clone,
-        new Promise(resolve => {
-          const settle = () => {
-            pendingStylesheets.delete(clone);
-            resolve();
-          };
-          clone.addEventListener('load', settle, { once: true });
-          clone.addEventListener('error', settle, { once: true });
-        }),
-      );
-      document.head.appendChild(clone);
+      document.head.appendChild(link.cloneNode(true));
     }
   }
 }
@@ -266,53 +243,16 @@ export function isApplyingFragment(): boolean {
 // content loses it in every browser. A fragment navigation sets it in every
 // browser, but it can reset the entry's history state and scroll position, so
 // restore both.
-//
-// WebKit defers fragment scrolling until pending stylesheets load, which would
-// later move the page away from the restored scroll position. Wait for them
-// first, and skip the update if another request or navigation replaced it.
-//
-// That deferred scroll can also set :target before the wait ends, which would
-// leave nothing to replace. WebKit then scrolls to the target again on the next
-// frame, undoing a scroll back to the saved position. A fragment navigation of
-// our own does not have that problem, so after waiting, repeat it even when
-// :target matches, restoring the saved position the caller passed in. When the
-// last stylesheet finishes loading just after the content swap, WebKit can
-// still scroll to the target in the next rendering update, after our restore,
-// so hold that position for a few frames.
-export function applyFragmentTarget(
-  window: Window,
-  restoredTop?: number,
-): void {
-  const request = ++fragmentTargetRequest;
-  const { href } = window.location;
-  let waited = false;
-  const apply = (): void => {
-    if (request !== fragmentTargetRequest || window.location.href !== href) {
-      return;
-    }
-    const pending = Array.from(pendingStylesheets.values());
-    if (pending.length > 0) {
-      waited = true;
-      void Promise.all(pending).then(apply);
-      return;
-    }
-    replaceFragmentTarget(window, waited ? restoredTop : undefined);
-  };
-  apply();
-}
-
-function replaceFragmentTarget(window: Window, forcedTop?: number): void {
+export function applyFragmentTarget(window: Window): void {
   const { document, history, location } = window;
   if (
-    forcedTop === undefined &&
     document.querySelector(':target') === getHashTarget(document, location.hash)
   ) {
     return;
   }
   const { href } = location;
   const state = history.state;
-  const { scrollX } = window;
-  const scrollY = forcedTop ?? window.scrollY;
+  const { scrollX, scrollY } = window;
   applyingFragment = true;
   try {
     globals.replaceLocation(
@@ -324,41 +264,6 @@ function replaceFragmentTarget(window: Window, forcedTop?: number): void {
   }
   history.replaceState(state, '', href);
   window.scrollTo({ left: scrollX, top: scrollY });
-  if (forcedTop !== undefined) {
-    holdScroll(window, scrollX, scrollY);
-  }
-}
-
-// Scroll back to the given position on each of the next few frames if the
-// browser moved the page, until the visitor scrolls or the URL changes
-function holdScroll(window: Window, left: number, top: number): void {
-  const { href } = window.location;
-  let held = true;
-  const release = (): void => {
-    held = false;
-    for (const type of HOLD_SCROLL_RELEASE_EVENTS) {
-      window.removeEventListener(type, release);
-    }
-  };
-  for (const type of HOLD_SCROLL_RELEASE_EVENTS) {
-    window.addEventListener(type, release, { passive: true });
-  }
-  let frames = 0;
-  const tick = (): void => {
-    if (!held || window.location.href !== href) {
-      release();
-      return;
-    }
-    if (Math.abs(window.scrollY - top) > 1) {
-      window.scrollTo({ left, top });
-    }
-    if (++frames < HOLD_SCROLL_FRAMES) {
-      window.requestAnimationFrame(tick);
-    } else {
-      release();
-    }
-  };
-  window.requestAnimationFrame(tick);
 }
 
 export async function navigateToUrl(
@@ -472,12 +377,10 @@ export async function navigateToUrl(
     teardownPerPageComponents();
     swapContent(document, newDoc);
     if (!pushHistory) {
-      // Restore the entry's :target before updateHead adds stylesheets, so it
-      // applies right away unless an earlier stylesheet is still loading
-      applyFragmentTarget(
-        window,
-        typeof scrollTarget === 'number' ? scrollTarget : undefined,
-      );
+      // Restore the entry's :target before updateHead adds stylesheets. WebKit
+      // defers fragment scrolling until they load, which would move the page
+      // away from the entry's restored scroll position.
+      applyFragmentTarget(window);
     }
     updateHead(document, newDoc);
     mountAppearancePickerForPage(window);