@abreen/tada 1.15.8 → 1.15.10

package/src/toc/model.ts

@@ -0,0 +1,78 @@
+type HeadingLevel = '1' | '2' | '3' | '4' | '5' | '6';
+type AlertType = 'warning' | 'note';
+
+export type Alert = { type: AlertType; title: string };
+export type Heading = { level: HeadingLevel; innerHtml: string; id: string };
+export type Dinkus = { type: 'dinkus' };
+
+export function getHighlightIndexes(items: (Heading | Alert | Dinkus)[]) {
+  const indexes: (number | null)[] = [];
+  let currentHeadingIndex: number | null = null;
+  let tocIndex = 0;
+
+  items.forEach(item => {
+    if (!('level' in item) && item.type === 'dinkus') {
+      return;
+    }
+
+    if ('level' in item) {
+      currentHeadingIndex = tocIndex;
+    }
+
+    indexes.push(currentHeadingIndex ?? tocIndex);
+    tocIndex++;
+  });
+
+  return indexes;
+}
+
+export function headingToTableItem(el: HTMLHeadingElement): Heading {
+  const level = el.tagName[1] as HeadingLevel;
+
+  const subtitle = el.querySelector('.heading-subtitle');
+  const subtitleText = subtitle?.textContent || '';
+  let mainText = el.textContent || '';
+
+  if (mainText.length > 0 && subtitleText.length > 0) {
+    mainText = mainText.replace(subtitleText, '').trim();
+    return {
+      level,
+      id: el.id,
+      innerHtml: `${mainText}: <span class="heading-subtitle">${subtitleText}</span>`,
+    };
+  }
+  return { level, id: el.id, innerHtml: el.innerHTML };
+}
+
+export function alertToTableItem(el: HTMLElement): Alert | null {
+  const classes = el.className
+    .split(' ')
+    .map(cl => cl.trim())
+    .filter(cl => cl != 'alert');
+
+  const firstClass = classes[0];
+  if (firstClass === 'warning' || firstClass === 'note') {
+    let title = el.querySelector('.title')?.innerHTML;
+    if (!title) {
+      if (firstClass === 'warning') {
+        title = 'Warning';
+      } else {
+        title = 'Note';
+      }
+    }
+
+    return { type: firstClass, title };
+  }
+
+  return null;
+}
+
+export function switchCurrent(
+  oldCurrent: HTMLElement | null,
+  newCurrent: HTMLElement,
+) {
+  if (oldCurrent) {
+    oldCurrent.classList.remove('current');
+  }
+  newCurrent.classList.add('current');
+}

package/src/top/index.ts

@@ -30,11 +30,12 @@ export default (window: Window) => {
   link.onclick = e => {
     e.preventDefault();
     const cleanUrl = window.location.pathname + window.location.search;
+    const historyState = window.history.state;
     if (window.location.hash) {
       globals.setLocationHash(window, '');
-      window.history.replaceState(null, '', cleanUrl);
+      window.history.replaceState(historyState, '', cleanUrl);
     } else {
-      window.history.replaceState(null, '', cleanUrl);
+      window.history.replaceState(historyState, '', cleanUrl);
     }
     window.scrollTo({ top: 0 });
     const toc = window.document.querySelector('nav.toc') as HTMLElement | null;

package/templates/_author.html

@@ -1,14 +1,14 @@
 <aside class="author">
   Written by
   <% if (page.author.url) { %>
-  <a href="<%= page.author.url %>">
+  <a href="<%- encodeAuthoredUrl(page.author.url) %>">
   <% } %>
   <span class="text"><%= page.author.name %></span>
   <% if (page.author.avatar) { %>
   <img
     width="32"
     height="32"
-    src="<%= page.author.avatar %>"
+    src="<%- encodeAuthoredUrl(page.author.avatar) %>"
     alt="Picture of <%= page.author.name %>"
     class="avatar"
   />

package/templates/_footer.html

@@ -1,5 +1,5 @@
 <% if (site.features.footer) { %>
 <footer data-pagefind-ignore>
-  <p>Built using <a href="https://github.com/abreen/Tada" target="_blank">Tada</a> <%= tadaVersion %></p>
+  <p>Built using <a href="https://github.com/abreen/Tada" target="_blank" rel="noopener noreferrer">Tada</a> <%= tadaVersion %></p>
 </footer>
 <% } %>

package/templates/_heading.html

@@ -1,6 +1,6 @@
 <div class="title-and-info" data-pagefind-body>
   <% if (page.parent) { %>
-  <a class="breadcrumb" href="<%= page.parent %>" data-pagefind-ignore><%= page.parentLabel %></a>
+  <a class="breadcrumb" href="<%- encodeAuthoredUrl(page.parent) %>" data-pagefind-ignore><%= page.parentLabel %></a>
   <% } %>
   <h1 data-pagefind-weight="10" data-pagefind-meta="title_html[data-title-html]" data-title-html="<%- page.titleHtml %>"><%= page.titleHtml %></h1>
 

package/templates/_nav.html

@@ -7,8 +7,8 @@
         <li>
           <a
             class="<%= cx({disabled: link.disabled, external: link.external}) %>"
-            <% if (!link.disabled) { %>href="<%= link.internal || link.external %>"<% } %>
-            <% if (link.external) { %>target="_blank"<% } %>
+            <% if (!link.disabled) { %>href="<%- encodeAuthoredUrl(link.internal || link.external) %>"<% } %>
+            <% if (link.external) { %>target="_blank" rel="noopener noreferrer"<% } %>
           >
             <%= link.text %></a>
         </li>