feat(charts): Update Victory dependencies

patternfly#7614
dlabrecq · Sep 15, 2022 · 0982333 · 0982333
1 parent d5b77ee
commit 0982333
Show file tree

Hide file tree

Showing 6 changed files with 317 additions and 195 deletions.
diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json
@@ -34,22 +34,22 @@
     "hoist-non-react-statics": "^3.3.0",
     "lodash": "^4.17.19",
     "tslib": "^2.0.0",
-    "victory-area": "^36.2.1",
-    "victory-axis": "^36.2.1",
-    "victory-bar": "^36.2.1",
-    "victory-chart": "^36.2.1",
-    "victory-core": "^36.2.1",
-    "victory-create-container": "^36.2.1",
-    "victory-cursor-container": "^36.2.1",
-    "victory-group": "^36.2.1",
-    "victory-legend": "^36.2.1",
-    "victory-line": "^36.2.1",
-    "victory-pie": "^36.2.1",
-    "victory-scatter": "^36.2.1",
-    "victory-stack": "^36.2.1",
-    "victory-tooltip": "^36.2.1",
-    "victory-voronoi-container": "^36.2.1",
-    "victory-zoom-container": "^36.2.1"
+    "victory-area": "^36.6.7",
+    "victory-axis": "^36.6.7",
+    "victory-bar": "^36.6.7",
+    "victory-chart": "^36.6.7",
+    "victory-core": "^36.6.7",
+    "victory-create-container": "^36.6.7",
+    "victory-cursor-container": "^36.6.7",
+    "victory-group": "^36.6.7",
+    "victory-legend": "^36.6.7",
+    "victory-line": "^36.6.7",
+    "victory-pie": "^36.6.7",
+    "victory-scatter": "^36.6.7",
+    "victory-stack": "^36.6.7",
+    "victory-tooltip": "^36.6.7",
+    "victory-voronoi-container": "^36.6.7",
+    "victory-zoom-container": "^36.6.7"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0",

diff --git a/packages/react-charts/src/components/ChartBullet/__snapshots__/ChartBullet.test.tsx.snap b/packages/react-charts/src/components/ChartBullet/__snapshots__/ChartBullet.test.tsx.snap
@@ -34,24 +34,24 @@ exports[`ChartBulletQualitativeRange 1`] = `
             shape-rendering="auto"
             style="stroke: var(--pf-chart-axis--tick--stroke--Color, #d2d2d2); fill: var(--pf-chart-axis--tick--Fill, transparent); size: 5px; stroke-linecap: round; stroke-linejoin: round; stroke-width: 1;"
             vector-effect="non-scaling-stroke"
-            x1="50"
-            x2="50"
+            x1="225"
+            x2="225"
             y1="85"
             y2="90"
           />
           <text
             direction="inherit"
             dx="0"
             id="test"
-            x="50"
+            x="225"
             y="111.97"
           >
             <tspan
               dx="0"
               dy="0"
               style="font-family: \\"RedHatText\\",\\"Overpass\\",overpass,helvetica,arial,sans-serif; font-size: 14px; letter-spacing: normal; padding: 10px; stroke: var(--pf-chart-global--label--stroke, transparent); fill: var(--pf-chart-axis--tick-label--Fill, #4f5255); text-anchor: middle;"
               text-anchor="middle"
-              x="50"
+              x="225"
             >
               0
             </tspan>
@@ -119,24 +119,24 @@ exports[`ChartBulletQualitativeRange 2`] = `
             shape-rendering="auto"
             style="stroke: var(--pf-chart-axis--tick--stroke--Color, #d2d2d2); fill: var(--pf-chart-axis--tick--Fill, transparent); size: 5px; stroke-linecap: round; stroke-linejoin: round; stroke-width: 1;"
             vector-effect="non-scaling-stroke"
-            x1="50"
-            x2="50"
+            x1="225"
+            x2="225"
             y1="85"
             y2="90"
           />
           <text
             direction="inherit"
             dx="0"
             id="test"
-            x="50"
+            x="225"
             y="111.97"
           >
             <tspan
               dx="0"
               dy="0"
               style="font-family: \\"RedHatText\\",\\"Overpass\\",overpass,helvetica,arial,sans-serif; font-size: 14px; letter-spacing: normal; padding: 10px; stroke: var(--pf-chart-global--label--stroke, transparent); fill: var(--pf-chart-axis--tick-label--Fill, #4f5255); text-anchor: middle;"
               text-anchor="middle"
-              x="50"
+              x="225"
             >
               0
             </tspan>

diff --git a/packages/react-charts/src/components/ChartCursorContainer/ChartCursorContainer.tsx b/packages/react-charts/src/components/ChartCursorContainer/ChartCursorContainer.tsx
@@ -3,7 +3,7 @@ import chart_global_label_Fill from '@patternfly/react-tokens/dist/esm/chart_glo
 
 import * as React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
-import { CallbackArgs, CoordinatesPropType, LineSegment, OriginType } from 'victory-core';
+import { LineSegment, OriginType, ValueOrAccessor, VictoryLabelProps } from 'victory-core';
 import {
   CursorCoordinatesPropType,
   VictoryCursorContainer,
@@ -59,7 +59,7 @@ export interface ChartCursorContainerProps extends VictoryCursorContainerProps {
    * @propType Function
    * example: cursorLabel={(point) => point.x}
    */
-  cursorLabel?: (point: CoordinatesPropType, args: CallbackArgs) => any | void;
+  cursorLabel?: ValueOrAccessor<VictoryLabelProps['text']>;
   /**
    * The cursorLabelComponent prop takes a component instance which will be used to render a label for the cursor. The
    * new element created from the passed cursorLabelComponent will be supplied with the following props: x, y, active,

diff --git a/packages/react-charts/src/components/ChartLine/ChartLine.tsx b/packages/react-charts/src/components/ChartLine/ChartLine.tsx
@@ -347,7 +347,7 @@ export interface ChartLineProps extends VictoryLineProps {
    * is given directly to the lodash sortBy function to be executed on the
    * final dataset.
    */
-  sortKey?: string | string[] | Function;
+  sortKey?: DataGetterPropType;
   /**
    * The sortOrder prop specifies whether sorted data should be returned in 'ascending' or 'descending' order.
    *

diff --git a/packages/react-charts/src/components/ChartThreshold/ChartThreshold.tsx b/packages/react-charts/src/components/ChartThreshold/ChartThreshold.tsx
@@ -340,7 +340,7 @@ export interface ChartThresholdProps extends VictoryLineProps {
    * is given directly to the lodash sortBy function to be executed on the
    * final dataset.
    */
-  sortKey?: string | string[] | Function;
+  sortKey?: DataGetterPropType;
   /**
    * The sortOrder prop specifies whether sorted data should be returned in 'ascending' or 'descending' order.
    *