@bicharts/chart-host 0.6.90 → 0.6.91

package/README.md

@@ -269,9 +269,11 @@ cue, a hierarchy level) is never flattened by a fix meant for another chart.
 
 **How far the rest dims, per chart.** `options.dimOpacity` (a share of full opacity, `0.01`-`1`;
 `DIM_OPACITY_MIN` is the floor) sets the level for one host without writing CSS, and it is live
-through `setOptions`. The host writes it as `--lch-dim-opacity` on its own container and removes
-only what it wrote, so with the option absent nothing is written and the CSS above decides: the
-stylesheet's `0.25`, or whatever your page sets on the variable.
+through `setOptions`. It takes a number or a numeric string; a value above 1 is clamped to 1 (no
+dim), never read as a percentage, and anything else is ignored. The host writes it as
+`--lch-dim-opacity` on its own container and, when the option goes away or the host is destroyed,
+puts back the value your page had set inline there, so with the option absent nothing is written
+and the CSS above decides: the stylesheet's `0.25`, or whatever your page sets on the variable.
 
 ```js
 createChartHost(el, { code, data, options: { dimOpacity: 0.15 } });
@@ -410,15 +412,27 @@ const zoomHost: ZoomMemoryHost = {
     persistZoom: json => localStorage.setItem("chart-zoom", json), // "" forgets
     log: () => {},
 };
-const zoomMemory = createZoomMemoryHook(zoomHost);   // once per container, reused by every host on it
+const zoomMemory = createZoomMemoryHook(zoomHost);   // once per chart, reused by every host built for it
 const host = createChartHost(el, { code, data, d3, zoomMemory });
 ```
 
 The view survives every redraw in the session whatever the preference says, and a close and reopen
 only while `rememberAcrossSessions()` is true. It is keyed by the chart's code and the viewport size
 (to the nearest 32 px), so a regenerated chart or a real resize opens at full extent instead of
-somewhere arbitrary. A chart with several zoomable panels is left alone. In React, pass the hook as
-the `zoomMemory` prop of `<BicChart>`.
+somewhere arbitrary. A chart with several zoomable panels is left alone. The `ZoomMemoryHost` is the
+memory: keep one per chart for as long as the chart is on the page, and hand its hook to every host
+built for that chart, on the same element or, after a remount, a new one (a destroyed host releases
+the hook's watcher, so the next one can take it). In React, pass the hook as the `zoomMemory` prop of
+`<BicChart>`, built once (`zoomHost` as above, kept outside the render):
+
+```tsx
+const [zoomMemory] = useState(() => createZoomMemoryHook(zoomHost));   // once, however often this renders
+return <BicChart code={code} data={data} d3={d3} zoomMemory={zoomMemory} />;
+```
+
+A hook that arrives after mount, or goes away, rebuilds the chart's host; swapping one hook for another
+on a mounted `<BicChart>` rebuilds nothing, and applies at the next rebuild (a new `code`, say) or at
+once if you remount it with a `key`, so a hook built inline in the props costs no rebuild.
 
 **A scrolled chart** keeps its place with no setup. A chart taller than its frame scrolls, and every
 redraw empties the container, which used to send the reader back to the top. The host now parks the

package/dist/{chunk-FHHT7DBM.mjs → chunk-RDUEXM2D.mjs}

@@ -614,10 +614,14 @@ function resolveOptions(p) {
     cultureCode: p.cultureCode,
     allowTooltips: p.allowTooltips,
     noDataText: p.noDataText,
-    // A finite number is clamped to DIM_OPACITY_MIN-1; absent, blank or junk stays undefined so the stylesheet - and a
-    // page's own CSS override - still decides. Never defaulted here: that would override every page's CSS.
+    // A finite number, or a string that is numeric once trimmed, is clamped to DIM_OPACITY_MIN-1; anything else (absent,
+    // blank, a boolean, an array, an object) stays undefined so the stylesheet - and a page's own CSS override - still
+    // decides. Not numberOr: Number() reads true as 1 and false, [] and whitespace as 0, which would dim to the floor.
+    // Above 1 is clamped to 1, which dims nothing; it is never reinterpreted as a percentage, so the option keeps one
+    // unit (a share of full opacity) for every value. Never defaulted here: that would override every page's CSS.
     dimOpacity: (() => {
-      const n = numberOr(p.dimOpacity, NaN);
+      const v = p.dimOpacity;
+      const n = typeof v === "number" ? v : typeof v === "string" && v.trim() !== "" ? Number(v) : NaN;
       return Number.isFinite(n) ? clamp(n, DIM_OPACITY_MIN, 1) : void 0;
     })(),
     // A recognised glyph or none: an unknown string must never reach the painter as a live mode, and "none" is
@@ -2031,6 +2035,7 @@ function compileRenderFn(code, win, doc, d3) {
 }
 var ASYNC_RENDER_TIMEOUT_MS = 15e3;
 var isThenable = (v) => !!v && (typeof v === "object" || typeof v === "function") && typeof v.then === "function";
+var dimVarPage = /* @__PURE__ */ new WeakMap();
 function createChartHost(container, config) {
   const doc = container.ownerDocument;
   const win = doc?.defaultView ?? globalThis;
@@ -2098,6 +2103,19 @@ function createChartHost(container, config) {
     });
   };
   let dimVarSet = false;
+  const releaseDimVar = () => {
+    if (!dimVarSet) return;
+    dimVarSet = false;
+    const page = dimVarPage.get(container);
+    if (!page || --page.holders > 0) return;
+    dimVarPage.delete(container);
+    try {
+      if (container.style?.getPropertyValue?.(DIM_OPACITY_VAR) !== page.wrote) return;
+      if (page.was) container.style?.setProperty(DIM_OPACITY_VAR, page.was.value, page.was.priority);
+      else container.style?.removeProperty(DIM_OPACITY_VAR);
+    } catch {
+    }
+  };
   let current = null;
   let activeTickEl = null;
   let selectionIsPeriod = false;
@@ -2169,6 +2187,7 @@ function createChartHost(container, config) {
     }
   };
   const paintSelection = () => {
+    if (destroyed) return;
     try {
       const sel = current;
       const active = !!sel && sel.length > 0;
@@ -2176,12 +2195,20 @@ function createChartHost(container, config) {
       container.classList?.[dim ? "add" : "remove"](SELECTION_ACTIVE_CLASS);
       const want = resolved.dimOpacity;
       if (typeof want === "number") {
-        container.style?.setProperty(DIM_OPACITY_VAR, String(want));
-        dimVarSet = true;
-      } else if (dimVarSet) {
-        container.style?.removeProperty(DIM_OPACITY_VAR);
-        dimVarSet = false;
-      }
+        const level = String(want);
+        let page = dimVarPage.get(container);
+        if (!dimVarSet) {
+          if (!page) {
+            const value = container.style?.getPropertyValue?.(DIM_OPACITY_VAR) ?? "";
+            page = { was: value ? { value, priority: container.style?.getPropertyPriority?.(DIM_OPACITY_VAR) ?? "" } : null, holders: 0, wrote: level };
+            dimVarPage.set(container, page);
+          }
+          page.holders++;
+          dimVarSet = true;
+        }
+        if (page) page.wrote = level;
+        container.style?.setProperty(DIM_OPACITY_VAR, level);
+      } else releaseDimVar();
       const lit = container.querySelectorAll(`.${ACTIVE_TICK_CLASS}`);
       for (const t of Array.from(lit)) t.classList?.remove(ACTIVE_TICK_CLASS);
       const tickStillDrawn = !!activeTickEl && (typeof container.contains === "function" ? container.contains(activeTickEl) : activeTickEl.isConnected !== false);
@@ -2418,6 +2445,7 @@ function createChartHost(container, config) {
     }
   };
   const notify = (rowIdxs, source, tick, fromChart = false) => {
+    if (destroyed) return;
     current = rowIdxs;
     selectionFromChart = rowIdxs.length > 0 && fromChart;
     activeTickEl = rowIdxs.length ? tick ?? null : null;
@@ -2523,6 +2551,14 @@ function createChartHost(container, config) {
       }
     }
   };
+  const releaseZoom = () => {
+    if (zoomMemory) {
+      try {
+        zoomMemory.release?.(container);
+      } catch {
+      }
+    }
+  };
   const keepScroll = config.restoreScroll !== false;
   let chartSource;
   const scrollKey = () => {
@@ -2761,12 +2797,18 @@ function createChartHost(container, config) {
         );
       }));
     },
+    // A DESTROYED HOST OWNS NOTHING ON THE CONTAINER any more. A host rebuilt on the same element has taken over
+    // the chart's slots (its clear, its animation stop, its initial mark) and the clicked-marks record, so every
+    // method below that reaches the container returns first: a stale reference to the old host (a closure, a late
+    // callback) must not clear, stop or annotate the chart that is on screen now.
     setOptions(partial) {
+      if (destroyed) return;
       raw = { ...raw, ...partial };
       resolved = resolveForHost(raw);
       host.render();
     },
     setData(next) {
+      if (destroyed) return;
       data = next;
       host.render();
     },
@@ -2774,8 +2816,9 @@ function createChartHost(container, config) {
       return resolved;
     },
     setAnnotations(list) {
+      if (destroyed) return;
       annotationLayer.set(list);
-      if (!destroyed) try {
+      try {
         drawAnnotations();
       } catch {
       }
@@ -2794,6 +2837,7 @@ function createChartHost(container, config) {
         return () => subs.delete(cb);
       },
       clear() {
+        if (destroyed) return;
         const s = container[CONTAINER_SLOT_XF_CLEAR];
         if (typeof s === "function") {
           try {
@@ -2806,6 +2850,7 @@ function createChartHost(container, config) {
         notify([], "host");
       },
       highlight(rowIdxs) {
+        if (destroyed) return;
         const rows = Array.isArray(rowIdxs) ? rowIdxs.slice() : [];
         if (lasso && lasso.rows().length && !sameRowSet(rows, lasso.rows())) lasso.clear({ publish: false, source: "host" });
         notify(rows, "host");
@@ -2814,9 +2859,11 @@ function createChartHost(container, config) {
         return current;
       }
     },
-    animation: { stop: stopAnim },
+    animation: { stop() {
+      if (!destroyed) stopAnim();
+    } },
     initialMark() {
-      return container[CONTAINER_SLOT_INITIAL_XF_MARK] ?? null;
+      return destroyed ? null : container[CONTAINER_SLOT_INITIAL_XF_MARK] ?? null;
     },
     destroy() {
       if (destroyed) return;
@@ -2828,17 +2875,12 @@ function createChartHost(container, config) {
       clearPress(container);
       disposeLasso();
       subs.clear();
-      if (dimVarSet) {
-        try {
-          container.style?.removeProperty(DIM_OPACITY_VAR);
-        } catch {
-        }
-        dimVarSet = false;
-      }
+      releaseDimVar();
       annotationLayer.destroy();
       if (hasRendered && keepScroll) rememberScroll(container, scrollKey());
       unpinScrolledAxis(container);
       flushZoom();
+      releaseZoom();
       followGlyphs(false);
       container.innerHTML = "";
       if (glyphPositionWas !== null) {

package/dist/index.mjs

@@ -97,7 +97,7 @@ import {
   toRGBA,
   toSourceRows,
   valuePlacementFlag
-} from "./chunk-FHHT7DBM.mjs";
+} from "./chunk-RDUEXM2D.mjs";
 import {
   LASSO_AXES_SLOT,
   LASSO_COUNT_CLASS,

package/dist/react.mjs

@@ -22,7 +22,7 @@ import {
   loadGeo,
   syncMemberSelection,
   toSourceRows
-} from "./chunk-FHHT7DBM.mjs";
+} from "./chunk-RDUEXM2D.mjs";
 import "./chunk-QHMLMF4L.mjs";
 import "./chunk-PDVEIW42.mjs";
 import "./chunk-VEVBXK44.mjs";
@@ -113,6 +113,11 @@ function BicChart(props) {
   };
   const userSelectedRef = useRef(false);
   const optKey = useMemo(() => JSON.stringify(options ?? {}), [options]);
+  const zoomOn = zoomMemory != null;
+  const zoomRef = useRef(zoomMemory ?? null);
+  useLayoutEffect(() => {
+    zoomRef.current = zoomMemory ?? null;
+  });
   const builtWithRef = useRef(null);
   const onSelectRef = useRef(onSelect);
   onSelectRef.current = onSelect;
@@ -155,7 +160,7 @@ function BicChart(props) {
       d3,
       geoKind,
       viewState,
-      zoomMemory,
+      zoomMemory: zoomRef.current,
       labelContrast,
       layoutPass,
       restoreScroll,
@@ -191,7 +196,7 @@ function BicChart(props) {
       host.destroy();
       hostRef.current = null;
     };
-  }, [code, renderFn, d3, geoKind, labelContrast, layoutPass, restoreScroll, controls]);
+  }, [code, renderFn, d3, geoKind, labelContrast, layoutPass, restoreScroll, zoomOn, controls]);
   useLayoutEffect(() => {
     const host = hostRef.current;
     if (!host || !selects) return;
@@ -217,7 +222,7 @@ function BicChart(props) {
       b.detach();
       if (bindingRef.current === b) bindingRef.current = null;
     };
-  }, [selects, code, renderFn, d3, geoKind, labelContrast, layoutPass, restoreScroll]);
+  }, [selects, code, renderFn, d3, geoKind, labelContrast, layoutPass, restoreScroll, zoomOn]);
   useEffect(() => {
     if (!hostRef.current || !options) return;
     if (builtWithRef.current?.optKey === optKey) return;

package/dist/types/host.d.ts

@@ -80,9 +80,10 @@ export interface ChartHostConfig {
     /**
      * REMEMBER THE READER'S ZOOM AND PAN on a chart that calls d3.zoom(), across every re-render (and across a
      * close and reopen, if the host's store says so). Build it with createZoomMemoryHook() from
-     * "@bicharts/chart-host/zoom-memory", ONCE per container, and hand the same hook to every host created on
-     * that container. Absent (the default), d3.zoom is never wrapped and nothing is listened for. It applies to a
-     * chart compiled from `code` only: a precompiled `renderFn` closed over its own d3.
+     * "@bicharts/chart-host/zoom-memory", ONCE per chart, and hand the same hook to every host built for that chart
+     * (on the same element or, after a remount, a new one): a host that is destroyed releases the hook's watcher, so
+     * the hook can go to the next. Absent (the default), d3.zoom is never wrapped and nothing is listened for. It
+     * applies to a chart compiled from `code` only: a precompiled `renderFn` closed over its own d3.
      */
     zoomMemory?: ZoomMemoryHook | null;
     /** D3 v7 instance handed to the compiled code. Default: (globalThis as any).d3. */

package/dist/types/react.d.ts

@@ -35,8 +35,11 @@ export interface BicChartProps {
     /**
      * REMEMBER THE READER'S ZOOM AND PAN on a chart that calls d3.zoom(), across re-renders and, if
      * the hook's store keeps it, across a reload. Build it with createZoomMemoryHook() from
-     * "@bicharts/chart-host/zoom-memory", once per chart (module scope or useMemo) with somewhere to
-     * keep the view. Absent, nothing is remembered. See createChartHost's `zoomMemory`.
+     * "@bicharts/chart-host/zoom-memory" over one ZoomMemoryHost per chart (module scope, useRef or
+     * useMemo) with somewhere to keep the view. Absent (null or undefined), nothing is remembered. Host config:
+     * a hook that arrives after mount, or goes away, rebuilds the host; a change from one hook to another does
+     * not, and applies at the next rebuild (a new `code`, say), or at once if the component is remounted with a
+     * `key`. So a hook built inline in the props is harmless. See createChartHost's `zoomMemory`.
      */
     zoomMemory?: ChartHostConfig["zoomMemory"];
     /**

package/dist/types/zoomMemory/zoomMemoryDom.d.ts

@@ -1,20 +1,23 @@
 import { type ZoomState } from "./zoomMemory";
 /**
  * WHAT A HOST SUPPLIES: where the remembered view lives, and whether it may outlive the session.
- * One per chart container, kept for as long as the container is, so it outlives a host that is destroyed
- * and re-created on the same element (a redraw on every resize, say).
+ * One per chart, kept for as long as the chart is on the page, so it outlives a host that is destroyed
+ * and re-created (on the same element for a redraw on every resize, say, or on a new one after a remount).
  */
 export interface ZoomMemoryHost {
     /** The in-session tier, always on: survives every re-render, never written anywhere. */
     liveZoomState: ZoomState | null;
     /** The key the watcher stamps on what it records (the latest render's). */
     zoomWatchKey: string;
-    /** Whether the watcher's listeners are on zoomContainer (they attach once). */
+    /** Whether the watcher's listeners are on zoomContainer (they attach once per element, and come off when the
+     *  host that drew into it is destroyed). */
     zoomWatchAttached: boolean;
     /** The pending settle timer, 0 when none. */
     zoomSettleTimer: number;
     /** The element the chart draws into; it outlives each render, so listeners attach to it once. Null until
-     *  known: createZoomMemoryHook's restore adopts the render's container then. */
+     *  known: createZoomMemoryHook's restore adopts the render's container then, moves to a new one when a
+     *  render arrives on a different element (a remount), and gives it back when the host is destroyed. An element
+     *  set here beforehand is the page's choice: the hook watches it and neither replaces nor gives it back. */
     zoomContainer: Element | null;
     /** Is the persisted tier on NOW? Read on every restore and every write, so a change applies to the next. */
     rememberAcrossSessions(): boolean;
@@ -68,7 +71,13 @@ export interface ZoomMemoryHook {
     flush(): void;
     /** forgetZoom: drop the session view and a pending gesture. */
     forget(): void;
+    /** Let go of the watcher on `container`, the element a destroyed host drew into (after flush, which records a
+     *  gesture still settling), so the next host handed this hook attaches afresh and a hook that is replaced leaves
+     *  nothing on the element. Without `container`, wherever the watcher is. A watcher that has since moved to another
+     *  element is left alone. Optional: a hook written by hand without it works as before. */
+    release?(container?: Element): void;
 }
-/** Bind the zoom memory to one host object. Build it once per container and hand the same hook to every
- *  host created on that container, so the session tier outlives each one. */
+/** Bind the zoom memory to one host object. Build it once per chart and hand the same hook to every
+ *  host created for it, so the session tier outlives each one - on the same element, or on a new one
+ *  after a remount, where the watcher moves with it. A host that is destroyed releases the watcher. */
 export declare function createZoomMemoryHook(host: ZoomMemoryHost): ZoomMemoryHook;

package/dist/zoom-memory.mjs

@@ -192,15 +192,34 @@ function attachZoomWatcher(host, key) {
       captureCurrentZoom(host);
     }, SETTLE_MS);
   };
-  for (const evt of ["wheel", "pointerup", "pointercancel", "click", "dblclick", "keyup"]) {
+  for (const evt of WATCHED_EVENTS) {
     try {
       ctr.addEventListener(evt, settle, true);
     } catch {
     }
   }
+  attachedWatchers.set(host, { ctr, settle });
   host.zoomWatchAttached = true;
   host.log("zoom-watcher-attached", {});
 }
+var WATCHED_EVENTS = ["wheel", "pointerup", "pointercancel", "click", "dblclick", "keyup"];
+var attachedWatchers = /* @__PURE__ */ new WeakMap();
+var adoptedContainers = /* @__PURE__ */ new WeakMap();
+function detachZoomWatcher(host) {
+  const w = attachedWatchers.get(host);
+  if (w) {
+    for (const evt of WATCHED_EVENTS) {
+      try {
+        w.ctr.removeEventListener(evt, w.settle, true);
+      } catch {
+      }
+    }
+    attachedWatchers.delete(host);
+  }
+  if (host.zoomSettleTimer) clearTimeout(host.zoomSettleTimer);
+  host.zoomSettleTimer = 0;
+  host.zoomWatchAttached = false;
+}
 function captureCurrentZoom(host) {
   try {
     const key = host.zoomWatchKey;
@@ -242,17 +261,32 @@ function forgetZoom(host) {
   host.liveZoomState = null;
 }
 function createZoomMemoryHook(host) {
-  return {
+  const hook = {
     keyFor: (code, width, height) => zoomStateKey(B(String(code ?? "")), width, height),
     capture: (d3) => captureZoomBehaviors(d3, host),
     restore: (container, capture, key, d3) => {
-      if (!host.zoomContainer) host.zoomContainer = container;
+      const mine = adoptedContainers.get(host);
+      if (host.zoomContainer && host.zoomContainer === mine && mine !== container) {
+        detachZoomWatcher(host);
+        host.zoomContainer = null;
+      }
+      if (!host.zoomContainer) {
+        host.zoomContainer = container;
+        adoptedContainers.set(host, container);
+      }
       restoreZoomForRender(d3, host, capture, key);
       attachZoomWatcher(host, key);
     },
     flush: () => flushPendingZoom(host),
-    forget: () => forgetZoom(host)
+    forget: () => forgetZoom(host),
+    release: (container) => {
+      if (container && attachedWatchers.get(host)?.ctr !== container) return;
+      detachZoomWatcher(host);
+      if (host.zoomContainer && host.zoomContainer === adoptedContainers.get(host)) host.zoomContainer = null;
+      adoptedContainers.delete(host);
+    }
   };
+  return hook;
 }
 export {
   attachZoomWatcher,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bicharts/chart-host",
-  "version": "0.6.90",
+  "version": "0.6.91",
   "description": "Run a BIC-generated D3 chart in any web host: compiles the generated render() function, applies the shared option defaults, resolves mark clicks (through tooltip overlays), owns the selection affordance, and translates row indices between cross-filtered charts. The same contract the BIC Power BI visual implements, minus Power BI. React bindings at @bicharts/chart-host/react.",
   "license": "Apache-2.0",
   "type": "module",