victory-bar 37.3.2 → 37.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-bar",
-  "version": "37.3.2",
+  "version": "37.3.4",
   "description": "Bar Component for Victory",
   "keywords": [
     "data visualization",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "dependencies": {
     "lodash": "^4.17.19",
-    "victory-core": "37.3.2",
-    "victory-vendor": "37.3.2"
+    "victory-core": "37.3.4",
+    "victory-vendor": "37.3.4"
   },
   "peerDependencies": {
     "react": ">=16.6.0"
@@ -190,32 +190,6 @@
         "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": "eslint src",
       "files": [
@@ -283,8 +257,6 @@
     "check": "wireit",
     "types:check": "wireit",
     "types:create": "wireit",
-    "format": "wireit",
-    "format:fix": "wireit",
     "lint": "wireit",
     "lint:fix": "wireit",
     "jest": "wireit"

package/src/bar-helper-methods.ts

@@ -1,4 +1,4 @@
-import { isPlainObject } from "lodash";
+import isPlainObject from "lodash/isPlainObject";
 import { Helpers, VictoryStyleObject } from "victory-core";
 import { BarProps } from "./bar";
 import {

package/src/bar.tsx

@@ -1,5 +1,5 @@
 import React, { forwardRef } from "react";
-import { defaults } from "lodash";
+import defaults from "lodash/defaults";
 import {
   Helpers,
   NumberOrCallback,

package/src/helper-methods.ts

@@ -5,6 +5,7 @@ import {
   Helpers,
   LabelHelpers,
   Scale,
+  VictoryClipContainer,
 } from "victory-core";
 
 export const getBarPosition = (props, datum) => {
@@ -61,6 +62,12 @@ const getCalculatedValues = (props) => {
   let data = Data.getData(props);
   data = Data.formatDataFromDomain(data, domain, 0);
 
+  // when inside a zoom container, reset the _x and _y properties of each datum to the original
+  // x and y property values so they will not be clipped. See https://github.com/FormidableLabs/victory/pull/2970
+  if (props.groupComponent.type === VictoryClipContainer) {
+    data = data.map((datum) => ({ ...datum, _x: datum.x, _y: datum.y }));
+  }
+
   return { style, data, scale, domain, origin };
 };
 

package/src/victory-bar.tsx

@@ -13,6 +13,7 @@ import {
   EventPropTypeInterface,
   NumberOrCallback,
   StringOrNumberOrCallback,
+  VictoryClipContainer,
   VictoryCommonProps,
   VictoryDatableProps,
   VictoryMultiLabelableProps,
@@ -127,7 +128,9 @@ class VictoryBarBase extends React.Component<VictoryBarProps> {
     "groupComponent",
     "containerComponent",
   ];
-
+  // passed to addEvents.renderData to prevent data props with undefined _x or _y from excluding data from render.
+  // used when inside of VictoryZoomContainer
+  static shouldRenderDatum = () => true;
   // Overridden in native versions
   shouldAnimate() {
     return !!this.props.animate;
@@ -141,7 +144,15 @@ class VictoryBarBase extends React.Component<VictoryBarProps> {
       return this.animateComponent(props, animationWhitelist);
     }
 
-    const children = this.renderData(props);
+    let children;
+    // when inside a zoom container (the only place VictoryClipContainer is used), all data
+    // should be renderable so bars won't dissappear before they've fully exited the container's bounds
+    // see https://github.com/FormidableLabs/victory/pull/2970
+    if (props.groupComponent.type === VictoryClipContainer) {
+      children = this.renderData(props, VictoryBarBase.shouldRenderDatum);
+    } else {
+      children = this.renderData(props);
+    }
 
     const component = props.standalone
       ? this.renderContainer(props.containerComponent, children)