solid-recharts 0.1.0 → 0.2.1

package/src/util/ChartUtils.ts

@@ -15,16 +15,8 @@ import {
   stackOffsetSilhouette,
   stackOffsetWiggle,
   stackOrderNone,
-} from "victory-vendor/d3-shape";
-import {
-  findEntryInArray,
-  isNan,
-  isNotNil,
-  isNullish,
-  isNumber,
-  isNumOrStr,
-  mathSign,
-} from "./DataUtils";
+} from "d3-shape";
+import { isNan, isNotNil, isNullish, isNumber, isNumOrStr, mathSign } from "./DataUtils";
 import { getSliced } from "./getSliced";
 import { isWellBehavedNumber } from "./isWellBehavedNumber";
 import type {
@@ -276,6 +268,32 @@ export const truncateByDomain = <T>(
   return result;
 };
 
+// Value→tick lookup cache, keyed on the ticks array reference. getCateCoordinateOfLine
+// is called once per data point; a linear findEntryInArray scan there is O(points²)
+// across a full series when allowDuplicatedCategory=false (ticks.length ≈ points).
+// The axis-ticks selector memoizes the ticks array, so this map is built once per
+// render and reused for every point lookup, making it O(points). First value wins,
+// mirroring Array.find.
+const tickByValueCache = new WeakMap<ReadonlyArray<TickItem>, Map<unknown, TickItem>>();
+function findTickByValue(ticks: ReadonlyArray<TickItem>, value: unknown): TickItem | undefined {
+  // Map uses SameValueZero and would match NaN, while the upstream Array.find
+  // lookup uses strict equality (NaN !== NaN). Preserve that fallback behavior.
+  if (typeof value === "number" && Number.isNaN(value)) {
+    return undefined;
+  }
+  let map = tickByValueCache.get(ticks);
+  if (map == null) {
+    map = new Map<unknown, TickItem>();
+    for (const tick of ticks) {
+      if (tick != null && !map.has(tick.value)) {
+        map.set(tick.value, tick);
+      }
+    }
+    tickByValueCache.set(ticks, map);
+  }
+  return map.get(value);
+}
+
 export function getCateCoordinateOfLine<T>({
   axis,
   ticks,
@@ -312,7 +330,7 @@ export function getCateCoordinateOfLine<T>({
       const key: string | number = axisDataKey;
       const cellValue = entry[key];
       if (!isNullish(cellValue)) {
-        const matchedTick = ticks ? findEntryInArray(ticks, "value", cellValue) : undefined;
+        const matchedTick = ticks ? findTickByValue(ticks, cellValue) : undefined;
 
         if (matchedTick) {
           return matchedTick.coordinate + bandSize / 2;
@@ -625,35 +643,61 @@ export const getStackedData = (
   offsetType: StackOffsetType,
 ): ReadonlyArray<Series<StackDatum, StackKey>> => {
   const offsetAccessor: OffsetAccessor = STACK_OFFSET_MAP[offsetType] ?? offsetSign;
+  // Track whether any value is a [min, max] tuple during the (unavoidable) value
+  // accessor pass, so the ranged-data fixup below can be skipped entirely for the
+  // common scalar case instead of running a second full series×points scan.
+  let hasRangedValues = false;
   const stack = shapeStack<StackDatum, StackKey>()
     .keys(dataKeys)
-    .value((d, key) => Number(getValueByDataKey(d, key, 0)))
+    .value((d, key) => {
+      const raw = getValueByDataKey(d, key, 0);
+      if (Array.isArray(raw) && raw.length === 2) {
+        hasRangedValues = true;
+      }
+      return Number(raw);
+    })
     .order(stackOrderNone)
     .offset(offsetAccessor);
 
   const result = stack(data);
 
   // Ranged data: when a value is a [min, max] tuple, use it directly (no stacking).
-  result.forEach((s, seriesIndex) => {
-    s.forEach((point, pointIndex) => {
-      const value = getValueByDataKey(data[pointIndex], dataKeys[seriesIndex], 0);
-      if (value != null && Array.isArray(value) && value.length === 2) {
-        const lo: unknown = value[0];
-        const hi: unknown = value[1];
-        if (isNumber(lo) && isNumber(hi)) {
-          point[0] = lo;
-          point[1] = hi;
+  if (hasRangedValues) {
+    result.forEach((s, seriesIndex) => {
+      s.forEach((point, pointIndex) => {
+        const value = getValueByDataKey(data[pointIndex], dataKeys[seriesIndex], 0);
+        if (value != null && Array.isArray(value) && value.length === 2) {
+          const lo: unknown = value[0];
+          const hi: unknown = value[1];
+          if (isNumber(lo) && isNumber(hi)) {
+            point[0] = lo;
+            point[1] = hi;
+          }
         }
-      }
+      });
     });
-  });
+  }
 
   return result;
 };
 
 const getDomainOfSingle = (data: ReadonlyArray<ReadonlyArray<unknown>>): number[] => {
-  const flat = data.flat(2).filter(isNumber);
-  return [Math.min(...flat), Math.max(...flat)];
+  // Reduce loop, not `Math.min(...flat)`: spreading a data-sized array throws a V8
+  // RangeError past ~100k elements. Empty input yields [Infinity, -Infinity],
+  // matching the previous Math.min/Math.max-of-empty behavior.
+  let min = Infinity;
+  let max = -Infinity;
+  for (const value of data.flat(2)) {
+    if (isNumber(value)) {
+      if (value < min) {
+        min = value;
+      }
+      if (value > max) {
+        max = value;
+      }
+    }
+  }
+  return [min, max];
 };
 
 const makeDomainFinite = (domain: NumberDomain): NumberDomain => [

package/src/util/propsAreEqual.ts

@@ -1,16 +1,15 @@
 // Ported from recharts 3.8.1 src/util/propsAreEqual.ts (commit 7a23854).
 //
 // Deviation: recharts imports `shallowEqual` from `react-redux`. A SolidJS port
-// has no react-redux, so we inline an equivalent one-level same-value compare.
-// react-redux's `shallowEqual` is just `Object.is` applied per own-enumerable
-// key (its internal `is` predates and mirrors `Object.is`), so the local
-// version below is behavior-identical — NaN compares equal, +0 and -0 do not.
+// has no react-redux, so it reuses the local equivalent in `./ShallowEqual`
+// (one-level same-value compare — NaN equal, +0 and -0 distinct).
 //
 // NOTE on relevance: recharts uses `propsAreEqual` only as the `React.memo`
 // comparator on Bar/Area/Line/Scatter/Legend/ReportEventSettings/etc. Solid
 // components do not re-render, so when those units are ported this comparator
 // will most likely be dropped or repurposed. The function itself is pure and
 // spec-tested, so we port it now and revisit its call sites in Tier 2.
+import { shallowEqual } from "./ShallowEqual";
 
 const propsToShallowCompare = new Set<string>([
   "axisLine",
@@ -37,35 +36,6 @@ const propsToShallowCompare = new Set<string>([
   "throttledEvents",
 ]);
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
-}
-
-/**
- * One-level same-value comparison, equivalent to react-redux's `shallowEqual`.
- * Uses `Object.is`, so two NaNs are equal and +0/-0 are not — matching the
- * original.
- */
-function shallowEqual(objA: unknown, objB: unknown): boolean {
-  if (Object.is(objA, objB)) {
-    return true;
-  }
-  if (!isRecord(objA) || !isRecord(objB)) {
-    return false;
-  }
-  const keysA = Object.keys(objA);
-  const keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) {
-    return false;
-  }
-  for (const key of keysA) {
-    if (!Object.hasOwn(objB, key) || !Object.is(objA[key], objB[key])) {
-      return false;
-    }
-  }
-  return true;
-}
-
 /**
  * When comparing two values, returns true if they are the same value or
  * are both NaN.

package/src/util/stacks/stackTypes.ts

@@ -1,5 +1,5 @@
 // Ported from recharts 3.8.1 src/util/stacks/stackTypes.ts (commit 7a23854).
-import { Series } from "victory-vendor/d3-shape";
+import { Series } from "d3-shape";
 import { StackId } from "../ChartUtils";
 import { DataKey } from "../types";
 import { GraphicalItemId } from "../../state/graphicalItemsSlice";

package/src/util/types.ts

@@ -1,6 +1,6 @@
 import type { JSX } from "@solidjs/web";
 import type { Element } from "solid-js";
-import type * as d3Scales from "victory-vendor/d3-scale";
+import type * as d3Scales from "d3-scale";
 import type { DotProps } from "../shape/Dot";
 import type { ExternalMouseEvents } from "../chart/types";
 
@@ -10,7 +10,7 @@ import type { ExternalMouseEvents } from "../chart/types";
 // codebase (Area, Label, Text, axisSelectors, d3-scale, the public index). We do
 // NOT port it whole — only the geometry/value types the currently-ported units
 // reference, growing this file as later units need more ("declare/stub then
-// backfill", per PORT_ORDER). Definitions are copied faithfully; the sole
+// backfill"). Definitions are copied faithfully; the sole
 // deviation is `ChartCoordinate`'s `any` fields → `unknown` (this repo bans
 // `any`; the type is `@deprecated` and those fields aren't read structurally by
 // current consumers).

package/test/animation/CSSTransitionAnimate.timing.spec.tsx

@@ -22,7 +22,7 @@
 //     load-bearing contracts (fresh `from`, settled `to`, gating) are asserted.
 import { describe, expect, it, vi, beforeEach } from "vitest";
 import { createSignal, flush } from "solid-js";
-import { render, fireEvent } from "../helper/render";
+import { render, fireEvent } from "@solidjs/testing-library";
 import { CSSTransitionAnimate } from "../../src/animation/CSSTransitionAnimate";
 import { MockControllerAnimationManager } from "./mockControllerAnimationManager";
 import { expectLastCalledWith } from "../helper/expectLastCalledWith";

package/test/animation/JavascriptAnimate.spec.tsx

@@ -9,7 +9,7 @@
 // injected MockControllerAnimationManager (deterministic, no requestAnimationFrame).
 import { describe, it, expect, vi } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { JavascriptAnimate } from "../../src/animation/JavascriptAnimate";
 import { MockControllerAnimationManager } from "./mockControllerAnimationManager";
 

package/test/animation/legacyAnimationLengthChange.spec.tsx

@@ -51,7 +51,7 @@ import {
   Scatter,
   ScatterChart,
 } from "../../src";
-import { render, fireEvent } from "../helper/render";
+import { render, fireEvent } from "@solidjs/testing-library";
 import { AnimationControllerProvider } from "../../src/animation/useAnimationController";
 import type { AnimationController } from "../../src";
 import {

package/test/cartesian/Area.animation.spec.tsx

@@ -19,7 +19,7 @@
 // propagation to a flush boundary.
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { createSignal, flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { AreaChart, Area } from "../../src";
 import { AnimationControllerProvider } from "../../src/animation/useAnimationController";
 import { MockControllerAnimationManager as MockProgressAnimationManager } from "../animation/mockControllerAnimationManager";

package/test/cartesian/Area.range.spec.tsx

@@ -7,7 +7,7 @@ import { beforeEach, describe, expect, it } from "vitest";
 import { flush } from "solid-js";
 import { Area, AreaChart, Tooltip, XAxis, YAxis } from "../../src";
 import { rangeData } from "../_data";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { mockGetBoundingClientRect } from "../helper/mockGetBoundingClientRect";
 import { showTooltip } from "../component/Tooltip/tooltipTestHelpers";
 import { areaChartMouseHoverTooltipSelector } from "../component/Tooltip/tooltipMouseHoverSelectors";

package/test/cartesian/Area.spec.tsx

@@ -40,7 +40,7 @@ import {
   allCartesianChartsExcept,
   type CartesianChartTestCase,
 } from "../helper/parameterizedTestCases";
-import { fireEvent, render, screen } from "../helper/render";
+import { fireEvent, render, screen } from "@solidjs/testing-library";
 
 const emptyBaseValues: ReadonlyArray<BaseValue | undefined> = [undefined, NaN];
 

package/test/cartesian/Area.stacked.render.spec.tsx

@@ -7,7 +7,7 @@
 // register via effects and points compute from the store.
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { AreaChart, Area } from "../../src";
 
 const data = [

package/test/cartesian/Area.typed.spec.tsx

@@ -23,7 +23,7 @@
 //     shape; `getRelativeCoordinate(e)` still accepts the (SVG) event.
 import { describe, it } from "vitest";
 import { Area, AreaChart, getRelativeCoordinate } from "../../src";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { expectAreaCurve, type ExpectedArea } from "../helper/expectAreaCurve";
 
 type ExampleDataPoint = {

package/test/cartesian/Axis.integration.spec.tsx

@@ -8,7 +8,7 @@
 // coords would diverge from recharts for reasons unrelated to axis logic.
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { LineChart, Line, XAxis, YAxis } from "../../src";
 
 function tickTexts(container: Element, axis: ".recharts-xAxis" | ".recharts-yAxis"): string[] {

package/test/cartesian/Bar/Bar.csstransition.spec.tsx

@@ -12,7 +12,7 @@ import { barChartMouseHoverTooltipSelector } from "../../component/Tooltip/toolt
 import { mockGetBoundingClientRect } from "../../helper/mockGetBoundingClientRect";
 import { expectNthCalledWith } from "../../helper/expectLastCalledWith";
 import { assertNotNull } from "../../helper/assertNotNull";
-import { fireEvent } from "../../helper/render";
+import { fireEvent } from "@solidjs/testing-library";
 
 const expectedBars: ReadonlyArray<ExpectedBar> = [
   {

package/test/cartesian/Bar/Bar.spec.tsx

@@ -21,7 +21,7 @@ import {
 import type { CartesianGraphicalItemSettings } from "../../../src/state/graphicalItemsSlice";
 import { useAppSelector } from "../../../src/state/hooks";
 import { BarSettings } from "../../../src/state/types/BarSettings";
-import { fireEvent, render } from "../../helper/render";
+import { fireEvent, render } from "@solidjs/testing-library";
 import { assertZIndexLayerOrder } from "../../helper/assertZIndexLayerOrder";
 import { expectActiveBars, expectBars, getAllBarPaths, getAllBars } from "../../helper/expectBars";
 import { expectLabels } from "../../helper/expectLabel";

package/test/cartesian/Bar/Bar.typed.spec.tsx

@@ -19,7 +19,7 @@
 //    on each call (golden-anchored to the Solid type surface).
 import { describe, it } from "vitest";
 import { Bar, BarChart, getRelativeCoordinate, type BarRectangleItem } from "../../../src";
-import { render } from "../../helper/render";
+import { render } from "@solidjs/testing-library";
 import { expectBars, type ExpectedBar } from "../../helper/expectBars";
 
 type ExampleDataPoint = {

package/test/cartesian/Bar.animation.spec.tsx

@@ -30,7 +30,7 @@
 //     same "restart from the beginning" behaviour.
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { createSignal, flush } from "solid-js";
-import { render, fireEvent } from "../helper/render";
+import { render, fireEvent } from "@solidjs/testing-library";
 import { BarChart, Bar } from "../../src";
 import { AnimationControllerProvider } from "../../src/animation/useAnimationController";
 import { MockControllerAnimationManager as MockProgressAnimationManager } from "../animation/mockControllerAnimationManager";

package/test/cartesian/Bar.stackDomain.spec.tsx

@@ -3,7 +3,7 @@
 // exercises the un-deferred selectDomainOfStackGroups → combineNumericalDomain path.
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { BarChart, Bar, XAxis, YAxis } from "../../src";
 
 const data = [

package/test/cartesian/Bar.stacked.render.spec.tsx

@@ -5,7 +5,7 @@
 // register via effects and rects compute from the store.
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { BarChart, Bar } from "../../src";
 
 const data = [

package/test/cartesian/Bar.zeroDimensionFiltering.spec.tsx

@@ -3,7 +3,7 @@ import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
 import { Bar, BarChart, BarStack, XAxis, YAxis } from "../../src";
 import { createSelectorTestCase } from "../helper/createSelectorTestCase";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { selectBarRectangles } from "../../src/state/selectors/barSelectors";
 import { getAllBars } from "../helper/expectBars";
 

package/test/cartesian/Brush.keyboard.spec.tsx

@@ -4,7 +4,7 @@
 // real browser; here we flush manually).
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render, fireEvent } from "../helper/render";
+import { render, fireEvent } from "@solidjs/testing-library";
 import { LineChart, Line, XAxis, YAxis, Brush } from "../../src";
 
 const data = [

package/test/cartesian/Brush.panorama.spec.tsx

@@ -6,7 +6,7 @@
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
 import { Brush, Line, LineChart } from "../../src";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 
 const data = [
   { name: "a", uv: 100 },

package/test/cartesian/Brush.props.spec.tsx

@@ -6,7 +6,7 @@ import { describe, expect, it, vi } from "vitest";
 import { flush } from "solid-js";
 import type { JSX } from "@solidjs/web";
 import { BarChart, Brush } from "../../src";
-import { fireEvent, render } from "../helper/render";
+import { fireEvent, render } from "@solidjs/testing-library";
 import { assertNotNull } from "../helper/assertNotNull";
 
 const data = [

package/test/cartesian/Brush.render.spec.tsx

@@ -5,7 +5,7 @@
 // `flush()` because the brush registers settings + reads indices via effects.
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render, fireEvent } from "../helper/render";
+import { render, fireEvent } from "@solidjs/testing-library";
 import { LineChart, Line, XAxis, YAxis, Brush } from "../../src";
 
 const data = [

package/test/cartesian/Brush.spec.tsx

@@ -26,7 +26,7 @@
 import { describe, expect, it, test } from "vitest";
 import { createSignal, flush } from "solid-js";
 import type { JSX } from "@solidjs/web";
-import { render, fireEvent, screen, waitFor } from "../helper/render";
+import { render, fireEvent, screen, waitFor } from "@solidjs/testing-library";
 import { BarChart, Brush, ComposedChart, Line, LineChart, ReferenceLine } from "../../src";
 import type { BrushProps } from "../../src";
 import { assertNotNull } from "../helper/assertNotNull";

package/test/cartesian/Brush.stacked.spec.tsx

@@ -18,7 +18,7 @@
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
 import { createSelectorTestCase } from "../helper/createSelectorTestCase";
-import { fireEvent } from "../helper/render";
+import { fireEvent } from "@solidjs/testing-library";
 import { BarChart, Bar, Brush } from "../../src";
 import { PageData } from "../_data";
 import { assertNotNull } from "../helper/assertNotNull";

package/test/cartesian/CartesianAxis.render.spec.tsx

@@ -3,7 +3,7 @@
 // not just register settings.
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { LineChart, Line, XAxis, YAxis } from "../../src";
 import { PageData } from "../_data";
 

package/test/cartesian/CartesianAxis.spec.tsx

@@ -6,8 +6,8 @@
 // React.cloneElement an already-evaluated element to inject computed x/y — function form
 // covers it).
 import { describe, expect, it } from "vitest";
-import { scaleLinear } from "victory-vendor/d3-scale";
-import { render } from "../helper/render";
+import { scaleLinear } from "d3-scale";
+import { render } from "@solidjs/testing-library";
 import { CartesianAxis, Surface } from "../../src";
 import type { CartesianTickContentProps, TickItem } from "../../src/util/types";
 import type { LabelContentType } from "../../src/component/Label";

package/test/cartesian/CartesianGrid.render.spec.tsx

@@ -2,7 +2,7 @@
 // axis ticks across the plot area.
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { LineChart, Line, XAxis, YAxis, CartesianGrid } from "../../src";
 import { PageData } from "../_data";
 

package/test/cartesian/CartesianGrid.spec.tsx

@@ -15,7 +15,7 @@
 import { describe, expect, it, type Mock, test, vi } from "vitest";
 import { createEffect, flush } from "solid-js";
 import type { JSX } from "@solidjs/web";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import {
   CartesianGrid,
   LineChart,

package/test/cartesian/ErrorBar.render.spec.tsx

@@ -3,7 +3,7 @@
 // selectAllErrorBarSettings → getErrorDomainByDataKey path).
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { LineChart, Line, XAxis, YAxis, ErrorBar } from "../../src";
 
 const data = [

package/test/cartesian/ErrorBar.spec.tsx

@@ -18,7 +18,7 @@ import {
   XAxis,
   YAxis,
 } from "../../src";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { AnimationControllerProvider } from "../../src/animation/useAnimationController";
 import type { AnimationController } from "../../src";
 import { MockControllerAnimationManager } from "../animation/mockControllerAnimationManager";

package/test/cartesian/Funnel.animation.spec.tsx

@@ -22,7 +22,7 @@
 import { describe, expect, it, vi } from "vitest";
 import { createSignal, flush } from "solid-js";
 import { createSelectorTestCase } from "../helper/createSelectorTestCase";
-import { render, fireEvent } from "../helper/render";
+import { render, fireEvent } from "@solidjs/testing-library";
 import { AnimationControllerProvider } from "../../src/animation/useAnimationController";
 import { MockControllerAnimationManager as MockProgressAnimationManager } from "../animation/mockControllerAnimationManager";
 import { Funnel, FunnelChart } from "../../src";

package/test/cartesian/Funnel.spec.tsx

@@ -10,7 +10,7 @@ import { Cell, Funnel, FunnelChart, FunnelProps, FunnelTrapezoidItem, LabelList
 import { showTooltip } from "../component/Tooltip/tooltipTestHelpers";
 import { funnelChartMouseHoverTooltipSelector } from "../component/Tooltip/tooltipMouseHoverSelectors";
 import { computeFunnelTrapezoids } from "../../src/cartesian/Funnel";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 
 const data = [
   { value: 100, name: "展现" },

package/test/cartesian/Funnel.typed.spec.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { Funnel, FunnelChart, getRelativeCoordinate, type FunnelTrapezoidItem } from "../../src";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 
 type ExampleDataPoint = {
   value: number;

package/test/cartesian/GraphicalItemClipPath.scale-behavior.spec.tsx

@@ -12,10 +12,10 @@
 // last spy call holds the current points. `p.payload` is `unknown` in our port
 // (recharts erases it via `any`), so a runtime guard reads `name`/`x` — no `as`.
 import { describe, it, expect, beforeEach } from "vitest";
-import { scaleLinear, scalePoint } from "victory-vendor/d3-scale";
+import { scaleLinear, scalePoint } from "d3-scale";
 import { createSignal, flush } from "solid-js";
 import type { JSX } from "@solidjs/web";
-import { fireEvent } from "../helper/render";
+import { fireEvent } from "@solidjs/testing-library";
 import { Line, LineChart, XAxis, YAxis } from "../../src";
 import { createSelectorTestCase } from "../helper/createSelectorTestCase";
 import { mockGetBoundingClientRect } from "../helper/mockGetBoundingClientRect";

package/test/cartesian/Line.animation.spec.tsx

@@ -25,7 +25,7 @@
 //     scheduling — render-count coupled.
 import { describe, expect, it, beforeAll, afterAll, beforeEach } from "vitest";
 import { createSignal, flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { LineChart, Line } from "../../src";
 import { AnimationControllerProvider } from "../../src/animation/useAnimationController";
 import { MockControllerAnimationManager as MockProgressAnimationManager } from "../animation/mockControllerAnimationManager";

package/test/cartesian/Line.sparseAnimationPath.spec.tsx

@@ -11,7 +11,7 @@
 // mocked on SVGElement.prototype (jsdom lacks it).
 import { describe, expect, it, beforeAll, afterAll } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { ComposedChart, Line, XAxis } from "../../src";
 import { AnimationControllerProvider } from "../../src/animation/useAnimationController";
 import { MockControllerAnimationManager as MockProgressAnimationManager } from "../animation/mockControllerAnimationManager";

package/test/cartesian/Line.spec.tsx

@@ -23,7 +23,7 @@ import { showTooltip } from "../component/Tooltip/tooltipTestHelpers";
 import { lineChartMouseHoverTooltipSelector } from "../component/Tooltip/tooltipMouseHoverSelectors";
 import { assertNotNull } from "../helper/assertNotNull";
 import { expectLastCalledWith } from "../helper/expectLastCalledWith";
-import { fireEvent, render } from "../helper/render";
+import { fireEvent, render } from "@solidjs/testing-library";
 
 describe("<Line />", () => {
   beforeEach(() => {

package/test/cartesian/Line.typed.spec.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { Line, LineChart, getRelativeCoordinate } from "../../src";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 
 type ExampleDataPoint = {
   x: number;

package/test/cartesian/ReferenceArea.render.spec.tsx

@@ -2,7 +2,7 @@
 // range (x1..x2, y1..y2), mapped to pixels through both cartesian scales.
 import { describe, expect, it } from "vitest";
 import { flush } from "solid-js";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 import { LineChart, Line, XAxis, YAxis, ReferenceArea } from "../../src";
 
 const data = [

package/test/cartesian/ReferenceArea.spec.tsx

@@ -20,7 +20,7 @@
 import { describe, expect, it, test, vi } from "vitest";
 import { createEffect, createSignal, flush, Show } from "solid-js";
 import type { JSX } from "@solidjs/web";
-import { fireEvent, render, screen } from "../helper/render";
+import { fireEvent, render, screen } from "@solidjs/testing-library";
 import { Bar, BarChart, IfOverflow, LineChart, ReferenceArea, XAxis, YAxis } from "../../src";
 import { useAppSelector } from "../../src/state/hooks";
 import { selectReferenceAreasByAxis } from "../../src/state/selectors/axisSelectors";

package/test/cartesian/ReferenceArea.typed.spec.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { Line, LineChart, ReferenceArea, getRelativeCoordinate } from "../../src";
-import { render } from "../helper/render";
+import { render } from "@solidjs/testing-library";
 
 // Ported from recharts 3.8.1 test/cartesian/ReferenceArea.typed.spec.tsx.