solid-recharts 0.2.0 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +17 -13
- package/src/animation/AnimatedItems.tsx +2 -4
- package/src/animation/CSSTransitionAnimate.tsx +41 -39
- package/src/animation/JavascriptAnimate.tsx +45 -41
- package/src/cartesian/Area.tsx +43 -58
- package/src/cartesian/AreaRevealShape.tsx +1 -1
- package/src/cartesian/Bar.tsx +98 -78
- package/src/cartesian/BarStack.tsx +10 -7
- package/src/cartesian/Brush.tsx +20 -16
- package/src/cartesian/CartesianAxis.tsx +4 -4
- package/src/cartesian/CartesianGrid.tsx +5 -5
- package/src/cartesian/ErrorBar.tsx +9 -7
- package/src/cartesian/Funnel.tsx +17 -21
- package/src/cartesian/GraphicalItemClipPath.tsx +1 -1
- package/src/cartesian/Line.tsx +51 -66
- package/src/cartesian/LineDrawShape.tsx +20 -17
- package/src/cartesian/ReferenceArea.tsx +28 -38
- package/src/cartesian/ReferenceDot.tsx +27 -37
- package/src/cartesian/ReferenceLine.tsx +28 -37
- package/src/cartesian/RenderedTicksReporter.tsx +19 -17
- package/src/cartesian/Scatter.tsx +27 -39
- package/src/cartesian/XAxis.tsx +55 -68
- package/src/cartesian/YAxis.tsx +88 -99
- package/src/cartesian/ZAxis.tsx +29 -41
- package/src/chart/AreaChart.tsx +1 -1
- package/src/chart/BarChart.tsx +1 -1
- package/src/chart/CartesianChart.tsx +4 -3
- package/src/chart/CategoricalChart.tsx +5 -5
- package/src/chart/ComposedChart.tsx +1 -1
- package/src/chart/FunnelChart.tsx +1 -1
- package/src/chart/LineChart.tsx +1 -1
- package/src/chart/PieChart.tsx +4 -3
- package/src/chart/PolarChart.tsx +4 -3
- package/src/chart/RadarChart.tsx +4 -3
- package/src/chart/RadialBarChart.tsx +7 -3
- package/src/chart/RechartsWrapper.tsx +14 -24
- package/src/chart/Sankey.tsx +9 -6
- package/src/chart/ScatterChart.tsx +1 -1
- package/src/chart/SunburstChart.tsx +6 -5
- package/src/chart/Treemap.tsx +5 -4
- package/src/component/ActivePoints.tsx +6 -15
- package/src/component/Cell.tsx +23 -5
- package/src/component/Cursor.tsx +3 -3
- package/src/component/DefaultLegendContent.tsx +8 -6
- package/src/component/DefaultTooltipContent.tsx +14 -10
- package/src/component/Dots.tsx +11 -7
- package/src/component/Label.tsx +13 -10
- package/src/component/LabelList.tsx +12 -7
- package/src/component/Legend.tsx +26 -21
- package/src/component/ResponsiveContainer.tsx +52 -49
- package/src/component/Text.tsx +5 -5
- package/src/component/Tooltip.tsx +21 -18
- package/src/component/TooltipBoundingBox.tsx +18 -16
- package/src/component/responsiveContainerUtils.ts +1 -1
- package/src/container/ClipPathProvider.tsx +3 -3
- package/src/container/Layer.tsx +5 -5
- package/src/container/RootSurface.tsx +1 -1
- package/src/container/Surface.tsx +5 -6
- package/src/context/ErrorBarContext.tsx +17 -26
- package/src/context/PanoramaContext.tsx +2 -2
- package/src/context/RegisterGraphicalItemId.tsx +4 -2
- package/src/context/chartDataContext.tsx +26 -23
- package/src/context/chartLayoutContext.tsx +16 -12
- package/src/polar/Pie.tsx +49 -60
- package/src/polar/PolarAngleAxis.tsx +43 -52
- package/src/polar/PolarGrid.tsx +5 -5
- package/src/polar/PolarRadiusAxis.tsx +42 -50
- package/src/polar/Radar.tsx +24 -36
- package/src/polar/RadialBar.tsx +23 -41
- package/src/shape/Cross.tsx +5 -5
- package/src/shape/Curve.tsx +7 -8
- package/src/shape/Dot.tsx +4 -4
- package/src/shape/Polygon.tsx +5 -5
- package/src/shape/Rectangle.tsx +22 -20
- package/src/shape/Sector.tsx +5 -5
- package/src/shape/Symbols.tsx +6 -6
- package/src/shape/Trapezoid.tsx +29 -27
- package/src/state/RechartsStoreProvider.tsx +5 -3
- package/src/state/ReportChartProps.tsx +8 -6
- package/src/state/ReportEventSettings.tsx +8 -6
- package/src/state/ReportMainChartProps.tsx +11 -9
- package/src/state/ReportPolarOptions.tsx +15 -13
- package/src/state/SetLegendPayload.ts +20 -28
- package/src/state/SetTooltipEntrySettings.tsx +10 -27
- package/src/state/brushSlice.ts +10 -8
- package/src/state/cartesianAxisSlice.ts +72 -84
- package/src/state/chartDataSlice.ts +29 -23
- package/src/state/createCollectionActions.ts +51 -0
- package/src/state/createSelector.ts +97 -0
- package/src/state/errorBarSlice.ts +22 -16
- package/src/state/eventSettingsSlice.ts +11 -9
- package/src/state/externalEventsMiddleware.ts +2 -11
- package/src/state/graphicalItemsSlice.ts +35 -44
- package/src/state/isEventThrottled.ts +12 -0
- package/src/state/keyboardEventsMiddleware.ts +2 -8
- package/src/state/layoutSlice.ts +29 -17
- package/src/state/legendSlice.ts +35 -31
- package/src/state/mouseEventsMiddleware.ts +2 -13
- package/src/state/optionsSlice.ts +8 -6
- package/src/state/patched.ts +19 -0
- package/src/state/polarAxisSlice.ts +21 -13
- package/src/state/polarOptionsSlice.ts +16 -14
- package/src/state/referenceElementsSlice.ts +49 -34
- package/src/state/registerInStore.ts +70 -0
- package/src/state/renderedTicksSlice.ts +11 -7
- package/src/state/rootPropsSlice.ts +16 -14
- package/src/state/selectors/areaSelectors.ts +13 -36
- package/src/state/selectors/arrayEqualityCheck.ts +32 -7
- package/src/state/selectors/axisSelectors.ts +215 -169
- package/src/state/selectors/barSelectors.ts +8 -36
- package/src/state/selectors/combiners/combineConfiguredScale.ts +1 -1
- package/src/state/selectors/combiners/combineRealScaleType.ts +1 -1
- package/src/state/selectors/dataSelectors.ts +35 -16
- package/src/state/selectors/numberDomainEqualityCheck.ts +16 -8
- package/src/state/selectors/selectAxisForGraphicalItem.ts +52 -0
- package/src/state/tooltipSlice.ts +135 -86
- package/src/state/unregisterOnCleanup.ts +5 -20
- package/src/state/zIndexSlice.ts +50 -42
- package/src/synchronisation/useChartSynchronisation.tsx +213 -217
- package/src/util/ActiveShapeUtils.tsx +2 -9
- package/src/util/BarUtils.tsx +30 -23
- package/src/util/ChartUtils.ts +69 -25
- package/src/util/DirectPortal.tsx +107 -0
- package/src/util/FunnelUtils.tsx +1 -1
- package/src/util/RadialBarUtils.tsx +4 -3
- package/src/util/createCartesianCharts.tsx +1 -1
- package/src/util/createPolarCharts.tsx +1 -1
- package/src/util/propsAreEqual.ts +3 -33
- package/src/util/stacks/stackTypes.ts +1 -1
- package/src/util/svgPropertiesAndEvents.ts +1 -1
- package/src/util/tooltip/translate.ts +2 -2
- package/src/util/types.ts +3 -3
- package/src/zIndex/ZIndexLayer.tsx +39 -68
- package/src/zIndex/ZIndexPortal.tsx +29 -25
- package/src/state/reduxDevtoolsJsonStringifyReplacer.ts +0 -15
- package/src/util/axisPropsAreEqual.ts +0 -42
- package/src/util/resolveDefaultProps.tsx +0 -8
- package/src/util/typedDataKey.ts +0 -8
- package/test/_data.ts +0 -408
- package/test/animation/AnimationController.typed.spec.ts +0 -53
- package/test/animation/AnimationControllerImpl.spec.ts +0 -271
- package/test/animation/CSSTransitionAnimate.timing.spec.tsx +0 -473
- package/test/animation/JavascriptAnimate.spec.tsx +0 -62
- package/test/animation/RechartsAnimation.spec.ts +0 -636
- package/test/animation/easing.spec.ts +0 -218
- package/test/animation/legacyAnimationLengthChange.spec.tsx +0 -803
- package/test/animation/matchBy.spec.ts +0 -467
- package/test/animation/mockAnimationController.ts +0 -40
- package/test/animation/mockControllerAnimationManager.ts +0 -143
- package/test/animation/mockTimeoutController.ts +0 -114
- package/test/animation/timeoutController.spec.ts +0 -138
- package/test/animation/useAnimationStartSnapshot.spec.ts +0 -147
- package/test/animation/util.spec.ts +0 -28
- package/test/cartesian/Area.animation.spec.tsx +0 -363
- package/test/cartesian/Area.range.spec.tsx +0 -54
- package/test/cartesian/Area.spec.tsx +0 -1202
- package/test/cartesian/Area.stacked.render.spec.tsx +0 -69
- package/test/cartesian/Area.typed.spec.tsx +0 -209
- package/test/cartesian/Axis.integration.spec.tsx +0 -158
- package/test/cartesian/Bar/Bar.csstransition.spec.tsx +0 -299
- package/test/cartesian/Bar/Bar.spec.tsx +0 -2314
- package/test/cartesian/Bar/Bar.typed.spec.tsx +0 -192
- package/test/cartesian/Bar.animation.spec.tsx +0 -426
- package/test/cartesian/Bar.stackDomain.spec.tsx +0 -66
- package/test/cartesian/Bar.stacked.render.spec.tsx +0 -53
- package/test/cartesian/Bar.truncateByDomain.spec.tsx +0 -237
- package/test/cartesian/Bar.zeroDimensionFiltering.spec.tsx +0 -336
- package/test/cartesian/BarStack.spec.tsx +0 -91
- package/test/cartesian/Brush.keyboard.spec.tsx +0 -88
- package/test/cartesian/Brush.panorama.spec.tsx +0 -41
- package/test/cartesian/Brush.props.spec.tsx +0 -63
- package/test/cartesian/Brush.render.spec.tsx +0 -117
- package/test/cartesian/Brush.spec.tsx +0 -522
- package/test/cartesian/Brush.stacked.spec.tsx +0 -221
- package/test/cartesian/CartesianAxis.render.spec.tsx +0 -50
- package/test/cartesian/CartesianAxis.spec.tsx +0 -396
- package/test/cartesian/CartesianGrid.render.spec.tsx +0 -39
- package/test/cartesian/CartesianGrid.spec.tsx +0 -2103
- package/test/cartesian/ErrorBar.render.spec.tsx +0 -69
- package/test/cartesian/ErrorBar.spec.tsx +0 -2414
- package/test/cartesian/Funnel.animation.spec.tsx +0 -241
- package/test/cartesian/Funnel.spec.tsx +0 -226
- package/test/cartesian/Funnel.typed.spec.tsx +0 -221
- package/test/cartesian/GraphicalItemClipPath.scale-behavior.spec.tsx +0 -627
- package/test/cartesian/GraphicalItemClipPath.spec.tsx +0 -427
- package/test/cartesian/Line.animation.spec.tsx +0 -643
- package/test/cartesian/Line.sparseAnimationPath.spec.tsx +0 -98
- package/test/cartesian/Line.spec.tsx +0 -471
- package/test/cartesian/Line.typed.spec.tsx +0 -152
- package/test/cartesian/ReferenceArea.render.spec.tsx +0 -63
- package/test/cartesian/ReferenceArea.spec.tsx +0 -663
- package/test/cartesian/ReferenceArea.typed.spec.tsx +0 -74
- package/test/cartesian/ReferenceDot.render.spec.tsx +0 -55
- package/test/cartesian/ReferenceDot.spec.tsx +0 -462
- package/test/cartesian/ReferenceDot.typed.spec.tsx +0 -76
- package/test/cartesian/ReferenceLine/ReferenceLine.panorama.spec.tsx +0 -184
- package/test/cartesian/ReferenceLine/ReferenceLine.spec.tsx +0 -744
- package/test/cartesian/ReferenceLine/ReferenceLine.typed.spec.tsx +0 -74
- package/test/cartesian/ReferenceLine/getEndPoints.spec.ts +0 -399
- package/test/cartesian/ReferenceLine.render.spec.tsx +0 -134
- package/test/cartesian/Scatter.animation.spec.tsx +0 -381
- package/test/cartesian/Scatter.render.spec.tsx +0 -61
- package/test/cartesian/Scatter.spec.tsx +0 -406
- package/test/cartesian/Scatter.typed.spec.tsx +0 -153
- package/test/cartesian/XAxis/XAxis.barSize.spec.tsx +0 -336
- package/test/cartesian/XAxis/XAxis.brush.spec.tsx +0 -266
- package/test/cartesian/XAxis/XAxis.categorydomain.spec.tsx +0 -872
- package/test/cartesian/XAxis/XAxis.dataKey.spec.tsx +0 -86
- package/test/cartesian/XAxis/XAxis.datatypes.spec.tsx +0 -127
- package/test/cartesian/XAxis/XAxis.hide.spec.tsx +0 -106
- package/test/cartesian/XAxis/XAxis.multiaxis.spec.tsx +0 -336
- package/test/cartesian/XAxis/XAxis.numberdomain.spec.tsx +0 -1466
- package/test/cartesian/XAxis/XAxis.padding.spec.tsx +0 -758
- package/test/cartesian/XAxis/XAxis.padding_clip.spec.tsx +0 -65
- package/test/cartesian/XAxis/XAxis.state.spec.tsx +0 -355
- package/test/cartesian/XAxis/XAxis.tick.spec.tsx +0 -493
- package/test/cartesian/XAxis/XAxis.timescale.spec.tsx +0 -233
- package/test/cartesian/XAxis/XAxis.type.spec.tsx +0 -107
- package/test/cartesian/XAxis/XAxis.typed.spec.tsx +0 -102
- package/test/cartesian/XAxis/XAxis.vertical.spec.tsx +0 -265
- package/test/cartesian/XAxis.tickFormatter.spec.tsx +0 -54
- package/test/cartesian/YAxis/YAxis.7362.derivedDomain.spec.tsx +0 -230
- package/test/cartesian/YAxis/YAxis.7362.spec.tsx +0 -104
- package/test/cartesian/YAxis/YAxis.interval-zero.spec.tsx +0 -88
- package/test/cartesian/YAxis/YAxis.label.spec.tsx +0 -219
- package/test/cartesian/YAxis/YAxis.spec.tsx +0 -1595
- package/test/cartesian/YAxis/YAxis.tick.spec.tsx +0 -428
- package/test/cartesian/YAxis/YAxis.tickFormatter.spec.tsx +0 -54
- package/test/cartesian/YAxis/YAxis.ticks.spec.tsx +0 -263
- package/test/cartesian/YAxis/YAxis.type.spec.tsx +0 -107
- package/test/cartesian/YAxis/YAxis.typed.spec.tsx +0 -102
- package/test/cartesian/ZAxis.spec.tsx +0 -300
- package/test/cartesian/ZAxis.typed.spec.tsx +0 -33
- package/test/cartesian/__snapshots__/Brush.spec.tsx.snap +0 -5
- package/test/cartesian/axisLineAndStroke.spec.tsx +0 -72
- package/test/cartesian/getCartesianPosition.spec.ts +0 -907
- package/test/cartesian/getEquidistantTicks.spec.ts +0 -88
- package/test/cartesian/getTicks.spec.ts +0 -378
- package/test/cartesian/miscFeatureGaps.spec.tsx +0 -89
- package/test/cartesian/useAnimatedLineLength.spec.ts +0 -168
- package/test/chart/AccessibilityLayer.spec.tsx +0 -569
- package/test/chart/AccessibilityScans.spec.tsx +0 -286
- package/test/chart/AreaChart.spec.tsx +0 -409
- package/test/chart/AreaChart.stacked.spec.tsx +0 -1407
- package/test/chart/AreaChart.typed.spec.tsx +0 -39
- package/test/chart/BarChart.spec.tsx +0 -3719
- package/test/chart/BarChart.typed.spec.tsx +0 -60
- package/test/chart/CategoricalChart.spec.tsx +0 -255
- package/test/chart/ComposedChart.spec.tsx +0 -199
- package/test/chart/ComposedChart.typed.spec.tsx +0 -39
- package/test/chart/FunnelChart.spec.tsx +0 -215
- package/test/chart/FunnelChart.typed.spec.tsx +0 -39
- package/test/chart/LineChart.multiseries.spec.tsx +0 -50
- package/test/chart/LineChart.smoke.spec.tsx +0 -50
- package/test/chart/LineChart.spec.tsx +0 -930
- package/test/chart/LineChart.typed.spec.tsx +0 -39
- package/test/chart/NicheChartTooltip.spec.tsx +0 -81
- package/test/chart/PieChart.spec.tsx +0 -793
- package/test/chart/PieChart.typed.spec.tsx +0 -39
- package/test/chart/RadarChart.spec.tsx +0 -530
- package/test/chart/RadarChart.typed.spec.tsx +0 -39
- package/test/chart/RadialBarChart.5966.spec.tsx +0 -48
- package/test/chart/RadialBarChart.spec.tsx +0 -679
- package/test/chart/RadialBarChart.typed.spec.tsx +0 -39
- package/test/chart/RechartsWrapper.spec.tsx +0 -83
- package/test/chart/Sankey.content.spec.tsx +0 -46
- package/test/chart/Sankey.spec.tsx +0 -952
- package/test/chart/Sankey.typed.spec.tsx +0 -29
- package/test/chart/ScatterChart.spec.tsx +0 -2613
- package/test/chart/ScatterChart.typed.spec.tsx +0 -39
- package/test/chart/SunburstChart.spec.tsx +0 -146
- package/test/chart/Treemap.animation.spec.tsx +0 -52
- package/test/chart/Treemap.spec.tsx +0 -1003
- package/test/chart/Treemap.typed.spec.tsx +0 -26
- package/test/chart/chartEvents.spec.tsx +0 -127
- package/test/chart/responsive.spec.tsx +0 -620
- package/test/component/Cell.render.spec.tsx +0 -155
- package/test/component/Cell.spec.tsx +0 -12
- package/test/component/Cursor.spec.tsx +0 -186
- package/test/component/DefaultTooltipContent.spec.tsx +0 -102
- package/test/component/Label.render.spec.tsx +0 -63
- package/test/component/Label.spec.tsx +0 -686
- package/test/component/Label.typed.spec.tsx +0 -46
- package/test/component/LabelList.spec.tsx +0 -188
- package/test/component/Legend.itemSorter.spec.tsx +0 -704
- package/test/component/Legend.render.spec.tsx +0 -92
- package/test/component/Legend.spec.tsx +0 -2213
- package/test/component/Legend.typed.spec.tsx +0 -22
- package/test/component/ResponsiveContainer.spec.tsx +0 -523
- package/test/component/ResponsiveContainerDataTest.spec.tsx +0 -51
- package/test/component/Text.spec.tsx +0 -415
- package/test/component/Text.typed.spec.tsx +0 -46
- package/test/component/Tooltip/ActiveDot.spec.tsx +0 -370
- package/test/component/Tooltip/Tooltip.animation.spec.tsx +0 -209
- package/test/component/Tooltip/Tooltip.content.spec.tsx +0 -128
- package/test/component/Tooltip/Tooltip.formatter.spec.tsx +0 -152
- package/test/component/Tooltip/Tooltip.includeHidden.spec.tsx +0 -79
- package/test/component/Tooltip/Tooltip.multipleDataArrays.spec.tsx +0 -165
- package/test/component/Tooltip/Tooltip.offset.spec.tsx +0 -113
- package/test/component/Tooltip/Tooltip.state.spec.tsx +0 -74
- package/test/component/Tooltip/Tooltip.sync.spec.tsx +0 -639
- package/test/component/Tooltip/defaultIndex.spec.tsx +0 -227
- package/test/component/Tooltip/graphicalItem.formatter.spec.tsx +0 -138
- package/test/component/Tooltip/itemSorter.spec.tsx +0 -2815
- package/test/component/Tooltip/tooltipEventType.spec.tsx +0 -344
- package/test/component/Tooltip/tooltipMouseHoverSelectors.ts +0 -41
- package/test/component/Tooltip/tooltipTestHelpers.tsx +0 -162
- package/test/component/Tooltip.defaultIndex.spec.tsx +0 -48
- package/test/component/Tooltip.hover.spec.tsx +0 -61
- package/test/component/Tooltip.item.spec.tsx +0 -54
- package/test/component/Tooltip.keyboard.spec.tsx +0 -51
- package/test/component/Tooltip.payload.spec.tsx +0 -1716
- package/test/component/Tooltip.touch.spec.tsx +0 -39
- package/test/component/Tooltip.visibility.spec.tsx +0 -1889
- package/test/component/TooltipBoundingBox.spec.tsx +0 -89
- package/test/component/responsiveContainerUtils.spec.ts +0 -205
- package/test/container/ClipPath.spec.tsx +0 -602
- package/test/container/chartDimensions.spec.tsx +0 -368
- package/test/context/chartLayoutContext.spec.tsx +0 -378
- package/test/helper/ExpectAxisDomain.tsx +0 -27
- package/test/helper/assertNotNull.ts +0 -6
- package/test/helper/assertZIndexLayerOrder.ts +0 -19
- package/test/helper/createSelectorTestCase.tsx +0 -176
- package/test/helper/expectAnimatedPieAngles.ts +0 -100
- package/test/helper/expectAnimatedPiePaths.ts +0 -78
- package/test/helper/expectAreaCurve.ts +0 -15
- package/test/helper/expectAxisTicks.ts +0 -48
- package/test/helper/expectBars.ts +0 -54
- package/test/helper/expectFunctionReturning.ts +0 -58
- package/test/helper/expectLabel.ts +0 -32
- package/test/helper/expectLastCalledWith.ts +0 -48
- package/test/helper/expectLine.ts +0 -20
- package/test/helper/expectPieSectors.ts +0 -80
- package/test/helper/expectScale.ts +0 -37
- package/test/helper/expectScatterPoints.ts +0 -52
- package/test/helper/expectStackGroups.ts +0 -144
- package/test/helper/mockAxes.ts +0 -22
- package/test/helper/mockGetBoundingClientRect.ts +0 -66
- package/test/helper/mockHTMLElementProperty.ts +0 -19
- package/test/helper/mockTouchingElement.ts +0 -27
- package/test/helper/offsetHelpers.ts +0 -19
- package/test/helper/parameterizedTestCases.tsx +0 -99
- package/test/helper/produceState.ts +0 -32
- package/test/helper/selectorTestHelpers.tsx +0 -63
- package/test/helper/trim.spec.ts +0 -35
- package/test/helper/trim.ts +0 -11
- package/test/hooks/useActiveTooltipDataPoints.spec.tsx +0 -358
- package/test/hooks/useAxisDomain.spec.tsx +0 -361
- package/test/hooks/useAxisScale.spec.tsx +0 -283
- package/test/hooks/useAxisTicks.spec.tsx +0 -130
- package/test/hooks/useOffset.spec.tsx +0 -248
- package/test/hooks/useTooltipStateHooks.spec.tsx +0 -109
- package/test/polar/Pie/Pie-TwoLevelPieChart.spec.tsx +0 -135
- package/test/polar/Pie/Pie.spec.tsx +0 -784
- package/test/polar/Pie/Pie.typed.spec.tsx +0 -78
- package/test/polar/Pie.animation.spec.tsx +0 -529
- package/test/polar/PieWithLegend.animation.spec.tsx +0 -142
- package/test/polar/PolarAngleAxis/PolarAngleAxis.events.spec.tsx +0 -76
- package/test/polar/PolarAngleAxis/PolarAngleAxis.spec.tsx +0 -2079
- package/test/polar/PolarAngleAxis/PolarAngleAxis.typed.spec.tsx +0 -102
- package/test/polar/PolarAngleAxis.render.spec.tsx +0 -79
- package/test/polar/PolarGrid.render.spec.tsx +0 -75
- package/test/polar/PolarGrid.spec.tsx +0 -918
- package/test/polar/PolarLegendPerRow.render.spec.tsx +0 -85
- package/test/polar/PolarRadiusAxis.events.spec.tsx +0 -65
- package/test/polar/PolarRadiusAxis.render.spec.tsx +0 -52
- package/test/polar/PolarRadiusAxis.spec.tsx +0 -991
- package/test/polar/PolarRadiusAxis.typed.spec.tsx +0 -84
- package/test/polar/PolarTooltipLegend.render.spec.tsx +0 -80
- package/test/polar/Radar.animation.spec.tsx +0 -570
- package/test/polar/Radar.render.spec.tsx +0 -71
- package/test/polar/Radar.spec.tsx +0 -265
- package/test/polar/Radar.typed.spec.tsx +0 -119
- package/test/polar/RadialBar/RadialBar.spec.tsx +0 -1521
- package/test/polar/RadialBar/RadialBar.typed.spec.tsx +0 -132
- package/test/polar/RadialBar.animation.spec.tsx +0 -375
- package/test/polar/RadialBar.render.spec.tsx +0 -66
- package/test/polar/RadialBar.stacked.spec.tsx +0 -57
- package/test/setup.ts +0 -84
- package/test/shape/ActiveShape.spec.tsx +0 -181
- package/test/shape/Cross.spec.tsx +0 -60
- package/test/shape/Cross.typed.spec.tsx +0 -26
- package/test/shape/Curve.spec.tsx +0 -368
- package/test/shape/Curve.typed.spec.tsx +0 -69
- package/test/shape/Dot.spec.tsx +0 -73
- package/test/shape/Dot.typed.spec.tsx +0 -30
- package/test/shape/Polygon.spec.tsx +0 -357
- package/test/shape/Polygon.typed.spec.tsx +0 -28
- package/test/shape/Rectangle.animation.spec.tsx +0 -451
- package/test/shape/Rectangle.spec.tsx +0 -68
- package/test/shape/Rectangle.typed.spec.tsx +0 -24
- package/test/shape/Sector.spec.tsx +0 -76
- package/test/shape/Sector.typed.spec.tsx +0 -24
- package/test/shape/Symbols.spec.tsx +0 -43
- package/test/shape/Symbols.typed.spec.tsx +0 -24
- package/test/shape/Trapezoid.spec.tsx +0 -50
- package/test/shape/Trapezoid.typed.spec.tsx +0 -24
- package/test/shape/__snapshots__/Cross.spec.tsx.snap +0 -62
- package/test/shape/__snapshots__/Curve.spec.tsx.snap +0 -460
- package/test/shape/__snapshots__/Polygon.spec.tsx.snap +0 -58
- package/test/shape/__snapshots__/Rectangle.spec.tsx.snap +0 -117
- package/test/shape/__snapshots__/Sector.spec.tsx.snap +0 -71
- package/test/shape/__snapshots__/Trapezoid.spec.tsx.snap +0 -64
- package/test/state/chartDataSlice.spec.ts +0 -53
- package/test/state/externalEventsMiddleware.spec.ts +0 -178
- package/test/state/graphicalItemsSlice.spec.ts +0 -92
- package/test/state/hooks.spec.tsx +0 -68
- package/test/state/legendSlice.spec.ts +0 -44
- package/test/state/mouseEventsMiddleware.spec.ts +0 -75
- package/test/state/optionsSlice.spec.ts +0 -19
- package/test/state/reduxDevtoolsJsonStringifyReplacer.spec.ts +0 -25
- package/test/state/referenceElementsSlice.spec.ts +0 -84
- package/test/state/selectors/areaSelectors.spec.tsx +0 -77
- package/test/state/selectors/axisSelectors.spec.tsx +0 -1418
- package/test/state/selectors/barStackSelectors.spec.tsx +0 -752
- package/test/state/selectors/brushSelectors.spec.tsx +0 -30
- package/test/state/selectors/cartesianAxisSlice.spec.ts +0 -96
- package/test/state/selectors/combineNiceTicks.spec.ts +0 -207
- package/test/state/selectors/combiners/combineActiveTooltipIndex.spec.ts +0 -61
- package/test/state/selectors/combiners/combineAllBarPositions.spec.ts +0 -39
- package/test/state/selectors/combiners/combineConfiguredScale.spec.ts +0 -56
- package/test/state/selectors/combiners/combineDisplayedStackedData.spec.ts +0 -123
- package/test/state/selectors/combiners/combineRealScaleType.spec.ts +0 -80
- package/test/state/selectors/containerSelectors.spec.tsx +0 -168
- package/test/state/selectors/dataSelectors.spec.tsx +0 -136
- package/test/state/selectors/legendSelectors.spec.tsx +0 -113
- package/test/state/selectors/lineSelectors.spec.tsx +0 -60
- package/test/state/selectors/pieSelectors.spec.tsx +0 -72
- package/test/state/selectors/radarSelectors.spec.tsx +0 -496
- package/test/state/selectors/rootPropsSelectors.spec.tsx +0 -169
- package/test/state/selectors/scatterSelectors.spec.tsx +0 -47
- package/test/state/selectors/selectActiveTooltipIndex.spec.tsx +0 -234
- package/test/state/selectors/selectAllAxes.spec.tsx +0 -18
- package/test/state/selectors/selectAxisDomain.spec.tsx +0 -21
- package/test/state/selectors/selectAxisDomainIncludingNiceTicks.spec.tsx +0 -19
- package/test/state/selectors/selectAxisRangeWithReverse.spec.tsx +0 -22
- package/test/state/selectors/selectAxisScale.spec.tsx +0 -91
- package/test/state/selectors/selectBarRectangles.stackOffset.spec.tsx +0 -503
- package/test/state/selectors/selectBaseAxis.spec.tsx +0 -56
- package/test/state/selectors/selectCartesianItemsSettings.spec.tsx +0 -57
- package/test/state/selectors/selectChartOffset.spec.tsx +0 -26
- package/test/state/selectors/selectDisplayedData.spec.tsx +0 -282
- package/test/state/selectors/selectIsTooltipActive.spec.tsx +0 -231
- package/test/state/selectors/selectNumericalDomain.spec.tsx +0 -21
- package/test/state/selectors/selectRealScaleType.spec.tsx +0 -19
- package/test/state/selectors/selectStackGroups.spec.tsx +0 -322
- package/test/state/selectors/selectXAxisPosition.spec.tsx +0 -22
- package/test/state/selectors/selectYAxisPosition.spec.tsx +0 -22
- package/test/state/selectors/selectors.spec.tsx +0 -1613
- package/test/state/throttling.spec.ts +0 -200
- package/test/state/zIndexSlice.spec.ts +0 -85
- package/test/synchronisation/useChartSynchronisation.spec.tsx +0 -225
- package/test/util/BarUtils.spec.ts +0 -39
- package/test/util/CartesianUtils/CartesianUtils.spec.ts +0 -261
- package/test/util/CartesianUtils/rectWithPoints.spec.ts +0 -48
- package/test/util/ChartUtils/ChartUtils.spec.ts +0 -491
- package/test/util/ChartUtils/appendOffsetOfLegend.spec.ts +0 -136
- package/test/util/ChartUtils/appendOffsetOfLegend.spec.tsx +0 -133
- package/test/util/ChartUtils/getCateCoordinateOfLine.spec.ts +0 -83
- package/test/util/ChartUtils/getStackedData.spec.ts +0 -416
- package/test/util/ChartUtils/truncateByDomain.spec.ts +0 -70
- package/test/util/DataUtils.spec.ts +0 -385
- package/test/util/DomUtils.spec.tsx +0 -117
- package/test/util/FunnelUtils.spec.tsx +0 -70
- package/test/util/Global.spec.ts +0 -11
- package/test/util/LRUCache.spec.ts +0 -81
- package/test/util/LogUtils.spec.ts +0 -45
- package/test/util/PolarUtils.spec.ts +0 -66
- package/test/util/ReduceCssCalcPrototype.spec.ts +0 -141
- package/test/util/ShallowEqual.spec.ts +0 -102
- package/test/util/TickUtils.spec.ts +0 -29
- package/test/util/axisPropsAreEqual.spec.ts +0 -93
- package/test/util/createChartHelpers.spec.tsx +0 -210
- package/test/util/cursor/getCursorPoints.spec.ts +0 -136
- package/test/util/cursor/getCursorRectangle.spec.ts +0 -50
- package/test/util/cursor/getRadialCursorPoints.spec.ts +0 -36
- package/test/util/errorValue.spec.ts +0 -69
- package/test/util/getEveryNth.spec.ts +0 -39
- package/test/util/getRadiusAndStrokeWidthFromDot.spec.ts +0 -51
- package/test/util/getRelativeCoordinate.spec.ts +0 -250
- package/test/util/getSliced.spec.ts +0 -45
- package/test/util/isDomainSpecifiedByUser.spec.ts +0 -207
- package/test/util/isWellBehavedNumber.spec.ts +0 -54
- package/test/util/payload/getUniqPayload.spec.ts +0 -56
- package/test/util/propsAreEqual.spec.ts +0 -75
- package/test/util/round.spec.ts +0 -112
- package/test/util/scale/arithmetic.spec.ts +0 -61
- package/test/util/scale/createCategoricalInverse.spec.ts +0 -84
- package/test/util/scale/getNiceTickValues.spec.ts +0 -421
- package/test/util/scale/getTickValuesFixedDomain.spec.ts +0 -155
- package/test/util/svgPropertiesAndEvents.spec.tsx +0 -206
- package/test/util/svgPropertiesNoEvents.spec.tsx +0 -228
- package/test/util/tooltip/translate.spec.ts +0 -396
- package/test/util/useAnimationId.spec.tsx +0 -59
- package/test/util/useElementOffset.spec.tsx +0 -173
- package/test/util/usePrefersReducedMotion.spec.ts +0 -54
- package/test/util/useUniqueId.spec.ts +0 -99
- package/test/utils/diagnostics-allowlist.ts +0 -18
- package/test/utils/diagnostics.ts +0 -58
- package/test/zIndex/AllZIndexPortals.spec.tsx +0 -83
- package/test/zIndex/DefaultZIndexes.spec.ts +0 -80
- package/test/zIndex/DynamicZIndex.spec.tsx +0 -102
- package/test/zIndex/ZIndexLayer.portalOwner.spec.tsx +0 -125
- package/test/zIndex/componentZIndex.spec.tsx +0 -255
- package/test/zIndex/getZIndexFromUnknown.spec.ts +0 -51
- package/test/zIndex/multiChartZIndexIsolation.spec.tsx +0 -90
- package/test/zIndex/zIndexSelectors.spec.ts +0 -172
- package/tsconfig.json +0 -11
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it } from "vitest";
|
|
2
|
-
import { Line, LineChart, ReferenceArea, getRelativeCoordinate } from "../../src";
|
|
3
|
-
import { render } from "@solidjs/testing-library";
|
|
4
|
-
|
|
5
|
-
// Ported from recharts 3.8.1 test/cartesian/ReferenceArea.typed.spec.tsx.
|
|
6
|
-
|
|
7
|
-
type ExampleDataPoint = { value: number; name: string };
|
|
8
|
-
const data: ReadonlyArray<ExampleDataPoint> = [
|
|
9
|
-
{ value: 100, name: "a" },
|
|
10
|
-
{ value: 80, name: "b" },
|
|
11
|
-
];
|
|
12
|
-
|
|
13
|
-
describe("ReferenceArea with strong typing", () => {
|
|
14
|
-
describe("with all implicit types", () => {
|
|
15
|
-
it("should render ReferenceArea with implicit coordinate types", () => {
|
|
16
|
-
const { container } = render(() => (
|
|
17
|
-
<LineChart data={data} width={400} height={400}>
|
|
18
|
-
<Line dataKey="value" />
|
|
19
|
-
<ReferenceArea x1={0} x2={1} y1={80} y2={120} />
|
|
20
|
-
</LineChart>
|
|
21
|
-
));
|
|
22
|
-
expect(container).toBeDefined();
|
|
23
|
-
});
|
|
24
|
-
});
|
|
25
|
-
|
|
26
|
-
describe("with explicit ReferenceArea type parameters", () => {
|
|
27
|
-
it("should allow matching explicit coordinate types", () => {
|
|
28
|
-
render(() => (
|
|
29
|
-
<LineChart data={data} width={400} height={400}>
|
|
30
|
-
<Line dataKey="value" />
|
|
31
|
-
<ReferenceArea<number, number> x1={0} x2={1} y1={80} y2={120} />
|
|
32
|
-
</LineChart>
|
|
33
|
-
));
|
|
34
|
-
});
|
|
35
|
-
|
|
36
|
-
it("should show errors when explicit coordinate types do not match", () => {
|
|
37
|
-
render(() => (
|
|
38
|
-
<LineChart data={data} width={400} height={400}>
|
|
39
|
-
<Line dataKey="value" />
|
|
40
|
-
{/* @ts-expect-error TypeScript is correct here - x values should be numbers */}
|
|
41
|
-
<ReferenceArea<number, number> x1="a" x2={1} y1={80} y2={120} />
|
|
42
|
-
{/* @ts-expect-error TypeScript is correct here - y values should be numbers */}
|
|
43
|
-
<ReferenceArea<number, number> x1={0} x2={1} y1="a" y2={120} />
|
|
44
|
-
</LineChart>
|
|
45
|
-
));
|
|
46
|
-
});
|
|
47
|
-
});
|
|
48
|
-
});
|
|
49
|
-
|
|
50
|
-
describe("ReferenceArea event handlers", () => {
|
|
51
|
-
// Handlers spread onto the rendered <rect> are Solid single-arg DOM handlers
|
|
52
|
-
// (repo convention; see ReferenceArea.spec "events"). The event's currentTarget
|
|
53
|
-
// is the SVGRectElement, satisfying SVGMousePointer/SVGTouchPointer, so it
|
|
54
|
-
// feeds getRelativeCoordinate directly — same call shape as the reference.
|
|
55
|
-
it("should allow calling getRelativeCoordinate with the type provided by Recharts event handler", () => {
|
|
56
|
-
render(() => (
|
|
57
|
-
<LineChart width={100} height={100}>
|
|
58
|
-
<ReferenceArea
|
|
59
|
-
onClick={(e) => getRelativeCoordinate(e)}
|
|
60
|
-
onMouseDown={(e) => getRelativeCoordinate(e)}
|
|
61
|
-
onMouseUp={(e) => getRelativeCoordinate(e)}
|
|
62
|
-
onMouseMove={(e) => getRelativeCoordinate(e)}
|
|
63
|
-
onMouseLeave={(e) => getRelativeCoordinate(e)}
|
|
64
|
-
onMouseOver={(e) => getRelativeCoordinate(e)}
|
|
65
|
-
onMouseOut={(e) => getRelativeCoordinate(e)}
|
|
66
|
-
onMouseEnter={(e) => getRelativeCoordinate(e)}
|
|
67
|
-
onTouchStart={(e) => getRelativeCoordinate(e)}
|
|
68
|
-
onTouchMove={(e) => getRelativeCoordinate(e)}
|
|
69
|
-
onTouchEnd={(e) => getRelativeCoordinate(e)}
|
|
70
|
-
/>
|
|
71
|
-
</LineChart>
|
|
72
|
-
));
|
|
73
|
-
});
|
|
74
|
-
});
|
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
// Spec for the ReferenceDot vertical: a circle at a data coordinate (x, y),
|
|
2
|
-
// mapped to pixels through both cartesian scales (CartesianScaleHelperImpl).
|
|
3
|
-
import { describe, expect, it } from "vitest";
|
|
4
|
-
import { flush } from "solid-js";
|
|
5
|
-
import { render } from "@solidjs/testing-library";
|
|
6
|
-
import { LineChart, Line, XAxis, YAxis, ReferenceDot } from "../../src";
|
|
7
|
-
|
|
8
|
-
const data = [
|
|
9
|
-
{ name: "A", uv: 10 },
|
|
10
|
-
{ name: "B", uv: 30 },
|
|
11
|
-
{ name: "C", uv: 50 },
|
|
12
|
-
{ name: "D", uv: 70 },
|
|
13
|
-
];
|
|
14
|
-
|
|
15
|
-
describe("<ReferenceDot />", () => {
|
|
16
|
-
it("draws a circle centered at the mapped data coordinate", () => {
|
|
17
|
-
const { container } = render(() => (
|
|
18
|
-
<LineChart
|
|
19
|
-
width={500}
|
|
20
|
-
height={500}
|
|
21
|
-
data={data}
|
|
22
|
-
margin={{ top: 5, right: 5, bottom: 5, left: 5 }}
|
|
23
|
-
>
|
|
24
|
-
<XAxis type="number" dataKey="uv" />
|
|
25
|
-
<YAxis type="number" domain={[0, 100]} />
|
|
26
|
-
<Line dataKey="uv" />
|
|
27
|
-
<ReferenceDot x={40} y={50} r={8} fill="#ff0000" />
|
|
28
|
-
</LineChart>
|
|
29
|
-
));
|
|
30
|
-
flush();
|
|
31
|
-
|
|
32
|
-
const dot = container.querySelector(".recharts-reference-dot-dot");
|
|
33
|
-
expect(dot).not.toBeNull();
|
|
34
|
-
// Y scale [0,100] → range [465, 5]: y=50 → cy=235.
|
|
35
|
-
// X scale (uv domain [10,70]) → range [65, 495]: x=40 → 65 + ((40-10)/60)*430 = 280.
|
|
36
|
-
expect(dot?.getAttribute("cy")).toBe("235");
|
|
37
|
-
expect(dot?.getAttribute("cx")).toBe("280");
|
|
38
|
-
expect(dot?.getAttribute("r")).toBe("8");
|
|
39
|
-
expect(dot?.getAttribute("fill")).toBe("#ff0000");
|
|
40
|
-
});
|
|
41
|
-
|
|
42
|
-
it("renders nothing when the dot overflows the domain and ifOverflow='discard'", () => {
|
|
43
|
-
const { container } = render(() => (
|
|
44
|
-
<LineChart width={500} height={500} data={data}>
|
|
45
|
-
<XAxis type="number" dataKey="uv" />
|
|
46
|
-
<YAxis type="number" domain={[0, 100]} />
|
|
47
|
-
<Line dataKey="uv" />
|
|
48
|
-
<ReferenceDot x={40} y={500} r={8} fill="#ff0000" />
|
|
49
|
-
</LineChart>
|
|
50
|
-
));
|
|
51
|
-
flush();
|
|
52
|
-
|
|
53
|
-
expect(container.querySelectorAll(".recharts-reference-dot-dot")).toHaveLength(0);
|
|
54
|
-
});
|
|
55
|
-
});
|
|
@@ -1,462 +0,0 @@
|
|
|
1
|
-
// Port of recharts 3.8.1 test/cartesian/ReferenceDot.spec.tsx (commit 7a23854) — the
|
|
2
|
-
// behavioral subset the Solid ReferenceDot implements: dot+label rendering at a data
|
|
3
|
-
// coordinate, in/out-of-domain visibility, ifOverflow (hidden clip-path / extendDomain),
|
|
4
|
-
// function-form label, and the Redux settings report. Deferred (impl/event-model gaps):
|
|
5
|
-
// element-form `shape`/`label` (Solid elements aren't introspectable), the React-style
|
|
6
|
-
// `DotProps` event-arg snapshot (port emits kebab SVG props on a non-bubbling Layer), and
|
|
7
|
-
// the React-component `shape` prop-equality case.
|
|
8
|
-
import { describe, expect, it, test, vi } from "vitest";
|
|
9
|
-
import { createEffect, createSignal, flush } from "solid-js";
|
|
10
|
-
import { fireEvent, render } from "@solidjs/testing-library";
|
|
11
|
-
import { Bar, BarChart, LineChart, ReferenceDot, XAxis, YAxis } from "../../src";
|
|
12
|
-
import { useAppSelector } from "../../src/state/hooks";
|
|
13
|
-
import { selectReferenceDotsByAxis } from "../../src/state/selectors/axisSelectors";
|
|
14
|
-
import { assertNotNull } from "../helper/assertNotNull";
|
|
15
|
-
import { Show } from "solid-js";
|
|
16
|
-
|
|
17
|
-
describe("<ReferenceDot />", () => {
|
|
18
|
-
const data = [
|
|
19
|
-
{ name: "201102", uv: -6.11, pv: 0 },
|
|
20
|
-
{ name: "201103", uv: 0.39, pv: 0 },
|
|
21
|
-
{ name: "201104", uv: -1.37, pv: 0 },
|
|
22
|
-
{ name: "201105", uv: 1.16, pv: 0 },
|
|
23
|
-
{ name: "201106", uv: 1.29, pv: 0 },
|
|
24
|
-
{ name: "201107", uv: 0.09, pv: 0 },
|
|
25
|
-
{ name: "201108", uv: 0.53, pv: 0 },
|
|
26
|
-
{ name: "201109", uv: 2.52, pv: 0 },
|
|
27
|
-
{ name: "201110", uv: 0.79, pv: 0 },
|
|
28
|
-
{ name: "201111", uv: 2.94, pv: 0 },
|
|
29
|
-
{ name: "201112", uv: 4.3, pv: 0 },
|
|
30
|
-
];
|
|
31
|
-
|
|
32
|
-
test("Render 1 dot and 1 label in ReferenceDot", () => {
|
|
33
|
-
const { container } = render(() => (
|
|
34
|
-
<BarChart
|
|
35
|
-
width={1100}
|
|
36
|
-
height={250}
|
|
37
|
-
barGap={2}
|
|
38
|
-
barSize={6}
|
|
39
|
-
data={data}
|
|
40
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
41
|
-
>
|
|
42
|
-
<XAxis dataKey="name" />
|
|
43
|
-
<YAxis tickCount={7} />
|
|
44
|
-
<Bar dataKey="uv" />
|
|
45
|
-
<ReferenceDot x="201106" y={3} stroke="#666" label="201106" />
|
|
46
|
-
</BarChart>
|
|
47
|
-
));
|
|
48
|
-
flush();
|
|
49
|
-
|
|
50
|
-
expect(
|
|
51
|
-
container.querySelectorAll(".recharts-reference-dot .recharts-reference-dot-dot"),
|
|
52
|
-
).toHaveLength(1);
|
|
53
|
-
const labels = container.querySelectorAll(".recharts-label");
|
|
54
|
-
expect(labels).toHaveLength(1);
|
|
55
|
-
const label = labels[0]!;
|
|
56
|
-
expect(label.getAttribute("x")).toEqual("472.72727272727275");
|
|
57
|
-
expect(label.getAttribute("y")).toEqual("86.66666666666667");
|
|
58
|
-
expect(label.getAttribute("fill")).toEqual("#808080");
|
|
59
|
-
expect(label.getAttribute("class")).toEqual("recharts-text recharts-label");
|
|
60
|
-
expect(label.getAttribute("text-anchor")).toEqual("middle");
|
|
61
|
-
expect(label.textContent).toEqual("201106");
|
|
62
|
-
});
|
|
63
|
-
|
|
64
|
-
test("Don't render any dot or label when reference dot is outside domain in ReferenceDot", () => {
|
|
65
|
-
const { container } = render(() => (
|
|
66
|
-
<BarChart
|
|
67
|
-
width={1100}
|
|
68
|
-
height={250}
|
|
69
|
-
barGap={2}
|
|
70
|
-
barSize={6}
|
|
71
|
-
data={data}
|
|
72
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
73
|
-
>
|
|
74
|
-
<XAxis dataKey="name" />
|
|
75
|
-
<YAxis tickCount={7} orientation="right" />
|
|
76
|
-
<Bar dataKey="uv" />
|
|
77
|
-
<ReferenceDot x="201106" y={20} stroke="#666" label="201106" />
|
|
78
|
-
</BarChart>
|
|
79
|
-
));
|
|
80
|
-
flush();
|
|
81
|
-
|
|
82
|
-
expect(container.querySelectorAll(".recharts-reference-dot-dot")).toHaveLength(0);
|
|
83
|
-
expect(container.querySelectorAll(".recharts-label")).toHaveLength(0);
|
|
84
|
-
});
|
|
85
|
-
|
|
86
|
-
test("Don't render any dot or label when x is not defined", () => {
|
|
87
|
-
const { container } = render(() => (
|
|
88
|
-
<BarChart
|
|
89
|
-
width={1100}
|
|
90
|
-
height={250}
|
|
91
|
-
barGap={2}
|
|
92
|
-
barSize={6}
|
|
93
|
-
data={data}
|
|
94
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
95
|
-
>
|
|
96
|
-
<XAxis dataKey="name" />
|
|
97
|
-
<YAxis tickCount={7} />
|
|
98
|
-
<Bar dataKey="uv" />
|
|
99
|
-
<ReferenceDot y={3} stroke="#666" label="201106" />
|
|
100
|
-
</BarChart>
|
|
101
|
-
));
|
|
102
|
-
flush();
|
|
103
|
-
|
|
104
|
-
expect(container.querySelectorAll(".recharts-reference-dot-dot")).toHaveLength(0);
|
|
105
|
-
expect(container.querySelectorAll(".recharts-label")).toHaveLength(0);
|
|
106
|
-
});
|
|
107
|
-
|
|
108
|
-
test("Don't render any dot or label when y is not defined", () => {
|
|
109
|
-
const { container } = render(() => (
|
|
110
|
-
<BarChart
|
|
111
|
-
width={1100}
|
|
112
|
-
height={250}
|
|
113
|
-
barGap={2}
|
|
114
|
-
barSize={6}
|
|
115
|
-
data={data}
|
|
116
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
117
|
-
>
|
|
118
|
-
<XAxis dataKey="name" />
|
|
119
|
-
<YAxis tickCount={7} />
|
|
120
|
-
<Bar dataKey="uv" />
|
|
121
|
-
<ReferenceDot x="201104" stroke="#666" label="201106" />
|
|
122
|
-
</BarChart>
|
|
123
|
-
));
|
|
124
|
-
flush();
|
|
125
|
-
|
|
126
|
-
expect(container.querySelectorAll(".recharts-reference-dot-dot")).toHaveLength(0);
|
|
127
|
-
expect(container.querySelectorAll(".recharts-label")).toHaveLength(0);
|
|
128
|
-
});
|
|
129
|
-
|
|
130
|
-
it("should render dot and label even when yAxis is not present", () => {
|
|
131
|
-
const { container } = render(() => (
|
|
132
|
-
<BarChart
|
|
133
|
-
width={1100}
|
|
134
|
-
height={250}
|
|
135
|
-
barGap={2}
|
|
136
|
-
barSize={6}
|
|
137
|
-
data={data}
|
|
138
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
139
|
-
>
|
|
140
|
-
<XAxis dataKey="name" />
|
|
141
|
-
<Bar dataKey="uv" />
|
|
142
|
-
<ReferenceDot x="201104" y={3} stroke="#666" label="201106" />
|
|
143
|
-
</BarChart>
|
|
144
|
-
));
|
|
145
|
-
flush();
|
|
146
|
-
|
|
147
|
-
expect(container.querySelectorAll(".recharts-reference-dot-dot")).toHaveLength(1);
|
|
148
|
-
expect(container.querySelectorAll(".recharts-label")).toHaveLength(1);
|
|
149
|
-
});
|
|
150
|
-
|
|
151
|
-
it('adds a clipPath attribute when ifOverflow is "hidden"', () => {
|
|
152
|
-
const { container } = render(() => (
|
|
153
|
-
<BarChart
|
|
154
|
-
width={1100}
|
|
155
|
-
height={250}
|
|
156
|
-
barGap={2}
|
|
157
|
-
barSize={6}
|
|
158
|
-
data={data}
|
|
159
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
160
|
-
>
|
|
161
|
-
<XAxis dataKey="name" />
|
|
162
|
-
<YAxis tickCount={7} />
|
|
163
|
-
<Bar dataKey="uv" />
|
|
164
|
-
<ReferenceDot x="201106" y={20} stroke="#666" label="201106" ifOverflow="hidden" />
|
|
165
|
-
</BarChart>
|
|
166
|
-
));
|
|
167
|
-
flush();
|
|
168
|
-
|
|
169
|
-
expect(
|
|
170
|
-
container.querySelectorAll(".recharts-reference-dot-dot")[0]!.getAttribute("clip-path"),
|
|
171
|
-
).toMatch(/url\(#recharts(\d+)-clip\)/);
|
|
172
|
-
});
|
|
173
|
-
|
|
174
|
-
test("Render 1 line and 1 label when ifOverflow is `extendDomain` in ReferenceDot", () => {
|
|
175
|
-
const { container } = render(() => (
|
|
176
|
-
<BarChart
|
|
177
|
-
width={1100}
|
|
178
|
-
height={250}
|
|
179
|
-
barGap={2}
|
|
180
|
-
barSize={6}
|
|
181
|
-
data={data}
|
|
182
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
183
|
-
>
|
|
184
|
-
<XAxis dataKey="name" />
|
|
185
|
-
<YAxis tickCount={7} />
|
|
186
|
-
<Bar dataKey="uv" />
|
|
187
|
-
<ReferenceDot x="201106" y={20} stroke="#666" label="201106" ifOverflow="extendDomain" />
|
|
188
|
-
</BarChart>
|
|
189
|
-
));
|
|
190
|
-
flush();
|
|
191
|
-
|
|
192
|
-
expect(container.querySelectorAll(".recharts-reference-dot-dot")).toHaveLength(1);
|
|
193
|
-
expect(container.querySelectorAll(".recharts-label")).toHaveLength(1);
|
|
194
|
-
});
|
|
195
|
-
|
|
196
|
-
test("Render custom label when label is set to be a function", () => {
|
|
197
|
-
const renderLabel = () => <text class="customized-label">Custom Text</text>;
|
|
198
|
-
|
|
199
|
-
const { container } = render(() => (
|
|
200
|
-
<BarChart
|
|
201
|
-
width={1100}
|
|
202
|
-
height={250}
|
|
203
|
-
barGap={2}
|
|
204
|
-
barSize={6}
|
|
205
|
-
data={data}
|
|
206
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
207
|
-
>
|
|
208
|
-
<XAxis dataKey="name" />
|
|
209
|
-
<YAxis tickCount={7} />
|
|
210
|
-
<Bar dataKey="uv" />
|
|
211
|
-
<ReferenceDot
|
|
212
|
-
x="201106"
|
|
213
|
-
y={20}
|
|
214
|
-
stroke="#666"
|
|
215
|
-
label={renderLabel}
|
|
216
|
-
ifOverflow="extendDomain"
|
|
217
|
-
/>
|
|
218
|
-
</BarChart>
|
|
219
|
-
));
|
|
220
|
-
flush();
|
|
221
|
-
|
|
222
|
-
expect(container.querySelector(".customized-label")?.textContent).toEqual("Custom Text");
|
|
223
|
-
});
|
|
224
|
-
|
|
225
|
-
test("Don't render any label when label is a plain object", () => {
|
|
226
|
-
const { container } = render(() => (
|
|
227
|
-
<BarChart
|
|
228
|
-
width={1100}
|
|
229
|
-
height={250}
|
|
230
|
-
barGap={2}
|
|
231
|
-
barSize={6}
|
|
232
|
-
data={data}
|
|
233
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
234
|
-
>
|
|
235
|
-
<XAxis dataKey="name" />
|
|
236
|
-
<YAxis tickCount={7} />
|
|
237
|
-
<Bar dataKey="uv" />
|
|
238
|
-
<ReferenceDot x="201106" y={20} stroke="#666" ifOverflow="extendDomain" />
|
|
239
|
-
</BarChart>
|
|
240
|
-
));
|
|
241
|
-
flush();
|
|
242
|
-
|
|
243
|
-
expect(container.querySelectorAll(".recharts-label")).toHaveLength(0);
|
|
244
|
-
});
|
|
245
|
-
|
|
246
|
-
test("Don't render any dot when x or y is not specified", () => {
|
|
247
|
-
const { container } = render(() => (
|
|
248
|
-
<BarChart
|
|
249
|
-
width={1100}
|
|
250
|
-
height={250}
|
|
251
|
-
barGap={2}
|
|
252
|
-
barSize={6}
|
|
253
|
-
data={data}
|
|
254
|
-
margin={{ top: 20, right: 60, bottom: 0, left: 20 }}
|
|
255
|
-
>
|
|
256
|
-
<XAxis dataKey="name" />
|
|
257
|
-
<YAxis tickCount={7} />
|
|
258
|
-
<Bar dataKey="uv" />
|
|
259
|
-
<ReferenceDot x="201106" stroke="#666" ifOverflow="extendDomain" />
|
|
260
|
-
<ReferenceDot y={20} stroke="#666" ifOverflow="extendDomain" />
|
|
261
|
-
</BarChart>
|
|
262
|
-
));
|
|
263
|
-
flush();
|
|
264
|
-
|
|
265
|
-
expect(container.querySelectorAll(".recharts-reference-dot-dot")).toHaveLength(0);
|
|
266
|
-
});
|
|
267
|
-
|
|
268
|
-
describe("events", () => {
|
|
269
|
-
// Handlers are called props-first — `(dotProps, event)` — exactly like recharts
|
|
270
|
-
// (the reference's Dot wraps them via adaptEventHandlers; the port wraps in
|
|
271
|
-
// ReferenceDot's renderDot). The first-arg snapshot asserts the geometry/style
|
|
272
|
-
// fields of the dot props (the full React props-bag snapshot is N/A: the port
|
|
273
|
-
// carries `class`, not `className`, and Solid handler values differ).
|
|
274
|
-
it("should fire event handlers when provided", () => {
|
|
275
|
-
const onClick = vi.fn();
|
|
276
|
-
const onMouseEnter = vi.fn();
|
|
277
|
-
const onMouseLeave = vi.fn();
|
|
278
|
-
const onMouseOver = vi.fn();
|
|
279
|
-
const onMouseOut = vi.fn();
|
|
280
|
-
const onMouseMove = vi.fn();
|
|
281
|
-
const onTouchStart = vi.fn();
|
|
282
|
-
const onTouchMove = vi.fn();
|
|
283
|
-
const onTouchEnd = vi.fn();
|
|
284
|
-
|
|
285
|
-
const { container } = render(() => (
|
|
286
|
-
<LineChart width={100} height={100} data={[{ x: 1, y: 1 }]}>
|
|
287
|
-
<YAxis dataKey="y" />
|
|
288
|
-
<XAxis dataKey="x" />
|
|
289
|
-
<ReferenceDot
|
|
290
|
-
x={1}
|
|
291
|
-
y={1}
|
|
292
|
-
r={3}
|
|
293
|
-
onClick={onClick}
|
|
294
|
-
onMouseEnter={onMouseEnter}
|
|
295
|
-
onMouseLeave={onMouseLeave}
|
|
296
|
-
onMouseOver={onMouseOver}
|
|
297
|
-
onMouseOut={onMouseOut}
|
|
298
|
-
onMouseMove={onMouseMove}
|
|
299
|
-
onTouchStart={onTouchStart}
|
|
300
|
-
onTouchMove={onTouchMove}
|
|
301
|
-
onTouchEnd={onTouchEnd}
|
|
302
|
-
/>
|
|
303
|
-
</LineChart>
|
|
304
|
-
));
|
|
305
|
-
flush();
|
|
306
|
-
|
|
307
|
-
const dot = container.querySelector(".recharts-reference-dot .recharts-dot");
|
|
308
|
-
assertNotNull(dot);
|
|
309
|
-
|
|
310
|
-
// The reference golden for this chart: cx=80, cy=5 (LineChart 100×100, one point).
|
|
311
|
-
const expectedDotProps = expect.objectContaining({
|
|
312
|
-
class: "recharts-reference-dot-dot",
|
|
313
|
-
cx: 80,
|
|
314
|
-
cy: 5,
|
|
315
|
-
fill: "#fff",
|
|
316
|
-
fillOpacity: 1,
|
|
317
|
-
r: 3,
|
|
318
|
-
stroke: "#ccc",
|
|
319
|
-
strokeWidth: 1,
|
|
320
|
-
});
|
|
321
|
-
|
|
322
|
-
fireEvent.click(dot);
|
|
323
|
-
expect(onClick).toHaveBeenCalledTimes(1);
|
|
324
|
-
expect(onClick).toHaveBeenLastCalledWith(
|
|
325
|
-
expectedDotProps,
|
|
326
|
-
expect.objectContaining({ type: "click" }),
|
|
327
|
-
);
|
|
328
|
-
|
|
329
|
-
fireEvent.mouseEnter(dot);
|
|
330
|
-
expect(onMouseEnter).toHaveBeenCalledTimes(1);
|
|
331
|
-
expect(onMouseEnter).toHaveBeenLastCalledWith(
|
|
332
|
-
expectedDotProps,
|
|
333
|
-
expect.objectContaining({ type: "mouseenter" }),
|
|
334
|
-
);
|
|
335
|
-
|
|
336
|
-
fireEvent.mouseOver(dot);
|
|
337
|
-
expect(onMouseOver).toHaveBeenCalledTimes(1);
|
|
338
|
-
expect(onMouseOver).toHaveBeenLastCalledWith(
|
|
339
|
-
expectedDotProps,
|
|
340
|
-
expect.objectContaining({ type: "mouseover" }),
|
|
341
|
-
);
|
|
342
|
-
|
|
343
|
-
fireEvent.mouseLeave(dot);
|
|
344
|
-
expect(onMouseLeave).toHaveBeenCalledTimes(1);
|
|
345
|
-
expect(onMouseLeave).toHaveBeenLastCalledWith(
|
|
346
|
-
expectedDotProps,
|
|
347
|
-
expect.objectContaining({ type: "mouseleave" }),
|
|
348
|
-
);
|
|
349
|
-
|
|
350
|
-
fireEvent.mouseOut(dot);
|
|
351
|
-
expect(onMouseOut).toHaveBeenCalledTimes(1);
|
|
352
|
-
expect(onMouseOut).toHaveBeenLastCalledWith(
|
|
353
|
-
expectedDotProps,
|
|
354
|
-
expect.objectContaining({ type: "mouseout" }),
|
|
355
|
-
);
|
|
356
|
-
|
|
357
|
-
fireEvent.mouseMove(dot);
|
|
358
|
-
expect(onMouseMove).toHaveBeenCalledTimes(1);
|
|
359
|
-
expect(onMouseMove).toHaveBeenLastCalledWith(
|
|
360
|
-
expectedDotProps,
|
|
361
|
-
expect.objectContaining({ type: "mousemove" }),
|
|
362
|
-
);
|
|
363
|
-
|
|
364
|
-
fireEvent.touchStart(dot);
|
|
365
|
-
expect(onTouchStart).toHaveBeenCalledTimes(1);
|
|
366
|
-
expect(onTouchStart).toHaveBeenLastCalledWith(
|
|
367
|
-
expectedDotProps,
|
|
368
|
-
expect.objectContaining({ type: "touchstart" }),
|
|
369
|
-
);
|
|
370
|
-
|
|
371
|
-
fireEvent.touchMove(dot);
|
|
372
|
-
expect(onTouchMove).toHaveBeenCalledTimes(1);
|
|
373
|
-
expect(onTouchMove).toHaveBeenLastCalledWith(
|
|
374
|
-
expectedDotProps,
|
|
375
|
-
expect.objectContaining({ type: "touchmove" }),
|
|
376
|
-
);
|
|
377
|
-
|
|
378
|
-
fireEvent.touchEnd(dot);
|
|
379
|
-
expect(onTouchEnd).toHaveBeenCalledTimes(1);
|
|
380
|
-
expect(onTouchEnd).toHaveBeenLastCalledWith(
|
|
381
|
-
expectedDotProps,
|
|
382
|
-
expect.objectContaining({ type: "touchend" }),
|
|
383
|
-
);
|
|
384
|
-
});
|
|
385
|
-
|
|
386
|
-
it("should fire mousedown and mouseup handlers props-first", () => {
|
|
387
|
-
const onMouseDown = vi.fn();
|
|
388
|
-
const onMouseUp = vi.fn();
|
|
389
|
-
const { container } = render(() => (
|
|
390
|
-
<LineChart width={100} height={100} data={[{ x: 1, y: 1 }]}>
|
|
391
|
-
<YAxis dataKey="y" />
|
|
392
|
-
<XAxis dataKey="x" />
|
|
393
|
-
<ReferenceDot x={1} y={1} r={3} onMouseDown={onMouseDown} onMouseUp={onMouseUp} />
|
|
394
|
-
</LineChart>
|
|
395
|
-
));
|
|
396
|
-
flush();
|
|
397
|
-
|
|
398
|
-
const dot = container.querySelector(".recharts-reference-dot .recharts-dot");
|
|
399
|
-
assertNotNull(dot);
|
|
400
|
-
|
|
401
|
-
fireEvent.mouseDown(dot);
|
|
402
|
-
expect(onMouseDown).toHaveBeenCalledTimes(1);
|
|
403
|
-
expect(onMouseDown).toHaveBeenLastCalledWith(
|
|
404
|
-
expect.objectContaining({ cx: 80, cy: 5, r: 3 }),
|
|
405
|
-
expect.objectContaining({ type: "mousedown" }),
|
|
406
|
-
);
|
|
407
|
-
|
|
408
|
-
fireEvent.mouseUp(dot);
|
|
409
|
-
expect(onMouseUp).toHaveBeenCalledTimes(1);
|
|
410
|
-
expect(onMouseUp).toHaveBeenLastCalledWith(
|
|
411
|
-
expect.objectContaining({ cx: 80, cy: 5, r: 3 }),
|
|
412
|
-
expect.objectContaining({ type: "mouseup" }),
|
|
413
|
-
);
|
|
414
|
-
});
|
|
415
|
-
});
|
|
416
|
-
|
|
417
|
-
describe("state integration", () => {
|
|
418
|
-
it("should report its settings to Redux state, and remove it after removing from DOM", () => {
|
|
419
|
-
const dotSpy = vi.fn();
|
|
420
|
-
const [showDot, setShowDot] = createSignal(true);
|
|
421
|
-
const Comp = (): null => {
|
|
422
|
-
const dots = useAppSelector((state) => selectReferenceDotsByAxis(state, "yAxis", 0));
|
|
423
|
-
createEffect(
|
|
424
|
-
() => dots(),
|
|
425
|
-
(v) => dotSpy(v),
|
|
426
|
-
);
|
|
427
|
-
return null;
|
|
428
|
-
};
|
|
429
|
-
render(() => (
|
|
430
|
-
<LineChart width={100} height={100}>
|
|
431
|
-
<YAxis />
|
|
432
|
-
<XAxis />
|
|
433
|
-
<Show when={showDot()}>
|
|
434
|
-
<ReferenceDot x={1} y="categorical data item" r={3} ifOverflow="extendDomain" />
|
|
435
|
-
</Show>
|
|
436
|
-
<Comp />
|
|
437
|
-
</LineChart>
|
|
438
|
-
));
|
|
439
|
-
flush();
|
|
440
|
-
|
|
441
|
-
expect(dotSpy).toHaveBeenLastCalledWith([
|
|
442
|
-
{
|
|
443
|
-
// `id` is a documented Solid deviation: recharts matches reference
|
|
444
|
-
// elements by object identity, but Solid store proxies break that, so
|
|
445
|
-
// the port mints a stable id for proxy-safe removal.
|
|
446
|
-
id: expect.stringMatching(/^recharts-reference-dot-/) as unknown as string,
|
|
447
|
-
x: 1,
|
|
448
|
-
y: "categorical data item",
|
|
449
|
-
r: 3,
|
|
450
|
-
xAxisId: 0,
|
|
451
|
-
yAxisId: 0,
|
|
452
|
-
ifOverflow: "extendDomain",
|
|
453
|
-
},
|
|
454
|
-
]);
|
|
455
|
-
|
|
456
|
-
setShowDot(false);
|
|
457
|
-
flush();
|
|
458
|
-
|
|
459
|
-
expect(dotSpy).toHaveBeenLastCalledWith([]);
|
|
460
|
-
});
|
|
461
|
-
});
|
|
462
|
-
});
|
|
@@ -1,76 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it } from "vitest";
|
|
2
|
-
import { type DotProps, Line, LineChart, ReferenceDot, getRelativeCoordinate } from "../../src";
|
|
3
|
-
import { render } from "@solidjs/testing-library";
|
|
4
|
-
|
|
5
|
-
// Ported from recharts 3.8.1 test/cartesian/ReferenceDot.typed.spec.tsx.
|
|
6
|
-
|
|
7
|
-
type ExampleDataPoint = { value: number; name: string };
|
|
8
|
-
const data: ReadonlyArray<ExampleDataPoint> = [
|
|
9
|
-
{ value: 100, name: "a" },
|
|
10
|
-
{ value: 80, name: "b" },
|
|
11
|
-
];
|
|
12
|
-
|
|
13
|
-
describe("ReferenceDot with strong typing", () => {
|
|
14
|
-
describe("with all implicit types", () => {
|
|
15
|
-
it("should render ReferenceDot with implicit coordinate types", () => {
|
|
16
|
-
const { container } = render(() => (
|
|
17
|
-
<LineChart data={data} width={400} height={400}>
|
|
18
|
-
<Line dataKey="value" />
|
|
19
|
-
<ReferenceDot x={0} y={100} />
|
|
20
|
-
</LineChart>
|
|
21
|
-
));
|
|
22
|
-
expect(container.querySelectorAll(".recharts-reference-dot-dot")).toHaveLength(1);
|
|
23
|
-
});
|
|
24
|
-
});
|
|
25
|
-
|
|
26
|
-
describe("with explicit ReferenceDot type parameters", () => {
|
|
27
|
-
it("should allow matching explicit coordinate types", () => {
|
|
28
|
-
render(() => (
|
|
29
|
-
<LineChart data={data} width={400} height={400}>
|
|
30
|
-
<Line dataKey="value" />
|
|
31
|
-
<ReferenceDot<number, number> x={0} y={100} />
|
|
32
|
-
</LineChart>
|
|
33
|
-
));
|
|
34
|
-
});
|
|
35
|
-
|
|
36
|
-
it("should show errors when explicit coordinate types do not match", () => {
|
|
37
|
-
render(() => (
|
|
38
|
-
<LineChart data={data} width={400} height={400}>
|
|
39
|
-
<Line dataKey="value" />
|
|
40
|
-
{/* @ts-expect-error TypeScript is correct here - x should be number */}
|
|
41
|
-
<ReferenceDot<number, number> x="a" y={100} />
|
|
42
|
-
{/* @ts-expect-error TypeScript is correct here - y should be number */}
|
|
43
|
-
<ReferenceDot<number, number> x={0} y="a" />
|
|
44
|
-
</LineChart>
|
|
45
|
-
));
|
|
46
|
-
});
|
|
47
|
-
});
|
|
48
|
-
});
|
|
49
|
-
|
|
50
|
-
describe("ReferenceDot event handlers", () => {
|
|
51
|
-
// Handlers are props-first `(dotProps, event)` (recharts parity; see
|
|
52
|
-
// ReferenceDot.spec). The event's currentTarget is the rendered <circle>,
|
|
53
|
-
// so it satisfies SVGMousePointer/SVGTouchPointer and feeds
|
|
54
|
-
// getRelativeCoordinate directly — same as the reference.
|
|
55
|
-
it("should allow calling getRelativeCoordinate with the type provided by Recharts event handler", () => {
|
|
56
|
-
render(() => (
|
|
57
|
-
<LineChart width={100} height={100}>
|
|
58
|
-
<ReferenceDot
|
|
59
|
-
x={10}
|
|
60
|
-
y={10}
|
|
61
|
-
onClick={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
62
|
-
onMouseDown={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
63
|
-
onMouseUp={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
64
|
-
onMouseMove={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
65
|
-
onMouseLeave={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
66
|
-
onMouseOver={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
67
|
-
onMouseOut={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
68
|
-
onMouseEnter={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
69
|
-
onTouchStart={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
70
|
-
onTouchMove={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
71
|
-
onTouchEnd={(_dotProps: DotProps, e) => getRelativeCoordinate(e)}
|
|
72
|
-
/>
|
|
73
|
-
</LineChart>
|
|
74
|
-
));
|
|
75
|
-
});
|
|
76
|
-
});
|