next-blurhash-previews 0.0.3-beta79 → 0.0.4-beta1

package/components/ImageWithPreview.tsx

@@ -1,7 +1,10 @@
+import { decode } from "blurhash/dist/esm";
 type blurhash = { w: number; h: number; blurhash: string };
 
-interface HTMLCanvasElement {
-  transferControlToOffscreen(): this & Transferable;
+declare global {
+  interface HTMLCanvasElement {
+    transferControlToOffscreen(): this & Transferable;
+  }
 }
 
 class ImageWithPreview extends HTMLElement {
@@ -29,6 +32,11 @@ class ImageWithPreview extends HTMLElement {
     if (this.#imgEl && this.#canvasEl) {
       this.mo?.disconnect();
 
+      console.log("checkready", this.#imgEl.complete);
+
+      setInterval(() => {
+        console.log("checkready interval", this.#imgEl.complete);
+      }, 100);
       if (this.#imgEl.complete) {
         this.#imgLoad();
       } else {
@@ -53,6 +61,7 @@ class ImageWithPreview extends HTMLElement {
   }
 
   #imgLoad = () => {
+    console.log("imgLoad - should work", this.#imgEl.complete);
     this.sd.innerHTML = `<slot name="image"></slot>`;
   };
 
@@ -68,7 +77,11 @@ class ImageWithPreview extends HTMLElement {
     }
 
     const previewObj = JSON.parse(this.getAttribute("preview")!);
-    updateBlurHashPreview(this.#canvasEl, previewObj);
+    updateBlurHashPreview(
+      this.hasAttribute("sync"),
+      this.#canvasEl,
+      previewObj
+    );
   }
 }
 
@@ -82,12 +95,27 @@ const workerBlob = new Blob(
 );
 const worker = new Worker(window.URL.createObjectURL(workerBlob));
 
-function updateBlurHashPreview(canvasEl: HTMLCanvasElement, preview: blurhash) {
+function updateBlurHashPreview(
+  sync: boolean,
+  canvasEl: HTMLCanvasElement,
+  preview: blurhash
+) {
   const { w: width, h: height, blurhash } = preview;
   canvasEl.width = width;
   canvasEl.height = height;
 
-  if (canvasEl.transferControlToOffscreen) {
+  if (sync) {
+    const start = +new Date();
+
+    const pixels = decode(blurhash, width, height);
+    const ctx = canvasEl.getContext("2d")!;
+    const imageData = ctx.createImageData(width, height);
+    imageData.data.set(pixels);
+    ctx.putImageData(imageData, 0, 0);
+
+    const end = +new Date();
+    console.log("Done Encoding Sync", blurhash, end - start);
+  } else if (canvasEl.transferControlToOffscreen) {
     const offscreen = canvasEl.transferControlToOffscreen();
     worker.postMessage({ canvas: offscreen, width, height, blurhash }, [
       offscreen,

package/components/NextWrapper.js

@@ -0,0 +1,29 @@
+import React, {
+  useEffect,
+  useRef,
+  createElement,
+  cloneElement,
+  Children,
+} from "react";
+
+export const NextWrapper = props => {
+  const wcRef = useRef(null);
+
+  const { blurhash, width, height } = props;
+
+  const json = JSON.stringify({ w: width, h: height, blurhash });
+  const wcProps = { preview: json };
+  if (props.sync) {
+    wcProps.sync = true;
+  }
+
+  return createElement(
+    "blurhash-image",
+    {
+      ref: wcRef,
+      ...wcProps,
+    },
+    cloneElement(Children.only(props.children), { slot: "image" }),
+    createElement("canvas", { width, height, slot: "preview" })
+  );
+};

package/imagePreviewBootstrap.js

@@ -9,6 +9,6 @@ export const imagePreviewBootstrap = createElement(
     dangerouslySetInnerHTML: { __html: `(() => { "use strict";const I=["0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","#","$","%","*","+",",","-",".",":",";","=","?","@","[","]","^","_","{","|","}","~"],u=t=>{let n=0;for(let o=0;o<t.length;o++){const e=t[o],c=I.indexOf(e);n=n*83+c}return n},D=t=>{let n=t/255;return n<=.04045?n/12.92:Math.pow((n+.055)/1.055,2.4)},b=t=>{let n=Math.max(0,Math.min(1,t));return n<=.0031308?Math.round(n*12.92*255+.5):Math.round((1.055*Math.pow(n,.4166666666666667)-.055)*255+.5)},P=t=>t<0?-1:1,p=(t,n)=>P(t)*Math.pow(Math.abs(t),n);class q extends Error{constructor(n){super(n),this.name="ValidationError",this.message=n}}const v=t=>{if(!t||t.length<6)throw new q("The blurhash string must be at least 6 characters");const n=u(t[0]),o=Math.floor(n/9)+1,e=n%9+1;if(t.length!==4+2*e*o)throw new q(\`blurhash length mismatch: length is \${t.length} but it should be \${4+2*e*o}\`)},A=t=>{const n=t>>16,o=t>>8&255,e=t&255;return[D(n),D(o),D(e)]},T=(t,n)=>{const o=Math.floor(t/361),e=Math.floor(t/19)%19,c=t%19;return[p((o-9)/9,2)*n,p((e-9)/9,2)*n,p((c-9)/9,2)*n]},V=(t,n,o,e)=>{v(t),e=e|1;const c=u(t[0]),i=Math.floor(c/9)+1,l=c%9+1,h=(u(t[1])+1)/166,r=new Array(l*i);for(let s=0;s<r.length;s++)if(s===0){const a=u(t.substring(2,6));r[s]=A(a)}else{const a=u(t.substring(4+s*2,6+s*2));r[s]=T(a,h*e)}const d=n*4,g=new Uint8ClampedArray(d*o);for(let s=0;s<o;s++)for(let a=0;a<n;a++){let B=0,E=0,R=0;for(let M=0;M<i;M++)for(let f=0;f<l;f++){const w=Math.cos(Math.PI*a*f/n)*Math.cos(Math.PI*s*M/o);let x=r[f+M*l];B+=x[0]*w,E+=x[1]*w,R+=x[2]*w}let C=b(B),G=b(E),y=b(R);g[4*a+0+s*d]=C,g[4*a+1+s*d]=G,g[4*a+2+s*d]=y,g[4*a+3+s*d]=255}return g};var $=V;addEventListener("message",t=>{console.log(t);const{canvas:n,width:o,height:e,blurhash:c}=t.data;console.log("Encoding",c);const i=+new Date,l=$(c,o,e),m=n.getContext("2d"),h=m.createImageData(o,e);h.data.set(l),m.putImageData(h,0,0);const r=+new Date;console.log("Done Encoding",c,r-i)}); })();` },
   }),
   createElement("script", {
-    dangerouslySetInnerHTML: { __html: `(() => { "use strict";class n extends HTMLElement{sd;mo;static observedAttributes=["preview"];#s=!1;get#e(){return this.querySelector("img")}get#t(){return this.querySelector("canvas")}constructor(){super(),this.sd=this.attachShadow({mode:"open"}),this.sd.innerHTML='<slot name="preview"></slot>'}#i=()=>{if(this.#e&&this.#t)return this.mo?.disconnect(),this.#e.complete?this.#r():(this.#o(),this.#e.addEventListener("load",this.#r)),1};connectedCallback(){this.#s=!0,this.#i()||(this.mo=new MutationObserver(this.#i),this.mo.observe(this,{subtree:!0,childList:!0,attributes:!1}))}#r=()=>{this.sd.innerHTML='<slot name="image"></slot>'};attributeChangedCallback(t){this.#t&&t==="preview"&&this.#o()}#o(){if(!this.#s||!this.getAttribute("preview"))return;const t=JSON.parse(this.getAttribute("preview"));c(this.#t,t)}}customElements.get("blurhash-image")||customElements.define("blurhash-image",n);const h=new Blob([document.querySelector("#next-blurhash-worker-script").textContent],{type:"text/javascript"}),a=new Worker(window.URL.createObjectURL(h));function c(e,t){const{w:s,h:i,blurhash:o}=t;if(e.width=s,e.height=i,e.transferControlToOffscreen){const r=e.transferControlToOffscreen();a.postMessage({canvas:r,width:s,height:i,blurhash:o},[r])}} })();` },
+    dangerouslySetInnerHTML: { __html: `(() => { "use strict";const T=["0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","#","$","%","*","+",",","-",".",":",";","=","?","@","[","]","^","_","{","|","}","~"],u=e=>{let t=0;for(let o=0;o<e.length;o++){const s=e[o],r=T.indexOf(s);t=t*83+r}return t},p=e=>{let t=e/255;return t<=.04045?t/12.92:Math.pow((t+.055)/1.055,2.4)},M=e=>{let t=Math.max(0,Math.min(1,e));return t<=.0031308?Math.round(t*12.92*255+.5):Math.round((1.055*Math.pow(t,.4166666666666667)-.055)*255+.5)},A=e=>e<0?-1:1,v=(e,t)=>A(e)*Math.pow(Math.abs(e),t);class L extends Error{constructor(t){super(t),this.name="ValidationError",this.message=t}}const D=e=>{if(!e||e.length<6)throw new L("The blurhash string must be at least 6 characters");const t=u(e[0]),o=Math.floor(t/9)+1,s=t%9+1;if(e.length!==4+2*s*o)throw new L(\`blurhash length mismatch: length is \${e.length} but it should be \${4+2*s*o}\`)},O=e=>{const t=e>>16,o=e>>8&255,s=e&255;return[p(t),p(o),p(s)]},P=(e,t)=>{const o=Math.floor(e/361),s=Math.floor(e/19)%19,r=e%19;return[v((o-9)/9,2)*t,v((s-9)/9,2)*t,v((r-9)/9,2)*t]},E=(e,t,o,s)=>{D(e),s=s|1;const r=u(e[0]),a=Math.floor(r/9)+1,c=r%9+1,g=(u(e[1])+1)/166,l=new Array(c*a);for(let n=0;n<l.length;n++)if(n===0){const i=u(e.substring(2,6));l[n]=O(i)}else{const i=u(e.substring(4+n*2,6+n*2));l[n]=P(i,g*s)}const h=t*4,d=new Uint8ClampedArray(h*o);for(let n=0;n<o;n++)for(let i=0;i<t;i++){let y=0,C=0,k=0;for(let m=0;m<a;m++)for(let f=0;f<c;f++){const w=Math.cos(Math.PI*i*f/t)*Math.cos(Math.PI*n*m/o);let b=l[f+m*c];y+=b[0]*w,C+=b[1]*w,k+=b[2]*w}let B=M(y),R=M(C),q=M(k);d[4*i+0+n*h]=B,d[4*i+1+n*h]=R,d[4*i+2+n*h]=q,d[4*i+3+n*h]=255}return d};var I=E;class S extends HTMLElement{sd;mo;static observedAttributes=["preview"];#s=!1;get#t(){return this.querySelector("img")}get#e(){return this.querySelector("canvas")}constructor(){super(),this.sd=this.attachShadow({mode:"open"}),this.sd.innerHTML='<slot name="preview"></slot>'}#o=()=>{if(this.#t&&this.#e)return this.mo?.disconnect(),console.log("checkready",this.#t.complete),setInterval(()=>{console.log("checkready interval",this.#t.complete)},100),this.#t.complete?this.#n():(this.#r(),this.#t.addEventListener("load",this.#n)),1};connectedCallback(){this.#s=!0,this.#o()||(this.mo=new MutationObserver(this.#o),this.mo.observe(this,{subtree:!0,childList:!0,attributes:!1}))}#n=()=>{console.log("imgLoad - should work",this.#t.complete),this.sd.innerHTML='<slot name="image"></slot>'};attributeChangedCallback(t){this.#e&&t==="preview"&&this.#r()}#r(){if(!this.#s||!this.getAttribute("preview"))return;const t=JSON.parse(this.getAttribute("preview"));H(this.hasAttribute("sync"),this.#e,t)}}customElements.get("blurhash-image")||customElements.define("blurhash-image",S);const G=new Blob([document.querySelector("#next-blurhash-worker-script").textContent],{type:"text/javascript"}),j=new Worker(window.URL.createObjectURL(G));function H(e,t,o){const{w:s,h:r,blurhash:a}=o;if(t.width=s,t.height=r,e){const c=+new Date,x=I(a,s,r),g=t.getContext("2d"),l=g.createImageData(s,r);l.data.set(x),g.putImageData(l,0,0);const h=+new Date;console.log("Done Encoding Sync",a,h-c)}else if(t.transferControlToOffscreen){const c=t.transferControlToOffscreen();j.postMessage({canvas:c,width:s,height:r,blurhash:a},[c])}} })();` },
   })
 );

package/index.js

@@ -1,3 +1,4 @@
 import { imagePreviewBootstrap } from "./imagePreviewBootstrap.js";
+import { NextWrapper } from "./components/NextWrapper.js";
 
-export { imagePreviewBootstrap };
+export { imagePreviewBootstrap, NextWrapper };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-blurhash-previews",
-  "version": "0.0.3-beta79",
+  "version": "0.0.4-beta1",
   "description": "",
   "main": "index.js",
   "module": "index.js",
@@ -24,7 +24,7 @@
     "url": "https://github.com/arackaf/next-static-image-previews/issues"
   },
   "homepage": "https://github.com/arackaf/next-static-image-previews#readme",
-  "dependencies": {
+  "devDependencies": {
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",
     "@vitejs/plugin-react": "^1.3.2",
@@ -34,6 +34,8 @@
     "install": "^0.13.0",
     "node-fetch": "^3.2.6",
     "npm": "^8.15.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "remark": "^14.0.2",
     "remark-frontmatter": "^4.0.1",
     "retext": "^8.1.0",

package/vite.nextwrapper.config.ts

@@ -0,0 +1,18 @@
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+
+export default defineConfig({
+  build: {
+    target: "es2022",
+    outDir: "./build",
+    emptyOutDir: false,
+    lib: {
+      entry: "components/NextWrapper.tsx",
+      formats: ["es"],
+      fileName: () => "NextWrapper.js",
+      name: "NextWrapper",
+    },
+    //minify: false,
+  },
+  plugins: [react()],
+});

package/components/NextWrapper.tsx

@@ -1,27 +0,0 @@
-import React, { useEffect, useRef } from "react";
-
-declare global {
-  namespace JSX {
-    interface IntrinsicElements {
-      ["blurhash-image"]: any;
-    }
-  }
-}
-
-export const ImageWithPreview = (props: any) => {
-  const wcRef = useRef<any>(null);
-
-  const { preview } = props;
-  const { w, h } = JSON.parse(preview);
-
-  useEffect(() => {
-    wcRef.current.activate();
-  }, []);
-
-  return (
-    <blurhash-image ref={wcRef} {...props}>
-      <img style={{ display: "none" }} />
-      <canvas width={w} height={h}></canvas>
-    </blurhash-image>
-  );
-};