victory-core 36.5.0 → 36.5.3

package/src/victory-theme/grayscale.tsx

@@ -1,5 +1,5 @@
 import { assign } from "lodash";
-import { VictoryThemeDefinition } from "./victory-theme-definition";
+import { VictoryThemeDefinition } from "./types";
 
 // *
 // * Colors
@@ -11,7 +11,7 @@ const colors = [
   "#969696",
   "#bdbdbd",
   "#d9d9d9",
-  "#f0f0f0"
+  "#f0f0f0",
 ];
 
 const charcoal = "#252525";
@@ -29,7 +29,7 @@ const baseProps = {
   width: 450,
   height: 300,
   padding: 50,
-  colorScale: colors
+  colorScale: colors,
 };
 // *
 // * Labels
@@ -40,7 +40,7 @@ const baseLabelStyles = {
   letterSpacing,
   padding: 10,
   fill: charcoal,
-  stroke: "transparent"
+  stroke: "transparent",
 };
 
 const centeredLabelStyles = assign({ textAnchor: "middle" }, baseLabelStyles);
@@ -55,12 +55,12 @@ export const grayscale: VictoryThemeDefinition = {
     {
       style: {
         data: {
-          fill: charcoal
+          fill: charcoal,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   axis: assign(
     {
@@ -70,25 +70,25 @@ export const grayscale: VictoryThemeDefinition = {
           stroke: charcoal,
           strokeWidth: 1,
           strokeLinecap,
-          strokeLinejoin
+          strokeLinejoin,
         },
         axisLabel: assign({}, centeredLabelStyles, {
-          padding: 25
+          padding: 25,
         }),
         grid: {
           fill: "none",
           stroke: "none",
-          pointerEvents: "painted"
+          pointerEvents: "painted",
         },
         ticks: {
           fill: "transparent",
           size: 1,
-          stroke: "transparent"
+          stroke: "transparent",
         },
-        tickLabels: baseLabelStyles
-      }
+        tickLabels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   bar: assign(
     {
@@ -96,12 +96,12 @@ export const grayscale: VictoryThemeDefinition = {
         data: {
           fill: charcoal,
           padding: 8,
-          strokeWidth: 0
+          strokeWidth: 0,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   boxplot: assign(
     {
@@ -115,27 +115,27 @@ export const grayscale: VictoryThemeDefinition = {
         q1: { padding: 8, fill: grey },
         q1Labels: assign({}, baseLabelStyles, { padding: 3 }),
         q3: { padding: 8, fill: grey },
-        q3Labels: assign({}, baseLabelStyles, { padding: 3 })
+        q3Labels: assign({}, baseLabelStyles, { padding: 3 }),
       },
-      boxWidth: 20
+      boxWidth: 20,
     },
-    baseProps
+    baseProps,
   ),
   candlestick: assign(
     {
       style: {
         data: {
           stroke: charcoal,
-          strokeWidth: 1
+          strokeWidth: 1,
         },
-        labels: assign({}, baseLabelStyles, { padding: 5 })
+        labels: assign({}, baseLabelStyles, { padding: 5 }),
       },
       candleColors: {
         positive: "#ffffff",
-        negative: charcoal
-      }
+        negative: charcoal,
+      },
     },
-    baseProps
+    baseProps,
   ),
   chart: baseProps,
   errorbar: assign(
@@ -145,18 +145,18 @@ export const grayscale: VictoryThemeDefinition = {
         data: {
           fill: "transparent",
           stroke: charcoal,
-          strokeWidth: 2
+          strokeWidth: 2,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   group: assign(
     {
-      colorScale: colors
+      colorScale: colors,
     },
-    baseProps
+    baseProps,
   ),
   histogram: assign(
     {
@@ -164,12 +164,12 @@ export const grayscale: VictoryThemeDefinition = {
         data: {
           fill: grey,
           stroke: charcoal,
-          strokeWidth: 2
+          strokeWidth: 2,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   legend: {
     colorScale: colors,
@@ -178,11 +178,11 @@ export const grayscale: VictoryThemeDefinition = {
     titleOrientation: "top",
     style: {
       data: {
-        type: "circle"
+        type: "circle",
       },
       labels: baseLabelStyles,
-      title: assign({}, baseLabelStyles, { padding: 5 })
-    }
+      title: assign({}, baseLabelStyles, { padding: 5 }),
+    },
   },
   line: assign(
     {
@@ -190,26 +190,26 @@ export const grayscale: VictoryThemeDefinition = {
         data: {
           fill: "transparent",
           stroke: charcoal,
-          strokeWidth: 2
+          strokeWidth: 2,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   pie: {
     style: {
       data: {
         padding: 10,
         stroke: "transparent",
-        strokeWidth: 1
+        strokeWidth: 1,
       },
-      labels: assign({}, baseLabelStyles, { padding: 20 })
+      labels: assign({}, baseLabelStyles, { padding: 20 }),
     },
     colorScale: colors,
     width: 400,
     height: 400,
-    padding: 50
+    padding: 50,
   },
   scatter: assign(
     {
@@ -217,18 +217,18 @@ export const grayscale: VictoryThemeDefinition = {
         data: {
           fill: charcoal,
           stroke: "transparent",
-          strokeWidth: 0
+          strokeWidth: 0,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   stack: assign(
     {
-      colorScale: colors
+      colorScale: colors,
     },
-    baseProps
+    baseProps,
   ),
   tooltip: {
     style: assign({}, baseLabelStyles, { padding: 0, pointerEvents: "none" }),
@@ -236,11 +236,11 @@ export const grayscale: VictoryThemeDefinition = {
       stroke: charcoal,
       strokeWidth: 1,
       fill: "#f0f0f0",
-      pointerEvents: "none"
+      pointerEvents: "none",
     },
     flyoutPadding: 5,
     cornerRadius: 5,
-    pointerLength: 10
+    pointerLength: 10,
   },
   voronoi: assign(
     {
@@ -248,20 +248,20 @@ export const grayscale: VictoryThemeDefinition = {
         data: {
           fill: "transparent",
           stroke: "transparent",
-          strokeWidth: 0
+          strokeWidth: 0,
         },
         labels: assign({}, baseLabelStyles, {
           padding: 5,
-          pointerEvents: "none"
+          pointerEvents: "none",
         }),
         flyout: {
           stroke: charcoal,
           strokeWidth: 1,
           fill: "#f0f0f0",
-          pointerEvents: "none"
-        }
-      }
+          pointerEvents: "none",
+        },
+      },
     },
-    baseProps
-  )
+    baseProps,
+  ),
 };

package/src/victory-theme/material.tsx

@@ -1,5 +1,5 @@
 import { assign } from "lodash";
-import { VictoryThemeDefinition } from "./victory-theme-definition";
+import { VictoryThemeDefinition } from "./types";
 
 // *
 // * Colors
@@ -16,7 +16,7 @@ const colors = [
   lime300,
   lightGreen500,
   teal700,
-  cyan900
+  cyan900,
 ];
 const blueGrey50 = "#ECEFF1";
 const blueGrey300 = "#90A4AE";
@@ -35,7 +35,7 @@ const padding = 8;
 const baseProps = {
   width: 350,
   height: 350,
-  padding: 50
+  padding: 50,
 };
 // *
 // * Labels
@@ -47,7 +47,7 @@ const baseLabelStyles = {
   padding,
   fill: blueGrey700,
   stroke: "transparent",
-  strokeWidth: 0
+  strokeWidth: 0,
 };
 
 const centeredLabelStyles = assign({ textAnchor: "middle" }, baseLabelStyles);
@@ -63,12 +63,12 @@ export const material: VictoryThemeDefinition = {
     {
       style: {
         data: {
-          fill: grey900
+          fill: grey900,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   axis: assign(
     {
@@ -78,11 +78,11 @@ export const material: VictoryThemeDefinition = {
           stroke: blueGrey300,
           strokeWidth: 2,
           strokeLinecap,
-          strokeLinejoin
+          strokeLinejoin,
         },
         axisLabel: assign({}, centeredLabelStyles, {
           padding,
-          stroke: "transparent"
+          stroke: "transparent",
         }),
         grid: {
           fill: "none",
@@ -90,7 +90,7 @@ export const material: VictoryThemeDefinition = {
           strokeDasharray,
           strokeLinecap,
           strokeLinejoin,
-          pointerEvents: "painted"
+          pointerEvents: "painted",
         },
         ticks: {
           fill: "transparent",
@@ -98,23 +98,23 @@ export const material: VictoryThemeDefinition = {
           stroke: blueGrey300,
           strokeWidth: 1,
           strokeLinecap,
-          strokeLinejoin
+          strokeLinejoin,
         },
         tickLabels: assign({}, baseLabelStyles, {
-          fill: blueGrey700
-        })
-      }
+          fill: blueGrey700,
+        }),
+      },
     },
-    baseProps
+    baseProps,
   ),
   polarDependentAxis: assign({
     style: {
       ticks: {
         fill: "transparent",
         size: 1,
-        stroke: "transparent"
-      }
-    }
+        stroke: "transparent",
+      },
+    },
   }),
   bar: assign(
     {
@@ -122,12 +122,12 @@ export const material: VictoryThemeDefinition = {
         data: {
           fill: blueGrey700,
           padding,
-          strokeWidth: 0
+          strokeWidth: 0,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   boxplot: assign(
     {
@@ -141,26 +141,26 @@ export const material: VictoryThemeDefinition = {
         q1: { padding, fill: blueGrey700 },
         q1Labels: assign({}, baseLabelStyles, { padding: 3 }),
         q3: { padding, fill: blueGrey700 },
-        q3Labels: assign({}, baseLabelStyles, { padding: 3 })
+        q3Labels: assign({}, baseLabelStyles, { padding: 3 }),
       },
-      boxWidth: 20
+      boxWidth: 20,
     },
-    baseProps
+    baseProps,
   ),
   candlestick: assign(
     {
       style: {
         data: {
-          stroke: blueGrey700
+          stroke: blueGrey700,
         },
-        labels: assign({}, baseLabelStyles, { padding: 5 })
+        labels: assign({}, baseLabelStyles, { padding: 5 }),
       },
       candleColors: {
         positive: "#ffffff",
-        negative: blueGrey700
-      }
+        negative: blueGrey700,
+      },
     },
-    baseProps
+    baseProps,
   ),
   chart: baseProps,
   errorbar: assign(
@@ -171,18 +171,18 @@ export const material: VictoryThemeDefinition = {
           fill: "transparent",
           opacity: 1,
           stroke: blueGrey700,
-          strokeWidth: 2
+          strokeWidth: 2,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   group: assign(
     {
-      colorScale: colors
+      colorScale: colors,
     },
-    baseProps
+    baseProps,
   ),
   histogram: assign(
     {
@@ -190,12 +190,12 @@ export const material: VictoryThemeDefinition = {
         data: {
           fill: blueGrey700,
           stroke: grey900,
-          strokeWidth: 2
+          strokeWidth: 2,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   legend: {
     colorScale: colors,
@@ -204,11 +204,11 @@ export const material: VictoryThemeDefinition = {
     titleOrientation: "top",
     style: {
       data: {
-        type: "circle"
+        type: "circle",
       },
       labels: baseLabelStyles,
-      title: assign({}, baseLabelStyles, { padding: 5 })
-    }
+      title: assign({}, baseLabelStyles, { padding: 5 }),
+    },
   },
   line: assign(
     {
@@ -217,12 +217,12 @@ export const material: VictoryThemeDefinition = {
           fill: "transparent",
           opacity: 1,
           stroke: blueGrey700,
-          strokeWidth: 2
+          strokeWidth: 2,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   pie: assign(
     {
@@ -231,12 +231,12 @@ export const material: VictoryThemeDefinition = {
         data: {
           padding,
           stroke: blueGrey50,
-          strokeWidth: 1
+          strokeWidth: 1,
         },
-        labels: assign({}, baseLabelStyles, { padding: 20 })
-      }
+        labels: assign({}, baseLabelStyles, { padding: 20 }),
+      },
     },
-    baseProps
+    baseProps,
   ),
   scatter: assign(
     {
@@ -245,18 +245,18 @@ export const material: VictoryThemeDefinition = {
           fill: blueGrey700,
           opacity: 1,
           stroke: "transparent",
-          strokeWidth: 0
+          strokeWidth: 0,
         },
-        labels: baseLabelStyles
-      }
+        labels: baseLabelStyles,
+      },
     },
-    baseProps
+    baseProps,
   ),
   stack: assign(
     {
-      colorScale: colors
+      colorScale: colors,
     },
-    baseProps
+    baseProps,
   ),
   tooltip: {
     style: assign({}, baseLabelStyles, { padding: 0, pointerEvents: "none" }),
@@ -264,11 +264,11 @@ export const material: VictoryThemeDefinition = {
       stroke: grey900,
       strokeWidth: 1,
       fill: "#f0f0f0",
-      pointerEvents: "none"
+      pointerEvents: "none",
     },
     flyoutPadding: 5,
     cornerRadius: 5,
-    pointerLength: 10
+    pointerLength: 10,
   },
   voronoi: assign(
     {
@@ -276,20 +276,20 @@ export const material: VictoryThemeDefinition = {
         data: {
           fill: "transparent",
           stroke: "transparent",
-          strokeWidth: 0
+          strokeWidth: 0,
         },
         labels: assign({}, baseLabelStyles, {
           padding: 5,
-          pointerEvents: "none"
+          pointerEvents: "none",
         }),
         flyout: {
           stroke: grey900,
           strokeWidth: 1,
           fill: "#f0f0f0",
-          pointerEvents: "none"
-        }
-      }
+          pointerEvents: "none",
+        },
+      },
     },
-    baseProps
-  )
+    baseProps,
+  ),
 };

package/src/victory-theme/{victory-theme-definition.ts → types.ts}

@@ -1,6 +1,14 @@
 import * as React from "react";
-import { VictoryCommonThemeProps, VictoryDatableProps } from "../index";
-import { CallbackArgs, StringOrNumberOrCallback } from "../types";
+import {
+  VictoryCommonThemeProps,
+  VictoryDatableProps,
+} from "../victory-util/common-props";
+import {
+  NumberOrCallback,
+  OrientationOrCallback,
+  PaddingOrCallback,
+  StringOrNumberOrCallback,
+} from "../types/callbacks";
 
 export type BlockProps = {
   top?: number;
@@ -10,18 +18,6 @@ export type BlockProps = {
 };
 export type PaddingProps = number | BlockProps;
 export type OrientationTypes = "top" | "bottom" | "left" | "right";
-export type VictoryNumberCallback = (args: CallbackArgs) => number;
-export type VictoryPaddingCallback = (
-  args: CallbackArgs
-) => number | BlockProps;
-export type VictoryOrientationCallback = (
-  args: CallbackArgs
-) => OrientationTypes;
-export type NumberOrCallback = number | VictoryNumberCallback;
-export type PaddingOrCallback = number | BlockProps | VictoryPaddingCallback;
-export type OrientationOrCallback =
-  | OrientationTypes
-  | VictoryOrientationCallback;
 export type VictoryStyleObject = {
   [K in keyof React.CSSProperties]: StringOrNumberOrCallback;
 };

package/src/victory-theme/victory-theme.tsx

@@ -1,5 +1,5 @@
 import { grayscale } from "./grayscale";
 import { material } from "./material";
-export * from "./victory-theme-definition";
+export * from "./types";
 
 export const VictoryTheme = { grayscale, material };