From a69620cb9fa5d2fa6f3be7dbbfbc5958a7ae97be Mon Sep 17 00:00:00 2001
From: Ryan Killeen <ryan@ryankilleen.com>
Date: Fri, 19 Jan 2024 12:52:04 -0500
Subject: [PATCH 1/4] fix: include defaultTextProps in Axis labelProps

This enables passing of partial labelProps per the docs.
---
 packages/visx-axis/src/axis/AxisRenderer.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/visx-axis/src/axis/AxisRenderer.tsx b/packages/visx-axis/src/axis/AxisRenderer.tsx
index be9bc0e0e..a7ea3e1bb 100644
--- a/packages/visx-axis/src/axis/AxisRenderer.tsx
+++ b/packages/visx-axis/src/axis/AxisRenderer.tsx
@@ -26,7 +26,7 @@ export default function AxisRenderer<Scale extends AxisScale>({
   label = '',
   labelClassName,
   labelOffset = 14,
-  labelProps = defaultTextProps,
+  labelProps,
   orientation = Orientation.bottom,
   scale,
   stroke = '#222',
@@ -42,6 +42,10 @@ export default function AxisRenderer<Scale extends AxisScale>({
   ticks,
   ticksComponent = Ticks,
 }: AxisRendererProps<Scale>) {
+  const labelPropsDefault = {
+    ...defaultTextProps,
+    ...labelProps
+  }
   const tickLabelPropsDefault = {
     ...defaultTextProps,
     ...(typeof tickLabelProps === 'object' ? tickLabelProps : null),
@@ -89,13 +93,13 @@ export default function AxisRenderer<Scale extends AxisScale>({
           className={cx('visx-axis-label', labelClassName)}
           {...getLabelTransform({
             labelOffset,
-            labelProps,
+            labelPropsDefault,
             orientation,
             range: scale.range(),
             tickLabelFontSize: maxTickLabelFontSize,
             tickLength,
           })}
-          {...labelProps}
+          {...labelPropsDefault}
         >
           {label}
         </Text>

From d02bc39703fcf3ffb9ab6b0c0f394e4433c07941 Mon Sep 17 00:00:00 2001
From: Ryan Killeen <ryan@ryankilleen.com>
Date: Wed, 24 Jan 2024 13:13:27 -0500
Subject: [PATCH 2/4] Apply suggestions from code review

Co-authored-by: Chris Williams <williaster@users.noreply.github.com>
---
 packages/visx-axis/src/axis/AxisRenderer.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/visx-axis/src/axis/AxisRenderer.tsx b/packages/visx-axis/src/axis/AxisRenderer.tsx
index a7ea3e1bb..cc73b8f65 100644
--- a/packages/visx-axis/src/axis/AxisRenderer.tsx
+++ b/packages/visx-axis/src/axis/AxisRenderer.tsx
@@ -42,9 +42,9 @@ export default function AxisRenderer<Scale extends AxisScale>({
   ticks,
   ticksComponent = Ticks,
 }: AxisRendererProps<Scale>) {
-  const labelPropsDefault = {
+  const combinedLabelProps = {
     ...defaultTextProps,
-    ...labelProps
+    ...labelProps,
   }
   const tickLabelPropsDefault = {
     ...defaultTextProps,
@@ -93,7 +93,7 @@ export default function AxisRenderer<Scale extends AxisScale>({
           className={cx('visx-axis-label', labelClassName)}
           {...getLabelTransform({
             labelOffset,
-            labelPropsDefault,
+            labelProps: combinedLabelProps,
             orientation,
             range: scale.range(),
             tickLabelFontSize: maxTickLabelFontSize,

From cc7d13bf1b30759df173db2bf6ed1e2e32715d4e Mon Sep 17 00:00:00 2001
From: Ryan Killeen <ryan@ryankilleen.com>
Date: Wed, 24 Jan 2024 13:40:34 -0500
Subject: [PATCH 3/4] Update packages/visx-axis/src/axis/AxisRenderer.tsx

Co-authored-by: Chris Williams <williaster@users.noreply.github.com>
---
 packages/visx-axis/src/axis/AxisRenderer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/visx-axis/src/axis/AxisRenderer.tsx b/packages/visx-axis/src/axis/AxisRenderer.tsx
index cc73b8f65..67ff45576 100644
--- a/packages/visx-axis/src/axis/AxisRenderer.tsx
+++ b/packages/visx-axis/src/axis/AxisRenderer.tsx
@@ -99,7 +99,7 @@ export default function AxisRenderer<Scale extends AxisScale>({
             tickLabelFontSize: maxTickLabelFontSize,
             tickLength,
           })}
-          {...labelPropsDefault}
+          {...combinedLabelProps}
         >
           {label}
         </Text>

From 342fb2aecc6bc4487e658a4d82540b5d05c1847f Mon Sep 17 00:00:00 2001
From: Ryan Killeen <ryan@ryankilleen.com>
Date: Thu, 25 Jan 2024 14:01:55 -0500
Subject: [PATCH 4/4] Update packages/visx-axis/src/axis/AxisRenderer.tsx

Co-authored-by: Chris Williams <williaster@users.noreply.github.com>
---
 packages/visx-axis/src/axis/AxisRenderer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/visx-axis/src/axis/AxisRenderer.tsx b/packages/visx-axis/src/axis/AxisRenderer.tsx
index 67ff45576..657260a5f 100644
--- a/packages/visx-axis/src/axis/AxisRenderer.tsx
+++ b/packages/visx-axis/src/axis/AxisRenderer.tsx
@@ -45,7 +45,7 @@ export default function AxisRenderer<Scale extends AxisScale>({
   const combinedLabelProps = {
     ...defaultTextProps,
     ...labelProps,
-  }
+  };
   const tickLabelPropsDefault = {
     ...defaultTextProps,
     ...(typeof tickLabelProps === 'object' ? tickLabelProps : null),