From 96c053d5fff3145297f9c8d56aba774cc3ae8f42 Mon Sep 17 00:00:00 2001
From: Max Richter <jim-x@web.de>
Date: Sat, 6 Apr 2024 23:40:31 +0200
Subject: [PATCH] feat: make thumbhash work with image slider

---
 public/app.css                            |  5 +-
 src/components/HeroCard.astro             |  1 +
 src/components/Image.astro                | 32 +++--------
 src/components/ImageSlider.svelte         | 67 ++++++++++++++---------
 src/components/Max.astro                  |  8 ++-
 src/content/projects/plantarium/index.mdx |  3 +-
 src/helpers/image.ts                      | 34 ++++++++++++
 src/layouts/Layout.astro                  | 34 ++++++++----
 src/pages/index.astro                     |  2 +-
 uno.config.ts                             |  8 +++
 10 files changed, 126 insertions(+), 68 deletions(-)
 create mode 100644 src/helpers/image.ts

diff --git a/public/app.css b/public/app.css
index 6a3f5fd..8513d2c 100644
--- a/public/app.css
+++ b/public/app.css
@@ -70,8 +70,8 @@ picture.thumb::before {
   position: absolute;
   bottom: 10px;
   right: 10px;
-  width: 30px;
-  height: 30px;
+  width: 20px;
+  height: 20px;
   opacity: 0;
   transition: opacity 0.3s;
   pointer-events: none;
@@ -81,7 +81,6 @@ picture.thumb::before {
   z-index: 2;
 }
 
-
 picture.thumb-loading::before {
   opacity: 0.5;
 }
diff --git a/src/components/HeroCard.astro b/src/components/HeroCard.astro
index df0d51a..5c2123b 100644
--- a/src/components/HeroCard.astro
+++ b/src/components/HeroCard.astro
@@ -49,6 +49,7 @@ const link = translatePath(`/${collection}/${slug.split("/")[0]}`);
       <a href={link}>
         <Image
           hash
+          loader={false}
           src={cover}
           alt={"cover for " + title}
           class="right-0 h-full object-cover object-center rounded-none border-l border-neutral"
diff --git a/src/components/Image.astro b/src/components/Image.astro
index a760539..ef94280 100644
--- a/src/components/Image.astro
+++ b/src/components/Image.astro
@@ -1,40 +1,20 @@
 ---
 import type { ImageMetadata } from "astro";
 import { Picture as AstroImage } from "astro:assets";
+import { generateThumbHash } from "@helpers/image";
 interface Props {
   src: ImageMetadata;
   alt: string;
   class?: string;
   caption?: string;
   hash?: boolean;
+  loader?: boolean;
   maxWidth?: number;
 }
-import { rgbaToThumbHash } from "thumbhash";
 
-const { src: image, hash = true, alt, maxWidth } = Astro.props;
+const { src: image, loader = true, hash = true, alt, maxWidth } = Astro.props;
 
-let thumbhash = "";
-
-const s = await import("sharp");
-const sharp = s.default;
-
-if (hash) {
-  const scaleFactor = 100 / Math.max(image.width, image.height);
-
-  const smallWidth = Math.floor(image.width * scaleFactor);
-  const smallHeight = Math.floor(image.height * scaleFactor);
-
-  //@ts-ignore
-  const smallImg = await sharp(image.fsPath)
-    .resize(smallWidth, smallHeight)
-    .withMetadata()
-    .raw()
-    .ensureAlpha()
-    .toBuffer();
-
-  const buffer = rgbaToThumbHash(smallWidth, smallHeight, smallImg);
-  thumbhash = Buffer.from(buffer).toString("base64");
-}
+let thumbhash = hash ? await generateThumbHash(image) : "";
 
 const sizes = [
   {
@@ -59,7 +39,9 @@ const sizes = [
   src={image}
   alt={alt}
   data-thumbhash={thumbhash}
-  pictureAttributes={{ class: hash ? "block h-full relative" : "" }}
+  pictureAttributes={{
+    class: `${hash ? "block h-full relative" : ""} ${loader ? "thumb" : ""}`,
+  }}
   class={Astro.props.class}
   widths={sizes.map((size) => size.width)}
   sizes={sizes
diff --git a/src/components/ImageSlider.svelte b/src/components/ImageSlider.svelte
index 3c03aa2..be23a95 100644
--- a/src/components/ImageSlider.svelte
+++ b/src/components/ImageSlider.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
-  import { onMount } from "svelte";
-
   let slot: HTMLDivElement;
-  let images: HTMLImageElement[];
+  let images: (HTMLPictureElement | HTMLImageElement)[];
 
   export let title: string;
 
@@ -10,17 +8,24 @@
   let height: number;
   let loaded = false;
 
-  function hide(img: HTMLImageElement) {
+  function hide(img: HTMLPictureElement) {
     img.classList.remove("active");
   }
 
-  function show(img: HTMLImageElement) {
+  function show(img: HTMLPictureElement) {
     img.classList.add("active");
-    if (img?.alt) altText = img.alt;
+    const _img = img.querySelector("img");
+    if (!_img) return;
+    _img.addEventListener("load", () => {
+      img.classList.remove("thumb-loading");
+      _img.style.opacity = "1";
+      console.log("loaded");
+    });
+    if (_img?.alt) altText = _img.alt;
     else altText = "";
-    height = img.getBoundingClientRect().height;
+    height = _img.getBoundingClientRect().height;
     setTimeout(() => {
-      height = img.getBoundingClientRect().height;
+      height = _img.getBoundingClientRect().height;
     }, 100);
   }
 
@@ -33,8 +38,8 @@
     show(images[index]);
   }
 
-  $: if (slot) {
-    images = Array.from(slot.querySelectorAll("img"));
+  $: if (slot && !images?.length) {
+    images = Array.from(slot.querySelectorAll("picture"));
     if (images?.length) {
       images.forEach(hide);
       show(images[index]);
@@ -52,12 +57,26 @@
 <div
   class="wrapper grid overflow-hidden rounded-xl border border-light"
   class:title
+  class:not-loaded={!loaded}
   class:loaded
   style={`--height:${height}px`}
 >
   {#if title}
-    <div class="flex items-center p-x-4 bg">
+    <div class="flex items-center p-x-4 bg justify-between">
       <h3>{title}</h3>
+
+      <div class="overflow-hidden rounded-md bg-light gap-2 flex p-1">
+        <button
+          class="flex-1 i-tabler-arrow-left"
+          aria-label="previous image"
+          on:click={() => setIndex(index - 1)}
+        />
+        <button
+          class="flex-1 i-tabler-arrow-right"
+          aria-label="next image"
+          on:click={() => setIndex(index + 1)}
+        />
+      </div>
     </div>
   {/if}
 
@@ -65,22 +84,14 @@
     <slot />
   </div>
   <div class="p-2 flex place-content-between bg">
-    <p>{index + 1}/{images?.length}</p>
+    <p>
+      {#if images?.length}
+        {index + 1}/{images?.length}
+      {/if}
+    </p>
     {#if altText}
-      <p class="text-right">{altText}</p>
+      <p class="flex-1 text-center">{altText}</p>
     {/if}
-    <div class="overflow-hidden rounded-md bg-light gap-2 flex p-1">
-      <button
-        class="flex-1 i-tabler-arrow-left"
-        aria-label="previous image"
-        on:click={() => setIndex(index - 1)}
-      />
-      <button
-        class="flex-1 i-tabler-arrow-right"
-        aria-label="next image"
-        on:click={() => setIndex(index + 1)}
-      />
-    </div>
   </div>
 </div>
 
@@ -102,11 +113,15 @@
     height: calc(var(--height) + 40px);
   }
 
+  .not-loaded .images :global(picture):first-child {
+    display: block !important;
+  }
+
   .wrapper.title.loaded {
     height: calc(var(--height) + 80px);
   }
 
-  .images :global(img) {
+  .images :global(picture) {
     border-radius: 0px;
     display: none;
   }
diff --git a/src/components/Max.astro b/src/components/Max.astro
index fc818d5..c91f89e 100644
--- a/src/components/Max.astro
+++ b/src/components/Max.astro
@@ -13,7 +13,13 @@ const t = useTranslations(Astro.url);
   classes="googley-eye-target relative rounded-diag-md border border-neutral gradient grid grid-cols-[250px_1fr] h-[180px] mt-8"
 >
   <div class="image">
-    <Image src={MaxImg} alt="its mee" hash={false} maxWidth={700} />
+    <Image
+      src={MaxImg}
+      alt="its mee"
+      hash={false}
+      maxWidth={700}
+      loader={false}
+    />
     <div class="eye right">
       <GoogleyEye client:load />
     </div>
diff --git a/src/content/projects/plantarium/index.mdx b/src/content/projects/plantarium/index.mdx
index dd8f06d..07965b1 100644
--- a/src/content/projects/plantarium/index.mdx
+++ b/src/content/projects/plantarium/index.mdx
@@ -26,6 +26,7 @@ import screenshot_geometry_nodes  from "./images/screenshot-geometry-nodes.jpg"
 import screenshot_houdini  from "./images/screenshot-houdini.jpg"
 import screenshot_unreal  from "./images/screenshot-unreal.jpg"
 import screenshot_davinci from "./images/screenshot-davinci.jpg"
+import Plantarium from "./images/plantarium.png"
 import ImageGallery from "@components/ImageGallery.svelte"
 
 <ImageGallery client:load/>
@@ -74,7 +75,7 @@ In der Beispielgrafik haben wir zwei `input-color` nodes die jeweils eine Farbe
 
 Das coole ist das man dieses System sehr generisch gestalten kann und zum beispiel eine `generate-stem`, `generate-branches` oder eine `add-leaves` node programmieren kann. Aufgrund der 
 
-<img src="/projects/plantarium/screenshot-plantarium.png" alt="Plantariums uses nodes to create plants"/>
+<Image src={Plantarium} alt="Plantariums uses nodes to create plants"/>
   
 <ImageSlider title="Beispiele von Node Systemen" client:load>
   <Image src={screenshot_geometry_nodes} alt="Blenders uses nodes to create geometry"/>
diff --git a/src/helpers/image.ts b/src/helpers/image.ts
new file mode 100644
index 0000000..8a39c79
--- /dev/null
+++ b/src/helpers/image.ts
@@ -0,0 +1,34 @@
+let loadingSharp = false;
+import { rgbaToThumbHash } from "thumbhash";
+
+export async function generateThumbHash(image: { width: number, height: number }) {
+  if (!loadingSharp) {
+    loadingSharp = true;
+    setTimeout(async () => {
+      // @ts-ignore
+      globalThis["sharp"] = (await import("sharp")).default;
+    }, 1000);
+    return;
+  }
+
+  // @ts-ignore
+  const sharp = globalThis["sharp"] as typeof import("sharp");
+
+  if (!sharp) return;
+
+  const scaleFactor = 100 / Math.max(image.width, image.height);
+
+  const smallWidth = Math.floor(image.width * scaleFactor);
+  const smallHeight = Math.floor(image.height * scaleFactor);
+
+  //@ts-ignore
+  const smallImg = await sharp(image.fsPath)
+    .resize(smallWidth, smallHeight)
+    .withMetadata()
+    .raw()
+    .ensureAlpha()
+    .toBuffer();
+
+  const buffer = rgbaToThumbHash(smallWidth, smallHeight, smallImg);
+  return Buffer.from(buffer).toString("base64");
+}
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 995ed61..ab181e5 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -123,7 +123,7 @@ const { title, width = "compact" } = Astro.props;
     <main id="main-content" class="flex flex-col mt-4xl gap-y-2xl">
       <slot />
     </main>
-    <footer>
+    <footer class="px-4">
       <LanguagePicker />
     </footer>
     <style>
@@ -157,7 +157,6 @@ const { title, width = "compact" } = Astro.props;
           const img = entry;
 
           if (parent?.nodeName !== "PICTURE") return;
-          parent.classList.add("thumb");
 
           const hash = img.getAttribute("data-thumbhash");
           if (!hash) return;
@@ -178,18 +177,31 @@ const { title, width = "compact" } = Astro.props;
           parent.style.background = `url(${dataURL})`;
           parent.style.backgroundSize = "cover";
 
-          if (img.complete) return;
+          if (img.complete || parent.complete) return;
+          let count = 0;
+          const interval = setInterval(() => {
+            count++;
+            if (count > 20) {
+              clearInterval(interval);
+              show(img);
+            }
+            if (img.complete || parent.complete) {
+              clearInterval(interval);
+              show(img);
+            }
+          }, 100);
+
+          img.addEventListener(
+            "load",
+            () => {
+              clearInterval(interval);
+              show(img);
+            },
+            { once: true },
+          );
 
           img.style.opacity = "0";
-          img.style.filter = "blur(5px)";
           img.style.transition = "opacity 0.6s ease, filter 0.8s ease";
-
-          const sources = parent.querySelectorAll("source");
-
-          img.onload = () => show(img);
-          for (const source of sources) {
-            source.addEventListener("load", () => show(img));
-          }
         });
       })();
     </script>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 4afeeef..ea94f9b 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -43,7 +43,7 @@ const otherPosts = posts.filter((post) => featuredPost !== post).slice(0, 3);
     <span class="i-tabler-circle-arrow-right-thin"></span>
     <ArrowA />
     {featuredProject && <HeroCard post={featuredProject} />}
-    <div class="grid grid-cols-2 gap-4 mt-4">
+    <div class="grid xs:grid-cols-2 gap-4 mt-4">
       {
         otherProjects.length > 0 &&
           otherProjects.map((project) => <SmallCard post={project} />)
diff --git a/uno.config.ts b/uno.config.ts
index 06468b5..cd370f0 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -22,6 +22,14 @@ export default defineConfig({
       "md": "20px",
       "diag-md": "0px var(--border-radius-md) 0px var(--border-radius-md)"
     },
+    screens: {
+      xs: "375px",
+      sm: "640px",
+      md: "768px",
+      lg: "1024px",
+      xl: "1280px",
+      "2xl": "1536px",
+    },
     colors: {
       neutral: {
         "000": "var(--neutral-000)",