refactor: only grab dependent axis when array is passed

FormidableLabs · Oct 15, 2024 · 13881ef · 13881ef
1 parent 7866e09
commit 13881ef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/packages/victory-core/src/victory-util/wrapper.test.tsx b/packages/victory-core/src/victory-util/wrapper.test.tsx
@@ -94,6 +94,12 @@ describe("helpers/wrapper", () => {
           "x",
         ),
       ).toEqual(["one", "two", "three"]);
+      expect(
+        Wrapper.getStringsFromCategories(
+          [<MockVictoryLine categories={["one", "z", "three"]} key="1" />],
+          "y",
+        ),
+      ).toEqual([]);
       expect(
         Wrapper.getStringsFromCategories(
           [

diff --git a/packages/victory-core/src/victory-util/wrapper.tsx b/packages/victory-core/src/victory-util/wrapper.tsx
@@ -356,6 +356,11 @@ export function getChildStyle(child, index, calculatedProps, theme) {
   };
 }
 
+function getDependentAxisCategories(categories: string[], axis: "x" | "y") {
+  const dependentAxis = "x";
+  return axis === dependentAxis ? categories : [];
+}
+
 export function getStringsFromCategories(childComponents, axis) {
   const iteratee = (child) => {
     const childProps = child.props || {};
@@ -365,7 +370,7 @@ export function getStringsFromCategories(childComponents, axis) {
     const categories =
       childProps.categories && !Array.isArray(childProps.categories)
         ? childProps.categories[axis]
-        : childProps.categories;
+        : getDependentAxisCategories(childProps.categories, axis);
     const categoryStrings =
       categories && categories.filter((val) => typeof val === "string");
     return categoryStrings ? Collection.removeUndefined(categoryStrings) : [];
@@ -419,7 +424,7 @@ export function getCategoryAndAxisStringsFromChildren(
 ) {
   const categories = isPlainObject(props.categories)
     ? props.categories[axis]
-    : props.categories;
+    : getDependentAxisCategories(props.categories, axis);
   const axisComponent = Axis.getAxisComponent(childComponents, axis);
   const axisStrings = axisComponent
     ? Data.getStringsFromAxes(axisComponent.props, axis)