hyperbook 0.53.7 → 0.54.0

package/dist/assets/client.js

@@ -230,8 +230,42 @@ var hyperbook = (function () {
    * @param {HTMLElement} el - The element to toggle.
    */
   function toggleLightbox(el) {
-    el.parentElement.classList.toggle("lightbox");
-    el.parentElement.classList.toggle("normal");
+    const overlay = document.createElement("div");
+    overlay.classList.add("lightbox-overlay");
+
+    const captionText =
+      el.parentElement.querySelector("figcaption")?.textContent || "";
+
+    // container for image + caption
+    const content = document.createElement("div");
+    content.classList.add("lightbox-content");
+
+    // image container fills remaining space
+    const imgContainer = document.createElement("div");
+    imgContainer.classList.add("lightbox-image-container");
+
+    const lightboxImg = document.createElement("img");
+    lightboxImg.src = el.src;
+    imgContainer.appendChild(lightboxImg);
+
+    content.appendChild(imgContainer);
+
+    // add caption if exists
+    if (captionText) {
+      const caption = document.createElement("div");
+      caption.classList.add("caption");
+      caption.textContent = captionText;
+      content.appendChild(caption);
+    }
+
+    overlay.appendChild(content);
+
+    overlay.addEventListener("click", () => {
+      document.body.removeChild(overlay);
+    });
+
+    document.body.appendChild(overlay);
+    overlay.style.display = "flex";
   }
 
   function init(root) {

package/dist/assets/content.css

@@ -27,27 +27,42 @@ figure {
   max-width: 100%;
 }
 
-.hyperbook-markdown figure.lightbox {
-  position: fixed;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-  align-items: center;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 1em;
-  z-index: 10000;
-  margin: 0px;
-  background: rgba(0, 0, 0, 0.5);
+.hyperbook-markdown figure.align-left {
+  display: table;
+  float: left;
+  margin-right: 1.75rem;
 }
 
-.hyperbook-markdown figure.lightbox img {
-  min-width: 100%;
-  min-height: 100%;
-  cursor: zoom-out;
-  object-fit: contain;
+.hyperbook-markdown figure.align-right {
+  display: table;
+  float: right;
+  margin-left: 1.75rem;
+}
+
+.hyperbook-markdown figure.align-rightplus {
+  display: table;
+  float: right;
+  margin-left: 1.75rem;
+  margin-right: -1.5rem;
+}
+
+.hyperbook-markdown figure.align-leftplus {
+  display: table;
+  float: left;
+  margin-right: 1.75rem;
+  margin-left: -1.5rem;
+}
+
+.hyperbook-markdown figure.align-centerplus {
+  display: grid;
+  justify-items: center;
+  clear: both;
+  margin-left: -1.5rem;
+  margin-right: -1.5rem;
+
+  img {
+    width: 100%;
+  }
 }
 
 .hyperbook-markdown table {
@@ -76,12 +91,16 @@ figure {
 }
 
 .hyperbook-markdown figure.normal {
-  text-align: center;
+  display: grid;
+  clear: both;
+  justify-items: center;
+  align-content: center;
   margin-top: 10px;
   margin-bottom: 10px;
 }
 
 .hyperbook-markdown figure.normal img {
+  display: inline-block;
   cursor: zoom-in;
 }
 
@@ -148,11 +167,11 @@ figure {
   margin-bottom: 0;
 }
 
-.hyperbook-markdown li + li {
+.hyperbook-markdown li+li {
   margin-top: 0.25em;
 }
 
-.hyperbook-markdown li > p {
+.hyperbook-markdown li>p {
   margin-top: 16px;
 }
 
@@ -226,6 +245,7 @@ figure {
 .hyperbook-markdown h4,
 .hyperbook-markdown h5,
 .hyperbook-markdown h6 {
+  clear: both;
   font-family: hyperbook-heading, sans-serif;
   margin-top: 24px;
   margin-bottom: 16px;
@@ -305,10 +325,10 @@ figure {
   list-style-type: none;
 }
 
-.hyperbook-markdown #toc-toggle > .bar1,
-.hyperbook-markdown #toc-toggle > .bar2,
-.hyperbook-markdown #toc-toggle > .bar3,
-.hyperbook-markdown #toc-toggle > .bar4 {
+.hyperbook-markdown #toc-toggle>.bar1,
+.hyperbook-markdown #toc-toggle>.bar2,
+.hyperbook-markdown #toc-toggle>.bar3,
+.hyperbook-markdown #toc-toggle>.bar4 {
   background-color: var(--color-text);
 }
 
@@ -431,16 +451,16 @@ figure {
   height: 100%;
 }
 
-.toc-drawer-content > nav {
+.toc-drawer-content>nav {
   padding: 20px;
   flex: 1;
 }
 
-.toc-drawer-content > nav li a {
+.toc-drawer-content>nav li a {
   display: block;
 }
 
-.toc-drawer-content > nav li a:hover {
+.toc-drawer-content>nav li a:hover {
   text-decoration: underline;
 }
 
@@ -547,16 +567,16 @@ figure {
   opacity: 1;
 }
 
-.hyperbook-markdown #toc-toggle > .bar1,
-.hyperbook-markdown #toc-toggle > .bar3 {
+.hyperbook-markdown #toc-toggle>.bar1,
+.hyperbook-markdown #toc-toggle>.bar3 {
   width: 20px;
   height: 2px;
   margin: 2px 3px;
   transition: 0.4s;
 }
 
-.hyperbook-markdown #toc-toggle > .bar2,
-.hyperbook-markdown #toc-toggle > .bar4 {
+.hyperbook-markdown #toc-toggle>.bar2,
+.hyperbook-markdown #toc-toggle>.bar4 {
   width: 25px;
   height: 2px;
   margin: 2px 3px;

package/dist/assets/shell.css

@@ -740,3 +740,69 @@ nav.toc li.level-3 {
   cursor: pointer;
   mask-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJsdWNpZGUgbHVjaWRlLXVwbG9hZCI+PHBhdGggZD0iTTIxIDE1djRhMiAyIDAgMCAxLTIgMkg1YTIgMiAwIDAgMS0yLTJ2LTQiLz48cG9seWxpbmUgcG9pbnRzPSIxNyA4IDEyIDMgNyA4Ii8+PGxpbmUgeDE9IjEyIiB4Mj0iMTIiIHkxPSIzIiB5Mj0iMTUiLz48L3N2Zz4=");
 }
+
+.lightbox-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.8);
+  z-index: 10000;
+  padding: 1em;
+  /* small margin around edges */
+  box-sizing: border-box;
+}
+
+.lightbox-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  max-width: 100%;
+  max-height: 100%;
+  height: 100vh;
+  /* Ensure full height usage */
+  box-sizing: border-box;
+}
+
+.lightbox-image-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  flex: 1;
+  /* Take up remaining space after caption */
+  min-height: 0;
+  /* Allow flexbox shrinking */
+}
+
+.lightbox-image-container img {
+  width: calc(100vw - 1em);
+  /* Forces image to grow to this width */
+  height: 100%;
+  /* Use all available height in the flex container */
+  max-width: calc(100vw - 1em);
+  /* Prevents overflow */
+  max-height: 100%;
+  /* Prevents overflow */
+  object-fit: contain;
+  /* Maintains aspect ratio while filling the space */
+  cursor: zoom-out;
+}
+
+.lightbox-content .caption {
+  color: white;
+  font-family: hyperbook-body, sans-serif;
+  text-align: center;
+  font-size: 1em;
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+  /* Add bottom margin for spacing */
+  max-width: 90vw;
+  word-wrap: break-word;
+  flex-shrink: 0;
+  /* Prevent caption from shrinking */
+}

package/dist/index.js

@@ -173369,14 +173369,16 @@ var remarkImage_default = (ctx) => () => {
         });
       }
       node3.data.hName = "figure";
+      let figureProps = node3.data.hProperties;
       node3.data.hProperties = {
-        class: "normal"
+        class: "normal " + figureProps?.class
       };
       node3.data.hChildren = [
         {
           type: "element",
           tagName: "img",
           properties: {
+            ...figureProps,
             src: node3.url,
             alt: node3.alt,
             onclick: `hyperbook.toggleLightbox(this)`
@@ -187816,6 +187818,93 @@ function supersub() {
   };
 }
 
+// src/remarkImageAttrs.ts
+var ATTR_BLOCK_RE = /^\s*\{([\s\S]*?)\}/;
+var ATTR_PAIR_RE = /([:\w-]+)\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'}]+))/g;
+var SHORTHAND_RE = /([#.])([\w-]+)/g;
+function parseAttrBlock(input) {
+  const m = ATTR_BLOCK_RE.exec(input);
+  if (!m) return null;
+  const inner2 = m[1];
+  const attrs = {};
+  let classes = [];
+  let pair;
+  while ((pair = ATTR_PAIR_RE.exec(inner2)) !== null) {
+    const key2 = pair[1];
+    const val = pair[2] ?? pair[3] ?? pair[4] ?? "";
+    attrs[key2] = val;
+  }
+  let sm;
+  while ((sm = SHORTHAND_RE.exec(inner2)) !== null) {
+    if (sm[1] === "#") {
+      attrs["id"] = sm[2];
+    } else if (sm[1] === ".") {
+      classes.push(sm[2]);
+    }
+  }
+  if (classes.length > 0) {
+    attrs["class"] = classes.join(" ");
+  }
+  return { attrs, length: m[0].length };
+}
+function detectAlignment(prev, next2) {
+  let left = prev?.value.endsWith("-") ? prev.value.match(/-+$/)?.[0] ?? "" : "";
+  let right = next2?.value.startsWith("-") ? next2.value.match(/^-+/)?.[0] ?? "" : "";
+  if (left === "-" && !right) return "align-left";
+  if (left === "--" && !right) return "align-leftplus";
+  if (right === "-" && !left) return "align-right";
+  if (right === "--" && !left) return "align-rightplus";
+  if (left === "--" && right === "--") return "align-centerplus";
+  return "";
+}
+var remarkImageAttrs = (ctx) => () => {
+  return (tree) => {
+    visit(tree, "paragraph", (para) => {
+      const children = para.children;
+      for (let i = 0; i < children.length; i++) {
+        const img = children[i];
+        if (!img || img.type !== "image") continue;
+        const prev = children[i - 1];
+        const next2 = children[i + 1];
+        const alignClass = detectAlignment(prev, next2);
+        img.data ||= {};
+        img.data.hProperties ||= {};
+        const hProps = img.data.hProperties;
+        if (alignClass !== "") {
+          const existing = hProps.class?.split(" ") ?? [];
+          const filtered = existing.filter((c) => !c.startsWith("align-"));
+          hProps.class = [...filtered, alignClass].join(" ");
+        }
+        if (prev && prev.type === "text" && prev.value.endsWith("-")) {
+          prev.value = prev.value.replace(/-+$/, "");
+          if (prev.value === "") children.splice(i - 1, 1);
+          i--;
+        }
+        if (next2 && next2.type === "text" && next2.value.startsWith("-")) {
+          next2.value = next2.value.replace(/^-+/, "");
+          if (next2.value === "") children.splice(i + 1, 1);
+        }
+        const nextAfter = children[i + 1];
+        if (nextAfter && nextAfter.type === "text") {
+          const parsed = parseAttrBlock(nextAfter.value);
+          if (parsed) {
+            for (const [k, v] of Object.entries(parsed.attrs)) {
+              hProps[k] = v;
+            }
+            const remainder = nextAfter.value.slice(parsed.length);
+            if (remainder.length > 0) {
+              nextAfter.value = remainder;
+            } else {
+              children.splice(i + 1, 1);
+            }
+          }
+        }
+      }
+    });
+  };
+};
+var remarkImageAttrs_default = remarkImageAttrs;
+
 // src/process.ts
 var remark = (ctx) => {
   i18n.init(ctx.config.language || "en");
@@ -187826,6 +187915,7 @@ var remark = (ctx) => {
     dist_default,
     remarkDirectivePagelist_default(ctx),
     remarkLink_default(ctx),
+    remarkImageAttrs_default(ctx),
     remarkImage_default(ctx),
     remarkGfm,
     supersub,
@@ -187924,7 +188014,7 @@ pako/dist/pako.esm.mjs:
 //# sourceMappingURL=index.js.map
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = /*#__PURE__*/JSON.parse('{"name":"hyperbook","version":"0.53.7","author":"Mike Barkmin","homepage":"https://github.com/openpatch/hyperbook#readme","license":"MIT","bin":{"hyperbook":"./dist/index.js"},"files":["dist"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/openpatch/hyperbook.git","directory":"packages/hyperbook"},"bugs":{"url":"https://github.com/openpatch/hyperbook/issues"},"engines":{"node":">=12.22.0"},"scripts":{"version":"pnpm build","lint":"tsc --noEmit","dev":"ncc build ./index.ts -w -o dist/","build":"rimraf dist && ncc build ./index.ts -o ./dist/ --no-cache --no-source-map-register && node postbuild.mjs"},"devDependencies":{"@hyperbook/fs":"workspace:*","@hyperbook/markdown":"workspace:*","@hyperbook/types":"workspace:*","@pnpm/exportable-manifest":"1000.0.6","@types/archiver":"6.0.3","@types/async-retry":"1.4.9","@types/cross-spawn":"6.0.6","@types/lunr":"^2.3.7","@types/prompts":"2.4.9","@types/tar":"6.1.13","@types/ws":"^8.5.14","@vercel/ncc":"0.38.3","archiver":"7.0.1","async-retry":"1.3.3","chalk":"5.4.1","chokidar":"4.0.3","commander":"12.1.0","cpy":"11.1.0","cross-spawn":"7.0.6","domutils":"^3.2.2","extract-zip":"^2.0.1","got":"12.6.0","htmlparser2":"^10.0.0","lunr":"^2.3.9","lunr-languages":"^1.14.0","mime":"^4.0.6","prompts":"2.4.2","rimraf":"6.0.1","tar":"7.4.3","update-check":"1.5.4","ws":"^8.18.0"}}');
+const package_namespaceObject = /*#__PURE__*/JSON.parse('{"name":"hyperbook","version":"0.54.0","author":"Mike Barkmin","homepage":"https://github.com/openpatch/hyperbook#readme","license":"MIT","bin":{"hyperbook":"./dist/index.js"},"files":["dist"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/openpatch/hyperbook.git","directory":"packages/hyperbook"},"bugs":{"url":"https://github.com/openpatch/hyperbook/issues"},"engines":{"node":">=12.22.0"},"scripts":{"version":"pnpm build","lint":"tsc --noEmit","dev":"ncc build ./index.ts -w -o dist/","build":"rimraf dist && ncc build ./index.ts -o ./dist/ --no-cache --no-source-map-register && node postbuild.mjs"},"devDependencies":{"@hyperbook/fs":"workspace:*","@hyperbook/markdown":"workspace:*","@hyperbook/types":"workspace:*","@pnpm/exportable-manifest":"1000.0.6","@types/archiver":"6.0.3","@types/async-retry":"1.4.9","@types/cross-spawn":"6.0.6","@types/lunr":"^2.3.7","@types/prompts":"2.4.9","@types/tar":"6.1.13","@types/ws":"^8.5.14","@vercel/ncc":"0.38.3","archiver":"7.0.1","async-retry":"1.3.3","chalk":"5.4.1","chokidar":"4.0.3","commander":"12.1.0","cpy":"11.1.0","cross-spawn":"7.0.6","domutils":"^3.2.2","extract-zip":"^2.0.1","got":"12.6.0","htmlparser2":"^10.0.0","lunr":"^2.3.9","lunr-languages":"^1.14.0","mime":"^4.0.6","prompts":"2.4.2","rimraf":"6.0.1","tar":"7.4.3","update-check":"1.5.4","ws":"^8.18.0"}}');
 ;// CONCATENATED MODULE: ./build.ts
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperbook",
-  "version": "0.53.7",
+  "version": "0.54.0",
   "author": "Mike Barkmin",
   "homepage": "https://github.com/openpatch/hyperbook#readme",
   "license": "MIT",
@@ -54,7 +54,7 @@
     "update-check": "1.5.4",
     "ws": "^8.18.0",
     "@hyperbook/fs": "0.18.3",
-    "@hyperbook/markdown": "0.29.5",
+    "@hyperbook/markdown": "0.30.0",
     "@hyperbook/types": "0.15.2"
   },
   "scripts": {