victory-core 36.8.4 → 36.8.5

package/src/victory-theme/grayscale.tsx

@@ -1,4 +1,3 @@
-import { assign } from "lodash";
 import { VictoryThemeDefinition } from "./types";
 
 // *
@@ -43,7 +42,10 @@ const baseLabelStyles = {
   stroke: "transparent",
 };
 
-const centeredLabelStyles = assign({ textAnchor: "middle" }, baseLabelStyles);
+const centeredLabelStyles = Object.assign(
+  { textAnchor: "middle" },
+  baseLabelStyles,
+);
 // *
 // * Strokes
 // *
@@ -51,7 +53,7 @@ const strokeLinecap = "round";
 const strokeLinejoin = "round";
 
 export const grayscale: VictoryThemeDefinition = {
-  area: assign(
+  area: Object.assign(
     {
       style: {
         data: {
@@ -62,7 +64,7 @@ export const grayscale: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  axis: assign(
+  axis: Object.assign(
     {
       style: {
         axis: {
@@ -72,7 +74,7 @@ export const grayscale: VictoryThemeDefinition = {
           strokeLinecap,
           strokeLinejoin,
         },
-        axisLabel: assign({}, centeredLabelStyles, {
+        axisLabel: Object.assign({}, centeredLabelStyles, {
           padding: 25,
         }),
         grid: {
@@ -90,7 +92,7 @@ export const grayscale: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  bar: assign(
+  bar: Object.assign(
     {
       style: {
         data: {
@@ -103,32 +105,32 @@ export const grayscale: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  boxplot: assign(
+  boxplot: Object.assign(
     {
       style: {
         max: { padding: 8, stroke: charcoal, strokeWidth: 1 },
-        maxLabels: assign({}, baseLabelStyles, { padding: 3 }),
+        maxLabels: Object.assign({}, baseLabelStyles, { padding: 3 }),
         median: { padding: 8, stroke: charcoal, strokeWidth: 1 },
-        medianLabels: assign({}, baseLabelStyles, { padding: 3 }),
+        medianLabels: Object.assign({}, baseLabelStyles, { padding: 3 }),
         min: { padding: 8, stroke: charcoal, strokeWidth: 1 },
-        minLabels: assign({}, baseLabelStyles, { padding: 3 }),
+        minLabels: Object.assign({}, baseLabelStyles, { padding: 3 }),
         q1: { padding: 8, fill: grey },
-        q1Labels: assign({}, baseLabelStyles, { padding: 3 }),
+        q1Labels: Object.assign({}, baseLabelStyles, { padding: 3 }),
         q3: { padding: 8, fill: grey },
-        q3Labels: assign({}, baseLabelStyles, { padding: 3 }),
+        q3Labels: Object.assign({}, baseLabelStyles, { padding: 3 }),
       },
       boxWidth: 20,
     },
     baseProps,
   ),
-  candlestick: assign(
+  candlestick: Object.assign(
     {
       style: {
         data: {
           stroke: charcoal,
           strokeWidth: 1,
         },
-        labels: assign({}, baseLabelStyles, { padding: 5 }),
+        labels: Object.assign({}, baseLabelStyles, { padding: 5 }),
       },
       candleColors: {
         positive: "#ffffff",
@@ -138,7 +140,7 @@ export const grayscale: VictoryThemeDefinition = {
     baseProps,
   ),
   chart: baseProps,
-  errorbar: assign(
+  errorbar: Object.assign(
     {
       borderWidth: 8,
       style: {
@@ -152,13 +154,13 @@ export const grayscale: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  group: assign(
+  group: Object.assign(
     {
       colorScale: colors,
     },
     baseProps,
   ),
-  histogram: assign(
+  histogram: Object.assign(
     {
       style: {
         data: {
@@ -181,10 +183,10 @@ export const grayscale: VictoryThemeDefinition = {
         type: "circle",
       },
       labels: baseLabelStyles,
-      title: assign({}, baseLabelStyles, { padding: 5 }),
+      title: Object.assign({}, baseLabelStyles, { padding: 5 }),
     },
   },
-  line: assign(
+  line: Object.assign(
     {
       style: {
         data: {
@@ -204,14 +206,14 @@ export const grayscale: VictoryThemeDefinition = {
         stroke: "transparent",
         strokeWidth: 1,
       },
-      labels: assign({}, baseLabelStyles, { padding: 20 }),
+      labels: Object.assign({}, baseLabelStyles, { padding: 20 }),
     },
     colorScale: colors,
     width: 400,
     height: 400,
     padding: 50,
   },
-  scatter: assign(
+  scatter: Object.assign(
     {
       style: {
         data: {
@@ -224,14 +226,17 @@ export const grayscale: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  stack: assign(
+  stack: Object.assign(
     {
       colorScale: colors,
     },
     baseProps,
   ),
   tooltip: {
-    style: assign({}, baseLabelStyles, { padding: 0, pointerEvents: "none" }),
+    style: Object.assign({}, baseLabelStyles, {
+      padding: 0,
+      pointerEvents: "none",
+    }),
     flyoutStyle: {
       stroke: charcoal,
       strokeWidth: 1,
@@ -242,7 +247,7 @@ export const grayscale: VictoryThemeDefinition = {
     cornerRadius: 5,
     pointerLength: 10,
   },
-  voronoi: assign(
+  voronoi: Object.assign(
     {
       style: {
         data: {
@@ -250,7 +255,7 @@ export const grayscale: VictoryThemeDefinition = {
           stroke: "transparent",
           strokeWidth: 0,
         },
-        labels: assign({}, baseLabelStyles, {
+        labels: Object.assign({}, baseLabelStyles, {
           padding: 5,
           pointerEvents: "none",
         }),

package/src/victory-theme/material.tsx

@@ -1,4 +1,3 @@
-import { assign } from "lodash";
 import { VictoryThemeDefinition } from "./types";
 
 // *
@@ -50,7 +49,10 @@ const baseLabelStyles = {
   strokeWidth: 0,
 };
 
-const centeredLabelStyles = assign({ textAnchor: "middle" }, baseLabelStyles);
+const centeredLabelStyles = Object.assign(
+  { textAnchor: "middle" },
+  baseLabelStyles,
+);
 // *
 // * Strokes
 // *
@@ -59,7 +61,7 @@ const strokeLinecap = "round";
 const strokeLinejoin = "round";
 
 export const material: VictoryThemeDefinition = {
-  area: assign(
+  area: Object.assign(
     {
       style: {
         data: {
@@ -70,7 +72,7 @@ export const material: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  axis: assign(
+  axis: Object.assign(
     {
       style: {
         axis: {
@@ -80,7 +82,7 @@ export const material: VictoryThemeDefinition = {
           strokeLinecap,
           strokeLinejoin,
         },
-        axisLabel: assign({}, centeredLabelStyles, {
+        axisLabel: Object.assign({}, centeredLabelStyles, {
           padding,
           stroke: "transparent",
         }),
@@ -100,14 +102,14 @@ export const material: VictoryThemeDefinition = {
           strokeLinecap,
           strokeLinejoin,
         },
-        tickLabels: assign({}, baseLabelStyles, {
+        tickLabels: Object.assign({}, baseLabelStyles, {
           fill: blueGrey700,
         }),
       },
     },
     baseProps,
   ),
-  polarDependentAxis: assign({
+  polarDependentAxis: Object.assign({
     style: {
       ticks: {
         fill: "transparent",
@@ -116,7 +118,7 @@ export const material: VictoryThemeDefinition = {
       },
     },
   }),
-  bar: assign(
+  bar: Object.assign(
     {
       style: {
         data: {
@@ -129,31 +131,31 @@ export const material: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  boxplot: assign(
+  boxplot: Object.assign(
     {
       style: {
         max: { padding, stroke: blueGrey700, strokeWidth: 1 },
-        maxLabels: assign({}, baseLabelStyles, { padding: 3 }),
+        maxLabels: Object.assign({}, baseLabelStyles, { padding: 3 }),
         median: { padding, stroke: blueGrey700, strokeWidth: 1 },
-        medianLabels: assign({}, baseLabelStyles, { padding: 3 }),
+        medianLabels: Object.assign({}, baseLabelStyles, { padding: 3 }),
         min: { padding, stroke: blueGrey700, strokeWidth: 1 },
-        minLabels: assign({}, baseLabelStyles, { padding: 3 }),
+        minLabels: Object.assign({}, baseLabelStyles, { padding: 3 }),
         q1: { padding, fill: blueGrey700 },
-        q1Labels: assign({}, baseLabelStyles, { padding: 3 }),
+        q1Labels: Object.assign({}, baseLabelStyles, { padding: 3 }),
         q3: { padding, fill: blueGrey700 },
-        q3Labels: assign({}, baseLabelStyles, { padding: 3 }),
+        q3Labels: Object.assign({}, baseLabelStyles, { padding: 3 }),
       },
       boxWidth: 20,
     },
     baseProps,
   ),
-  candlestick: assign(
+  candlestick: Object.assign(
     {
       style: {
         data: {
           stroke: blueGrey700,
         },
-        labels: assign({}, baseLabelStyles, { padding: 5 }),
+        labels: Object.assign({}, baseLabelStyles, { padding: 5 }),
       },
       candleColors: {
         positive: "#ffffff",
@@ -163,7 +165,7 @@ export const material: VictoryThemeDefinition = {
     baseProps,
   ),
   chart: baseProps,
-  errorbar: assign(
+  errorbar: Object.assign(
     {
       borderWidth: 8,
       style: {
@@ -178,13 +180,13 @@ export const material: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  group: assign(
+  group: Object.assign(
     {
       colorScale: colors,
     },
     baseProps,
   ),
-  histogram: assign(
+  histogram: Object.assign(
     {
       style: {
         data: {
@@ -207,10 +209,10 @@ export const material: VictoryThemeDefinition = {
         type: "circle",
       },
       labels: baseLabelStyles,
-      title: assign({}, baseLabelStyles, { padding: 5 }),
+      title: Object.assign({}, baseLabelStyles, { padding: 5 }),
     },
   },
-  line: assign(
+  line: Object.assign(
     {
       style: {
         data: {
@@ -224,7 +226,7 @@ export const material: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  pie: assign(
+  pie: Object.assign(
     {
       colorScale: colors,
       style: {
@@ -233,12 +235,12 @@ export const material: VictoryThemeDefinition = {
           stroke: blueGrey50,
           strokeWidth: 1,
         },
-        labels: assign({}, baseLabelStyles, { padding: 20 }),
+        labels: Object.assign({}, baseLabelStyles, { padding: 20 }),
       },
     },
     baseProps,
   ),
-  scatter: assign(
+  scatter: Object.assign(
     {
       style: {
         data: {
@@ -252,14 +254,17 @@ export const material: VictoryThemeDefinition = {
     },
     baseProps,
   ),
-  stack: assign(
+  stack: Object.assign(
     {
       colorScale: colors,
     },
     baseProps,
   ),
   tooltip: {
-    style: assign({}, baseLabelStyles, { padding: 0, pointerEvents: "none" }),
+    style: Object.assign({}, baseLabelStyles, {
+      padding: 0,
+      pointerEvents: "none",
+    }),
     flyoutStyle: {
       stroke: grey900,
       strokeWidth: 1,
@@ -270,7 +275,7 @@ export const material: VictoryThemeDefinition = {
     cornerRadius: 5,
     pointerLength: 10,
   },
-  voronoi: assign(
+  voronoi: Object.assign(
     {
       style: {
         data: {
@@ -278,7 +283,7 @@ export const material: VictoryThemeDefinition = {
           stroke: "transparent",
           strokeWidth: 0,
         },
-        labels: assign({}, baseLabelStyles, {
+        labels: Object.assign({}, baseLabelStyles, {
           padding: 5,
           pointerEvents: "none",
         }),

package/src/victory-util/add-events.tsx

@@ -1,6 +1,5 @@
 import React from "react";
 import {
-  assign,
   defaults,
   difference,
   isEmpty,
@@ -389,7 +388,7 @@ export function addEvents<
           componentProps.events,
         );
 
-        return assign({}, componentProps, { events });
+        return Object.assign({}, componentProps, { events });
       }
 
       return defaults({ index, key: id }, currentProps, baseProps, { id });

package/src/victory-util/axis.tsx

@@ -1,13 +1,11 @@
 import React from "react";
 import {
-  assign,
   defaults,
   identity,
   isFunction,
   isObject,
   invert,
   uniq,
-  range,
   orderBy,
   values,
   includes,
@@ -208,7 +206,7 @@ function getTickArray(props) {
   if (tickValues && Collection.containsStrings(tickValues)) {
     ticks = stringMap
       ? tickValues.map((tick) => stringMap[tick])
-      : range(1, tickValues.length + 1);
+      : Helpers.range(1, tickValues.length + 1);
   }
   const tickArray = ticks ? uniq(ticks) : getTicksFromFormat();
   const buildTickArray = (arr: number[]) => {
@@ -393,9 +391,9 @@ export function modifyProps(props, fallbackProps) {
     return Helpers.modifyProps(props, fallbackProps, "axis");
   }
   const axisTheme = defaults({}, props.theme[role], props.theme.axis);
-  const theme = assign({}, props.theme, { axis: axisTheme });
+  const theme = Object.assign({}, props.theme, { axis: axisTheme });
   return Helpers.modifyProps(
-    assign({}, props, { theme }),
+    Object.assign({}, props, { theme }),
     fallbackProps,
     "axis",
   );

package/src/victory-util/data.ts

@@ -1,9 +1,7 @@
 /* eslint-disable no-use-before-define */
 import React from "react";
 import {
-  assign,
   uniq,
-  range,
   last,
   isFunction,
   isPlainObject,
@@ -47,7 +45,7 @@ function generateDataArray(props, axis) {
   const domainMax = Math.max(...domain);
   const domainMin = Math.min(...domain);
   const step = (domainMax - domainMin) / samples;
-  const values = range(domainMin, domainMax, step);
+  const values = Helpers.range(domainMin, domainMax, step);
   return last(values) === domainMax ? values : values.concat(domainMax);
 }
 
@@ -84,7 +82,7 @@ function cleanData(dataset, props) {
     const _x = rules(datum, "x") ? datum._x : smallNumber;
     const _y = rules(datum, "y") ? datum._y : smallNumber;
     const _y0 = rules(datum, "y0") ? datum._y0 : smallNumber;
-    return assign({}, datum, { _x, _y, _y0 });
+    return Object.assign({}, datum, { _x, _y, _y0 });
   };
 
   return dataset.map((datum) => {
@@ -117,7 +115,9 @@ function addEventKeys(props, data) {
       return datum;
     } else if (hasEventKeyAccessor) {
       const eventKey = eventKeyAccessor(datum, index);
-      return eventKey !== undefined ? assign({ eventKey }, datum) : datum;
+      return eventKey !== undefined
+        ? Object.assign({ eventKey }, datum)
+        : datum;
     }
     return datum;
   });
@@ -170,7 +170,7 @@ export function formatDataFromDomain(dataset, domain, defaultBaseline?) {
     // baseline and value with only baseline above max, set baseline to maxDomainY
     if (isOverMaxY(baseline) && !isOverMaxY(value)) _y0 = maxDomainY;
 
-    return assign({}, datum, omitBy({ _x, _y, _y0, _y1 }, isUndefined));
+    return Object.assign({}, datum, omitBy({ _x, _y, _y0, _y1 }, isUndefined));
   });
 }
 
@@ -304,7 +304,7 @@ export function formatData(
           return memo;
         }, {});
 
-        const formattedDatum = assign({}, processedValues, parsedDatum);
+        const formattedDatum = Object.assign({}, processedValues, parsedDatum);
         if (!isEmpty(formattedDatum)) {
           dataArr.push(formattedDatum);
         }

package/src/victory-util/events.ts

@@ -1,6 +1,5 @@
 /* eslint-disable no-use-before-define */
 import {
-  assign,
   isEmpty,
   isFunction,
   without,
@@ -82,7 +81,7 @@ export function getEvents(
     return (
       Array.isArray(selectedEvents) &&
       selectedEvents.reduce((memo, event) => {
-        return event ? assign(memo, event.eventHandlers) : memo;
+        return event ? Object.assign(memo, event.eventHandlers) : memo;
       }, {} as ComponentEvent["eventHandlers"])
     );
   };
@@ -115,7 +114,7 @@ export function getEvents(
   const sharedEvents =
     props.sharedEvents.events &&
     getSharedEvents(getEventsByTarget(props.sharedEvents.events), target);
-  return assign({}, sharedEvents, ownEvents);
+  return Object.assign({}, sharedEvents, ownEvents);
 }
 
 /* Returns a modified events object where each event handler is replaced by a new
@@ -194,7 +193,7 @@ export function getScopedEvents(
         "state",
       );
       const mutatedProps = eventReturn.mutation(
-        assign({}, mutationTargetProps, mutationTargetState),
+        Object.assign({}, mutationTargetProps, mutationTargetState),
         newBaseProps,
       );
       const childState = baseState[childName] || {};
@@ -211,9 +210,13 @@ export function getScopedEvents(
 
       const extendState = (state) => {
         return target === "parent"
-          ? assign(state, { [key]: assign(state[key], mutatedProps) })
-          : assign(state, {
-              [key]: assign(state[key], { [target]: mutatedProps }),
+          ? Object.assign(state, {
+              [key]: Object.assign(state[key] || {}, mutatedProps),
+            })
+          : Object.assign(state, {
+              [key]: Object.assign(state[key] || {}, {
+                [target]: mutatedProps,
+              }),
             });
       };
 
@@ -222,7 +225,7 @@ export function getScopedEvents(
       };
 
       return childName !== undefined && childName !== null
-        ? assign(baseState, { [childName]: updateState(childState) })
+        ? Object.assign(baseState, { [childName]: updateState(childState) })
         : updateState(baseState);
     };
 
@@ -231,7 +234,7 @@ export function getScopedEvents(
       const mutationKeys = getKeys(childName);
       return Array.isArray(mutationKeys)
         ? mutationKeys.reduce((memo, key) => {
-            return assign(memo, getMutationObject(key, childName));
+            return Object.assign(memo, getMutationObject(key, childName));
           }, {})
         : getMutationObject(mutationKeys, childName);
     };
@@ -241,7 +244,7 @@ export function getScopedEvents(
       childNames === "all" ? without(keys(newBaseProps), "parent") : childNames;
     return Array.isArray(allChildNames)
       ? allChildNames.reduce((memo, childName) => {
-          return assign(memo, getReturnByChild(childName));
+          return Object.assign(memo, getReturnByChild(childName));
         }, {})
       : getReturnByChild(allChildNames);
   };
@@ -250,7 +253,7 @@ export function getScopedEvents(
   const parseEventReturn = (eventReturn, eventKey) => {
     return Array.isArray(eventReturn)
       ? eventReturn.reduce(
-          (memo, props) => assign({}, memo, parseEvent(props, eventKey)),
+          (memo, props) => Object.assign({}, memo, parseEvent(props, eventKey)),
           {},
         )
       : parseEvent(eventReturn, eventKey);
@@ -394,7 +397,9 @@ export function getExternalMutations(
         identifier,
       );
       memo[eventKey] =
-        mutation !== undefined ? assign({}, keyState, mutation) : keyState;
+        mutation !== undefined
+          ? Object.assign({}, keyState, mutation)
+          : keyState;
     } else {
       // use keys from both state and props so that elements not intially included in baseProps
       // will be used. (i.e. labels)
@@ -409,7 +414,7 @@ export function getExternalMutations(
         );
         m[target] =
           mutation !== undefined
-            ? assign({}, keyState[target], mutation)
+            ? Object.assign({}, keyState[target], mutation)
             : keyState[target];
         return pickBy(m, (v) => !isEmpty(v));
       }, {});
@@ -466,8 +471,10 @@ export function getExternalMutation(
   return keyMutations.reduce((memo, curr) => {
     const mutationFunction =
       curr && isFunction(curr.mutation) ? curr.mutation : () => undefined;
-    const currentMutation = mutationFunction(assign({}, baseProps, baseState));
-    return assign({}, memo, currentMutation);
+    const currentMutation = mutationFunction(
+      Object.assign({}, baseProps, baseState),
+    );
+    return Object.assign({}, memo, currentMutation);
   }, {});
 }
 
@@ -503,4 +510,4 @@ export const omitGlobalEvents = (events) =>
   omitBy(events, (_, key) => GLOBAL_EVENT_REGEX.test(key));
 
 export const emulateReactEvent = (event) =>
-  assign(event, { nativeEvent: event });
+  Object.assign(event, { nativeEvent: event });

package/src/victory-util/helpers.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-use-before-define */
 import React, { isValidElement } from "react";
-import { defaults, isFunction, property, pick, assign, keys } from "lodash";
+import { defaults, isFunction, property, pick, keys } from "lodash";
 import { CallbackArgs } from "../types/callbacks";
 import { ValueOrAccessor } from "../types/prop-types";
 
@@ -217,6 +217,37 @@ export function getCurrentAxis(axis, horizontal) {
   return horizontal ? otherAxis : axis;
 }
 
+/**
+ * Creates an array of numbers (positive and/or negative) progressing
+ * from start up to, but not including, end.
+ * A step of -1 is used if a negative start is specified without an end or step.
+ * If end is not specified, it's set to start with start then set to 0.
+ *
+ * @param start The length of the array to create, or the start value
+ * @param end [The end value] If this is defined, start is the start value
+ * @returns An array of the given length
+ */
+export function range(start: number, end?: number, increment?: number) {
+  // when the end index is not given, start from 0
+  const startIndex = end ? start : 0;
+
+  // when the end index is not given, the end of the range is the start index
+  let endIndex = end ? end : start;
+
+  // ensure endIndex is not a falsy value
+  if (!endIndex) endIndex = 0;
+
+  const k = endIndex - startIndex; // the value range
+  const length = Math.abs(k); //      the length of the range
+  const sign = k / length || 1; //    the sign of the range (negative or positive)
+  const inc = increment || 1; //      the step size of each increment
+
+  // normalize the array length when dealing with floating point values
+  const arrayLength = Math.max(Math.ceil(length / inc), 0);
+
+  return Array.from(Array(arrayLength), (_, i) => startIndex + i * sign * inc);
+}
+
 /**
  * @param {Array} children: an array of child components
  * @param {Function} iteratee: a function with arguments "child", "childName", and "parent"
@@ -262,7 +293,7 @@ export function reduceChildren<
       const childRole = child.type && child.type.role;
       const childName = child.props.name || `${childRole}-${names[index]}`;
       if (child.props && child.props.children) {
-        const childProps = assign(
+        const childProps = Object.assign(
           {},
           child.props,
           pick(parentProps, sharedProps),
@@ -278,7 +309,7 @@ export function reduceChildren<
                   child.props.children,
                 ) as Array<React.ReactElement>
               ).map((c) => {
-                const nestedChildProps = assign(
+                const nestedChildProps = Object.assign(
                   {},
                   c.props,
                   pick(childProps, sharedProps),

package/src/victory-util/point-path-helpers.ts

@@ -1,5 +1,6 @@
 /* eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2, 2.5, 3] }]*/
-import { range } from "lodash";
+
+import * as Helpers from "./helpers";
 
 export function circle(x: number, y: number, size: number) {
   return `M ${x}, ${y}
@@ -110,7 +111,7 @@ export function star(x: number, y: number, size: number) {
   const baseSize = 1.35 * size; // eslint-disable-line no-magic-numbers
   const angle = Math.PI / 5; // eslint-disable-line no-magic-numbers
   // eslint-disable-next-line no-magic-numbers
-  const starCoords = range(10).map((index) => {
+  const starCoords = Helpers.range(10).map((index) => {
     const length = index % 2 === 0 ? baseSize : baseSize / 2;
     return `${length * Math.sin(angle * (index + 1)) + x},
         ${length * Math.cos(angle * (index + 1)) + y}`;