victory-pie 37.3.0 → 37.3.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # victory-pie
 
+## 37.3.2
+
+## 37.3.1
+
+### Patch Changes
+
+- Added logic to sort pie chart slices by categories prop ([#2934](https://github.com/FormidableLabs/victory/pull/2934))
+
+* Remove duplicate types from interfaces ([#2940](https://github.com/FormidableLabs/victory/pull/2940))
+
 ## 37.3.0
 
 ## 37.2.0

package/dist/victory-pie.js

@@ -77,6 +77,30 @@ const getSlices = (props, data) => {
   });
   return layoutFunction(data);
 };
+const getCategoriesFromProps = props => Array.isArray(props.categories) ? props.categories : props?.categories?.x ?? [];
+
+/**
+ * Sorts data by props.categories or props.categories.x. If all of the data keys aren't
+ * included in categories, any remaining data will be appended to the data array.
+ * If extraneous categories are included in the categories prop, the will be ignored and
+ * have no effect on the rendered component.
+ */
+const getDataSortedByCategories = (props, data) => {
+  const sorted = [];
+  getCategoriesFromProps(props).forEach(category => {
+    const idx = data.findIndex(_ref => {
+      let {
+        x
+      } = _ref;
+      return x === category;
+    });
+    if (idx >= 0) {
+      const datum = data.splice(idx, 1)[0];
+      sorted.push(datum);
+    }
+  });
+  return [...sorted, ...data];
+};
 const getCalculatedValues = props => {
   const {
     colorScale,
@@ -88,7 +112,7 @@ const getCalculatedValues = props => {
   const padding = victory_core__WEBPACK_IMPORTED_MODULE_3__.getPadding(props);
   const defaultRadius = getRadius(props, padding);
   const origin = getOrigin(props, padding);
-  const data = victory_core__WEBPACK_IMPORTED_MODULE_5__.getData(props);
+  const data = getDataSortedByCategories(props, victory_core__WEBPACK_IMPORTED_MODULE_5__.getData(props));
   const slices = getSlices(props, data);
   return Object.assign({}, props, {
     style,
@@ -519,7 +543,7 @@ const datumHasXandY = datum => {
   return !victory_core__WEBPACK_IMPORTED_MODULE_1__.isNil(datum._x) && !victory_core__WEBPACK_IMPORTED_MODULE_1__.isNil(datum._y);
 };
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 
 class VictoryPieBase extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
   static animationWhitelist = ["data", "endAngle", "height", "innerRadius", "cornerRadius", "padAngle", "padding", "colorScale", "startAngle", "style", "width"];
@@ -5024,7 +5048,7 @@ const interpolateFunction = function (a, b) {
       return b;
     }
     return function () {
-      /* eslint-disable no-invalid-this, prefer-rest-params */
+      /* eslint-disable prefer-rest-params */
       const aval = typeof a === "function" ? a.apply(this, arguments) : a;
       const bval = typeof b === "function" ? b.apply(this, arguments) : b;
       return (0,victory_vendor_d3_interpolate__WEBPACK_IMPORTED_MODULE_2__.interpolate)(aval, bval)(t);
@@ -5416,9 +5440,9 @@ const VictoryContainer = initialProps => {
       ...style,
       width: responsive ? style?.width : dimensions.width,
       height: responsive ? style?.height : dimensions.height,
-      pointerEvents: "none",
-      touchAction: "none",
-      position: "relative"
+      pointerEvents: style?.pointerEvents ?? "none",
+      touchAction: style?.touchAction ?? "none",
+      position: style?.position ?? "relative"
     },
     "data-ouia-component-id": ouiaId,
     "data-ouia-component-type": ouiaType,
@@ -7588,7 +7612,7 @@ class VictoryTransition extends (react__WEBPACK_IMPORTED_MODULE_2___default().Co
   componentDidMount() {
     this.setState({
       nodesShouldLoad: true
-    }); // eslint-disable-line react/no-did-mount-set-state
+    });
   }
   shouldComponentUpdate(nextProps) {
     if (!react_fast_compare__WEBPACK_IMPORTED_MODULE_3___default()(this.props, nextProps)) {
@@ -7802,7 +7826,7 @@ const defaultComponents = [{
 function addEvents(WrappedComponent, options) {
   if (options === void 0) {
     options = {};
-  } // eslint-disable-next-line @typescript-eslint/no-empty-interface
+  } // eslint-disable-next-line @typescript-eslint/no-empty-object-type
   // @ts-expect-error "TS2545: A mixin class must have a constructor with a single rest parameter of type 'any[]'."
   class AddEventsMixin extends WrappedComponent {
     constructor(props) {
@@ -8171,7 +8195,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-/* eslint-disable no-use-before-define */
 
 
 
@@ -8297,8 +8320,6 @@ function formatDataFromDomain(dataset, domain, defaultBaseline) {
   const isUnderMinY = underMin(minDomainY);
   const isOverMaxX = overMax(maxDomainX);
   const isOverMaxY = overMax(maxDomainY);
-
-  // eslint-disable-next-line complexity
   return dataset.map(datum => {
     let {
       _x,
@@ -8409,7 +8430,6 @@ function formatData(dataset, props, expectedKeys) {
     };
   }
   const data = preformattedData ? dataset : dataset.reduce((dataArr, datum, index) => {
-    // eslint-disable-line complexity
     const parsedDatum = parseDatum(datum);
     const fallbackValues = {
       x: index,
@@ -8600,7 +8620,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-/* eslint-disable no-use-before-define */
 
 const GLOBAL_EVENT_REGEX = /^onGlobal(.*)$/;
 
@@ -8648,11 +8667,10 @@ getScopedEvents) {
    */
   const getAllEvents = () => {
     // Mandatory usage: `getEvents.bind(this)`
-    /* eslint-disable no-invalid-this */
+
     if (Array.isArray(this.componentEvents)) {
       return Array.isArray(props.events) ? this.componentEvents.concat(...props.events) : this.componentEvents;
     }
-    /* eslint-enable no-invalid-this */
     return props.events;
   };
   const allEvents = getAllEvents();
@@ -8677,7 +8695,7 @@ function getScopedEvents(events, namespace, childType, baseProps) {
   }
 
   // Mandatory usage: `getScopedEvents.bind(this)`
-  // eslint-disable-next-line no-invalid-this
+
   const newBaseProps = baseProps || this.baseProps;
   // returns the original base props or base state of a given target element
   const getTargetProps = (identifier, type) => {
@@ -8686,7 +8704,6 @@ function getScopedEvents(events, namespace, childType, baseProps) {
       target,
       key
     } = identifier;
-    // eslint-disable-next-line no-invalid-this
     const baseType = type === "props" ? newBaseProps : this.state || {};
     const base = childName === undefined || childName === null || !baseType[childName] ? baseType : baseType[childName];
     return key === "parent" ? base.parent : base[key] && base[key][target];
@@ -8713,7 +8730,6 @@ function getScopedEvents(events, namespace, childType, baseProps) {
 
     // returns the state object with mutated props applied for a single key
     const getMutationObject = (key, childName) => {
-      // eslint-disable-next-line no-invalid-this
       const baseState = this.state || {};
       if (!(0,_helpers__WEBPACK_IMPORTED_MODULE_4__.isFunction)(eventReturn.mutation)) {
         return baseState;
@@ -8786,11 +8802,9 @@ function getScopedEvents(events, namespace, childType, baseProps) {
   // into a state mutation, and calls setState
   // eslint-disable-next-line max-params
   const onEvent = (evt, childProps, eventKey, eventName) => {
-    // eslint-disable-next-line no-invalid-this
     const eventReturn = events[eventName](evt, childProps, eventKey, this);
     if (!lodash_isEmpty__WEBPACK_IMPORTED_MODULE_3___default()(eventReturn)) {
       const callbacks = compileCallbacks(eventReturn);
-      // eslint-disable-next-line no-invalid-this
       this.setState(parseEventReturn(eventReturn, eventKey), callbacks);
     }
   };
@@ -8820,7 +8834,7 @@ function getPartialEvents(events, eventKey, childProps) {
 // eslint-disable-next-line max-params
 function getEventState(eventKey, namespace, childType) {
   // Mandatory usage: `getEventState.bind(this)`
-  // eslint-disable-next-line no-invalid-this
+
   const state = this.state || {};
   if (!childType) {
     return eventKey === "parent" ? state[eventKey] && state[eventKey][namespace] || state[eventKey] : state[eventKey] && state[eventKey][namespace];
@@ -9013,7 +9027,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-/* eslint-disable no-use-before-define */
 
 // Private Functions
 
@@ -9482,7 +9495,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var lodash_defaults__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash_defaults__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./helpers */ "../../victory-core/es/victory-util/helpers.js");
 
-/* eslint-disable no-use-before-define */
 
 // Private Functions
 
@@ -9802,7 +9814,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _collection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./collection */ "../../victory-core/es/victory-util/collection.js");
 /* harmony import */ var victory_vendor_d3_scale__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! victory-vendor/d3-scale */ "../../victory-vendor/es/d3-scale.js");
 
-/* eslint-disable no-use-before-define */
 
 
 
@@ -10593,8 +10604,6 @@ function getChildBeforeLoad(animate, child, data, cb) {
     clipWidth: 0
   };
 }
-
-// eslint-disable-next-line max-params
 function getChildOnLoad(animate, data, cb) {
   const newAnimate = Object.assign({}, animate, {
     onEnd: cb
@@ -10617,7 +10626,7 @@ function getChildOnLoad(animate, data, cb) {
   };
 }
 
-// eslint-disable-next-line max-params, max-len
+// eslint-disable-next-line max-params
 function getChildPropsOnExit(animate, child, data, exitingNodes, cb) {
   // Whether or not _this_ child has exiting nodes, we want the exit-
   // transition for all children to have the same duration, delay, etc.
@@ -10641,7 +10650,7 @@ function getChildPropsOnExit(animate, child, data, exitingNodes, cb) {
   };
 }
 
-// eslint-disable-next-line max-params,max-len
+// eslint-disable-next-line max-params
 function getChildPropsBeforeEnter(animate, child, data, enteringNodes, cb) {
   let newAnimate = animate;
   let newData = data;
@@ -10666,7 +10675,7 @@ function getChildPropsBeforeEnter(animate, child, data, enteringNodes, cb) {
   };
 }
 
-// eslint-disable-next-line max-params, max-len
+// eslint-disable-next-line max-params
 function getChildPropsOnEnter(animate, data, enteringNodes, cb) {
   // Whether or not _this_ child has entering nodes, we want the entering-
   // transition for all children to have the same duration, delay, etc.
@@ -10773,8 +10782,6 @@ function getTransitionPropsFactory(props, state, setState) {
     }
     return {};
   };
-
-  // eslint-disable-next-line max-statements, complexity, max-len
   return function getTransitionProps(child, index) {
     const data = getChildData(child) || [];
     const animate = lodash_defaults__WEBPACK_IMPORTED_MODULE_1___default()({}, props.animate, child.props.animate);