@octanejs/recharts 0.1.51 → 0.1.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/recharts",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -43,10 +43,10 @@
     "reselect": "5.2.0",
     "tiny-invariant": "^1.3.3",
     "victory-vendor": "^37.3.6",
-    "@octanejs/redux": "0.1.50"
+    "@octanejs/redux": "0.1.51"
   },
   "peerDependencies": {
-    "octane": "^0.1.51 || ^0.2.0"
+    "octane": "^0.1.51 || ^0.2.0 || ^0.3.0"
   },
   "devDependencies": {
     "@tsrx/react": "^0.3.0",
@@ -55,7 +55,7 @@
     "react-dom": "19.2.7",
     "recharts": "3.9.2",
     "vitest": "^4.1.10",
-    "octane": "0.2.12"
+    "octane": "0.3.0"
   },
   "scripts": {
     "test": "vitest run"

package/src/animation/AnimationController.ts

@@ -1,6 +1,6 @@
 // Adapted from recharts@3.9.2, commit b3451050c027a23957ffa50a2665c9119df21e47.
 import type { CancelableTimeout, TimeoutController } from './timeoutController';
-import { AnimationHandle } from './AnimationHandle';
+import type { AnimationHandle } from './AnimationHandle';
 
 /**
  * JavaScript animations produce numbers and CSS transitions produce strings.

package/src/animation/AnimationControllerImpl.ts

@@ -1,10 +1,10 @@
 // Adapted from recharts@3.9.2, commit b3451050c027a23957ffa50a2665c9119df21e47.
-import {
+import type {
 	AnimationController,
 	AnimationControllerHandle,
 	OnAnimationStateUpdate,
 } from './AnimationController';
-import { CancelableTimeout, TimeoutController } from './timeoutController';
+import type { CancelableTimeout, TimeoutController } from './timeoutController';
 
 /**
  * JavaScript animations require trigger and repaint as soon as possible,

package/src/animation/AnimationHandle.ts

@@ -1,7 +1,7 @@
 // Adapted from recharts@3.9.2, commit b3451050c027a23957ffa50a2665c9119df21e47.
 // eslint-disable-next-line max-classes-per-file
 import { interpolate } from '../util/DataUtils';
-import { EasingFunction, NamedBezier } from './easing';
+import type { EasingFunction, NamedBezier } from './easing';
 
 const INIT = 'init' as const;
 const PENDING = 'pending' as const;

package/src/animation/CSSTransitionAnimate.tsrx

@@ -10,7 +10,7 @@ import { Global } from '../util/Global';
 import { usePrefersReducedMotion } from '../util/usePrefersReducedMotion';
 import { CSSTransitionAnimation } from './AnimationHandle';
 import { RequestAnimationFrameTimeoutController } from './timeoutController';
-import { EasingInput, NamedBezier } from './easing';
+import type { EasingInput, NamedBezier } from './easing';
 import type { AnimationController } from './AnimationController';
 
 type CSSTransitionAnimateProps = {

package/src/animation/matchBy.ts

@@ -1,5 +1,5 @@
 // Adapted from recharts@3.9.2, commit b3451050c027a23957ffa50a2665c9119df21e47.
-import { DataKey } from '../util/types';
+import type { DataKey } from '../util/types';
 import { getValueByDataKey } from '../util/ChartUtils';
 
 /**

package/src/animation/useAnimationController.ts

@@ -12,7 +12,7 @@ const AnimationControllerContext = createContext(animationControllerImpl);
  * internally to drive animations.
  * @since 3.9
  */
-export const AnimationControllerProvider = AnimationControllerContext.Provider;
+export const AnimationControllerProvider = AnimationControllerContext;
 
 export function useAnimationController(
 	animationControllerFromProps?: AnimationController,

package/src/cartesian/Area.tsrx

@@ -2,24 +2,24 @@ import type { MutableRefObject, OctaneElement, OctaneNode } from '../util/Octane
 import * as React from 'octane';
 import { useMemo, useRef } from 'octane';
 import { clsx } from 'clsx';
-import { BaseLineType, CurveType, Props as CurveProps } from '../shape/Curve.tsrx';
+import type { BaseLineType, CurveType, Props as CurveProps } from '../shape/Curve.tsrx';
 import { Layer } from '../container/Layer.tsrx';
 import {
 	CartesianLabelListContextProvider,
-	CartesianLabelListEntry,
-	ImplicitLabelListType,
+	type CartesianLabelListEntry,
+	type ImplicitLabelListType,
 	LabelListFromLabelProp,
 } from '../component/LabelList.tsrx';
-import { Dots, DotsDotProps } from '../component/Dots.tsrx';
+import { Dots, type DotsDotProps } from '../component/Dots.tsrx';
 import { interpolate, isNan, isNullish, isNumber, noop } from '../util/DataUtils';
 import {
 	getCateCoordinateOfLine,
 	getNormalizedStackId,
 	getTooltipNameProp,
 	getValueByDataKey,
-	StackId,
+	type StackId,
 } from '../util/ChartUtils';
-import {
+import type {
 	ActiveDotType,
 	ActiveShape,
 	AnimationDuration,
@@ -37,14 +37,18 @@ import {
 } from '../util/types';
 import { isClipDot } from '../util/ReactUtils';
 import type { LegendPayload } from '../component/DefaultLegendContent.tsrx';
-import { Formatter } from '../component/DefaultTooltipContent.tsrx';
+import type { Formatter } from '../component/DefaultTooltipContent.tsrx';
 import { ActivePoints } from '../component/ActivePoints.tsrx';
-import { TooltipPayloadConfiguration } from '../state/tooltipSlice';
+import type { TooltipPayloadConfiguration } from '../state/tooltipSlice';
 import { SetTooltipEntrySettings } from '../state/SetTooltipEntrySettings';
 import { GraphicalItemClipPath, useNeedsClip } from './GraphicalItemClipPath.tsrx';
-import { BaseAxisWithScale } from '../state/selectors/axisSelectors';
-import { ChartData } from '../state/chartDataSlice';
-import { AreaPointItem, ComputedArea, selectArea } from '../state/selectors/areaSelectors';
+import type { BaseAxisWithScale } from '../state/selectors/axisSelectors';
+import type { ChartData } from '../state/chartDataSlice';
+import {
+	type AreaPointItem,
+	type ComputedArea,
+	selectArea,
+} from '../state/selectors/areaSelectors';
 import { useIsPanorama } from '../context/PanoramaContext';
 import { useCartesianChartLayout, useChartLayout } from '../context/chartLayoutContext';
 import { useChartName } from '../state/selectors/selectors';
@@ -52,19 +56,19 @@ import { SetLegendPayload } from '../state/SetLegendPayload';
 import { useAppSelector } from '../state/hooks';
 import {
 	AnimatedItems,
-	AnimationInterpolateFn,
+	type AnimationInterpolateFn,
 	useAnimationCallbacks,
 } from '../animation/AnimatedItems.tsrx';
 import {
-	AnimationItem,
-	AnimationMatchByProp,
+	type AnimationItem,
+	type AnimationMatchByProp,
 	matchAnimationItems,
 	matchByIndex,
 } from '../animation/matchBy';
 import { useAnimationStartSnapshot } from '../animation/useAnimationStartSnapshot';
-import { RequiresDefaultProps, resolveDefaultProps } from '../util/resolveDefaultProps';
+import { type RequiresDefaultProps, resolveDefaultProps } from '../util/resolveDefaultProps';
 import { usePlotArea } from '../hooks';
-import { WithIdRequired, WithoutId } from '../util/useUniqueId';
+import type { WithIdRequired, WithoutId } from '../util/useUniqueId';
 import { RegisterGraphicalItemId } from '../context/RegisterGraphicalItemId.tsrx';
 import type { AreaSettings } from '../state/types/AreaSettings';
 import { SetCartesianGraphicalItem } from '../state/SetGraphicalItem';
@@ -72,12 +76,12 @@ import { svgPropertiesNoEvents } from '../util/svgPropertiesNoEvents';
 import { getRadiusAndStrokeWidthFromDot } from '../util/getRadiusAndStrokeWidthFromDot';
 import { svgPropertiesAndEvents } from '../util/svgPropertiesAndEvents';
 import { Shape } from '../util/ActiveShapeUtils.tsrx';
-import { ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
+import { type ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
 import { DefaultZIndexes } from '../zIndex/DefaultZIndexes';
 import { propsAreEqual } from '../util/propsAreEqual';
-import { AxisId } from '../state/cartesianAxisSlice';
+import type { AxisId } from '../state/cartesianAxisSlice';
 import type { StackDataPoint } from '../util/stacks/stackTypes';
-import { AreaRevealShape, AreaRevealShapeProps } from './AreaRevealShape.tsrx';
+import { AreaRevealShape, type AreaRevealShapeProps } from './AreaRevealShape.tsrx';
 
 /**
  * @inline

package/src/cartesian/AreaRevealShape.tsrx

@@ -1,8 +1,8 @@
 import type { OctaneElement } from '../util/OctaneTypes.ts';
 import * as React from 'octane';
 import { isNumber } from '../util/DataUtils';
-import { Curve, BaseLineType, Props as CurveProps } from '../shape/Curve.tsrx';
-import { CartesianLayout, LayoutType, ShapeAnimationProps } from '../util/types';
+import { Curve, type BaseLineType, type Props as CurveProps } from '../shape/Curve.tsrx';
+import type { CartesianLayout, LayoutType, ShapeAnimationProps } from '../util/types';
 import { isWellBehavedNumber } from '../util/isWellBehavedNumber';
 import { Layer } from '../container/Layer.tsrx';
 import { svgPropertiesNoEvents } from '../util/svgPropertiesNoEvents';

package/src/cartesian/Bar.tsrx

@@ -750,7 +750,7 @@ function BarImpl(props: BarImplProps) {
 		dataPointFormatter={errorBarDataPointFormatter}
 		errorBarOffset={errorBarOffset}
 	>
-		<CellsContext.Provider value={cellRegistry}>
+		<CellsContext value={cellRegistry}>
 			<BarWithState
 				{...props}
 				layout={layout}
@@ -767,7 +767,7 @@ function BarImpl(props: BarImplProps) {
 				animationEasing={animationEasing}
 				isAnimationActive={isAnimationActive}
 			/>
-		</CellsContext.Provider>
+		</CellsContext>
 	</SetErrorBarContext>;
 }
 

package/src/cartesian/BarStack.tsrx

@@ -106,10 +106,10 @@ function BarStackImpl(props: BarStackProps) @{
 		resolvedStackId,
 		radius,
 	]);
-	<BarStackContext.Provider value={context}>
+	<BarStackContext value={context}>
 		<BarStackClipPath stackId={resolvedStackId} radius={radius} />
 		{children}
-	</BarStackContext.Provider>
+	</BarStackContext>
 }
 
 /**

package/src/cartesian/CartesianGrid.tsrx

@@ -3,26 +3,26 @@ import * as React from 'octane';
 
 import { warn } from '../util/LogUtils';
 import { isNumber } from '../util/DataUtils';
-import { ChartOffsetInternal } from '../util/types';
+import type { ChartOffsetInternal } from '../util/types';
 
 import {
-	AxisPropsNeededForTicksGenerator,
+	type AxisPropsNeededForTicksGenerator,
 	getCoordinatesOfGrid,
 	getTicksOfAxis,
 } from '../util/ChartUtils';
-import { getTicks, GetTicksInput } from './getTicks';
+import { getTicks, type GetTicksInput } from './getTicks';
 import { defaultCartesianAxisProps } from './CartesianAxis.tsrx';
 import { useChartHeight, useChartWidth, useOffsetInternal } from '../context/chartLayoutContext';
-import { AxisId } from '../state/cartesianAxisSlice';
+import type { AxisId } from '../state/cartesianAxisSlice';
 import {
 	selectAxisPropsNeededForCartesianGridTicksGenerator,
 } from '../state/selectors/axisSelectors';
 import { useAppSelector } from '../state/hooks';
 import { useIsPanorama } from '../context/PanoramaContext';
-import { RequiresDefaultProps, resolveDefaultProps } from '../util/resolveDefaultProps';
+import { type RequiresDefaultProps, resolveDefaultProps } from '../util/resolveDefaultProps';
 import { svgPropertiesNoEvents } from '../util/svgPropertiesNoEvents';
 import { isPositiveNumber } from '../util/isWellBehavedNumber';
-import { ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
+import { type ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
 import { DefaultZIndexes } from '../zIndex/DefaultZIndexes';
 
 /**

package/src/cartesian/ErrorBar.tsrx

@@ -5,17 +5,17 @@ import type { SVGProps } from '../util/OctaneTypes.ts';
 import * as React from 'octane';
 
 import { Layer } from '../container/Layer.tsrx';
-import { EasingInput, DataKey, RectangleCoordinate } from '../util/types';
-import { BarRectangleItem } from './Bar';
-import { LinePointItem } from './Line';
-import { ScatterPointItem } from './Scatter.tsrx';
+import type { EasingInput, DataKey, RectangleCoordinate } from '../util/types';
+import type { BarRectangleItem } from './Bar';
+import type { LinePointItem } from './Line';
+import type { ScatterPointItem } from './Scatter.tsrx';
 import { ReportErrorBarSettings, useErrorBarContext } from '../context/ErrorBarContext.tsrx';
 import { useXAxis, useYAxis } from '../hooks';
 import { resolveDefaultProps } from '../util/resolveDefaultProps';
 import { svgPropertiesNoEvents } from '../util/svgPropertiesNoEvents';
 import { useChartLayout } from '../context/chartLayoutContext';
 import { CSSTransitionAnimate, extractCssEasing } from '../animation/CSSTransitionAnimate.tsrx';
-import { ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
+import { type ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
 import { DefaultZIndexes } from '../zIndex/DefaultZIndexes';
 
 export interface ErrorBarDataItem {

package/src/cartesian/Funnel.tsrx

@@ -8,60 +8,63 @@ import { clsx } from 'clsx';
 import { selectActiveIndex } from '../state/selectors/selectors';
 import { useAppSelector } from '../state/hooks';
 import { Layer } from '../container/Layer.tsrx';
-import { Props as TrapezoidProps } from '../shape/Trapezoid.tsrx';
+import type { Props as TrapezoidProps } from '../shape/Trapezoid.tsrx';
 import {
 	CartesianLabelListContextProvider,
-	CartesianLabelListEntry,
-	ImplicitLabelListType,
+	type CartesianLabelListEntry,
+	type ImplicitLabelListType,
 	LabelListFromLabelProp,
 } from '../component/LabelList.tsrx';
 import { getPercentValue, interpolate } from '../util/DataUtils';
 import { getValueByDataKey } from '../util/ChartUtils';
 import {
-	ActiveShape,
+	type ActiveShape,
 	adaptEventsOfChild,
-	AnimationDuration,
-	EasingInput,
-	CartesianViewBoxRequired,
-	ChartOffsetInternal,
-	Coordinate,
-	DataConsumer,
-	DataKey,
-	DataProvider,
-	LegendType,
-	PresentationAttributesAdaptChildEvent,
-	ShapeAnimationProps,
-	TooltipType,
-	TrapezoidViewBox,
-	CartesianLayout,
+	type AnimationDuration,
+	type EasingInput,
+	type CartesianViewBoxRequired,
+	type ChartOffsetInternal,
+	type Coordinate,
+	type DataConsumer,
+	type DataKey,
+	type DataProvider,
+	type LegendType,
+	type PresentationAttributesAdaptChildEvent,
+	type ShapeAnimationProps,
+	type TooltipType,
+	type TrapezoidViewBox,
+	type CartesianLayout,
 } from '../util/types';
 import {
 	defaultFunnelShape,
 	FunnelTrapezoid,
-	FunnelTrapezoidProps,
+	type FunnelTrapezoidProps,
 } from '../util/FunnelUtils.tsrx';
 import {
 	useMouseClickItemDispatch,
 	useMouseEnterItemDispatch,
 	useMouseLeaveItemDispatch,
 } from '../context/tooltipContext';
-import { TooltipPayload, TooltipPayloadConfiguration } from '../state/tooltipSlice';
+import type { TooltipPayload, TooltipPayloadConfiguration } from '../state/tooltipSlice';
 import { SetTooltipEntrySettings } from '../state/SetTooltipEntrySettings';
-import { Formatter } from '../component/DefaultTooltipContent.tsrx';
+import type { Formatter } from '../component/DefaultTooltipContent.tsrx';
 import type { LegendPayload } from '../component/DefaultLegendContent.tsrx';
-import { ResolvedFunnelSettings, selectFunnelTrapezoids } from '../state/selectors/funnelSelectors';
-import { RequiresDefaultProps, resolveDefaultProps } from '../util/resolveDefaultProps';
+import {
+	type ResolvedFunnelSettings,
+	selectFunnelTrapezoids,
+} from '../state/selectors/funnelSelectors';
+import { type RequiresDefaultProps, resolveDefaultProps } from '../util/resolveDefaultProps';
 import { usePlotArea } from '../hooks';
 import { svgPropertiesNoEvents } from '../util/svgPropertiesNoEvents';
 import {
 	AnimatedItems,
-	AnimationInterpolateFn,
+	type AnimationInterpolateFn,
 	useAnimationCallbacks,
 } from '../animation/AnimatedItems.tsrx';
-import { AnimationMatchByProp, matchAppend } from '../animation/matchBy';
-import { GraphicalItemId } from '../state/graphicalItemsSlice';
+import { type AnimationMatchByProp, matchAppend } from '../animation/matchBy';
+import type { GraphicalItemId } from '../state/graphicalItemsSlice';
 import { RegisterGraphicalItemId } from '../context/RegisterGraphicalItemId.tsrx';
-import { WithIdRequired } from '../util/useUniqueId';
+import type { WithIdRequired } from '../util/useUniqueId';
 import { SetLegendPayload } from '../state/SetLegendPayload';
 import { CellsContext, useCellRegistry } from '../context/CellsContext';
 import { useCartesianChartLayout } from '../context/chartLayoutContext';
@@ -611,7 +614,7 @@ function FunnelImpl(props: WithIdRequired<RequiresDefaultProps<Props, typeof def
 	}, [fill, hide, legendType, props.dataKey, trapezoids]);
 
 	if (hide || !trapezoids || !trapezoids.length || !plotArea) {
-		return <CellsContext.Provider value={cellRegistry}>
+		return <CellsContext value={cellRegistry}>
 			<SetLegendPayload legendPayload={legendPayload} />
 			<SetFunnelTooltipEntrySettings
 				dataKey={props.dataKey}
@@ -628,13 +631,13 @@ function FunnelImpl(props: WithIdRequired<RequiresDefaultProps<Props, typeof def
 				id={id}
 			/>
 			{props.children}
-		</CellsContext.Provider>;
+		</CellsContext>;
 	}
 	const { height, width } = plotArea;
 
 	const layerClass = clsx('recharts-trapezoids', props.className);
 
-	return <CellsContext.Provider value={cellRegistry}>
+	return <CellsContext value={cellRegistry}>
 		<SetLegendPayload legendPayload={legendPayload} />
 		<SetFunnelTooltipEntrySettings
 			dataKey={props.dataKey}
@@ -669,7 +672,7 @@ function FunnelImpl(props: WithIdRequired<RequiresDefaultProps<Props, typeof def
 				trapezoids={trapezoids}
 			/>
 		</Layer>
-	</CellsContext.Provider>;
+	</CellsContext>;
 }
 
 function normalizeFunnelValue(value: unknown): {

package/src/cartesian/ReferenceLine.tsrx

@@ -9,14 +9,14 @@ import { Layer } from '../container/Layer.tsrx';
 import {
 	CartesianLabelContextProvider,
 	CartesianLabelFromLabelProp,
-	ImplicitLabelType,
+	type ImplicitLabelType,
 } from '../component/Label.tsrx';
 import type { IfOverflow, Overflowable } from '../util/IfOverflow';
 import { isNumOrStr } from '../util/DataUtils';
 import { rectWithCoords } from '../util/CartesianUtils';
-import { CartesianViewBoxRequired, Coordinate } from '../util/types';
+import type { CartesianViewBoxRequired, Coordinate } from '../util/types';
 import { useViewBox } from '../context/chartLayoutContext';
-import { addLine, ReferenceLineSettings, removeLine } from '../state/referenceElementsSlice';
+import { addLine, type ReferenceLineSettings, removeLine } from '../state/referenceElementsSlice';
 import { useAppDispatch, useAppSelector } from '../state/hooks';
 import {
 	selectAxisScale,
@@ -27,12 +27,15 @@ import { useIsPanorama } from '../context/PanoramaContext';
 
 import { useClipPathId } from '../container/ClipPathProvider.tsrx';
 import { svgPropertiesAndEvents } from '../util/svgPropertiesAndEvents';
-import { RequiresDefaultProps, resolveDefaultProps } from '../util/resolveDefaultProps';
-import { ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
+import { type RequiresDefaultProps, resolveDefaultProps } from '../util/resolveDefaultProps';
+import { type ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
 import { DefaultZIndexes } from '../zIndex/DefaultZIndexes';
 import { isWellBehavedNumber } from '../util/isWellBehavedNumber';
-import { BandPosition, RechartsScale } from '../util/scale/RechartsScale';
-import { CartesianScaleHelper, CartesianScaleHelperImpl } from '../util/scale/CartesianScaleHelper';
+import type { BandPosition, RechartsScale } from '../util/scale/RechartsScale';
+import {
+	type CartesianScaleHelper,
+	CartesianScaleHelperImpl,
+} from '../util/scale/CartesianScaleHelper';
 
 /**
  * Single point that defines one end of a segment.

package/src/cartesian/Scatter.tsrx

@@ -14,56 +14,64 @@ import { clsx } from 'clsx';
 import { Layer } from '../container/Layer.tsrx';
 import {
 	CartesianLabelListContextProvider,
-	CartesianLabelListEntry,
-	ImplicitLabelListType,
+	type CartesianLabelListEntry,
+	type ImplicitLabelListType,
 	LabelListFromLabelProp,
 } from '../component/LabelList.tsrx';
-import { Curve, CurveType, Props as CurveProps } from '../shape/Curve.tsrx';
-import { ErrorBarDataItem, ErrorBarDataPointFormatter, ErrorBarDirection } from './ErrorBar.tsrx';
+import { Curve, type CurveType, type Props as CurveProps } from '../shape/Curve.tsrx';
+import type {
+	ErrorBarDataItem,
+	ErrorBarDataPointFormatter,
+	ErrorBarDirection,
+} from './ErrorBar.tsrx';
 import { getLinearRegression, interpolate, isNullish } from '../util/DataUtils';
 import { getCateCoordinateOfLine, getTooltipNameProp, getValueByDataKey } from '../util/ChartUtils';
 import {
-	ActiveShape,
+	type ActiveShape,
 	adaptEventsOfChild,
-	AnimationDuration,
-	EasingInput,
-	Coordinate,
-	DataConsumer,
-	DataKey,
-	DataProvider,
+	type AnimationDuration,
+	type EasingInput,
+	type Coordinate,
+	type DataConsumer,
+	type DataKey,
+	type DataProvider,
 	isNonEmptyArray,
-	LegendType,
-	NonEmptyArray,
-	NullableCoordinate,
-	PresentationAttributesAdaptChildEvent,
-	ShapeAnimationProps,
-	SymbolType,
-	TickItem,
-	TrapezoidViewBox,
-	CartesianLayout,
+	type LegendType,
+	type NonEmptyArray,
+	type NullableCoordinate,
+	type PresentationAttributesAdaptChildEvent,
+	type ShapeAnimationProps,
+	type SymbolType,
+	type TickItem,
+	type TrapezoidViewBox,
+	type CartesianLayout,
 } from '../util/types';
-import { Formatter, TooltipType } from '../component/DefaultTooltipContent.tsrx';
-import { ScatterShapeProps, ScatterSymbol } from '../util/ScatterUtils.tsrx';
-import { InnerSymbolsProp } from '../shape/Symbols.tsrx';
+import type { Formatter, TooltipType } from '../component/DefaultTooltipContent.tsrx';
+import { type ScatterShapeProps, ScatterSymbol } from '../util/ScatterUtils.tsrx';
+import type { InnerSymbolsProp } from '../shape/Symbols.tsrx';
 import type { LegendPayload } from '../component/DefaultLegendContent.tsrx';
 import {
 	useMouseClickItemDispatch,
 	useMouseEnterItemDispatch,
 	useMouseLeaveItemDispatch,
 } from '../context/tooltipContext';
-import {
+import type {
 	TooltipPayload,
 	TooltipPayloadConfiguration,
 	TooltipPayloadEntry,
 } from '../state/tooltipSlice';
 import { SetTooltipEntrySettings } from '../state/SetTooltipEntrySettings';
 import { SetErrorBarContext } from '../context/ErrorBarContext.tsrx';
-import { AxisId } from '../state/cartesianAxisSlice';
+import type { AxisId } from '../state/cartesianAxisSlice';
 import { GraphicalItemClipPath, useNeedsClip } from './GraphicalItemClipPath.tsrx';
 import { selectScatterPoints } from '../state/selectors/scatterSelectors';
 import { useAppSelector } from '../state/hooks';
-import { RechartsRootState } from '../state/store';
-import { BaseAxisWithScale, implicitZAxis, ZAxisWithScale } from '../state/selectors/axisSelectors';
+import type { RechartsRootState } from '../state/store';
+import {
+	type BaseAxisWithScale,
+	implicitZAxis,
+	type ZAxisWithScale,
+} from '../state/selectors/axisSelectors';
 import { useIsPanorama } from '../context/PanoramaContext';
 import { selectActiveTooltipIndex } from '../state/selectors/tooltipSelectors';
 import { SetLegendPayload } from '../state/SetLegendPayload';
@@ -79,16 +87,16 @@ import {
 import { useCartesianChartLayout, useViewBox } from '../context/chartLayoutContext';
 import {
 	AnimatedItems,
-	AnimationInterpolateFn,
+	type AnimationInterpolateFn,
 	useAnimationCallbacks,
 } from '../animation/AnimatedItems.tsrx';
-import { AnimationMatchByProp, matchAppend } from '../animation/matchBy';
-import { WithIdRequired, WithoutId } from '../util/useUniqueId';
-import { GraphicalItemId } from '../state/graphicalItemsSlice';
-import { ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
+import { type AnimationMatchByProp, matchAppend } from '../animation/matchBy';
+import type { WithIdRequired, WithoutId } from '../util/useUniqueId';
+import type { GraphicalItemId } from '../state/graphicalItemsSlice';
+import { type ZIndexable, ZIndexLayer } from '../zIndex/ZIndexLayer.tsrx';
 import { DefaultZIndexes } from '../zIndex/DefaultZIndexes';
 import { propsAreEqual } from '../util/propsAreEqual';
-import { ChartData } from '../state/chartDataSlice';
+import type { ChartData } from '../state/chartDataSlice';
 import { CellsContext, useCellRegistry } from '../context/CellsContext';
 
 export interface ScatterPointNode {
@@ -997,9 +1005,9 @@ function ScatterImpl(props: WithIdRequired<Props>) {
 		return selectScatterPoints(state, xAxisId, yAxisId, zAxisId, props.id, cells, isPanorama);
 	});
 	if (needClip == null || points == null) {
-		return <CellsContext.Provider value={cellRegistry}>{props.children}</CellsContext.Provider>;
+		return <CellsContext value={cellRegistry}>{props.children}</CellsContext>;
 	}
-	return <CellsContext.Provider value={cellRegistry}>
+	return <CellsContext value={cellRegistry}>
 		<SetScatterTooltipEntrySettings
 			dataKey={props.dataKey}
 			points={points}
@@ -1029,7 +1037,7 @@ function ScatterImpl(props: WithIdRequired<Props>) {
 			points={points}
 			needClip={needClip}
 		/>
-	</CellsContext.Provider>;
+	</CellsContext>;
 }
 
 function ScatterFn<DataPointType = any, ValueAxisType = any>(

package/src/cartesian/ZAxis.tsrx

@@ -1,15 +1,15 @@
 import * as React from 'octane';
 import { useLayoutEffect, useRef } from 'octane';
-import { AxisDomain, BaseAxisProps, ScaleType } from '../util/types';
+import type { AxisDomain, BaseAxisProps, ScaleType } from '../util/types';
 import {
 	addZAxis,
-	AxisId,
+	type AxisId,
 	removeZAxis,
 	replaceZAxis,
-	ZAxisSettings,
+	type ZAxisSettings,
 } from '../state/cartesianAxisSlice';
 import { useAppDispatch } from '../state/hooks';
-import { AxisRange, implicitZAxis } from '../state/selectors/axisSelectors';
+import { type AxisRange, implicitZAxis } from '../state/selectors/axisSelectors';
 import { resolveDefaultProps } from '../util/resolveDefaultProps';
 import type { CustomScaleDefinition } from '../util/scale/CustomScaleDefinition';
 

package/src/cartesian/getCartesianPosition.ts

@@ -1,7 +1,7 @@
 // Adapted from recharts@3.9.2, commit b3451050c027a23957ffa50a2665c9119df21e47.
 import { getPercentValue, isNumber, isPercent } from '../util/DataUtils';
-import { CartesianViewBoxRequired, TrapezoidViewBox } from '../util/types';
-import { TextAnchor, TextVerticalAnchor } from '../component/Text.tsrx';
+import type { CartesianViewBoxRequired, TrapezoidViewBox } from '../util/types';
+import type { TextAnchor, TextVerticalAnchor } from '../component/Text.tsrx';
 import { cartesianViewBoxToTrapezoid } from '../context/chartLayoutContext';
 
 export type CartesianLabelPosition =

package/src/cartesian/getEquidistantTicks.ts

@@ -1,8 +1,8 @@
 // Adapted from recharts@3.9.2, commit b3451050c027a23957ffa50a2665c9119df21e47.
 import { isVisible } from '../util/TickUtils';
-import { CartesianTickItem } from '../util/types';
+import type { CartesianTickItem } from '../util/types';
 import { getEveryNth } from '../util/getEveryNth';
-import { Sign } from './getTicks';
+import type { Sign } from './getTicks';
 
 export function getEquidistantTicks(
 	sign: Sign,