Fix the signature of class static fields as functions (#2840)

FormidableLabs · Mar 25, 2024 · 06b9f31 · 06b9f31
1 parent 300b527
commit 06b9f31
Show file tree

Hide file tree

Showing 27 changed files with 162 additions and 92 deletions.
diff --git a/.changeset/stale-shirts-grow.md b/.changeset/stale-shirts-grow.md
@@ -0,0 +1,25 @@
+---
+"victory-area": patch
+"victory-axis": patch
+"victory-bar": patch
+"victory-box-plot": patch
+"victory-brush-container": patch
+"victory-candlestick": patch
+"victory-create-container": patch
+"victory-cursor-container": patch
+"victory-errorbar": patch
+"victory-histogram": patch
+"victory-legend": patch
+"victory-line": patch
+"victory-native": patch
+"victory-pie": patch
+"victory-polar-axis": patch
+"victory-scatter": patch
+"victory-selection-container": patch
+"victory-tooltip": patch
+"victory-voronoi": patch
+"victory-voronoi-container": patch
+"victory-zoom-container": patch
+---
+
+Fix the signature of class static functions in components
diff --git a/packages/victory-area/src/victory-area.tsx b/packages/victory-area/src/victory-area.tsx
@@ -88,7 +88,9 @@ class VictoryAreaBase extends React.Component<VictoryAreaProps> {
     DefaultTransitions.continuousPolarTransitions();
   static getDomain = Domain.getDomainWithZero;
   static getData = Data.getData;
-  static getBaseProps = (props) => getBaseProps(props, fallbackProps);
+  static getBaseProps(props) {
+    return getBaseProps(props, fallbackProps);
+  }
   static expectedComponents = [
     "dataComponent",
     "labelComponent",

diff --git a/packages/victory-axis/src/victory-axis.tsx b/packages/victory-axis/src/victory-axis.tsx
@@ -102,8 +102,12 @@ class VictoryAxisBase extends React.Component<VictoryAxisProps> {
 
   static getDomain = Axis.getDomain;
   static getAxis = Axis.getAxis;
-  static getStyles = (props) => getStyles(props);
-  static getBaseProps = (props) => getBaseProps(props, fallbackProps);
+  static getStyles(props) {
+    return getStyles(props);
+  }
+  static getBaseProps(props) {
+    return getBaseProps(props, fallbackProps);
+  }
   static expectedComponents: Array<keyof VictoryAxisProps> = [
     "axisComponent",
     "axisLabelComponent",

diff --git a/packages/victory-bar/src/victory-bar.tsx b/packages/victory-bar/src/victory-bar.tsx
@@ -119,8 +119,9 @@ class VictoryBarBase extends React.Component<VictoryBarProps> {
 
   static getDomain = Domain.getDomainWithZero;
   static getData = Data.getData;
-  static getBaseProps = (props: VictoryBarProps) =>
-    getBaseProps(props, fallbackProps);
+  static getBaseProps(props: VictoryBarProps) {
+    return getBaseProps(props, fallbackProps);
+  }
   static expectedComponents: (keyof VictoryBarProps)[] = [
     "dataComponent",
     "labelComponent",

diff --git a/packages/victory-box-plot/src/victory-box-plot.tsx b/packages/victory-box-plot/src/victory-box-plot.tsx
@@ -161,9 +161,15 @@ class VictoryBoxPlotBase extends React.Component<VictoryBoxPlotProps> {
     theme: VictoryTheme.grayscale,
   };
 
-  static getDomain = getDomain;
-  static getData = getData;
-  static getBaseProps = (props) => getBaseProps(props, fallbackProps);
+  static getDomain(props, axis) {
+    return getDomain(props, axis);
+  }
+  static getData(props) {
+    return getData(props);
+  }
+  static getBaseProps(props) {
+    return getBaseProps(props, fallbackProps);
+  }
   static expectedComponents: Array<keyof VictoryBoxPlotProps> = [
     "maxComponent",
     "maxLabelComponent",

diff --git a/packages/victory-brush-container/src/victory-brush-container.tsx b/packages/victory-brush-container/src/victory-brush-container.tsx
@@ -66,7 +66,7 @@ export function brushContainerMixin<
       mouseMoveThreshold: 0,
     };
 
-    static defaultEvents = (props) => {
+    static defaultEvents(props) {
       return [
         {
           target: "parent",
@@ -111,7 +111,7 @@ export function brushContainerMixin<
           },
         },
       ];
-    };
+    }
 
     getSelectBox(props, coordinates) {
       const { x, y } = coordinates;

diff --git a/packages/victory-candlestick/src/victory-candlestick.tsx b/packages/victory-candlestick/src/victory-candlestick.tsx
@@ -169,10 +169,15 @@ class VictoryCandlestickBase extends React.Component<VictoryCandlestickProps> {
     theme: VictoryTheme.grayscale,
   };
 
-  static getDomain = getDomain;
-  static getData = getData;
-  static getBaseProps = (props: VictoryCandlestickProps) =>
-    getBaseProps(props, fallbackProps);
+  static getDomain(props, axis) {
+    return getDomain(props, axis);
+  }
+  static getData(props) {
+    return getData(props);
+  }
+  static getBaseProps(props: VictoryCandlestickProps) {
+    return getBaseProps(props, fallbackProps);
+  }
   static expectedComponents = [
     "openLabelComponent",
     "closeLabelComponent",

diff --git a/packages/victory-create-container/src/create-container.ts b/packages/victory-create-container/src/create-container.ts
@@ -97,7 +97,7 @@ export const combineContainerMixins = (
       {},
     );
 
-    static defaultEvents = (props) => {
+    static defaultEvents(props) {
       return combineDefaultEvents(
         Classes.reduce((defaultEvents, Class) => {
           const events = Helpers.isFunction(Class.defaultEvents)
@@ -106,7 +106,7 @@ export const combineContainerMixins = (
           return [...defaultEvents, ...events];
         }, []),
       );
-    };
+    }
 
     getChildren(props) {
       return instances.reduce(

diff --git a/packages/victory-cursor-container/src/victory-cursor-container.tsx b/packages/victory-cursor-container/src/victory-cursor-container.tsx
@@ -46,7 +46,7 @@ export function cursorContainerMixin<
       },
       cursorComponent: <LineSegment />,
     };
-    static defaultEvents = (props) => {
+    static defaultEvents(props) {
       return [
         {
           target: "parent",
@@ -72,7 +72,7 @@ export function cursorContainerMixin<
           },
         },
       ];
-    };
+    }
 
     getCursorPosition(props) {
       const { cursorValue, defaultCursorValue, domain, cursorDimension } =

diff --git a/packages/victory-errorbar/src/victory-errorbar.tsx b/packages/victory-errorbar/src/victory-errorbar.tsx
@@ -86,9 +86,15 @@ class VictoryErrorBarBase extends React.Component<VictoryErrorBarProps> {
     theme: VictoryTheme.grayscale,
   };
 
-  static getDomain = getDomain;
-  static getData = getData;
-  static getBaseProps = (props) => getBaseProps(props, fallbackProps);
+  static getDomain(props, axis) {
+    return getDomain(props, axis);
+  }
+  static getData(props) {
+    return getData(props);
+  }
+  static getBaseProps(props) {
+    return getBaseProps(props, fallbackProps);
+  }
   static expectedComponents = [
     "dataComponent",
     "labelComponent",

diff --git a/packages/victory-histogram/src/victory-histogram.tsx b/packages/victory-histogram/src/victory-histogram.tsx
@@ -97,7 +97,9 @@ class VictoryHistogramBase extends React.Component<VictoryHistogramProps> {
     },
   };
 
-  static getFormattedData = getFormattedData;
+  static getFormattedData(...args: any) {
+    return getFormattedData(...args);
+  }
 
   static defaultProps: VictoryHistogramProps = {
     containerComponent: <VictoryContainer />,
@@ -111,10 +113,15 @@ class VictoryHistogramBase extends React.Component<VictoryHistogramProps> {
     theme: VictoryTheme.grayscale,
   };
 
-  static getDomain = getDomain;
-  static getData = getData;
-  static getBaseProps = (props: VictoryHistogramProps) =>
-    getBaseProps(props, fallbackProps);
+  static getDomain(props, axis) {
+    return getDomain(props, axis);
+  }
+  static getData(props) {
+    return getData(props);
+  }
+  static getBaseProps(props: VictoryHistogramProps) {
+    return getBaseProps(props, fallbackProps);
+  }
   static expectedComponents: Partial<keyof VictoryHistogramProps>[] = [
     "dataComponent",
     "labelComponent",

diff --git a/packages/victory-legend/src/victory-legend.tsx b/packages/victory-legend/src/victory-legend.tsx
@@ -84,11 +84,13 @@ class VictoryLegendBase extends React.Component<VictoryLegendProps> {
     titleComponent: <VictoryLabel />,
   };
 
-  static getBaseProps = (props: VictoryLegendProps) =>
-    getBaseProps(props, fallbackProps);
+  static getBaseProps(props: VictoryLegendProps) {
+    return getBaseProps(props, fallbackProps);
+  }
 
-  static getDimensions = (props: VictoryLegendProps) =>
-    getDimensions(props, fallbackProps);
+  static getDimensions(props: VictoryLegendProps) {
+    return getDimensions(props, fallbackProps);
+  }
 
   static expectedComponents = [
     "borderComponent",

diff --git a/packages/victory-line/src/victory-line.tsx b/packages/victory-line/src/victory-line.tsx
@@ -77,7 +77,9 @@ class VictoryLineBase extends React.Component<VictoryLineProps> {
 
   static getDomain = Domain.getDomain;
   static getData = Data.getData;
-  static getBaseProps = (props) => getBaseProps(props, fallbackProps);
+  static getBaseProps(props) {
+    return getBaseProps(props, fallbackProps);
+  }
   static expectedComponents = [
     "dataComponent",
     "labelComponent",

diff --git a/packages/victory-native/src/components/victory-brush-container.tsx b/packages/victory-native/src/components/victory-brush-container.tsx
@@ -50,7 +50,7 @@ function nativeBrushMixin<
     };
 
     // overrides all web events with native specific events
-    static defaultEvents = (props: TProps) => {
+    static defaultEvents(props: TProps) {
       return [
         {
           target: "parent",
@@ -77,7 +77,7 @@ function nativeBrushMixin<
           },
         },
       ];
-    };
+    }
   };
 }
 

diff --git a/packages/victory-native/src/components/victory-cursor-container.tsx b/packages/victory-native/src/components/victory-cursor-container.tsx
@@ -42,7 +42,7 @@ function nativeCursorMixin<
     };
 
     // overrides all web events with native specific events
-    static defaultEvents = (props: TProps) => {
+    static defaultEvents(props: TProps) {
       return [
         {
           target: "parent",
@@ -65,7 +65,7 @@ function nativeCursorMixin<
           },
         },
       ];
-    };
+    }
   };
 }
 

diff --git a/packages/victory-native/src/components/victory-selection-container.tsx b/packages/victory-native/src/components/victory-selection-container.tsx
@@ -50,7 +50,7 @@ function nativeSelectionMixin<
     };
 
     // overrides all web events with native specific events
-    static defaultEvents = (props: TProps) => {
+    static defaultEvents(props: TProps) {
       return [
         {
           target: "parent",
@@ -77,7 +77,7 @@ function nativeSelectionMixin<
           },
         },
       ];
-    };
+    }
   };
 }
 

diff --git a/packages/victory-native/src/components/victory-tooltip.tsx b/packages/victory-native/src/components/victory-tooltip.tsx
@@ -13,40 +13,42 @@ export class VictoryTooltip extends VictoryTooltipBase {
     groupComponent: <G />,
   };
 
-  static defaultEvents = () => [
-    {
-      target: "data",
-      eventHandlers: {
-        onPressIn: (targetProps) => {
-          return [
-            {
-              target: "labels",
-              mutation: () => ({ active: true }),
-            },
-            {
-              target: "data",
-              mutation: () =>
-                targetProps.activateData
-                  ? { active: true }
-                  : { active: undefined },
-            },
-          ];
-        },
-        onPressOut: () => {
-          return [
-            {
-              target: "labels",
-              mutation: () => ({ active: undefined }),
-            },
-            {
-              target: "data",
-              mutation: () => ({ active: undefined }),
-            },
-          ];
+  static defaultEvents() {
+    return [
+      {
+        target: "data",
+        eventHandlers: {
+          onPressIn: (targetProps) => {
+            return [
+              {
+                target: "labels",
+                mutation: () => ({ active: true }),
+              },
+              {
+                target: "data",
+                mutation: () =>
+                  targetProps.activateData
+                    ? { active: true }
+                    : { active: undefined },
+              },
+            ];
+          },
+          onPressOut: () => {
+            return [
+              {
+                target: "labels",
+                mutation: () => ({ active: undefined }),
+              },
+              {
+                target: "data",
+                mutation: () => ({ active: undefined }),
+              },
+            ];
+          },
         },
       },
-    },
-  ];
+    ];
+  }
 
   renderTooltip(props) {
     const evaluatedProps = this.getEvaluatedProps(props);

diff --git a/packages/victory-native/src/components/victory-voronoi-container.tsx b/packages/victory-native/src/components/victory-voronoi-container.tsx
@@ -43,7 +43,7 @@ function nativeVoronoiMixin<
     };
 
     // overrides all web events with native specific events
-    static defaultEvents = (props: TProps) => {
+    static defaultEvents(props: TProps) {
       return [
         {
           target: "parent",
@@ -76,7 +76,7 @@ function nativeVoronoiMixin<
               },
         },
       ];
-    };
+    }
   };
 }