@bicharts/chart-host 0.6.99 → 0.6.102

package/dist/card.mjs

@@ -1,8 +1,8 @@
 /*! @bicharts/chart-host — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; Natural Earth and US Census/TIGER (public domain). Full text: NOTICE in this package. */
 import {
   computeSelectionCard
-} from "./chunk-LDMLLLC6.mjs";
-import "./chunk-W5L6OH25.mjs";
+} from "./chunk-D6A37G2G.mjs";
+import "./chunk-CNT3QA3R.mjs";
 import "./chunk-GHODWOAL.mjs";
 
 // src/selectionCardChrome.ts

package/dist/{chunk-RAKU2JBE.mjs → chunk-ALX4D2I2.mjs}

@@ -40,7 +40,7 @@ import {
   Yn,
   ir,
   tt
-} from "./chunk-W5L6OH25.mjs";
+} from "./chunk-CNT3QA3R.mjs";
 import {
   NA_ISO3,
   NA_LAT_MAX,
@@ -1767,6 +1767,67 @@ function shapeTest(mark) {
   };
 }
 var parseIdxs = (s) => (s || "").split(",").map((x) => parseInt(x, 10)).filter((n) => Number.isFinite(n));
+var hits = (a, b) => a.l < b.r && b.l < a.r && a.t < b.b && b.t < a.b;
+var ROW_ASPECT = 3;
+var LABEL_JOIN = 0.75;
+var UNDRAWN = /* @__PURE__ */ new Set(["title", "desc", "style", "script", "noscript", "template", "metadata", "textarea", "option"]);
+function textBoxes(root, skip) {
+  const doc = root.ownerDocument, out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const walker = doc.createTreeWalker(
+    root,
+    4
+    /* NodeFilter.SHOW_TEXT */
+  );
+  let range = null;
+  try {
+    range = doc.createRange();
+  } catch {
+    range = null;
+  }
+  for (let n = walker.nextNode(); n; n = walker.nextNode()) {
+    if (!/\S/.test(n.nodeValue || "")) continue;
+    const p = n.parentElement;
+    if (!p || p.closest(skip)) continue;
+    if (UNDRAWN.has(p.localName.toLowerCase()) || p.closest("defs, clipPath, mask, title, desc")) continue;
+    let r = null;
+    const svgText = p.closest("text");
+    if (svgText) {
+      if (seen.has(svgText)) continue;
+      seen.add(svgText);
+      r = svgText.getBoundingClientRect();
+    } else {
+      try {
+        if (range && typeof range.getBoundingClientRect === "function") {
+          range.selectNodeContents(n);
+          const rr = range.getBoundingClientRect();
+          if (rr && rr.width > 0 && rr.height > 0) r = rr;
+        }
+      } catch {
+        r = null;
+      }
+      if (!r) r = p.getBoundingClientRect();
+    }
+    if (r && r.width > 0 && r.height > 0) out.push({ b: box(r), el: svgText ?? p, node: n });
+  }
+  return out;
+}
+function seenRight(el, right, stop) {
+  const win = el.ownerDocument.defaultView;
+  if (!win || el.closest("svg")) return right;
+  for (let a = el; a && a !== stop.parentElement; a = a.parentElement) {
+    try {
+      const o = win.getComputedStyle(a);
+      if (o && o.overflowX && o.overflowX !== "visible") {
+        const r = a.getBoundingClientRect();
+        if (r.width > 0) right = Math.min(right, r.right);
+      }
+    } catch {
+    }
+    if (a === stop) break;
+  }
+  return right;
+}
 function createAnnotationLayer(container, onClick) {
   let list = [];
   let report = { shown: 0, notShown: 0 };
@@ -1842,28 +1903,73 @@ function createAnnotationLayer(container, onClick) {
       return v;
     };
     const controls = Array.from(container.querySelectorAll(`.${CONTROL_CLASS}, .${ZOOM_PAD_CLASS}`)).map((c) => c.getBoundingClientRect()).filter((r) => r.width > 0 && r.height > 0).map(box);
+    let texts = null;
+    const textsNow = () => texts ??= textBoxes(container, `.${ANNOTATION_LAYER_CLASS}, .${CONTROL_CLASS}, .${ZOOM_PAD_CLASS}`);
+    const placed = [];
+    const clampX = (x, hw) => open.l === -Infinity ? x : Math.min(Math.max(x, open.l + hw), Math.max(open.l + hw, open.r - hw));
+    const clampY = (y, hh) => open.t === -Infinity ? y : Math.min(Math.max(y, open.t + hh), Math.max(open.t + hh, open.b - hh));
+    const rowLabel = (v, mark) => {
+      const w = v.r - v.l, h = v.b - v.t;
+      if (!(h > 0) || w < ROW_ASPECT * h) return null;
+      const own = textsNow().filter((t) => {
+        const x = (t.b.l + t.b.r) / 2, y = (t.b.t + t.b.b) / 2;
+        return x > v.l && x < v.r && y > v.t && y < v.b && t.b.b - t.b.t <= h * 1.5;
+      }).sort((p, q) => p.b.l - q.b.l || p.b.t - q.b.t);
+      if (!own.length) return null;
+      const first = own[0];
+      let run = { ...first.b }, seen = mark ? seenRight(first.el, first.b.r, mark) : first.b.r;
+      for (const t of own.slice(1)) {
+        const lineH = run.b - run.t, midY = (t.b.t + t.b.b) / 2;
+        if (midY < run.t || midY > run.b || t.b.l - run.r > LABEL_JOIN * lineH) continue;
+        if (t.b.l < run.r - 1 && t.b.r <= run.r) continue;
+        run = { l: run.l, t: Math.min(run.t, t.b.t), r: Math.max(run.r, t.b.r), b: Math.max(run.b, t.b.b) };
+        seen = Math.max(seen, mark ? seenRight(t.el, t.b.r, mark) : t.b.r);
+      }
+      const after = own.filter((t) => t.b.l >= run.r && t.b.b > run.t && t.b.t < run.b).map((t) => t.b.l);
+      return { r: Math.min(run.r, seen), y: (run.t + run.b) / 2, next: after.length ? Math.min(...after) : v.r };
+    };
     const clear = (v, len, mark) => {
       const hw = Math.max(16, len * 6 + 8) / 2, hh = 8, g = 2;
       const cx = (v.l + v.r) / 2, cy = (v.t + v.b) / 2;
-      const free = (x, y) => x >= v.l && x <= v.r && y >= v.t && y <= v.b && controls.every((c) => x + hw <= c.l || x - hw >= c.r || y + hh <= c.t || y - hh >= c.b);
-      const onShape = shapeTest(mark);
-      const tries = [[cx, cy]];
-      for (let i = 0; i <= 8; i++) for (let j = 0; j <= 6; j++) tries.push([v.l + (v.r - v.l) * i / 8, v.t + (v.b - v.t) * j / 6]);
-      tries.sort((p, q) => Math.hypot(p[0] - cx, p[1] - cy) - Math.hypot(q[0] - cx, q[1] - cy));
-      for (const c of controls) tries.push([cx, c.b + hh + g], [cx, c.t - hh - g], [c.l - hw - g, cy], [c.r + hw + g, cy]);
-      return tries.find(([x, y]) => free(x, y) && onShape(x, y)) ?? tries.find(([x, y]) => free(x, y)) ?? null;
+      const at = (x, y) => ({ l: x - hw, t: y - hh, r: x + hw, b: y + hh });
+      const free = (x, y) => x >= v.l - hw && x <= v.r + hw && y >= v.t - hh && y <= v.b + hh && controls.every((c) => x + hw <= c.l || x - hw >= c.r || y + hh <= c.t || y - hh >= c.b);
+      const noText = (x, y) => {
+        const b = at(x, y);
+        return textsNow().every((t) => !hits(b, t.b)) && placed.every((p) => !hits(b, p));
+      };
+      const shape = shapeTest(mark);
+      const tries = [];
+      const add = (x, y, px = x, py = y) => tries.push({ x: clampX(x, hw), y: clampY(y, hh), px, py });
+      const label = rowLabel(v, mark);
+      if (label) {
+        const x = label.r + g + hw;
+        if (x + hw <= label.next - g || label.next >= v.r) add(x, label.y, Math.min(x, v.r - 1), label.y);
+      }
+      const ix = Math.max(2, (v.r - v.l) * 0.175), iy = Math.max(2, (v.b - v.t) * 0.175);
+      for (const [kx, ky, sx, sy] of [[v.r, v.t, 1, -1], [v.l, v.t, -1, -1], [v.r, v.b, 1, 1], [v.l, v.b, -1, 1]])
+        for (const k of [0, 0.5, 1]) add(kx + sx * k * hw, ky + sy * k * hh, kx - sx * ix, ky - sy * iy);
+      const grid = [];
+      for (let i = 0; i <= 8; i++) for (let j = 0; j <= 6; j++) grid.push([v.l + (v.r - v.l) * i / 8, v.t + (v.b - v.t) * j / 6]);
+      grid.sort((p, q) => Math.hypot(p[0] - v.r, p[1] - v.t) - Math.hypot(q[0] - v.r, q[1] - v.t));
+      for (const [x, y] of grid) add(x, y);
+      for (const c of controls) for (const [x, y] of [[cx, c.b + hh + g], [cx, c.t - hh - g], [c.l - hw - g, cy], [c.r + hw + g, cy]]) add(x, y);
+      const on = (t) => shape(t.px, t.py);
+      const pick = tries.find((t) => free(t.x, t.y) && noText(t.x, t.y) && on(t)) ?? tries.find((t) => free(t.x, t.y) && noText(t.x, t.y)) ?? tries.find((t) => free(t.x, t.y) && on(t)) ?? tries.find((t) => free(t.x, t.y));
+      if (!pick) return null;
+      placed.push(at(pick.x, pick.y));
+      return [pick.x, pick.y];
     };
     let shown = 0;
     for (const a of list) {
       const pairs = (a.where ? Object.entries(a.where) : a.column != null ? [[a.column, a.value]] : []).map(([c, v]) => [names.indexOf(c), text(v)]);
       const want = pairs.map((p) => p[1]).join(" / ");
-      const hits = /* @__PURE__ */ new Set();
+      const hits2 = /* @__PURE__ */ new Set();
       if (pairs.length && pairs.every((p) => p[0] >= 0)) (data.rows || []).forEach((row, r) => {
-        if (pairs.every(([ci, v]) => text(row?.[ci]) === v)) for (const m of marksByRow.get(r) ?? []) hits.add(m);
+        if (pairs.every(([ci, v]) => text(row?.[ci]) === v)) for (const m of marksByRow.get(r) ?? []) hits2.add(m);
       });
-      if (!hits.size) continue;
+      if (!hits2.size) continue;
       let best = null, bestMark = null, laidOut = false;
-      for (const m of hits) {
+      for (const m of hits2) {
         const b = m.getBoundingClientRect();
         if (!(b.width > 0 && b.height > 0)) continue;
         laidOut = true;

package/dist/{chunk-W5L6OH25.mjs → chunk-CNT3QA3R.mjs}

@@ -1027,7 +1027,7 @@ function Fn(n, s2) {
   return { iso: o2, unmatched: I2, matchedRows: N2, totalRows: n.length };
 }
 
-// ../shape-core/dist/chunk-AMXLHWUI.mjs
+// ../shape-core/dist/chunk-CQS6BGRJ.mjs
 var import_papaparse = __toESM(require_papaparse_min(), 1);
 /*! @bicharts/shape-core — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; US Census/TIGER (public domain). Full text: NOTICE in this package. */
 var ft = { "north-america": "AG AI AW BB BL BM BQ BS BZ CA CR CU CW DM DO GD GL GP GT HN HT JM KN KY LC MF MQ MS MX NI PA PM PR SV SX TC TT US VC VG VI", "south-america": "AR BO BR CL CO EC FK GF GY PE PY SR UY VE", europe: "AD AL AT AX BA BE BG BY CH CY CZ DE DK EE ES FI FO FR GB GG GI GR HR HU IE IM IS IT JE LI LT LU LV MC MD ME MK MT NL NO PL PT RO RS RU SE SI SJ SK SM UA VA", africa: "AO BF BI BJ BW CD CF CG CI CM CV DJ DZ EG EH ER ET GA GH GM GN GQ GW KE KM LR LS LY MA MG ML MR MU MW MZ NA NE NG RE RW SC SD SH SL SN SO SS ST SZ TD TG TN TZ UG YT ZA ZM ZW", asia: "AE AF AM AZ BD BH BN BT CC CN CX GE HK ID IL IN IO IQ IR JO JP KG KH KP KR KW KZ LA LB LK MM MN MO MV MY NP OM PH PK PS QA SA SG SY TH TJ TL TM TR TW UZ VN YE", oceania: "AS AU CK FJ FM GU KI MH MP NC NF NR NU NZ PF PG PN PW SB TK TO TV UM VU WF WS", antarctica: "AQ BV GS HM TF" };

package/dist/{chunk-LDMLLLC6.mjs → chunk-D6A37G2G.mjs}

@@ -6,7 +6,7 @@ import {
   pi,
   u,
   vt
-} from "./chunk-W5L6OH25.mjs";
+} from "./chunk-CNT3QA3R.mjs";
 
 // src/sourceDateFormat.ts
 function formatSourceDate(raw, opts = {}) {

package/dist/index.mjs

@@ -5,7 +5,7 @@ import {
   formatSourceDateFor,
   isExcelDateFormat,
   normaliseAggregation
-} from "./chunk-LDMLLLC6.mjs";
+} from "./chunk-D6A37G2G.mjs";
 import {
   captureSvgSnapshot,
   chartSvgOf,
@@ -97,7 +97,7 @@ import {
   toRGBA,
   toSourceRows,
   valuePlacementFlag
-} from "./chunk-RAKU2JBE.mjs";
+} from "./chunk-ALX4D2I2.mjs";
 import {
   LASSO_AXES_SLOT,
   LASSO_COUNT_CLASS,
@@ -189,7 +189,7 @@ import {
   _3,
   l,
   o
-} from "./chunk-W5L6OH25.mjs";
+} from "./chunk-CNT3QA3R.mjs";
 import "./chunk-A2GMXZP7.mjs";
 import {
   ACTIVE_TICK_CLASS,

package/dist/react.mjs

@@ -22,12 +22,12 @@ import {
   loadGeo,
   syncMemberSelection,
   toSourceRows
-} from "./chunk-RAKU2JBE.mjs";
+} from "./chunk-ALX4D2I2.mjs";
 import "./chunk-B6BLSIID.mjs";
 import "./chunk-ASLRGGLV.mjs";
 import "./chunk-5OCL4EFM.mjs";
 import "./chunk-3JBJ2SIF.mjs";
-import "./chunk-W5L6OH25.mjs";
+import "./chunk-CNT3QA3R.mjs";
 import "./chunk-A2GMXZP7.mjs";
 import "./chunk-M7MBTLDP.mjs";
 import "./chunk-GHODWOAL.mjs";

package/dist/zoom-memory.mjs

@@ -1,7 +1,7 @@
 /*! @bicharts/chart-host — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; Natural Earth and US Census/TIGER (public domain). Full text: NOTICE in this package. */
 import {
   K
-} from "./chunk-W5L6OH25.mjs";
+} from "./chunk-CNT3QA3R.mjs";
 import "./chunk-GHODWOAL.mjs";
 
 // src/zoomMemory/zoomMemory.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bicharts/chart-host",
-  "version": "0.6.99",
+  "version": "0.6.102",
   "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",