victory-core 37.1.2 → 37.2.0

package/lib/victory-theme/clean.js

@@ -76,7 +76,26 @@ const green = {
   "500": "#20C933",
   "900": "#338A17"
 };
-const colors = [blue["500"], pink["500"], teal["500"], purple["500"], green["500"], orange["500"], cyan["500"], red["500"], yellow["500"]];
+const colors = {
+  blue: blue["500"],
+  pink: pink["500"],
+  teal: teal["500"],
+  purple: purple["500"],
+  green: green["500"],
+  orange: orange["500"],
+  cyan: cyan["500"],
+  red: red["500"],
+  yellow: yellow["500"]
+};
+const colorScale = Object.values(colors);
+const grayscale = [gray["200"], gray["400"], gray["600"], gray["900"]];
+const warm = [yellow["500"], orange["500"], red["500"], pink["500"]];
+const cool = [cyan["500"], teal["500"], blue["500"], purple["500"]];
+const heatmap = [green["500"], yellow["500"], red["500"]];
+const redPalette = [red["500"], red["300"], red["100"]];
+const greenPalette = [green["500"], green["300"], green["100"]];
+const bluePalette = [blue["500"], blue["300"], blue["100"]];
+
 // *
 // * Typography
 // *
@@ -91,7 +110,7 @@ const baseProps = {
   width: 450,
   height: 300,
   padding: 50,
-  colorScale: colors
+  colorScale
 };
 // *
 // * Labels
@@ -120,10 +139,23 @@ const borderRadius = 1;
 // * Theme
 // *
 const clean = exports.clean = {
+  palette: {
+    colors,
+    grayscale,
+    qualitative: colorScale,
+    heatmap,
+    warm,
+    cool,
+    red: redPalette,
+    green: greenPalette,
+    blue: bluePalette
+  },
   area: Object.assign({
     style: {
       data: {
-        fill: cyan["500"]
+        fill: blue["500"],
+        strokeWidth: 2,
+        fillOpacity: 0.5
       },
       labels: baseLabelStyles
     }
@@ -132,7 +164,7 @@ const clean = exports.clean = {
     style: {
       axis: {
         fill: "transparent",
-        stroke: gray["300"],
+        stroke: gray["500"],
         strokeWidth: 1,
         strokeLinecap,
         strokeLinejoin
@@ -157,10 +189,10 @@ const clean = exports.clean = {
   polarAxis: Object.assign({
     style: {
       axis: {
-        stroke: gray["300"]
+        stroke: gray["500"]
       },
       grid: {
-        stroke: gray["200"],
+        stroke: gray["400"],
         strokeDasharray,
         strokeLinecap,
         strokeLinejoin,
@@ -169,7 +201,7 @@ const clean = exports.clean = {
       ticks: {
         fill: "transparent",
         size: 5,
-        stroke: gray["200"],
+        stroke: gray["400"],
         strokeWidth: 1,
         strokeLinecap,
         strokeLinejoin
@@ -180,10 +212,10 @@ const clean = exports.clean = {
   polarDependentAxis: Object.assign({
     style: {
       axis: {
-        stroke: gray["300"]
+        stroke: gray["500"]
       },
       grid: {
-        stroke: gray["200"],
+        stroke: gray["400"],
         strokeDasharray,
         strokeLinecap,
         strokeLinejoin,
@@ -192,7 +224,7 @@ const clean = exports.clean = {
       ticks: {
         fill: "transparent",
         size: 5,
-        stroke: gray["200"],
+        stroke: gray["300"],
         strokeWidth: 1,
         strokeLinecap,
         strokeLinejoin
@@ -205,7 +237,8 @@ const clean = exports.clean = {
       data: {
         fill: blue["500"],
         padding,
-        strokeWidth: 0
+        strokeWidth: 1,
+        fillOpacity: 0.5
       },
       labels: baseLabelStyles
     },
@@ -242,14 +275,15 @@ const clean = exports.clean = {
       q1: {
         padding,
         fill: teal["500"],
-        rx: borderRadius
+        rx: borderRadius,
+        strokeWidth: 2
       },
       q1Labels: Object.assign({}, baseLabelStyles, {
         padding: 3
       }),
       q3: {
         padding,
-        fill: teal["500"],
+        fill: cyan["500"],
         rx: borderRadius
       },
       q3Labels: Object.assign({}, baseLabelStyles, {
@@ -290,14 +324,13 @@ const clean = exports.clean = {
     }
   }, baseProps),
   group: Object.assign({
-    colorScale: colors
+    colorScale
   }, baseProps),
   histogram: Object.assign({
     style: {
       data: {
         fill: cyan["500"],
-        stroke: "transparent",
-        strokeWidth: 0
+        fillOpacity: 0.5
       },
       labels: baseLabelStyles
     },
@@ -308,21 +341,23 @@ const clean = exports.clean = {
   }, baseProps),
   label: baseLabelStyles,
   legend: {
-    colorScale: colors,
-    gutter: 10,
-    orientation: "vertical",
+    colorScale,
+    gutter: 24,
+    borderPadding: 10,
+    orientation: "horizontal",
     titleOrientation: "top",
+    centerTitle: true,
     style: {
       data: {
         type: "circle"
       },
       labels: {
         ...baseLabelStyles,
-        fontSize: 14
+        fontSize: 12
       },
       title: Object.assign({}, baseLabelStyles, {
         padding,
-        fontSize: 20
+        fontSize: 16
       }),
       border: {
         stroke: gray["200"],
@@ -336,7 +371,7 @@ const clean = exports.clean = {
       data: {
         fill: "transparent",
         opacity: 1,
-        stroke: pink["500"],
+        stroke: blue["500"],
         strokeWidth: 2,
         strokeLinecap,
         strokeLinejoin
@@ -346,16 +381,22 @@ const clean = exports.clean = {
   }, baseProps),
   pie: Object.assign({
     style: {
+      parent: {
+        backgroundColor: gray.white
+      },
       data: {
         padding,
         stroke: gray.white,
         strokeWidth: 1
       },
-      labels: Object.assign({}, baseLabelStyles, {
-        padding: 20
-      })
+      labels: {
+        ...baseLabelStyles,
+        padding: 20,
+        fill: gray["600"],
+        fontSize: 10
+      }
     },
-    colorScale: colors,
+    colorScale,
     cornerRadius: borderRadius
   }, baseProps),
   scatter: Object.assign({
@@ -366,11 +407,14 @@ const clean = exports.clean = {
         stroke: "transparent",
         strokeWidth: 0
       },
-      labels: baseLabelStyles
+      labels: {
+        ...baseLabelStyles,
+        padding: 20
+      }
     }
   }, baseProps),
   stack: Object.assign({
-    colorScale: colors
+    colorScale
   }, baseProps),
   tooltip: {
     style: Object.assign({}, baseLabelStyles, {
@@ -378,7 +422,7 @@ const clean = exports.clean = {
       pointerEvents: "none"
     }),
     flyoutStyle: {
-      stroke: gray["500"],
+      stroke: gray["300"],
       strokeWidth: 2,
       fill: gray.white,
       pointerEvents: "none"
@@ -395,9 +439,10 @@ const clean = exports.clean = {
   voronoi: Object.assign({
     style: {
       data: {
-        fill: red["100"],
-        stroke: red["500"],
-        strokeWidth: 2
+        fill: blue["100"],
+        stroke: blue["500"],
+        strokeWidth: 2,
+        opacity: 0.4
       },
       labels: Object.assign({}, baseLabelStyles, {
         padding: 5,

package/lib/victory-theme/grayscale.js

@@ -7,9 +7,28 @@ exports.grayscale = void 0;
 // *
 // * Colors
 // *
-const colors = ["#252525", "#525252", "#737373", "#969696", "#bdbdbd", "#d9d9d9", "#f0f0f0"];
+const colors = {
+  blue: "#4F7DA1",
+  pink: "#E2A37F",
+  teal: "#00796B",
+  purple: "#DF948A",
+  green: "#8BC34A",
+  orange: "#F4511E",
+  cyan: "#006064",
+  red: "#DF5A49",
+  yellow: "#FFF59D"
+};
+const colorScale = ["#252525", "#525252", "#737373", "#969696", "#bdbdbd", "#d9d9d9", "#f0f0f0"];
 const charcoal = "#252525";
 const grey = "#969696";
+const qualitative = ["#334D5C", "#45B29D", "#EFC94C", "#E27A3F", "#DF5A49", "#4F7DA1", "#55DBC1", "#EFDA97", "#E2A37F", "#DF948A"];
+const heatmap = ["#428517", "#77D200", "#D6D305", "#EC8E19", "#C92B05"];
+const warm = ["#940031", "#C43343", "#DC5429", "#FF821D", "#FFAF55"];
+const cool = ["#2746B9", "#0B69D4", "#2794DB", "#31BB76", "#60E83B"];
+const red = ["#FCAE91", "#FB6A4A", "#DE2D26", "#A50F15", "#750B0E"];
+const green = ["#354722", "#466631", "#649146", "#8AB25C", "#A9C97E"];
+const blue = ["#002C61", "#004B8F", "#006BC9", "#3795E5", "#65B4F4"];
+
 // *
 // * Typography
 // *
@@ -23,7 +42,7 @@ const baseProps = {
   width: 450,
   height: 300,
   padding: 50,
-  colorScale: colors
+  colorScale
 };
 // *
 // * Labels
@@ -45,6 +64,17 @@ const centeredLabelStyles = Object.assign({
 const strokeLinecap = "round";
 const strokeLinejoin = "round";
 const grayscale = exports.grayscale = {
+  palette: {
+    colors,
+    grayscale: colorScale,
+    qualitative,
+    heatmap,
+    warm,
+    cool,
+    red,
+    green,
+    blue
+  },
   area: Object.assign({
     style: {
       data: {
@@ -159,7 +189,7 @@ const grayscale = exports.grayscale = {
     }
   }, baseProps),
   group: Object.assign({
-    colorScale: colors
+    colorScale
   }, baseProps),
   histogram: Object.assign({
     style: {
@@ -172,7 +202,7 @@ const grayscale = exports.grayscale = {
     }
   }, baseProps),
   legend: {
-    colorScale: colors,
+    colorScale,
     gutter: 10,
     orientation: "vertical",
     titleOrientation: "top",
@@ -207,7 +237,7 @@ const grayscale = exports.grayscale = {
         padding: 20
       })
     },
-    colorScale: colors,
+    colorScale,
     width: 400,
     height: 400,
     padding: 50
@@ -223,7 +253,7 @@ const grayscale = exports.grayscale = {
     }
   }, baseProps),
   stack: Object.assign({
-    colorScale: colors
+    colorScale
   }, baseProps),
   tooltip: {
     style: Object.assign({}, baseLabelStyles, {

package/lib/victory-theme/material.js

@@ -13,11 +13,31 @@ const lime300 = "#DCE775";
 const lightGreen500 = "#8BC34A";
 const teal700 = "#00796B";
 const cyan900 = "#006064";
-const colors = [deepOrange600, yellow200, lime300, lightGreen500, teal700, cyan900];
+const colorScale = [deepOrange600, yellow200, lime300, lightGreen500, teal700, cyan900];
 const blueGrey50 = "#ECEFF1";
 const blueGrey300 = "#90A4AE";
 const blueGrey700 = "#455A64";
 const grey900 = "#212121";
+const colors = {
+  blue: "#4F7DA1",
+  pink: "#E2A37F",
+  teal: teal700,
+  purple: "#DF948A",
+  green: lightGreen500,
+  orange: deepOrange600,
+  cyan: cyan900,
+  red: "#DF5A49",
+  yellow: yellow200
+};
+const grayscale = [blueGrey50, blueGrey300, blueGrey700, grey900];
+const qualitative = ["#334D5C", "#45B29D", "#EFC94C", "#E27A3F", "#DF5A49", "#4F7DA1", "#55DBC1", "#EFDA97", "#E2A37F", "#DF948A"];
+const heatmap = ["#428517", "#77D200", "#D6D305", "#EC8E19", "#C92B05"];
+const warm = ["#940031", "#C43343", "#DC5429", "#FF821D", "#FFAF55"];
+const cool = ["#2746B9", "#0B69D4", "#2794DB", "#31BB76", "#60E83B"];
+const red = ["#FCAE91", "#FB6A4A", "#DE2D26", "#A50F15", "#750B0E"];
+const green = ["#354722", "#466631", "#649146", "#8AB25C", "#A9C97E"];
+const blue = ["#002C61", "#004B8F", "#006BC9", "#3795E5", "#65B4F4"];
+
 // *
 // * Typography
 // *
@@ -55,6 +75,17 @@ const strokeDasharray = "10, 5";
 const strokeLinecap = "round";
 const strokeLinejoin = "round";
 const material = exports.material = {
+  palette: {
+    colors,
+    grayscale,
+    qualitative,
+    heatmap,
+    warm,
+    cool,
+    red,
+    green,
+    blue
+  },
   area: Object.assign({
     style: {
       data: {
@@ -187,7 +218,7 @@ const material = exports.material = {
     }
   }, baseProps),
   group: Object.assign({
-    colorScale: colors
+    colorScale
   }, baseProps),
   histogram: Object.assign({
     style: {
@@ -200,7 +231,7 @@ const material = exports.material = {
     }
   }, baseProps),
   legend: {
-    colorScale: colors,
+    colorScale,
     gutter: 10,
     orientation: "vertical",
     titleOrientation: "top",
@@ -226,7 +257,7 @@ const material = exports.material = {
     }
   }, baseProps),
   pie: Object.assign({
-    colorScale: colors,
+    colorScale,
     style: {
       data: {
         padding,
@@ -250,7 +281,7 @@ const material = exports.material = {
     }
   }, baseProps),
   stack: Object.assign({
-    colorScale: colors
+    colorScale
   }, baseProps),
   tooltip: {
     style: Object.assign({}, baseLabelStyles, {

package/lib/victory-theme/types.d.ts

@@ -59,7 +59,22 @@ export interface VictoryAxisCommonProps {
     tickValues?: any[];
 }
 export declare type VerticalAnchorType = "start" | "middle" | "end";
+declare type VictoryThemePaletteKeys = "blue" | "pink" | "teal" | "purple" | "green" | "orange" | "cyan" | "red" | "yellow";
+export declare type VictoryThemePalette = {
+    [key in VictoryThemePaletteKeys]?: string;
+};
 export interface VictoryThemeDefinition {
+    palette?: {
+        colors?: VictoryThemePalette;
+        grayscale?: string[];
+        qualitative?: string[];
+        heatmap?: string[];
+        warm?: string[];
+        cool?: string[];
+        red?: string[];
+        blue?: string[];
+        green?: string[];
+    };
     area?: {
         style?: {
             data?: VictoryStyleObject;
@@ -237,4 +252,5 @@ export interface VictoryThemeDefinition {
         };
     } & VictoryCommonThemeProps & VictoryDatableProps;
 }
+export {};
 //# sourceMappingURL=types.d.ts.map

package/lib/victory-util/style.d.ts

@@ -1,3 +1,4 @@
+import { VictoryThemeDefinition } from "../victory-theme/victory-theme";
 /**
  * Given an object with CSS/SVG transform definitions, return the string value
  * for use with the `transform` CSS property or SVG attribute. Note that we
@@ -13,7 +14,8 @@ export declare const toTransformString: (obj: any, ...more: any[]) => any;
  * of 5 hex string values in that color scale. If no 'name' parameter
  * is given, it will return the Victory default grayscale.
  * @param {String} name The name of the color scale to return (optional).
+ * @param {Object} theme The theme object to retrieve the color scale from (optional).
  * @returns {Array} An array of 5 hex string values composing a color scale.
  */
-export declare function getColorScale(name: any): any;
+export declare function getColorScale(name?: string, theme?: VictoryThemeDefinition): string[];
 //# sourceMappingURL=style.d.ts.map

package/lib/victory-util/style.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getColorScale = getColorScale;
 exports.toTransformString = void 0;
+var _victoryTheme = require("../victory-theme/victory-theme");
 /**
  * Given an object with CSS/SVG transform definitions, return the string value
  * for use with the `transform` CSS property or SVG attribute. Note that we
@@ -41,19 +42,36 @@ const toTransformString = function (obj) {
  * of 5 hex string values in that color scale. If no 'name' parameter
  * is given, it will return the Victory default grayscale.
  * @param {String} name The name of the color scale to return (optional).
+ * @param {Object} theme The theme object to retrieve the color scale from (optional).
  * @returns {Array} An array of 5 hex string values composing a color scale.
  */
 exports.toTransformString = toTransformString;
-function getColorScale(name) {
+function getColorScale(name, theme) {
+  if (theme === void 0) {
+    theme = _victoryTheme.VictoryTheme.material;
+  }
+  const {
+    palette: {
+      grayscale = ["#cccccc", "#969696", "#636363", "#252525"],
+      qualitative = [],
+      heatmap = [],
+      warm = [],
+      cool = [],
+      red = [],
+      blue = [],
+      green = []
+    } = {}
+  } = theme;
   const scales = {
-    grayscale: ["#cccccc", "#969696", "#636363", "#252525"],
-    qualitative: ["#334D5C", "#45B29D", "#EFC94C", "#E27A3F", "#DF5A49", "#4F7DA1", "#55DBC1", "#EFDA97", "#E2A37F", "#DF948A"],
-    heatmap: ["#428517", "#77D200", "#D6D305", "#EC8E19", "#C92B05"],
-    warm: ["#940031", "#C43343", "#DC5429", "#FF821D", "#FFAF55"],
-    cool: ["#2746B9", "#0B69D4", "#2794DB", "#31BB76", "#60E83B"],
-    red: ["#FCAE91", "#FB6A4A", "#DE2D26", "#A50F15", "#750B0E"],
-    blue: ["#002C61", "#004B8F", "#006BC9", "#3795E5", "#65B4F4"],
-    green: ["#354722", "#466631", "#649146", "#8AB25C", "#A9C97E"]
+    grayscale,
+    qualitative,
+    heatmap,
+    warm,
+    cool,
+    red,
+    blue,
+    green
   };
-  return name ? scales[name] : scales.grayscale;
+  const selectedScale = name && scales[name]?.length ? scales[name] : scales.grayscale;
+  return selectedScale;
 }

package/lib/victory-util/wrapper.d.ts

@@ -14,9 +14,9 @@ export declare function getDomainFromChildren(props: any, axis: any, childCompon
 export declare function getDomain(props: any, axis: any, childComponents: any): any;
 export declare function getScale(props: any, axis: any, childComponents?: any): import("..").D3Scale<any>;
 export declare function getAllEvents(props: any): any;
-export declare function getColor(calculatedProps: any, child: any, index: any): any;
+export declare function getColor(calculatedProps: any, child: any, index: any, theme: any): any;
 export declare function getStyle(theme: any, style: any, role: any): any;
-export declare function getChildStyle(child: any, index: any, calculatedProps: any): any;
+export declare function getChildStyle(child: any, index: any, calculatedProps: any, theme: any): any;
 export declare function getStringsFromCategories(childComponents: any, axis: any): any[];
 export declare function getStringsFromData(childComponents: any): {
     x: number[];

package/lib/victory-util/wrapper.js

@@ -279,7 +279,9 @@ function getAllEvents(props) {
   }
   return events || [];
 }
-function getColor(calculatedProps, child, index) {
+
+// eslint-disable-next-line max-params
+function getColor(calculatedProps, child, index, theme) {
   // check for styles first
   const {
     style
@@ -296,14 +298,16 @@ function getColor(calculatedProps, child, index) {
   if (!colorScale && !color) {
     return undefined;
   }
-  const colors = Array.isArray(colorScale) ? colorScale : Style.getColorScale(colorScale);
+  const colors = Array.isArray(colorScale) ? colorScale : Style.getColorScale(colorScale, theme);
   return color || colors[index % colors.length];
 }
 function getStyle(theme, style, role) {
   const defaultStyle = theme && theme[role] && theme[role].style ? theme[role].style : {};
   return Helpers.getStyles(style, defaultStyle);
 }
-function getChildStyle(child, index, calculatedProps) {
+
+// eslint-disable-next-line max-params
+function getChildStyle(child, index, calculatedProps, theme) {
   const {
     style,
     role
@@ -313,7 +317,7 @@ function getChildStyle(child, index, calculatedProps) {
     return childStyle;
   }
   const childRole = child.type && child.type.role;
-  const defaultFill = childRole === "stack" ? undefined : getColor(calculatedProps, child, index);
+  const defaultFill = childRole === "stack" ? undefined : getColor(calculatedProps, child, index, theme);
   const defaultColor = childRole === "line" ? {
     fill: "none",
     stroke: defaultFill

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "37.1.2",
+  "version": "37.2.0",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -22,7 +22,7 @@
   "dependencies": {
     "lodash": "^4.17.21",
     "react-fast-compare": "^3.2.0",
-    "victory-vendor": "37.1.2"
+    "victory-vendor": "37.2.0"
   },
   "peerDependencies": {
     "react": ">=16.6.0"

package/src/types/prop-types.ts

@@ -42,6 +42,7 @@ export interface Padding {
 
 export interface AnimatePropTypeInterface {
   duration?: number;
+  delay?: number;
   onEnd?: () => void;
   onExit?: {
     duration?: number;

package/src/victory-portal/victory-portal.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { defaults } from "lodash";
+import { defaults, uniqueId } from "lodash";
 import * as Log from "../victory-util/log";
 import * as Helpers from "../victory-util/helpers";
 import { usePortalContext } from "./portal-context";
@@ -15,7 +15,7 @@ const defaultProps: Partial<VictoryPortalProps> = {
 
 export const VictoryPortal = (initialProps: VictoryPortalProps) => {
   const props = { ...defaultProps, ...initialProps };
-  const id = React.useId();
+  const id = uniqueId();
   const portalContext = usePortalContext();
 
   if (!portalContext) {