victory-stack 36.5.2 → 36.6.1

package/lib/victory-stack.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.VictoryStack = void 0;
 
 var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
 
@@ -37,9 +37,9 @@ var fallbackProps = {
   padding: 50
 };
 
-var VictoryStack = function (initialProps) {
+var VictoryStackBase = function (initialProps) {
   // eslint-disable-next-line no-use-before-define
-  var role = VictoryStackMemo.role;
+  var role = VictoryStack.role;
 
   var _Hooks$useAnimationSt = _victoryCore.Hooks.useAnimationState(),
       setAnimationState = _Hooks$useAnimationSt.setAnimationState,
@@ -67,14 +67,13 @@ var VictoryStack = function (initialProps) {
   var calculatedProps = (0, _helperMethods.useMemoizedProps)(modifiedProps);
   var domain = calculatedProps.domain,
       scale = calculatedProps.scale,
-      style = calculatedProps.style,
-      origin = calculatedProps.origin;
+      style = calculatedProps.style;
 
   var newChildren = _react.default.useMemo(function () {
     var children = (0, _helperMethods.getChildren)(props, childComponents, calculatedProps);
     var orderedChildren = children.map(function (child, index) {
       var childProps = (0, _assign2.default)({
-        animate: getAnimationProps(props, child, index, "victory-stack")
+        animate: getAnimationProps(props, child, index)
       }, child.props);
       return /*#__PURE__*/_react.default.cloneElement(child, childProps);
     });
@@ -99,13 +98,12 @@ var VictoryStack = function (initialProps) {
         style: style.parent,
         horizontal: horizontal,
         polar: polar,
-        origin: origin,
         name: name
       };
     }
 
     return {};
-  }, [standalone, domain, scale, width, height, theme, style, horizontal, polar, origin, name]);
+  }, [standalone, domain, scale, width, height, theme, style, horizontal, polar, name]);
 
   var userProps = _react.default.useMemo(function () {
     return _victoryCore.UserProps.getSafeUserProps(initialProps);
@@ -147,7 +145,7 @@ var VictoryStack = function (initialProps) {
   return /*#__PURE__*/_react.default.cloneElement(container, container.props, newChildren);
 };
 
-VictoryStack.propTypes = _objectSpread(_objectSpread({}, _victoryCore.CommonProps.baseProps), {}, {
+VictoryStackBase.propTypes = _objectSpread(_objectSpread({}, _victoryCore.CommonProps.baseProps), {}, {
   bins: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.instanceOf(Date)])), _victoryCore.PropTypes.nonNegative]),
   categories: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.string), _propTypes.default.shape({
     x: _propTypes.default.arrayOf(_propTypes.default.string),
@@ -166,20 +164,19 @@ VictoryStack.propTypes = _objectSpread(_objectSpread({}, _victoryCore.CommonProp
   }),
   xOffset: _propTypes.default.number
 });
-VictoryStack.defaultProps = {
+VictoryStackBase.defaultProps = {
   containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
   groupComponent: /*#__PURE__*/_react.default.createElement("g", null),
   standalone: true,
   theme: _victoryCore.VictoryTheme.grayscale,
   fillInMissingData: true
 };
-
-var VictoryStackMemo = /*#__PURE__*/_react.default.memo(VictoryStack, _reactFastCompare.default);
-
-VictoryStackMemo.displayName = "VictoryStack";
-VictoryStackMemo.role = "stack";
-VictoryStackMemo.expectedComponents = ["groupComponent", "containerComponent", "labelComponent"];
-VictoryStackMemo.getChildren = _helperMethods.getChildren;
-var _default = VictoryStackMemo;
-exports.default = _default;
+var componentConfig = {
+  role: "stack",
+  expectedComponents: ["groupComponent", "containerComponent", "labelComponent"],
+  getChildren: _helperMethods.getChildren
+};
+var VictoryStack = Object.assign( /*#__PURE__*/_react.default.memo(VictoryStackBase, _reactFastCompare.default), componentConfig);
+exports.VictoryStack = VictoryStack;
+VictoryStack.displayName = "VictoryStack";
 //# sourceMappingURL=victory-stack.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-stack",
-  "version": "36.5.2",
+  "version": "36.6.1",
   "description": "Stack 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,272 @@
     "lodash": "^4.17.19",
     "prop-types": "^15.8.1",
     "react-fast-compare": "^3.2.0",
-    "victory-core": "^36.5.2",
-    "victory-shared-events": "^36.5.2"
+    "victory-core": "^36.6.1",
+    "victory-shared-events": "^36.6.1"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
   },
-  "scripts": {
-    "version": "yarn run nps build-libs && nps build-dists"
+  "devDependencies": {
+    "victory-bar": "*",
+    "victory-histogram": "*",
+    "victory-stack": "*"
   },
-  "sideEffects": false,
-  "gitHead": "def218e9749ecafc159ef458dd03a8b92e227666"
-}
+  "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-histogram: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-histogram: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-histogram: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-histogram:build:lib:cjs",
+        "../victory-vendor:build:lib:cjs",
+        "../victory-voronoi:build:lib:cjs"
+      ],
+      "packageLocks": [
+        "pnpm-lock.yaml"
+      ]
+    }
+  },
+  "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}

@@ -19,31 +19,29 @@ function fillData(props, datasets) {
     });
     return prev;
   }, {});
-  const xKeys = keys(xMap).map((k) => +k);
+  const xKeys = keys(xMap).map((k) => Number(k));
   const xArr = orderBy(xKeys);
 
   return datasets.map((dataset) => {
     let indexOffset = 0;
     const isDate = dataset[0] && dataset[0]._x instanceof Date;
-    const filledInData = xArr.map((x, index) => {
-      x = +x;
+    const filledInData = xArr.map((x: number | Date, index) => {
+      x = Number(x);
       const datum = dataset[index - indexOffset];
 
       if (datum) {
         const x1 = isDate ? datum._x.getTime() : datum._x;
         if (x1 === x) {
           return datum;
-        } else {
-          indexOffset++;
-          const y = fillInMissingData ? 0 : null;
-          x = isDate ? new Date(x) : x;
-          return { x, y, _x: x, _y: y };
         }
-      } else {
+        indexOffset++;
         const y = fillInMissingData ? 0 : null;
         x = isDate ? new Date(x) : x;
         return { x, y, _x: x, _y: y };
       }
+      const y = fillInMissingData ? 0 : null;
+      x = isDate ? new Date(x) : x;
+      return { x, y, _x: x, _y: y };
     });
 
     return filledInData;
@@ -75,7 +73,7 @@ function getY0(datum, index, datasets) {
     previousPoints.length &&
     previousPoints.reduce((memo, value) => {
       const sameSign = (y < 0 && value < 0) || (y >= 0 && value >= 0);
-      return sameSign ? +value + memo : memo;
+      return sameSign ? Number(value) + memo : memo;
     }, firstDatasetBaseline[group] || 0);
   return previousPoints.some((point) => point instanceof Date)
     ? new Date(y0)
@@ -97,13 +95,13 @@ function addLayoutData(props, datasets, index) {
         datum._y === null
           ? null
           : datum._y instanceof Date
-          ? new Date(+datum._y + +yOffset)
+          ? new Date(Number(datum._y) + Number(yOffset))
           : datum._y + yOffset,
       _x1:
         datum._x === null
           ? null
           : datum._x instanceof Date
-          ? new Date(+datum._x + +xOffset)
+          ? new Date(Number(datum._x) + Number(xOffset))
           : datum._x + xOffset,
     });
   });
@@ -164,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";