victory-stack 36.6.0 → 36.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-stack",
-  "version": "36.6.0",
+  "version": "36.6.1",
   "description": "Stack Layout Component for Victory",
   "keywords": [
     "data visualization",
@@ -23,14 +23,16 @@
     "lodash": "^4.17.19",
     "prop-types": "^15.8.1",
     "react-fast-compare": "^3.2.0",
-    "victory-core": "^36.6.0",
-    "victory-shared-events": "^36.6.0"
+    "victory-core": "^36.6.1",
+    "victory-shared-events": "^36.6.1"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
   },
   "devDependencies": {
-    "victory-histogram": "^36.6.0"
+    "victory-bar": "*",
+    "victory-histogram": "*",
+    "victory-stack": "*"
   },
   "wireit": {
     "###            THESE WIREIT CONFIGS ARE GENERATED        ####": {},
@@ -132,6 +134,14 @@
         "pnpm-lock.yaml"
       ]
     },
+    "check": {
+      "dependencies": [
+        "types:check",
+        "jest",
+        "format",
+        "lint"
+      ]
+    },
     "types:check": {
       "command": "nps types:pkg:check",
       "files": [
@@ -143,6 +153,7 @@
         "types:create",
         "../victory-core:types:create",
         "../victory-shared-events:types:create",
+        "../victory-bar:types:create",
         "../victory-histogram:types:create",
         "../victory-vendor:types:create",
         "../victory-voronoi:types:create"
@@ -187,6 +198,19 @@
         "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": [
@@ -198,6 +222,7 @@
       "dependencies": [
         "../victory-core:types:create",
         "../victory-shared-events:types:create",
+        "../victory-bar:types:create",
         "../victory-histogram:types:create",
         "../victory-vendor:types:create",
         "../victory-voronoi:types:create"
@@ -206,19 +231,6 @@
         "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:fix": {
       "command": "pnpm run lint || nps lint:pkg:fix",
       "files": [
@@ -230,6 +242,7 @@
       "dependencies": [
         "../victory-core:types:create",
         "../victory-shared-events:types:create",
+        "../victory-bar:types:create",
         "../victory-histogram:types:create",
         "../victory-vendor:types:create",
         "../victory-voronoi:types:create"
@@ -249,6 +262,7 @@
       "output": [],
       "dependencies": [
         "build:lib:cjs",
+        "../victory-bar:build:lib:cjs",
         "../victory-histogram:build:lib:cjs",
         "../victory-vendor:build:lib:cjs",
         "../victory-voronoi:build:lib:cjs"
@@ -268,6 +282,7 @@
     "build:dist": "wireit",
     "build:dist:dev": "wireit",
     "build:dist:min": "wireit",
+    "check": "wireit",
     "types:check": "wireit",
     "types:create": "wireit",
     "format": "wireit",

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

@@ -25,7 +25,7 @@ function fillData(props, datasets) {
   return datasets.map((dataset) => {
     let indexOffset = 0;
     const isDate = dataset[0] && dataset[0]._x instanceof Date;
-    const filledInData = xArr.map((x, index) => {
+    const filledInData = xArr.map((x: number | Date, index) => {
       x = Number(x);
       const datum = dataset[index - indexOffset];
 
@@ -162,7 +162,8 @@ 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) => {
+  const modifiedChildren = React.Children.toArray(children).map((_child) => {
+    const child = _child as React.ReactElement;
     return {
       ...child,
       props: Helpers.omit(child.props, ["sharedEvents"]),

package/src/index.ts

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

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

@@ -2,15 +2,26 @@ import { assign, defaults, isEmpty } from "lodash";
 import PropTypes from "prop-types";
 import React from "react";
 import {
+  CategoryPropType,
+  ColorScalePropType,
+  DomainPropType,
+  EventPropTypeInterface,
+  StringOrNumberOrCallback,
+  VictoryCommonProps,
+  VictoryLabelableProps,
+  VictoryMultiLabelableProps,
+  VictoryStyleInterface,
   CommonProps,
   Helpers,
   Hooks,
   PropTypes as CustomPropTypes,
   UserProps,
+  VictoryComponentConfiguration,
   VictoryContainer,
   VictoryTheme,
   Wrapper,
 } from "victory-core";
+
 import { VictorySharedEvents } from "victory-shared-events";
 import { getChildren, useMemoizedProps } from "./helper-methods";
 import isEqual from "react-fast-compare";
@@ -21,9 +32,29 @@ const fallbackProps = {
   padding: 50,
 };
 
-const VictoryStack = (initialProps) => {
+export type VictoryStackTTargetType = "data" | "labels" | "parent";
+export interface VictoryStackProps
+  extends VictoryCommonProps,
+    VictoryLabelableProps,
+    VictoryMultiLabelableProps {
+  bins?: number | number[] | Date[];
+  categories?: CategoryPropType;
+  children?: React.ReactNode | React.ReactNode[];
+  colorScale?: ColorScalePropType;
+  domain?: DomainPropType;
+  events?: EventPropTypeInterface<
+    VictoryStackTTargetType,
+    StringOrNumberOrCallback
+  >[];
+  eventKey?: StringOrNumberOrCallback;
+  fillInMissingData?: boolean;
+  style?: VictoryStyleInterface;
+  xOffset?: number;
+}
+
+const VictoryStackBase = (initialProps) => {
   // eslint-disable-next-line no-use-before-define
-  const { role } = VictoryStackMemo;
+  const { role } = VictoryStack;
   const { setAnimationState, getAnimationProps, getProps } =
     Hooks.useAnimationState();
 
@@ -46,13 +77,13 @@ const VictoryStack = (initialProps) => {
 
   const childComponents = React.Children.toArray(modifiedProps.children);
   const calculatedProps = useMemoizedProps(modifiedProps);
-  const { domain, scale, style, origin } = calculatedProps;
+  const { domain, scale, style } = calculatedProps;
 
   const newChildren = React.useMemo(() => {
     const children = getChildren(props, childComponents, calculatedProps);
     const orderedChildren = children.map((child, index) => {
       const childProps = assign(
-        { animate: getAnimationProps(props, child, index, "victory-stack") },
+        { animate: getAnimationProps(props, child, index) },
         child.props,
       );
       return React.cloneElement(child, childProps);
@@ -77,7 +108,6 @@ const VictoryStack = (initialProps) => {
         style: style.parent,
         horizontal,
         polar,
-        origin,
         name,
       };
     }
@@ -92,7 +122,6 @@ const VictoryStack = (initialProps) => {
     style,
     horizontal,
     polar,
-    origin,
     name,
   ]);
   const userProps = React.useMemo(
@@ -150,7 +179,7 @@ const VictoryStack = (initialProps) => {
   return React.cloneElement(container, container.props, newChildren);
 };
 
-VictoryStack.propTypes = {
+VictoryStackBase.propTypes = {
   ...CommonProps.baseProps,
   bins: PropTypes.oneOfType([
     PropTypes.arrayOf(
@@ -197,7 +226,7 @@ VictoryStack.propTypes = {
   xOffset: PropTypes.number,
 };
 
-VictoryStack.defaultProps = {
+VictoryStackBase.defaultProps = {
   containerComponent: <VictoryContainer />,
   groupComponent: <g />,
   standalone: true,
@@ -205,17 +234,18 @@ VictoryStack.defaultProps = {
   fillInMissingData: true,
 };
 
-const VictoryStackMemo = React.memo(VictoryStack, isEqual);
-
-VictoryStackMemo.displayName = "VictoryStack";
-VictoryStackMemo.role = "stack";
-
-VictoryStackMemo.expectedComponents = [
-  "groupComponent",
-  "containerComponent",
-  "labelComponent",
-];
-
-VictoryStackMemo.getChildren = getChildren;
+const componentConfig: VictoryComponentConfiguration<VictoryStackProps> = {
+  role: "stack",
+  expectedComponents: [
+    "groupComponent",
+    "containerComponent",
+    "labelComponent",
+  ],
+  getChildren,
+};
 
-export default VictoryStackMemo;
+export const VictoryStack = Object.assign(
+  React.memo(VictoryStackBase, isEqual),
+  componentConfig,
+);
+VictoryStack.displayName = "VictoryStack";

package/src/index.d.ts

@@ -1,35 +0,0 @@
-import * as React from "react";
-import {
-  CategoryPropType,
-  ColorScalePropType,
-  DomainPropType,
-  EventPropTypeInterface,
-  StringOrNumberOrCallback,
-  VictoryCommonProps,
-  VictoryLabelableProps,
-  VictoryMultiLabelableProps,
-  VictoryStyleInterface,
-} from "victory-core";
-
-export type VictoryStackTTargetType = "data" | "labels" | "parent";
-
-export interface VictoryStackProps
-  extends VictoryCommonProps,
-    VictoryLabelableProps,
-    VictoryMultiLabelableProps {
-  bins?: number | number[] | Date[];
-  categories?: CategoryPropType;
-  children?: React.ReactNode | React.ReactNode[];
-  colorScale?: ColorScalePropType;
-  domain?: DomainPropType;
-  events?: EventPropTypeInterface<
-    VictoryStackTTargetType,
-    StringOrNumberOrCallback
-  >[];
-  eventKey?: StringOrNumberOrCallback;
-  fillInMissingData?: boolean;
-  style?: VictoryStyleInterface;
-  xOffset?: number;
-}
-
-export class VictoryStack extends React.Component<VictoryStackProps, any> {}

package/src/index.js

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