numbl 0.4.21 → 0.4.22

package/dist-graphics/index.js

@@ -20829,15 +20829,15 @@ function resolveIncludes(string) {
   return string.replace(includePattern, includeReplacer);
 }
 var shaderChunkMap = /* @__PURE__ */ new Map();
-function includeReplacer(match, include) {
-  let string = ShaderChunk[include];
+function includeReplacer(match, include2) {
+  let string = ShaderChunk[include2];
   if (string === void 0) {
-    const newInclude = shaderChunkMap.get(include);
+    const newInclude = shaderChunkMap.get(include2);
     if (newInclude !== void 0) {
       string = ShaderChunk[newInclude];
-      warn('WebGLRenderer: Shader chunk "%s" has been deprecated. Use "%s" instead.', include, newInclude);
+      warn('WebGLRenderer: Shader chunk "%s" has been deprecated. Use "%s" instead.', include2, newInclude);
     } else {
-      throw new Error("Can not resolve #include <" + include + ">");
+      throw new Error("Can not resolve #include <" + include2 + ">");
     }
   }
   return resolveIncludes(string);
@@ -30053,32 +30053,75 @@ var Line2 = class extends LineSegments2 {
   }
 };
 
-// src/graphics/surfColormap.ts
-var COLORMAP = [
+// src/numbl-core/plotting/colormaps.ts
+var PARULA_ANCHORS = [
   [0.2422, 0.1504, 0.6603],
-  [0.281, 0.3228, 0.9579],
-  [0.1786, 0.5289, 0.9682],
-  [0.0689, 0.6948, 0.8394],
-  [0.128, 0.789, 0.5927],
-  [0.3391, 0.849, 0.3798],
-  [0.633, 0.8518, 0.2091],
-  [0.8902, 0.8044, 0.1137],
-  [0.9905, 0.6816, 0.0235],
-  [0.9763, 0.517, 0.034]
+  [0.278, 0.3556, 0.9777],
+  [0.1085, 0.5267, 0.8943],
+  [0.0469, 0.6353, 0.7861],
+  [0.2161, 0.7269, 0.6499],
+  [0.5044, 0.7993, 0.4519],
+  [0.8328, 0.8056, 0.2008],
+  [0.9871, 0.8092, 0.1432],
+  [0.9763, 0.9831, 0.0538]
 ];
-function colormapLookup(t) {
-  const safe = Number.isFinite(t) ? t : 0;
-  const clamped = Math.max(0, Math.min(1, safe));
-  const idx = clamped * (COLORMAP.length - 1);
+function interpTable(data, t) {
+  const n = data.length;
+  if (n === 1) return data[0];
+  const idx = t * (n - 1);
   const lo = Math.floor(idx);
-  const hi = Math.min(lo + 1, COLORMAP.length - 1);
+  const hi = Math.min(lo + 1, n - 1);
   const frac = idx - lo;
   return [
-    COLORMAP[lo][0] + frac * (COLORMAP[hi][0] - COLORMAP[lo][0]),
-    COLORMAP[lo][1] + frac * (COLORMAP[hi][1] - COLORMAP[lo][1]),
-    COLORMAP[lo][2] + frac * (COLORMAP[hi][2] - COLORMAP[lo][2])
+    data[lo][0] + frac * (data[hi][0] - data[lo][0]),
+    data[lo][1] + frac * (data[hi][1] - data[lo][1]),
+    data[lo][2] + frac * (data[hi][2] - data[lo][2])
   ];
 }
+function jetColormap(t) {
+  let r, g, b;
+  if (t < 0.125) {
+    r = 0;
+    g = 0;
+    b = 0.5 + t * 4;
+  } else if (t < 0.375) {
+    r = 0;
+    g = (t - 0.125) * 4;
+    b = 1;
+  } else if (t < 0.625) {
+    r = (t - 0.375) * 4;
+    g = 1;
+    b = 1 - (t - 0.375) * 4;
+  } else if (t < 0.875) {
+    r = 1;
+    g = 1 - (t - 0.625) * 4;
+    b = 0;
+  } else {
+    r = 1 - (t - 0.875) * 4;
+    g = 0;
+    b = 0;
+  }
+  return [
+    Math.max(0, Math.min(1, r)),
+    Math.max(0, Math.min(1, g)),
+    Math.max(0, Math.min(1, b))
+  ];
+}
+function redblueColormap(t) {
+  if (t < 0.5) {
+    const s2 = t * 2;
+    return [s2, s2, 1];
+  }
+  const s = (t - 0.5) * 2;
+  return [1, 1 - s, 1 - s];
+}
+function colormapLookup(t, cm = {}) {
+  const clamped = Number.isFinite(t) ? Math.max(0, Math.min(1, t)) : 0;
+  if (cm.data && cm.data.length > 0) return interpTable(cm.data, clamped);
+  if (cm.name === "jet") return jetColormap(clamped);
+  if (cm.name === "redblue") return redblueColormap(clamped);
+  return interpTable(PARULA_ANCHORS, clamped);
+}
 
 // src/graphics/SurfView.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -30109,6 +30152,7 @@ function SurfView({
   colorbar,
   colorbarLocation,
   colormap,
+  colormapData,
   axisVisible
 }) {
   const containerRef = useRef(null);
@@ -30163,6 +30207,7 @@ function SurfView({
     const st = stateRef.current;
     if (!st) return;
     const { scene } = st;
+    const cm = { name: colormap, data: colormapData };
     const toRemove = [];
     scene.traverse((obj) => {
       if (obj instanceof Mesh || obj instanceof LineSegments || obj instanceof Line) {
@@ -30311,7 +30356,7 @@ function SurfView({
           positions[vi * 3 + 2] = ny;
           const cval = trace.c ? trace.c[idx] : z[idx];
           const t = (cval - cMin) / cRange;
-          const [r, g, b] = colormapLookup(t);
+          const [r, g, b] = colormapLookup(t, cm);
           colors[vi * 3] = r;
           colors[vi * 3 + 1] = g;
           colors[vi * 3 + 2] = b;
@@ -30460,7 +30505,7 @@ function SurfView({
           if (Array.isArray(c)) {
             [r, g, b] = c;
           } else {
-            [r, g, b] = colormapLookup((c - lo) / range);
+            [r, g, b] = colormapLookup((c - lo) / range, cm);
           }
           vertexColors[i * 3] = r;
           vertexColors[i * 3 + 1] = g;
@@ -30505,7 +30550,7 @@ function SurfView({
         });
         scene.add(new Mesh(geometry, faceMaterial));
       }
-      const showEdges = trace.edgeColor !== "none" && trace.lineStyle !== "none";
+      const showEdges = trace.edgeColor !== "none" && trace.lineStyle !== "none" && (shading ?? "faceted") === "faceted";
       if (showEdges) {
         const edgePositions = [];
         for (const face of trace.faces) {
@@ -30528,8 +30573,11 @@ function SurfView({
           new Float32BufferAttribute(edgePositions, 3)
         );
         const edgeColor = Array.isArray(trace.edgeColor) ? trace.edgeColor : [0, 0, 0];
+        const edgeAlpha = trace.edgeAlpha ?? 1;
         const edgeMat = new LineBasicMaterial({
-          color: new Color(edgeColor[0], edgeColor[1], edgeColor[2])
+          color: new Color(edgeColor[0], edgeColor[1], edgeColor[2]),
+          opacity: edgeAlpha,
+          transparent: edgeAlpha < 1
         });
         scene.add(new LineSegments(edgeGeometry, edgeMat));
       }
@@ -30692,7 +30740,7 @@ function SurfView({
           halfW * 2 / barRangeMax
         );
         const t = (bz - zMin) / zRangeT;
-        const [cr, cg, cb] = trace.color ?? colormapLookup(t);
+        const [cr, cg, cb] = trace.color ?? colormapLookup(t, cm);
         const mat = new MeshPhongMaterial({
           color: new Color(cr, cg, cb)
         });
@@ -30726,7 +30774,7 @@ function SurfView({
           halfW * 2 / barRangeMax
         );
         const t = (len - xMin) / xRangeH;
-        const [cr, cg, cb] = trace.color ?? colormapLookup(t);
+        const [cr, cg, cb] = trace.color ?? colormapLookup(t, cm);
         const mat = new MeshPhongMaterial({
           color: new Color(cr, cg, cb)
         });
@@ -30771,7 +30819,9 @@ function SurfView({
     quiver3Traces,
     patchTraces,
     shading,
-    axisVisible
+    axisVisible,
+    colormap,
+    colormapData
   ]);
   let cbMin = Infinity;
   let cbMax = -Infinity;
@@ -30807,7 +30857,7 @@ function SurfView({
         location: (colorbarLocation ?? "eastoutside").toLowerCase(),
         dMin: cbMin,
         dMax: cbMax,
-        colormap
+        colormap: { name: colormap, data: colormapData }
       }
     )
   ] });
@@ -30818,12 +30868,11 @@ function ColorbarOverlay({
   dMax,
   colormap
 }) {
-  void colormap;
   const N = 32;
   const stops = [];
   for (let i = 0; i < N; i++) {
     const t = i / (N - 1);
-    const [r, g, b] = colormapLookup(t);
+    const [r, g, b] = colormapLookup(t, colormap);
     const rgb = `rgb(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)})`;
     stops.push(`${rgb} ${(t * 100).toFixed(2)}%`);
   }
@@ -31195,6 +31244,161 @@ function formatTick(v) {
   return parseFloat(v.toPrecision(6)).toString();
 }
 
+// src/numbl-core/plotting/imagescExtent.ts
+function imagescExtent(t) {
+  const dx = t.cols > 1 ? (t.x[1] - t.x[0]) / (t.cols - 1) : 1;
+  const dy = t.rows > 1 ? (t.y[1] - t.y[0]) / (t.rows - 1) : 1;
+  const xa = t.x[0] - dx / 2;
+  const xb = t.x[0] + (t.cols - 0.5) * dx;
+  const ya = t.y[0] - dy / 2;
+  const yb = t.y[0] + (t.rows - 0.5) * dy;
+  return {
+    dx,
+    dy,
+    x: [Math.min(xa, xb), Math.max(xa, xb)],
+    y: [Math.min(ya, yb), Math.max(ya, yb)]
+  };
+}
+function imagescColorLimits(t, caxis) {
+  if (caxis) return caxis;
+  let lo = Infinity, hi = -Infinity;
+  for (const v of t.z) {
+    if (isFinite(v)) {
+      if (v < lo) lo = v;
+      if (v > hi) hi = v;
+    }
+  }
+  return isFinite(lo) ? [lo, hi] : null;
+}
+
+// src/numbl-core/plotting/axisLimits.ts
+var EMPTY = { min: Infinity, max: -Infinity };
+function include(e, v) {
+  if (Number.isFinite(v)) {
+    if (v < e.min) e.min = v;
+    if (v > e.max) e.max = v;
+  }
+}
+function includeAll(e, vs) {
+  if (!vs) return;
+  for (let i = 0; i < vs.length; i++) include(e, vs[i]);
+}
+function dataExtents(axes) {
+  const x = { ...EMPTY };
+  const y = { ...EMPTY };
+  const z = { ...EMPTY };
+  for (const t of axes.traces ?? []) {
+    includeAll(x, t.x);
+    includeAll(y, t.y);
+  }
+  for (const t of axes.plot3Traces ?? []) {
+    includeAll(x, t.x);
+    includeAll(y, t.y);
+    includeAll(z, t.z);
+  }
+  for (const t of [...axes.surfTraces ?? []]) {
+    includeAll(x, t.x);
+    includeAll(y, t.y);
+    includeAll(z, t.z);
+  }
+  if (axes.imagescTrace) {
+    const ext = imagescExtent(axes.imagescTrace);
+    include(x, ext.x[0]);
+    include(x, ext.x[1]);
+    include(y, ext.y[0]);
+    include(y, ext.y[1]);
+  }
+  for (const t of axes.pcolorTraces ?? []) {
+    includeAll(x, t.x);
+    includeAll(y, t.y);
+  }
+  for (const t of axes.contourTraces ?? []) {
+    includeAll(x, t.x);
+    includeAll(y, t.y);
+  }
+  for (const t of axes.patchTraces ?? []) {
+    for (const v of t.vertices) {
+      include(x, v[0]);
+      include(y, v[1]);
+      include(z, v[2] ?? 0);
+    }
+  }
+  for (const bt of axes.barTraces ?? []) {
+    const hw = bt.width / 2;
+    for (let i = 0; i < bt.x.length; i++) {
+      include(x, bt.x[i] - hw);
+      include(x, bt.x[i] + hw);
+      include(y, bt.y[i]);
+    }
+    include(y, 0);
+  }
+  for (const bt of axes.barhTraces ?? []) {
+    const hh = bt.width / 2;
+    for (let i = 0; i < bt.x.length; i++) {
+      include(y, bt.x[i] - hh);
+      include(y, bt.x[i] + hh);
+      include(x, bt.y[i]);
+    }
+    include(x, 0);
+  }
+  for (const bt of [...axes.bar3Traces ?? [], ...axes.bar3hTraces ?? []]) {
+    includeAll(x, bt.x);
+    includeAll(y, bt.y);
+    includeAll(z, bt.z);
+    include(z, 0);
+  }
+  for (const et2 of axes.errorBarTraces ?? []) {
+    for (let i = 0; i < et2.x.length; i++) {
+      include(x, et2.xNeg ? et2.x[i] - et2.xNeg[i] : et2.x[i]);
+      include(x, et2.xPos ? et2.x[i] + et2.xPos[i] : et2.x[i]);
+      include(y, et2.y[i] - et2.yNeg[i]);
+      include(y, et2.y[i] + et2.yPos[i]);
+    }
+  }
+  for (const bt of axes.boxTraces ?? []) {
+    const hw = bt.width / 2;
+    include(x, bt.x - hw);
+    include(x, bt.x + hw);
+    include(y, bt.whiskerLow);
+    include(y, bt.whiskerHigh);
+    for (const o of bt.outliers) include(y, o);
+  }
+  if (axes.areaTraces && axes.areaTraces.length > 0) {
+    const base = axes.areaBaseValue ?? 0;
+    include(y, base);
+    const n = axes.areaTraces[0].x.length;
+    for (let i = 0; i < n; i++) {
+      let cum = base;
+      for (const t of axes.areaTraces) {
+        if (i < t.x.length) {
+          include(x, t.x[i]);
+          cum += t.y[i] - base;
+          include(y, cum);
+        }
+      }
+    }
+  }
+  for (const qt of axes.quiverTraces ?? []) {
+    for (let i = 0; i < qt.x.length; i++) {
+      include(x, qt.x[i]);
+      include(x, qt.x[i] + qt.u[i]);
+      include(y, qt.y[i]);
+      include(y, qt.y[i] + qt.v[i]);
+    }
+  }
+  for (const qt of axes.quiver3Traces ?? []) {
+    for (let i = 0; i < qt.x.length; i++) {
+      include(x, qt.x[i]);
+      include(x, qt.x[i] + qt.u[i]);
+      include(y, qt.y[i]);
+      include(y, qt.y[i] + qt.v[i]);
+      include(z, qt.z[i]);
+      include(z, qt.z[i] + qt.w[i]);
+    }
+  }
+  return { x, y, z };
+}
+
 // src/graphics/plotMarkers.ts
 function drawMarkers(ctx, trace, toCanvasX, toCanvasY, defaultColor) {
   if (!trace.marker || trace.marker === "none") return;
@@ -31417,7 +31621,7 @@ function formatLogTick(v) {
   return v.toExponential(0);
 }
 function drawPlot(canvas, traces, title, xlabel, ylabel, legend, gridOn, imagescTrace, contourTraces, colormap, axisMode, axisScale, barTraces, barhTraces, errorBarTraces, boxTraces, pieTrace, heatmapTrace, areaTraces, areaBaseValue, pcolorTraces, shading, colorbar, colorbarLocation, caxis, colormapData, quiverTraces, xlim, ylim, yDir, axisVisible, boxOn, patchTraces) {
-  _activeColormapData = colormapData;
+  const cmap = { name: colormap, data: colormapData };
   const ctx = canvas.getContext("2d");
   const hasContent = traces.length > 0 || imagescTrace !== void 0 || pcolorTraces && pcolorTraces.length > 0 || contourTraces && contourTraces.length > 0 || barTraces && barTraces.length > 0 || barhTraces && barhTraces.length > 0 || errorBarTraces && errorBarTraces.length > 0 || boxTraces && boxTraces.length > 0 || pieTrace !== void 0 || heatmapTrace !== void 0 || areaTraces && areaTraces.length > 0 || quiverTraces && quiverTraces.length > 0 || patchTraces && patchTraces.length > 0;
   if (!ctx || !hasContent) return;
@@ -31434,7 +31638,7 @@ function drawPlot(canvas, traces, title, xlabel, ylabel, legend, gridOn, imagesc
     return;
   }
   if (heatmapTrace) {
-    drawHeatmap(ctx, cw, ch, heatmapTrace, title, colormap);
+    drawHeatmap(ctx, cw, ch, heatmapTrace, title, cmap);
     return;
   }
   const margin = {
@@ -31453,193 +31657,21 @@ function drawPlot(canvas, traces, title, xlabel, ylabel, legend, gridOn, imagesc
   const plotW = cw - margin.left - margin.right;
   const plotH = ch - margin.top - margin.bottom;
   if (plotW <= 0 || plotH <= 0) return;
-  let xMin = Infinity, xMax = -Infinity, yMin = Infinity, yMax = -Infinity;
-  for (const t of traces) {
-    for (const v of t.x) {
-      if (isFinite(v)) {
-        if (v < xMin) xMin = v;
-        if (v > xMax) xMax = v;
-      }
-    }
-    for (const v of t.y) {
-      if (isFinite(v)) {
-        if (v < yMin) yMin = v;
-        if (v > yMax) yMax = v;
-      }
-    }
-  }
-  if (imagescTrace) {
-    if (imagescTrace.x[0] < xMin) xMin = imagescTrace.x[0];
-    if (imagescTrace.x[1] > xMax) xMax = imagescTrace.x[1];
-    if (imagescTrace.y[0] < yMin) yMin = imagescTrace.y[0];
-    if (imagescTrace.y[1] > yMax) yMax = imagescTrace.y[1];
-  }
-  if (pcolorTraces) {
-    for (const pt of pcolorTraces) {
-      for (const v of pt.x) {
-        if (isFinite(v)) {
-          if (v < xMin) xMin = v;
-          if (v > xMax) xMax = v;
-        }
-      }
-      for (const v of pt.y) {
-        if (isFinite(v)) {
-          if (v < yMin) yMin = v;
-          if (v > yMax) yMax = v;
-        }
-      }
-    }
-  }
-  if (contourTraces) {
-    for (const ct of contourTraces) {
-      for (const v of ct.x) {
-        if (isFinite(v)) {
-          if (v < xMin) xMin = v;
-          if (v > xMax) xMax = v;
-        }
-      }
-      for (const v of ct.y) {
-        if (isFinite(v)) {
-          if (v < yMin) yMin = v;
-          if (v > yMax) yMax = v;
-        }
-      }
-    }
-  }
-  if (patchTraces) {
-    for (const pt of patchTraces) {
-      for (const v of pt.vertices) {
-        if (isFinite(v[0])) {
-          if (v[0] < xMin) xMin = v[0];
-          if (v[0] > xMax) xMax = v[0];
-        }
-        if (isFinite(v[1])) {
-          if (v[1] < yMin) yMin = v[1];
-          if (v[1] > yMax) yMax = v[1];
-        }
-      }
-    }
-  }
-  if (barTraces) {
-    for (const bt of barTraces) {
-      const halfW = bt.width / 2;
-      for (let i = 0; i < bt.x.length; i++) {
-        const bx = bt.x[i];
-        if (isFinite(bx)) {
-          if (bx - halfW < xMin) xMin = bx - halfW;
-          if (bx + halfW > xMax) xMax = bx + halfW;
-        }
-        const by = bt.y[i];
-        if (isFinite(by)) {
-          if (by < yMin) yMin = by;
-          if (by > yMax) yMax = by;
-        }
-      }
-      if (0 < yMin) yMin = 0;
-      if (0 > yMax) yMax = 0;
-    }
-  }
-  if (barhTraces) {
-    for (const bt of barhTraces) {
-      const halfH = bt.width / 2;
-      for (let i = 0; i < bt.x.length; i++) {
-        const pos = bt.x[i];
-        if (isFinite(pos)) {
-          if (pos - halfH < yMin) yMin = pos - halfH;
-          if (pos + halfH > yMax) yMax = pos + halfH;
-        }
-        const len = bt.y[i];
-        if (isFinite(len)) {
-          if (len < xMin) xMin = len;
-          if (len > xMax) xMax = len;
-        }
-      }
-      if (0 < xMin) xMin = 0;
-      if (0 > xMax) xMax = 0;
-    }
-  }
-  if (errorBarTraces) {
-    for (const et2 of errorBarTraces) {
-      for (let i = 0; i < et2.x.length; i++) {
-        const ex = et2.x[i];
-        const ey = et2.y[i];
-        if (isFinite(ex)) {
-          const xl = et2.xNeg ? ex - et2.xNeg[i] : ex;
-          const xr = et2.xPos ? ex + et2.xPos[i] : ex;
-          if (xl < xMin) xMin = xl;
-          if (xr > xMax) xMax = xr;
-        }
-        if (isFinite(ey)) {
-          const ylo = ey - et2.yNeg[i];
-          const yhi = ey + et2.yPos[i];
-          if (ylo < yMin) yMin = ylo;
-          if (yhi > yMax) yMax = yhi;
-        }
-      }
-    }
-  }
-  if (boxTraces) {
-    for (const bt of boxTraces) {
-      const halfW = bt.width / 2;
-      if (bt.x - halfW < xMin) xMin = bt.x - halfW;
-      if (bt.x + halfW > xMax) xMax = bt.x + halfW;
-      if (bt.whiskerLow < yMin) yMin = bt.whiskerLow;
-      if (bt.whiskerHigh > yMax) yMax = bt.whiskerHigh;
-      for (const o of bt.outliers) {
-        if (o < yMin) yMin = o;
-        if (o > yMax) yMax = o;
-      }
-    }
-  }
-  if (areaTraces && areaTraces.length > 0) {
-    const base = areaBaseValue ?? 0;
-    if (base < yMin) yMin = base;
-    if (base > yMax) yMax = base;
-    const n = areaTraces[0].x.length;
-    for (let i = 0; i < n; i++) {
-      let cumY = base;
-      for (const t of areaTraces) {
-        if (i < t.x.length) {
-          const v = t.x[i];
-          if (isFinite(v)) {
-            if (v < xMin) xMin = v;
-            if (v > xMax) xMax = v;
-          }
-          cumY += t.y[i] - base;
-          if (isFinite(cumY)) {
-            if (cumY < yMin) yMin = cumY;
-            if (cumY > yMax) yMax = cumY;
-          }
-        }
-      }
-    }
-  }
-  if (quiverTraces) {
-    for (const qt of quiverTraces) {
-      for (let i = 0; i < qt.x.length; i++) {
-        const x0 = qt.x[i];
-        const y0 = qt.y[i];
-        const x1 = x0 + qt.u[i];
-        const y1 = y0 + qt.v[i];
-        if (isFinite(x0)) {
-          if (x0 < xMin) xMin = x0;
-          if (x0 > xMax) xMax = x0;
-        }
-        if (isFinite(x1)) {
-          if (x1 < xMin) xMin = x1;
-          if (x1 > xMax) xMax = x1;
-        }
-        if (isFinite(y0)) {
-          if (y0 < yMin) yMin = y0;
-          if (y0 > yMax) yMax = y0;
-        }
-        if (isFinite(y1)) {
-          if (y1 < yMin) yMin = y1;
-          if (y1 > yMax) yMax = y1;
-        }
-      }
-    }
-  }
+  const ext = dataExtents({
+    traces,
+    imagescTrace,
+    pcolorTraces,
+    contourTraces,
+    patchTraces,
+    barTraces,
+    barhTraces,
+    errorBarTraces,
+    boxTraces,
+    areaTraces,
+    areaBaseValue,
+    quiverTraces
+  });
+  let xMin = ext.x.min, xMax = ext.x.max, yMin = ext.y.min, yMax = ext.y.max;
   if (!isFinite(xMin)) return;
   if (xMax === xMin) {
     xMin -= 1;
@@ -31650,7 +31682,7 @@ function drawPlot(canvas, traces, title, xlabel, ylabel, legend, gridOn, imagesc
     yMax += 1;
   }
   const isImage = axisMode?.includes("image") ?? false;
-  const isTight = (axisMode?.includes("tight") ?? false) || isImage;
+  const isTight = (axisMode?.includes("tight") ?? false) || isImage || imagescTrace !== void 0;
   const isEqual = (axisMode?.includes("equal") ?? false) || isImage;
   const isSquare = axisMode?.includes("square") ?? false;
   const isPadded = axisMode?.includes("padded") ?? false;
@@ -31833,21 +31865,21 @@ function drawPlot(canvas, traces, title, xlabel, ylabel, legend, gridOn, imagesc
   ctx.rect(effMarginLeft, effMarginTop, effPlotW, effPlotH);
   ctx.clip();
   if (imagescTrace) {
-    drawImagesc(ctx, imagescTrace, toCanvasX, toCanvasY, colormap);
+    drawImagesc(ctx, imagescTrace, toCanvasX, toCanvasY, cmap, caxis);
   }
   if (pcolorTraces) {
     for (const pt of pcolorTraces) {
-      drawPcolor(ctx, pt, toCanvasX, toCanvasY, colormap, shading, caxis);
+      drawPcolor(ctx, pt, toCanvasX, toCanvasY, cmap, shading, caxis);
     }
   }
   if (contourTraces) {
     for (const ct of contourTraces) {
-      drawContour(ctx, ct, toCanvasX, toCanvasY, colormap);
+      drawContour(ctx, ct, toCanvasX, toCanvasY, cmap);
     }
   }
   if (patchTraces) {
     for (const pt of patchTraces) {
-      drawPatch(ctx, pt, toCanvasX, toCanvasY, colormap, caxis);
+      drawPatch(ctx, pt, toCanvasX, toCanvasY, cmap, caxis);
     }
   }
   if (barTraces) {
@@ -32148,7 +32180,7 @@ function drawPlot(canvas, traces, title, xlabel, ylabel, legend, gridOn, imagesc
         effPlotH,
         cbRange[0],
         cbRange[1],
-        colormap
+        cmap
       );
     }
   }
@@ -32223,101 +32255,30 @@ function drawQuiver(ctx, quiverTraces, toCanvasX, toCanvasY, dpr) {
     ctx.setLineDash([]);
   }
 }
-var _activeColormapData;
-function colormapLookup2(t, name) {
-  const clamped = Math.max(0, Math.min(1, t));
-  if (_activeColormapData && _activeColormapData.length > 0) {
-    const data = _activeColormapData;
-    const n = data.length;
-    if (n === 1) return data[0];
-    const idx = clamped * (n - 1);
-    const lo = Math.floor(idx);
-    const hi = Math.min(lo + 1, n - 1);
-    const frac = idx - lo;
-    return [
-      data[lo][0] + frac * (data[hi][0] - data[lo][0]),
-      data[lo][1] + frac * (data[hi][1] - data[lo][1]),
-      data[lo][2] + frac * (data[hi][2] - data[lo][2])
-    ];
-  }
-  if (name === "jet") {
-    return jetColormap(clamped);
-  }
-  if (name === "redblue") {
-    return redblueColormap(clamped);
-  }
-  return parulaColormap(clamped);
-}
-function parulaColormap(t) {
-  if (t < 0.5) {
-    const s2 = t * 2;
-    return [0.2 * (1 - s2), 0.1 + 0.6 * s2, 0.9 - 0.3 * s2];
-  }
-  const s = (t - 0.5) * 2;
-  return [0.2 + 0.8 * s, 0.7 + 0.3 * s, 0.6 - 0.5 * s];
-}
-function jetColormap(t) {
-  let r, g, b;
-  if (t < 0.125) {
-    r = 0;
-    g = 0;
-    b = 0.5 + t * 4;
-  } else if (t < 0.375) {
-    r = 0;
-    g = (t - 0.125) * 4;
-    b = 1;
-  } else if (t < 0.625) {
-    r = (t - 0.375) * 4;
-    g = 1;
-    b = 1 - (t - 0.375) * 4;
-  } else if (t < 0.875) {
-    r = 1;
-    g = 1 - (t - 0.625) * 4;
-    b = 0;
-  } else {
-    r = 1 - (t - 0.875) * 4;
-    g = 0;
-    b = 0;
-  }
-  return [
-    Math.max(0, Math.min(1, r)),
-    Math.max(0, Math.min(1, g)),
-    Math.max(0, Math.min(1, b))
-  ];
-}
-function redblueColormap(t) {
-  if (t < 0.5) {
-    const s2 = t * 2;
-    return [s2, s2, 1];
-  }
-  const s = (t - 0.5) * 2;
-  return [1, 1 - s, 1 - s];
-}
-function drawImagesc(ctx, trace, toCanvasX, toCanvasY, colormap) {
+function drawImagesc(ctx, trace, toCanvasX, toCanvasY, colormap, caxis) {
   const { rows, cols, z, x, y } = trace;
   if (rows === 0 || cols === 0) return;
-  let zMin = Infinity, zMax = -Infinity;
-  for (const v of z) {
-    if (isFinite(v)) {
-      if (v < zMin) zMin = v;
-      if (v > zMax) zMax = v;
-    }
-  }
-  if (!isFinite(zMin)) return;
+  const limits = imagescColorLimits(trace, caxis);
+  if (!limits) return;
+  const [zMin, zMax] = limits;
   const zRange = zMax - zMin || 1;
-  const dx = (x[1] - x[0]) / cols;
-  const dy = (y[1] - y[0]) / rows;
+  const { dx, dy } = imagescExtent(trace);
   for (let j = 0; j < cols; j++) {
     for (let i = 0; i < rows; i++) {
       const val = z[j * rows + i];
-      const t = (val - zMin) / zRange;
-      const [r, g, b] = colormapLookup2(t, colormap);
-      const cx1 = toCanvasX(x[0] + j * dx);
-      const cy1 = toCanvasY(y[0] + (i + 1) * dy);
-      const cx2 = toCanvasX(x[0] + (j + 1) * dx);
-      const cy2 = toCanvasY(y[0] + i * dy);
+      const t = Number.isNaN(val) ? 0 : (val - zMin) / zRange;
+      const [r, g, b] = colormapLookup(t, colormap);
+      const cxa = toCanvasX(x[0] + (j - 0.5) * dx);
+      const cxb = toCanvasX(x[0] + (j + 0.5) * dx);
+      const cya = toCanvasY(y[0] + (i - 0.5) * dy);
+      const cyb = toCanvasY(y[0] + (i + 0.5) * dy);
       ctx.fillStyle = `rgb(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)})`;
-      ctx.fillRect(cx1, cy1, cx2 - cx1, cy2 - cy1);
+      ctx.fillRect(
+        Math.min(cxa, cxb),
+        Math.min(cya, cyb),
+        Math.abs(cxb - cxa),
+        Math.abs(cyb - cya)
+      );
     }
   }
 }
@@ -32349,8 +32310,9 @@ function drawContour(ctx, trace, toCanvasX, toCanvasY, colormap) {
     for (let j = 0; j < cols - 1; j++) {
       for (let i = 0; i < rows - 1; i++) {
         const zAvg = (getZ(i, j) + getZ(i + 1, j) + getZ(i, j + 1) + getZ(i + 1, j + 1)) / 4;
+        if (Number.isNaN(zAvg)) continue;
         const t = (zAvg - zMin) / zRange;
-        const [r, g, b] = colormapLookup2(t, colormap);
+        const [r, g, b] = colormapLookup(t, colormap);
         const cx1 = toCanvasX(getX(i, j));
         const cy1 = toCanvasY(getY(i, j));
         const cx2 = toCanvasX(getX(i + 1, j + 1));
@@ -32368,7 +32330,7 @@ function drawContour(ctx, trace, toCanvasX, toCanvasY, colormap) {
     for (let li = 1; li < levels.length - 1; li++) {
       const level = levels[li];
       const t = (level - zMin) / zRange;
-      const [r, g, b] = colormapLookup2(t, colormap);
+      const [r, g, b] = colormapLookup(t, colormap);
       ctx.strokeStyle = `rgb(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)})`;
       ctx.lineWidth = trace.lineWidth ?? 1;
       for (let j = 0; j < cols - 1; j++) {
@@ -32567,7 +32529,7 @@ function drawHeatmap(ctx, cw, ch, hm, title, colormap) {
       const cx = plotL + j * cellW;
       const cy = plotT + i * cellH;
       const t = isFinite(v) ? (v - dMin) / dRange : 0;
-      const [r, g, b] = colormapLookup2(t, colormap);
+      const [r, g, b] = colormapLookup(t, colormap);
       ctx.fillStyle = `rgb(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)})`;
       ctx.fillRect(cx, cy, cellW, cellH);
       ctx.strokeStyle = "#fff";
@@ -32604,7 +32566,7 @@ function drawHeatmap(ctx, cw, ch, hm, title, colormap) {
   const nSteps = Math.max(1, Math.round(cbH));
   for (let s = 0; s < nSteps; s++) {
     const t = 1 - s / nSteps;
-    const [r, g, b] = colormapLookup2(t, colormap);
+    const [r, g, b] = colormapLookup(t, colormap);
     ctx.fillStyle = `rgb(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)})`;
     ctx.fillRect(cbL, cbT + s / nSteps * cbH, cbW, cbH / nSteps + 1);
   }
@@ -32644,7 +32606,7 @@ function drawPatch(ctx, trace, toCanvasX, toCanvasY, colormap, caxis) {
     if (Array.isArray(entry)) return entry;
     if (typeof entry !== "number") return [0, 0, 0];
     const t = isFinite(cMin) ? (entry - cMin) / cRange : 0.5;
-    return colormapLookup2(t, colormap);
+    return colormapLookup(t, colormap);
   };
   const cdataAt = (idx) => cdata ? mapColor(cdata[Math.min(Math.max(idx, 0), cdata.length - 1)]) : void 0;
   const css = (c) => `rgb(${Math.round(c[0] * 255)},${Math.round(c[1] * 255)},${Math.round(c[2] * 255)})`;
@@ -32804,7 +32766,7 @@ function drawPcolorFlat(ctx, trace, toCanvasX, toCanvasY, colormap, drawEdges, c
       const cv = c[idx00];
       if (!isFinite(cv)) continue;
       const t = (cv - cMin) / cRange;
-      const [r, g, b] = colormapLookup2(t, colormap);
+      const [r, g, b] = colormapLookup(t, colormap);
       const fill = `rgb(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)})`;
       const x0 = toCanvasX(x[idx00]);
       const y0 = toCanvasY(y[idx00]);
@@ -33007,7 +32969,7 @@ function drawColorbarVertical(ctx, x, y, w, h, dMin, dMax, colormap, labelSide)
   const nSteps = Math.max(1, Math.round(h));
   for (let s = 0; s < nSteps; s++) {
     const t = 1 - s / nSteps;
-    const [r, g, b] = colormapLookup2(t, colormap);
+    const [r, g, b] = colormapLookup(t, colormap);
     ctx.fillStyle = `rgb(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)})`;
     ctx.fillRect(x, y + s / nSteps * h, w, h / nSteps + 1);
   }
@@ -33034,7 +32996,7 @@ function drawColorbarHorizontal(ctx, x, y, w, h, dMin, dMax, colormap, labelSide
   const nSteps = Math.max(1, Math.round(w));
   for (let s = 0; s < nSteps; s++) {
     const t = s / nSteps;
-    const [r, g, b] = colormapLookup2(t, colormap);
+    const [r, g, b] = colormapLookup(t, colormap);
     ctx.fillStyle = `rgb(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)})`;
     ctx.fillRect(x + s / nSteps * w, y, w / nSteps + 1, h);
   }
@@ -33307,6 +33269,7 @@ function SingleAxesView({ axes }) {
         colorbar: axes.colorbar,
         colorbarLocation: axes.colorbarLocation,
         colormap: axes.colormap,
+        colormapData: axes.colormapData,
         axisVisible: axes.axisVisible
       }
     );
@@ -33476,7 +33439,7 @@ function PlotCanvas({
   return /* @__PURE__ */ jsx2("div", { ref: containerRef, style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsx2("canvas", { ref: canvasRef, style: { display: "block" } }) });
 }
 
-// src/graphics/figuresReducer.ts
+// src/numbl-core/plotting/figuresReducer.ts
 var defaultAxes = {
   holdOn: false,
   traces: [],
@@ -33645,8 +33608,11 @@ var figuresReducer = (state, action) => {
         surfTraces: [...axes.surfTraces, action.trace]
       });
     }
-    case "imagesc":
-      return addTraces(state, { imagescTrace: action.trace });
+    case "imagesc": {
+      const hold = getAxes(ensureFig(state)).holdOn;
+      const next = addTraces(state, { imagescTrace: action.trace });
+      return hold ? next : updateAxes(next, { yDir: "reverse" });
+    }
     case "pcolor": {
       const axes = getAxes(ensureFig(state));
       return addTraces(state, {