victory-group 36.5.3 → 36.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-group",
-  "version": "36.5.3",
+  "version": "36.6.2",
   "description": "Group Layout Component for Victory",
   "keywords": [
     "data visualization",
@@ -13,6 +13,7 @@
     "url": "https://github.com/formidablelabs/victory.git"
   },
   "homepage": "https://formidable.com/open-source/victory",
+  "sideEffects": false,
   "main": "lib/index.js",
   "module": "es/index.js",
   "jsnext:main": "es/index.js",
@@ -22,15 +23,267 @@
     "lodash": "^4.17.19",
     "prop-types": "^15.8.1",
     "react-fast-compare": "^3.2.0",
-    "victory-core": "^36.5.3",
-    "victory-shared-events": "^36.5.3"
+    "victory-core": "^36.6.2",
+    "victory-shared-events": "^36.6.2"
+  },
+  "devDependencies": {
+    "victory-bar": "*",
+    "victory-group": "*"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
   },
-  "scripts": {
-    "version": "yarn run nps build-libs && nps build-dists"
+  "wireit": {
+    "###            THESE WIREIT CONFIGS ARE GENERATED        ####": {},
+    "###            DO NOT MODIFY THESE MANUALLY              ####": {},
+    "build": {
+      "dependencies": [
+        "build:lib",
+        "build:dist",
+        "types:create"
+      ]
+    },
+    "build:lib": {
+      "dependencies": [
+        "build:lib:esm",
+        "build:lib:cjs"
+      ]
+    },
+    "build:lib:esm": {
+      "command": "nps build:lib:esm",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../.babelrc.build.js"
+      ],
+      "output": [
+        "es/**/*.js",
+        "es/**/*.js.map"
+      ],
+      "dependencies": [
+        "../victory-core:build:lib:esm",
+        "../victory-shared-events:build:lib:esm"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "build:lib:cjs": {
+      "command": "nps build:lib:cjs",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../.babelrc.build.js"
+      ],
+      "output": [
+        "lib/**/*.js",
+        "lib/**/*.js.map"
+      ],
+      "dependencies": [
+        "../victory-core:build:lib:cjs",
+        "../victory-shared-events:build:lib:cjs"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "build:dist": {
+      "dependencies": [
+        "build:dist:dev",
+        "build:dist:min"
+      ]
+    },
+    "build:dist:dev": {
+      "command": "nps build:dist:dev",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../.babelrc.build.js",
+        "../../config/webpack.config.js",
+        "../../config/webpack.config.dev.js"
+      ],
+      "output": [
+        "dist/victory*.js",
+        "!dist/victory*.min.js*"
+      ],
+      "dependencies": [
+        "../victory-core:build:lib:esm",
+        "../victory-shared-events:build:lib:esm"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "build:dist:min": {
+      "command": "nps build:dist:min",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../.babelrc.build.js",
+        "../../config/webpack.config.js"
+      ],
+      "output": [
+        "dist/victory*.min.js*"
+      ],
+      "dependencies": [
+        "../victory-core:build:lib:esm",
+        "../victory-shared-events:build:lib:esm"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "check": {
+      "dependencies": [
+        "types:check",
+        "jest",
+        "format",
+        "lint"
+      ]
+    },
+    "types:check": {
+      "command": "nps types:pkg:check",
+      "files": [
+        "src/**/*.{ts,tsx}",
+        "../../tsconfig.base.json",
+        "tsconfig.json"
+      ],
+      "dependencies": [
+        "types:create",
+        "../victory-core:types:create",
+        "../victory-shared-events:types:create",
+        "../victory-bar:types:create",
+        "../victory-vendor:types:create",
+        "../victory-voronoi:types:create"
+      ],
+      "output": [],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "types:create": {
+      "command": "nps types:pkg:create",
+      "files": [
+        "src/**",
+        "!src/**/*.test.*",
+        "../../tsconfig.base.json",
+        "tsconfig.build.json"
+      ],
+      "output": [
+        "es/**/*.d.ts",
+        "es/**/*.d.ts.map",
+        "lib/**/*.d.ts",
+        "lib/**/*.d.ts.map"
+      ],
+      "dependencies": [
+        "../victory-core:types:create",
+        "../victory-shared-events:types:create"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "format": {
+      "command": "nps format:pkg",
+      "files": [
+        "src/**",
+        "*.json",
+        "../../.prettierignore",
+        "../../.prettierrc.json"
+      ],
+      "output": [],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "format:fix": {
+      "command": "pnpm run format || nps format:pkg:fix",
+      "files": [
+        "src/**",
+        "*.json",
+        "../../.prettierignore",
+        "../../.prettierrc.json"
+      ],
+      "output": [],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "lint": {
+      "command": "nps lint:pkg",
+      "files": [
+        "src/**",
+        "../../.eslintignore",
+        "../../.eslintrc.js"
+      ],
+      "output": [],
+      "dependencies": [
+        "../victory-core:types:create",
+        "../victory-shared-events:types:create",
+        "../victory-bar:types:create",
+        "../victory-vendor:types:create",
+        "../victory-voronoi:types:create"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "lint:fix": {
+      "command": "pnpm run lint || nps lint:pkg:fix",
+      "files": [
+        "src/**",
+        "../../.eslintignore",
+        "../../.eslintrc.js"
+      ],
+      "output": [],
+      "dependencies": [
+        "../victory-core:types:create",
+        "../victory-shared-events:types:create",
+        "../victory-bar:types:create",
+        "../victory-vendor:types:create",
+        "../victory-voronoi:types:create"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    },
+    "jest": {
+      "command": "nps jest:pkg",
+      "files": [
+        "src/**/*.test.*",
+        "../../.babelrc.js",
+        "../../test/jest-config.js",
+        "../../test/jest-setup.ts"
+      ],
+      "output": [],
+      "dependencies": [
+        "build:lib:cjs",
+        "../victory-bar:build:lib:cjs",
+        "../victory-vendor:build:lib:cjs",
+        "../victory-voronoi:build:lib:cjs"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    }
   },
-  "sideEffects": false,
-  "gitHead": "55338af3c57eacca5956e53c08a58e47ba41d01e"
-}
+  "scripts": {
+    "###            THESE SCRIPTS ARE GENERATED           ###": "true",
+    "###            DO NOT MODIFY THESE MANUALLY          ###": "true",
+    "build": "wireit",
+    "build:lib": "wireit",
+    "build:lib:esm": "wireit",
+    "build:lib:cjs": "wireit",
+    "build:dist": "wireit",
+    "build:dist:dev": "wireit",
+    "build:dist:min": "wireit",
+    "check": "wireit",
+    "types:check": "wireit",
+    "types:create": "wireit",
+    "format": "wireit",
+    "format:fix": "wireit",
+    "lint": "wireit",
+    "lint:fix": "wireit",
+    "jest": "wireit"
+  }
+}

package/src/{helper-methods.js → helper-methods.tsx}

@@ -18,8 +18,8 @@ export function getCalculatedProps(props, childComponents) {
   const style = Wrapper.getStyle(props.theme, props.style, role);
   const { offset, colorScale, color, polar, horizontal } = props;
   const categories =
-    props.categories || Wrapper.getCategories(props, childComponents);
-  const datasets = props.datasets || Wrapper.getDataFromChildren(props);
+    props.categories || Wrapper.getCategories(props, childComponents, null);
+  const datasets = props.datasets || Wrapper.getDataFromChildren(props, null);
   const domain = {
     x: Wrapper.getDomain(
       assign({}, props, { categories }),
@@ -67,12 +67,14 @@ export function getCalculatedProps(props, childComponents) {
 // With shared events, the props change on every event, and every value is re-calculated
 const withoutSharedEvents = (props) => {
   const { children } = props;
-  const modifiedChildren = React.Children.toArray(children).map((child) => {
-    return {
-      ...child,
-      props: Helpers.omit(child.props, ["sharedEvents"]),
-    };
-  });
+  const modifiedChildren = React.Children.toArray(children).map(
+    (child: Record<string, any> | any) => {
+      return {
+        ...child,
+        props: Helpers.omit(child.props, ["sharedEvents"]),
+      };
+    },
+  );
   props.children = modifiedChildren;
   return props;
 };
@@ -186,7 +188,7 @@ function getDataWithOffset(props, defaultDataset = [], offset) {
   });
 }
 
-export function getChildren(props, childComponents, calculatedProps) {
+export function getChildren(props, childComponents?, calculatedProps?) {
   props = Helpers.modifyProps(props, fallbackProps, "stack");
   childComponents = childComponents || React.Children.toArray(props.children);
   calculatedProps =

package/src/index.ts

@@ -0,0 +1 @@
+export * from "./victory-group";

package/src/{victory-group.js → victory-group.tsx}

@@ -2,13 +2,24 @@ import { assign, defaults, isEmpty } from "lodash";
 import PropTypes from "prop-types";
 import React from "react";
 import {
+  CategoryPropType,
+  ColorScalePropType,
   CommonProps,
+  DomainPaddingPropType,
+  DomainPropType,
+  EventPropTypeInterface,
   Helpers,
   Hooks,
+  StringOrNumberOrCallback,
   UserProps,
+  VictoryCommonProps,
   VictoryContainer,
+  VictoryDatableProps,
+  VictoryMultiLabelableProps,
+  VictoryStyleInterface,
   VictoryTheme,
   Wrapper,
+  VictoryComponentConfiguration,
 } from "victory-core";
 import { VictorySharedEvents } from "victory-shared-events";
 import { getChildren, useMemoizedProps } from "./helper-methods";
@@ -21,9 +32,31 @@ const fallbackProps = {
   offset: 0,
 };
 
-const VictoryGroup = (initialProps) => {
+export type VictoryGroupTTargetType = "data" | "labels" | "parent";
+export interface VictoryGroupProps
+  extends VictoryCommonProps,
+    VictoryDatableProps,
+    VictoryMultiLabelableProps {
+  categories?: CategoryPropType;
+  children?: React.ReactNode;
+  color?: string;
+  colorScale?: ColorScalePropType;
+  domain?: DomainPropType;
+  domainPadding?: DomainPaddingPropType;
+  events?: EventPropTypeInterface<
+    VictoryGroupTTargetType,
+    StringOrNumberOrCallback
+  >[];
+  eventKey?: StringOrNumberOrCallback;
+  horizontal?: boolean;
+  offset?: number;
+  style?: VictoryStyleInterface;
+  displayName?: string;
+}
+
+const VictoryGroupBase: React.FC<VictoryGroupProps> = (initialProps) => {
   // eslint-disable-next-line no-use-before-define
-  const { role } = VictoryGroupMemo;
+  const role = VictoryGroup?.role;
   const { getAnimationProps, setAnimationState, getProps } =
     Hooks.useAnimationState();
   const props = getProps(initialProps);
@@ -51,7 +84,7 @@ const VictoryGroup = (initialProps) => {
     const children = getChildren(props, childComponents, calculatedProps);
     return children.map((child, index) => {
       const childProps = assign(
-        { animate: getAnimationProps(props, child, index, "victory-group") },
+        { animate: getAnimationProps(props, child, index) },
         child.props,
       );
       return React.cloneElement(child, childProps);
@@ -144,32 +177,18 @@ const VictoryGroup = (initialProps) => {
   return React.cloneElement(container, container.props, newChildren);
 };
 
-VictoryGroup.propTypes = {
+VictoryGroupBase.propTypes = {
   ...CommonProps.baseProps,
   ...CommonProps.dataProps,
   children: PropTypes.oneOfType([
     PropTypes.arrayOf(PropTypes.node),
     PropTypes.node,
   ]),
-  color: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
-  colorScale: PropTypes.oneOfType([
-    PropTypes.arrayOf(PropTypes.string),
-    PropTypes.oneOf([
-      "grayscale",
-      "qualitative",
-      "heatmap",
-      "warm",
-      "cool",
-      "red",
-      "green",
-      "blue",
-    ]),
-  ]),
   horizontal: PropTypes.bool,
   offset: PropTypes.number,
 };
 
-VictoryGroup.defaultProps = {
+VictoryGroupBase.defaultProps = {
   containerComponent: <VictoryContainer />,
   groupComponent: <g />,
   samples: 50,
@@ -178,19 +197,18 @@ VictoryGroup.defaultProps = {
   theme: VictoryTheme.grayscale,
 };
 
-// We need to attatch the static properties to the memoized version, or else
-// VictoryChart will not be able to get this component's role type
-const VictoryGroupMemo = React.memo(VictoryGroup, isEqual);
-
-VictoryGroupMemo.displayName = "VictoryGroup";
-VictoryGroupMemo.role = "group";
-
-VictoryGroupMemo.expectedComponents = [
-  "groupComponent",
-  "containerComponent",
-  "labelComponent",
-];
-
-VictoryGroupMemo.getChildren = getChildren;
+const componentConfig: VictoryComponentConfiguration<VictoryGroupProps> = {
+  role: "group",
+  expectedComponents: [
+    "groupComponent",
+    "containerComponent",
+    "labelComponent",
+  ],
+  getChildren,
+};
 
-export default VictoryGroupMemo;
+export const VictoryGroup = Object.assign(
+  React.memo(VictoryGroupBase, isEqual),
+  componentConfig,
+);
+VictoryGroup.displayName = "VictoryGroup";

package/src/index.d.ts

@@ -1,37 +0,0 @@
-import * as React from "react";
-import {
-  CategoryPropType,
-  ColorScalePropType,
-  DomainPropType,
-  DomainPaddingPropType,
-  EventPropTypeInterface,
-  StringOrNumberOrCallback,
-  VictoryCommonProps,
-  VictoryDatableProps,
-  VictoryMultiLabelableProps,
-  VictoryStyleInterface,
-} from "victory-core";
-
-export type VictoryGroupTTargetType = "data" | "labels" | "parent";
-
-export interface VictoryGroupProps
-  extends VictoryCommonProps,
-    VictoryDatableProps,
-    VictoryMultiLabelableProps {
-  categories?: CategoryPropType;
-  children?: React.ReactNode;
-  color?: string;
-  colorScale?: ColorScalePropType;
-  domain?: DomainPropType;
-  domainPadding?: DomainPaddingPropType;
-  events?: EventPropTypeInterface<
-    VictoryGroupTTargetType,
-    StringOrNumberOrCallback
-  >[];
-  eventKey?: StringOrNumberOrCallback;
-  horizontal?: boolean;
-  offset?: number;
-  style?: VictoryStyleInterface;
-}
-
-export class VictoryGroup extends React.Component<VictoryGroupProps, any> {}

package/src/index.js

@@ -1 +0,0 @@
-export { default as VictoryGroup } from "./victory-group";