@marimo-team/islands 0.23.2-dev25 → 0.23.2-dev28

package/src/plugins/impl/plotly/__tests__/selection.test.ts

@@ -102,6 +102,14 @@ describe("shouldHandleClickSelection", () => {
     expect(shouldHandleClickSelection([heatmapPoint])).toBe(true);
   });
 
+  it("accepts box clicks", () => {
+    const boxPoint = createPlotDatum({
+      data: { type: "box" },
+    });
+
+    expect(shouldHandleClickSelection([boxPoint])).toBe(true);
+  });
+
   it("accepts violin clicks", () => {
     const violinPoint = createPlotDatum({
       data: { type: "violin" },
@@ -126,6 +134,22 @@ describe("shouldHandleClickSelection", () => {
     expect(shouldHandleClickSelection([linePoint])).toBe(true);
   });
 
+  it("accepts funnel clicks", () => {
+    const funnelPoint = createPlotDatum({
+      data: { type: "funnel" },
+    });
+
+    expect(shouldHandleClickSelection([funnelPoint])).toBe(true);
+  });
+
+  it("accepts funnelarea clicks", () => {
+    const funnelAreaPoint = createPlotDatum({
+      data: { type: "funnelarea" },
+    });
+
+    expect(shouldHandleClickSelection([funnelAreaPoint])).toBe(true);
+  });
+
   it("accepts waterfall clicks", () => {
     const waterfallPoint = createPlotDatum({
       data: { type: "waterfall" },
@@ -214,6 +238,64 @@ describe("extractPoints", () => {
     expect(extractPoints([point])).toEqual([{ x: 1, y: 2, z: 3 }]);
   });
 
+  it("returns funnel-specific fields for funnel traces", () => {
+    const point = createPlotDatum({
+      x: 1000,
+      y: "Visit",
+      label: "Visit",
+      value: 1000,
+      percentInitial: 1.0,
+      percentPrevious: 1.0,
+      percentTotal: 1.0,
+      curveNumber: 0,
+      pointIndex: 0,
+      pointNumber: 0,
+      data: { type: "funnel" },
+    });
+
+    expect(extractPoints([point])).toEqual([
+      {
+        x: 1000,
+        y: "Visit",
+        label: "Visit",
+        value: 1000,
+        percentInitial: 1.0,
+        percentPrevious: 1.0,
+        percentTotal: 1.0,
+        curveNumber: 0,
+        pointIndex: 0,
+        pointNumber: 0,
+      },
+    ]);
+  });
+
+  it("returns funnelarea-specific fields without x/y for funnelarea traces", () => {
+    const point = createPlotDatum({
+      label: "Stage A",
+      value: 500,
+      percentInitial: 0.5,
+      percentPrevious: 0.8,
+      percentTotal: 0.5,
+      curveNumber: 0,
+      pointNumber: 1,
+      x: 99,
+      y: 99,
+      data: { type: "funnelarea" },
+    });
+
+    expect(extractPoints([point])).toEqual([
+      {
+        label: "Stage A",
+        value: 500,
+        percentInitial: 0.5,
+        percentPrevious: 0.8,
+        percentTotal: 0.5,
+        curveNumber: 0,
+        pointNumber: 1,
+      },
+    ]);
+  });
+
   it("returns x/y/pointIndex for waterfall clicks", () => {
     const point = createPlotDatum({
       x: "Revenue",

package/src/plugins/impl/plotly/selection.ts

@@ -24,6 +24,32 @@ const SUNBURST_DATA_KEYS: (keyof Plotly.SunburstPlotDatum)[] = [
   "value",
 ] as const;
 
+// Fields emitted by go.Funnel click events: includes x/y coordinates plus
+// funnel-specific percent metrics.
+const FUNNEL_DATA_KEYS: string[] = [
+  "curveNumber",
+  "pointIndex",
+  "pointNumber",
+  "x",
+  "y",
+  "label",
+  "value",
+  "percentInitial",
+  "percentPrevious",
+  "percentTotal",
+] as const;
+
+// Fields emitted by go.FunnelArea click events: sector-based, no x/y.
+const FUNNEL_AREA_DATA_KEYS: string[] = [
+  "curveNumber",
+  "pointNumber",
+  "label",
+  "value",
+  "percentInitial",
+  "percentPrevious",
+  "percentTotal",
+] as const;
+
 const LINE_CLICK_TRACE_TYPES = new Set(["scatter", "scattergl"]);
 
 const STANDARD_POINT_KEYS: string[] = [
@@ -256,10 +282,13 @@ export function shouldHandleClickSelection(
     const type = getTraceSource(point).type;
     return (
       type === "bar" ||
+      type === "box" ||
+      type === "funnel" ||
+      type === "funnelarea" ||
       type === "heatmap" ||
       type === "histogram" ||
-      type === "waterfall" ||
       type === "violin" ||
+      type === "waterfall" ||
       isLinePoint(point)
     );
   });
@@ -329,13 +358,43 @@ export function extractPoints(
   let parser: PlotlyTemplateParser | undefined;
 
   return points.map((point) => {
+    const trace = getTraceSource(point);
+
+    // FunnelArea: sector-based chart with no x/y coordinates.
+    // Pick funnel-area-specific keys, then merge any hovertemplate-parsed
+    // fields (e.g. customdata columns) so user-defined fields are preserved.
+    if (trace.type === "funnelarea") {
+      const base = pick(point, FUNNEL_AREA_DATA_KEYS);
+      const ht = Array.isArray(trace.hovertemplate)
+        ? trace.hovertemplate[0]
+        : trace.hovertemplate;
+      if (!ht) {
+        return base;
+      }
+      parser = parser ? parser.update(ht) : createParser(ht);
+      return { ...base, ...parser.parse(point) };
+    }
+
+    // Funnel: bar-like chart with x/y plus per-stage percent metrics.
+    // Pick funnel-specific keys, then merge hovertemplate-parsed fields so
+    // callers get both percentInitial et al. and any user-defined columns.
+    if (trace.type === "funnel") {
+      const base = pick(point, FUNNEL_DATA_KEYS);
+      const ht = Array.isArray(trace.hovertemplate)
+        ? trace.hovertemplate[0]
+        : trace.hovertemplate;
+      if (!ht) {
+        return base;
+      }
+      parser = parser ? parser.update(ht) : createParser(ht);
+      return { ...base, ...parser.parse(point) };
+    }
+
     const standardPointFields = withInferredXY(
       point,
       pick(point, STANDARD_POINT_KEYS),
     );
 
-    const trace = getTraceSource(point);
-
     // Get the first hovertemplate
     const hovertemplate = Array.isArray(trace.hovertemplate)
       ? trace.hovertemplate[0]

package/dist/_basePickBy-Sow3pJjS.js

@@ -1,41 +0,0 @@
-import { O as _assignValue_default, j as _isIndex_default, z as isObject_default } from "./isArrayLikeObject-LXbTYiBa.js";
-import { c as _castPath_default, o as _baseGet_default, r as _baseFlatten_default, s as _toKey_default } from "./hasIn-DnfJcYpY.js";
-import { t as toNumber_default } from "./toNumber-55tjPCWr.js";
-var INFINITY = Infinity, MAX_INTEGER = 17976931348623157e292;
-function toFinite(e) {
-  return e ? (e = toNumber_default(e), e === INFINITY || e === -INFINITY ? (e < 0 ? -1 : 1) * MAX_INTEGER : e === e ? e : 0) : e === 0 ? e : 0;
-}
-var toFinite_default = toFinite;
-function flatten(e) {
-  return e != null && e.length ? _baseFlatten_default(e, 1) : [];
-}
-var flatten_default = flatten;
-function baseSet(o, s, l, u) {
-  if (!isObject_default(o)) return o;
-  s = _castPath_default(s, o);
-  for (var d = -1, f = s.length, p = f - 1, m = o; m != null && ++d < f; ) {
-    var h = _toKey_default(s[d]), g = l;
-    if (h === "__proto__" || h === "constructor" || h === "prototype") return o;
-    if (d != p) {
-      var _ = m[h];
-      g = u ? u(_, h, m) : void 0, g === void 0 && (g = isObject_default(_) ? _ : _isIndex_default(s[d + 1]) ? [] : {});
-    }
-    _assignValue_default(m, h, g), m = m[h];
-  }
-  return o;
-}
-var _baseSet_default = baseSet;
-function basePickBy(e, i, a) {
-  for (var s = -1, c = i.length, l = {}; ++s < c; ) {
-    var u = i[s], d = _baseGet_default(e, u);
-    a(d, u) && _baseSet_default(l, _castPath_default(u, e), d);
-  }
-  return l;
-}
-var _basePickBy_default = basePickBy;
-export {
-  toFinite_default as i,
-  _baseSet_default as n,
-  flatten_default as r,
-  _basePickBy_default as t
-};

package/dist/min-Ds3gG0Ff.js

@@ -1,96 +0,0 @@
-import { B as isArray_default, C as isArrayLike_default, H as _baseGetTag_default, R as identity_default, S as _isIterateeCall_default, T as _baseRest_default, V as isObjectLike_default, f as keysIn_default, k as eq_default } from "./isArrayLikeObject-LXbTYiBa.js";
-import { t as isSymbol_default } from "./isSymbol-DCbjQG_U.js";
-import { d as _arrayMap_default, n as _hasPath_default } from "./hasIn-DnfJcYpY.js";
-import { i as toFinite_default } from "./_basePickBy-Sow3pJjS.js";
-import { C as _baseFindIndex_default, b as keys_default, f as _baseIteratee_default, u as _baseEach_default } from "./_baseUniq-C87CckHL.js";
-function toInteger(c) {
-  var P = toFinite_default(c), F = P % 1;
-  return P === P ? F ? P - F : P : 0;
-}
-var toInteger_default = toInteger, objectProto = Object.prototype, hasOwnProperty$1 = objectProto.hasOwnProperty, defaults_default = _baseRest_default(function(c, P) {
-  c = Object(c);
-  var F = -1, I = P.length, R = I > 2 ? P[2] : void 0;
-  for (R && _isIterateeCall_default(P[0], P[1], R) && (I = 1); ++F < I; ) for (var z = P[F], H = keysIn_default(z), U = -1, W = H.length; ++U < W; ) {
-    var G = H[U], K = c[G];
-    (K === void 0 || eq_default(K, objectProto[G]) && !hasOwnProperty$1.call(c, G)) && (c[G] = z[G]);
-  }
-  return c;
-});
-function last(c) {
-  var P = c == null ? 0 : c.length;
-  return P ? c[P - 1] : void 0;
-}
-var last_default = last;
-function createFind(c) {
-  return function(F, I, L) {
-    var R = Object(F);
-    if (!isArrayLike_default(F)) {
-      var z = _baseIteratee_default(I, 3);
-      F = keys_default(F), I = function(c2) {
-        return z(R[c2], c2, R);
-      };
-    }
-    var B = c(F, I, L);
-    return B > -1 ? R[z ? F[B] : B] : void 0;
-  };
-}
-var _createFind_default = createFind, nativeMax = Math.max;
-function findIndex(c, P, F) {
-  var I = c == null ? 0 : c.length;
-  if (!I) return -1;
-  var L = F == null ? 0 : toInteger_default(F);
-  return L < 0 && (L = nativeMax(I + L, 0)), _baseFindIndex_default(c, _baseIteratee_default(P, 3), L);
-}
-var find_default = _createFind_default(findIndex);
-function baseMap(c, F) {
-  var I = -1, L = isArrayLike_default(c) ? Array(c.length) : [];
-  return _baseEach_default(c, function(c2, P, R) {
-    L[++I] = F(c2, P, R);
-  }), L;
-}
-var _baseMap_default = baseMap;
-function map(P, F) {
-  return (isArray_default(P) ? _arrayMap_default : _baseMap_default)(P, _baseIteratee_default(F, 3));
-}
-var map_default = map, hasOwnProperty = Object.prototype.hasOwnProperty;
-function baseHas(c, P) {
-  return c != null && hasOwnProperty.call(c, P);
-}
-var _baseHas_default = baseHas;
-function has(c, P) {
-  return c != null && _hasPath_default(c, P, _baseHas_default);
-}
-var has_default = has, stringTag = "[object String]";
-function isString(P) {
-  return typeof P == "string" || !isArray_default(P) && isObjectLike_default(P) && _baseGetTag_default(P) == stringTag;
-}
-var isString_default = isString;
-function baseLt(c, P) {
-  return c < P;
-}
-var _baseLt_default = baseLt;
-function baseExtremum(c, P, F) {
-  for (var I = -1, L = c.length; ++I < L; ) {
-    var R = c[I], z = P(R);
-    if (z != null && (B === void 0 ? z === z && !isSymbol_default(z) : F(z, B))) var B = z, V = R;
-  }
-  return V;
-}
-var _baseExtremum_default = baseExtremum;
-function min(c) {
-  return c && c.length ? _baseExtremum_default(c, identity_default, _baseLt_default) : void 0;
-}
-var min_default = min;
-export {
-  has_default as a,
-  find_default as c,
-  toInteger_default as d,
-  isString_default as i,
-  last_default as l,
-  _baseExtremum_default as n,
-  map_default as o,
-  _baseLt_default as r,
-  _baseMap_default as s,
-  min_default as t,
-  defaults_default as u
-};

package/dist/range-fJeId9Ri.js

@@ -1,30 +0,0 @@
-import { E as _overRest_default, M as _setToString_default, S as _isIterateeCall_default } from "./isArrayLikeObject-LXbTYiBa.js";
-import { t as hasIn_default } from "./hasIn-DnfJcYpY.js";
-import { i as toFinite_default, r as flatten_default, t as _basePickBy_default } from "./_basePickBy-Sow3pJjS.js";
-function flatRest(p) {
-  return _setToString_default(_overRest_default(p, void 0, flatten_default), p + "");
-}
-var _flatRest_default = flatRest;
-function basePick(e, f) {
-  return _basePickBy_default(e, f, function(f2, p) {
-    return hasIn_default(e, p);
-  });
-}
-var _basePick_default = basePick, pick_default = _flatRest_default(function(e, f) {
-  return e == null ? {} : _basePick_default(e, f);
-}), nativeCeil = Math.ceil, nativeMax = Math.max;
-function baseRange(e, f, p, m) {
-  for (var h = -1, g = nativeMax(nativeCeil((f - e) / (p || 1)), 0), _ = Array(g); g--; ) _[m ? g : ++h] = e, e += p;
-  return _;
-}
-var _baseRange_default = baseRange;
-function createRange(e) {
-  return function(f, m, g) {
-    return g && typeof g != "number" && _isIterateeCall_default(f, m, g) && (m = g = void 0), f = toFinite_default(f), m === void 0 ? (m = f, f = 0) : m = toFinite_default(m), g = g === void 0 ? f < m ? 1 : -1 : toFinite_default(g), _baseRange_default(f, m, g, e);
-  };
-}
-var range_default = createRange();
-export {
-  pick_default as n,
-  range_default as t
-};