From a2640576673b27280af0c0d7b27d82c05b3d6414 Mon Sep 17 00:00:00 2001
From: Haider Alshamma <haidera@nulogy.com>
Date: Wed, 6 Nov 2024 13:02:10 -0500
Subject: [PATCH] fix: preserve styled components composability

---
 src/NDSProvider/ComponentVariantContext.tsx |  12 --
 src/Type/Headings.tsx                       | 153 ++++++++------------
 2 files changed, 64 insertions(+), 101 deletions(-)

diff --git a/src/NDSProvider/ComponentVariantContext.tsx b/src/NDSProvider/ComponentVariantContext.tsx
index e1b8653ba..ba753b5df 100644
--- a/src/NDSProvider/ComponentVariantContext.tsx
+++ b/src/NDSProvider/ComponentVariantContext.tsx
@@ -21,15 +21,3 @@ export function useComponentVariant(selectedVariant?: ComponentVariant) {
 
   return selectedVariant ?? context.variant;
 }
-
-type WithVariantProps = {
-  variant?: ComponentVariant;
-};
-
-export function withComponentVariant<P extends WithVariantProps>(WrappedComponent: React.ComponentType<P>) {
-  return function ComponentWithVariant(props: P) {
-    const variant = useComponentVariant(props.variant);
-
-    return <WrappedComponent {...(props as P)} variant={variant} />;
-  };
-}
diff --git a/src/Type/Headings.tsx b/src/Type/Headings.tsx
index 82f303e70..bb6d1f6a6 100644
--- a/src/Type/Headings.tsx
+++ b/src/Type/Headings.tsx
@@ -1,101 +1,76 @@
 import { variant } from "styled-system";
 import styled from "styled-components";
+import { DefaultNDSThemeType } from "../theme.type";
 import { addStyledProps } from "../StyledProps";
-import { withComponentVariant } from "../NDSProvider/ComponentVariantContext";
+import { useComponentVariant } from "../NDSProvider/ComponentVariantContext";
 import Text, { TextProps } from "./Text";
 
-export const Heading1 = withComponentVariant(
-  styled(Text).attrs(() => ({
-    as: "h1",
-  }))<TextProps>(
-    ({ theme }) => ({
-      fontSize: theme.fontSizes.heading1,
-      lineHeight: theme.lineHeights.heading1,
-      fontWeight: theme.fontWeights.light,
-      marginTop: 0,
-      marginBottom: theme.space.x6,
-    }),
-    ({ theme }) =>
-      variant({
-        variants: {
-          touch: {
-            fontWeight: theme.fontWeights.bold,
-            marginBottom: theme.space.none,
-          },
-        },
-      }),
-    addStyledProps
-  )
+const useVariantStyles = ({ theme }: { theme: DefaultNDSThemeType }) => {
+  const componentVariant = useComponentVariant();
+
+  return variant({
+    variants: {
+      touch: {
+        fontWeight: theme.fontWeights.bold,
+        marginBottom: theme.space.none,
+      },
+    },
+    prop: "variant",
+  })({ theme, variant: componentVariant });
+};
+
+export const Heading1 = styled(Text).attrs(() => ({
+  as: "h1",
+}))<TextProps>(
+  ({ theme }) => ({
+    fontSize: theme.fontSizes.heading1,
+    lineHeight: theme.lineHeights.heading1,
+    fontWeight: theme.fontWeights.light,
+    marginTop: 0,
+    marginBottom: theme.space.x6,
+  }),
+  useVariantStyles,
+  addStyledProps
 );
 
-export const Heading2 = withComponentVariant(
-  styled(Text).attrs(() => ({
-    as: "h2",
-  }))(
-    ({ theme }) => ({
-      fontSize: theme.fontSizes.heading2,
-      lineHeight: theme.lineHeights.heading2,
-      fontWeight: theme.fontWeights.normal,
-      marginTop: 0,
-      marginBottom: theme.space.x2,
-    }),
-    ({ theme }) =>
-      variant({
-        variants: {
-          touch: {
-            fontWeight: theme.fontWeights.bold,
-            marginBottom: theme.space.none,
-          },
-        },
-      }),
-    addStyledProps
-  )
+export const Heading2 = styled(Text).attrs(() => ({
+  as: "h2",
+}))(
+  ({ theme }) => ({
+    fontSize: theme.fontSizes.heading2,
+    lineHeight: theme.lineHeights.heading2,
+    fontWeight: theme.fontWeights.normal,
+    marginTop: 0,
+    marginBottom: theme.space.x2,
+  }),
+  useVariantStyles,
+  addStyledProps
 );
 
-export const Heading3 = withComponentVariant(
-  styled(Text).attrs(() => ({
-    as: "h3",
-  }))(
-    ({ theme }) => ({
-      fontSize: theme.fontSizes.heading3,
-      lineHeight: theme.lineHeights.heading3,
-      fontWeight: theme.fontWeights.medium,
-      marginTop: 0,
-      marginBottom: theme.space.x1,
-    }),
-    ({ theme }) =>
-      variant({
-        variants: {
-          touch: {
-            fontWeight: theme.fontWeights.bold,
-            marginBottom: theme.space.none,
-          },
-        },
-      }),
-    addStyledProps
-  )
+export const Heading3 = styled(Text).attrs(() => ({
+  as: "h3",
+}))(
+  ({ theme }) => ({
+    fontSize: theme.fontSizes.heading3,
+    lineHeight: theme.lineHeights.heading3,
+    fontWeight: theme.fontWeights.medium,
+    marginTop: 0,
+    marginBottom: theme.space.x1,
+  }),
+  useVariantStyles,
+  addStyledProps
 );
 
-export const Heading4 = withComponentVariant(
-  styled(Text).attrs(() => ({
-    as: "h4",
-  }))(
-    ({ theme }) => ({
-      fontSize: theme.fontSizes.heading4,
-      lineHeight: theme.lineHeights.heading4,
-      fontWeight: theme.fontWeights.bold,
-      marginTop: 0,
-      marginBottom: theme.space.x1,
-    }),
-    ({ theme }) =>
-      variant({
-        variants: {
-          touch: {
-            fontWeight: theme.fontWeights.bold,
-            marginBottom: theme.space.none,
-          },
-        },
-      }),
-    addStyledProps
-  )
+export const Heading4 = styled(Text).attrs(() => ({
+  as: "h4",
+}))(
+  ({ theme }) => ({
+    fontSize: theme.fontSizes.heading4,
+    lineHeight: theme.lineHeights.heading4,
+    fontWeight: theme.fontWeights.bold,
+    marginTop: 0,
+    marginBottom: theme.space.x1,
+  }),
+  useVariantStyles,
+  addStyledProps
 );