@ornikar/bumper 3.1.0 → 3.2.0

package/src/system/dataDisplays/Badge/Badge.tsx

@@ -1,6 +1,7 @@
-import { styled, useProps } from '@tamagui/core';
+import { styled } from '@tamagui/core';
 import type { ReactNode } from 'react';
 import { InternalTypography } from '../../content/typography/Typography';
+import { useProps } from '../../core/hooks/useProps';
 import { Center } from '../../core/primitives/Center';
 import type { TamaguiMediaProps } from '../../types';
 

package/src/system/dataDisplays/Badge/__snapshots_web__/Badge.features.stories.tsx.snap

@@ -24,8 +24,7 @@ exports[`Bumper/Data Displays/Badge/Features WithCount 1`] = `
               class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
             >
               <span
-                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-                data-disable-theme="true"
+                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
               >
                 1
               </span>
@@ -34,8 +33,7 @@ exports[`Bumper/Data Displays/Badge/Features WithCount 1`] = `
               class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
             >
               <span
-                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-                data-disable-theme="true"
+                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
               >
                 5
               </span>
@@ -44,8 +42,7 @@ exports[`Bumper/Data Displays/Badge/Features WithCount 1`] = `
               class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
             >
               <span
-                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-                data-disable-theme="true"
+                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
               >
                 9+
               </span>
@@ -54,8 +51,7 @@ exports[`Bumper/Data Displays/Badge/Features WithCount 1`] = `
               class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
             >
               <span
-                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-                data-disable-theme="true"
+                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
               >
                 9+
               </span>
@@ -64,8 +60,7 @@ exports[`Bumper/Data Displays/Badge/Features WithCount 1`] = `
               class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
             >
               <span
-                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-                data-disable-theme="true"
+                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
               >
                 0
               </span>
@@ -102,8 +97,7 @@ exports[`Bumper/Data Displays/Badge/Features WithMaximumCount 1`] = `
               class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
             >
               <span
-                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-                data-disable-theme="true"
+                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
               >
                 9+
               </span>
@@ -112,8 +106,7 @@ exports[`Bumper/Data Displays/Badge/Features WithMaximumCount 1`] = `
               class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
             >
               <span
-                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-                data-disable-theme="true"
+                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
               >
                 99+
               </span>
@@ -122,8 +115,7 @@ exports[`Bumper/Data Displays/Badge/Features WithMaximumCount 1`] = `
               class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
             >
               <span
-                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-                data-disable-theme="true"
+                class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
               >
                 999
               </span>

package/src/system/dataDisplays/Badge/__snapshots_web__/Badge.stories.tsx.snap

@@ -21,8 +21,7 @@ exports[`Bumper/Data Displays/Badge Default 1`] = `
             class="_dsp-flex _fd-column _fb-auto _bxs-border-box _pos-relative _flexShrink-0 _justifyContent-center _alignItems-center _btlr-t-radius-ra1854241453 _btrr-t-radius-ra1854241453 _bbrr-t-radius-ra1854241453 _bblr-t-radius-ra1854241453 _backgroundColor-bg--danger-46574 _alignSelf-flex-start _minWidth-16px _minHeight-16px _paddingRight-t-space-spa94482162 _paddingLeft-t-space-spa94482162"
           >
             <span
-              class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _tt-uppercase _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _col-content--ba254712717 _paddingBottom-1px"
-              data-disable-theme="true"
+              class="font_GTStandardNarrow _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-cont1213109893 _lh-f-lineHeigh599485626 _ls-f-letterSpa1883393765 _fw-f-weight-bo3448 _tt-uppercase _col-content--ba254712717 _paddingBottom-1px"
             >
               3
             </span>

package/src/system/loading/loader/__snapshots_web__/Loader.features.stories.tsx.snap

@@ -165,8 +165,7 @@ exports[`Bumper/Loading/Loader/Features Sizes 1`] = `
                 </svg>
               </div>
               <span
-                class="font_GTStandard _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fw-f-weight-re98715119 _fs-f-size-body47080 _lh-f-lineHeigh1960620717 _ls-f-letterSpa260968488 _col-content--ba1918259606"
-                data-disable-theme="true"
+                class="font_GTStandard _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-body47080 _lh-f-lineHeigh1960620717 _ls-f-letterSpa260968488 _fw-f-weight-re98715119 _col-content--ba1918259606"
               >
                 icon (20)
               </span>
@@ -210,8 +209,7 @@ exports[`Bumper/Loading/Loader/Features Sizes 1`] = `
                 </svg>
               </div>
               <span
-                class="font_GTStandard _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fw-f-weight-re98715119 _fs-f-size-body47080 _lh-f-lineHeigh1960620717 _ls-f-letterSpa260968488 _col-content--ba1918259606"
-                data-disable-theme="true"
+                class="font_GTStandard _WebkitFontSmoothing-_platformweb_antialiased _dsp-inline _bxs-border-box _ww-break-word _ws-pre-wrap _marginTop-0px _marginRight-0px _marginBottom-0px _marginLeft-0px _ff-f-family _fs-f-size-body47080 _lh-f-lineHeigh1960620717 _ls-f-letterSpa260968488 _fw-f-weight-re98715119 _col-content--ba1918259606"
               >
                 page (48)
               </span>

package/src/system/types.ts

@@ -1,6 +1,7 @@
 import type { WithMediaProps } from '@tamagui/core';
 
-type PropsWithoutMediaStyles<A> = {
+// Rewrite PropsWithoutMediaStyles to fix Tamagui's one. Which make optionnall all media props, even if they are required in the original props type. This is a problem for our components which have required media props (like variant for Typography).
+export type PropsWithoutMediaStyles<A> = {
   [Key in keyof A as Key extends `$${string}` ? never : Key]: A[Key];
 };
 

package/dist/definitions/system/content/typography/utils/getVariantAndWeightValues.d.ts

@@ -1,10 +0,0 @@
-import type { FontVariants } from '../../../core/tokens/fonts';
-import type { TypographyTextProps } from '../Typography';
-import type { TypographyVariantContextValue, TypographyWeightContextValue } from './typographyContext';
-interface VariantAndWeightValues {
-    weight: TypographyTextProps['weight'] | undefined;
-    variant: FontVariants | undefined;
-}
-export declare function getVariantAndWeightValues(weightProp: TypographyTextProps['weight'], variantProp: TypographyTextProps['variant'], typographyWeightAncestorValue: TypographyWeightContextValue, typographyVariantAncestorValue: TypographyVariantContextValue): VariantAndWeightValues;
-export {};
-//# sourceMappingURL=getVariantAndWeightValues.d.ts.map

package/dist/definitions/system/content/typography/utils/getVariantAndWeightValues.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getVariantAndWeightValues.d.ts","sourceRoot":"","sources":["../../../../../../src/system/content/typography/utils/getVariantAndWeightValues.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAEvG,UAAU,sBAAsB;IAC9B,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;IAClD,OAAO,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,mBAAmB,CAAC,QAAQ,CAAC,EACzC,WAAW,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAC3C,6BAA6B,EAAE,4BAA4B,EAC3D,8BAA8B,EAAE,6BAA6B,GAC5D,sBAAsB,CAuBxB"}

package/src/system/content/typography/utils/getVariantAndWeightValues.test.tsx

@@ -1,178 +0,0 @@
-import { BODY_VARIANTS, HEADING_VARIANTS, LABEL_VARIANTS } from '../../../core/tokens/GTStandardFont';
-import { CONTENT_CAPS_VARIANTS } from '../../../core/tokens/GTStandardNarrowFont';
-import { getVariantAndWeightValues } from './getVariantAndWeightValues';
-
-describe('getVariantAndWeightValues', () => {
-  describe('when variant is a body size', () => {
-    it.each(BODY_VARIANTS.map((size) => [size, undefined, null, null, { weight: undefined, variant: size }]))(
-      'should return weight from prop and variant "%s" when weight prop is undefined and no ancestor values',
-      (variant, weight, ancestorWeight, ancestorVariant, expected) => {
-        expect(getVariantAndWeightValues(weight, variant, ancestorWeight, ancestorVariant)).toEqual(expected);
-      },
-    );
-
-    it('should return weight from prop when defined', () => {
-      expect(getVariantAndWeightValues('regular', 'body-l', null, null)).toEqual({
-        weight: 'regular',
-        variant: 'body-l',
-      });
-    });
-
-    it('should return weight from ancestor when weight prop is undefined', () => {
-      expect(getVariantAndWeightValues(undefined, 'body-m', 'regular', null)).toEqual({
-        weight: 'regular',
-        variant: 'body-m',
-      });
-    });
-
-    it('should prioritize weight prop over ancestor weight for body sizes', () => {
-      expect(getVariantAndWeightValues('bold', 'body-m', 'regular', null)).toEqual({
-        weight: 'bold',
-        variant: 'body-m',
-      });
-    });
-  });
-
-  describe('when variant is a heading size', () => {
-    it.each(HEADING_VARIANTS.map((size) => [size, undefined, null, null, { weight: 'semibold', variant: size }]))(
-      'should return weight "semibold" for heading variant "%s"',
-      (variant, weight, ancestorWeight, ancestorVariant, expected) => {
-        expect(getVariantAndWeightValues(weight, variant, ancestorWeight, ancestorVariant)).toEqual(expected);
-      },
-    );
-
-    it('should ignore weight prop for heading sizes and always return semibold', () => {
-      expect(getVariantAndWeightValues('regular', 'heading-m', null, null)).toEqual({
-        weight: 'semibold',
-        variant: 'heading-m',
-      });
-    });
-
-    it('should ignore ancestor weight for heading sizes and always return semibold', () => {
-      expect(getVariantAndWeightValues(undefined, 'heading-m', 'bold', null)).toEqual({
-        weight: 'semibold',
-        variant: 'heading-m',
-      });
-    });
-  });
-
-  describe('when variant is a label size', () => {
-    it.each(LABEL_VARIANTS.map((size) => [size, undefined, null, null, { weight: 'semibold', variant: size }]))(
-      'should return weight "semibold" for label variant "%s"',
-      (variant, weight, ancestorWeight, ancestorVariant, expected) => {
-        expect(getVariantAndWeightValues(weight, variant, ancestorWeight, ancestorVariant)).toEqual(expected);
-      },
-    );
-
-    it('should ignore weight prop for label sizes and always return semibold', () => {
-      expect(getVariantAndWeightValues('regular', 'label-m', null, null)).toEqual({
-        weight: 'semibold',
-        variant: 'label-m',
-      });
-    });
-
-    it('should ignore ancestor weight for label sizes and always return semibold', () => {
-      expect(getVariantAndWeightValues(undefined, 'label-m', 'bold', null)).toEqual({
-        weight: 'semibold',
-        variant: 'label-m',
-      });
-    });
-  });
-
-  describe('when variant is a content caps size', () => {
-    it.each(CONTENT_CAPS_VARIANTS.map((size) => [size, undefined, null, null, { weight: 'bold', variant: size }]))(
-      'should return weight "bold" for label variant "%s"',
-      (variant, weight, ancestorWeight, ancestorVariant, expected) => {
-        expect(getVariantAndWeightValues(weight, variant, ancestorWeight, ancestorVariant)).toEqual(expected);
-      },
-    );
-
-    it('should ignore weight prop for label sizes and always return bold', () => {
-      expect(getVariantAndWeightValues('regular', 'content-caps-m', null, null)).toEqual({
-        weight: 'bold',
-        variant: 'content-caps-m',
-      });
-    });
-
-    it('should ignore ancestor weight for label sizes and always return bold', () => {
-      expect(getVariantAndWeightValues(undefined, 'content-caps-m', 'bold', null)).toEqual({
-        weight: 'bold',
-        variant: 'content-caps-m',
-      });
-    });
-  });
-
-  describe('when variant comes from ancestor', () => {
-    it('should use ancestor variant when variant prop is undefined', () => {
-      expect(getVariantAndWeightValues(undefined, undefined, null, 'body-m')).toEqual({
-        weight: undefined,
-        variant: 'body-m',
-      });
-    });
-
-    it('should prioritize variant prop over ancestor type', () => {
-      expect(getVariantAndWeightValues(undefined, 'body-l', null, 'body-m')).toEqual({
-        weight: undefined,
-        variant: 'body-l',
-      });
-    });
-
-    it('should return semibold weight when ancestor variant is a heading', () => {
-      expect(getVariantAndWeightValues(undefined, undefined, null, 'heading-m')).toEqual({
-        weight: 'semibold',
-        variant: 'heading-m',
-      });
-    });
-
-    it('should return semibold weight when ancestor variant is a label', () => {
-      expect(getVariantAndWeightValues(undefined, undefined, null, 'label-m')).toEqual({
-        weight: 'semibold',
-        variant: 'label-m',
-      });
-    });
-
-    it('should use ancestor weight when ancestor variant is a body size', () => {
-      expect(getVariantAndWeightValues(undefined, undefined, 'bold', 'body-m')).toEqual({
-        weight: 'bold',
-        variant: 'body-m',
-      });
-    });
-
-    it('should use ancestor weight when ancestor variant is a content caps size', () => {
-      expect(getVariantAndWeightValues(undefined, undefined, 'bold', 'content-caps-m')).toEqual({
-        weight: 'bold',
-        variant: 'content-caps-m',
-      });
-    });
-  });
-
-  describe('when no variant is provided', () => {
-    it('should return weight from prop and undefined variant when no ancestor values', () => {
-      expect(getVariantAndWeightValues('regular', undefined, null, null)).toEqual({
-        weight: 'regular',
-        variant: undefined,
-      });
-    });
-
-    it('should return weight from prop and undefined variant when ancestor variant is null', () => {
-      expect(getVariantAndWeightValues('bold', undefined, null, null)).toEqual({
-        weight: 'bold',
-        variant: undefined,
-      });
-    });
-
-    it('should return undefined weight when weight prop is undefined and no variant', () => {
-      expect(getVariantAndWeightValues(undefined, undefined, null, null)).toEqual({
-        weight: undefined,
-        variant: undefined,
-      });
-    });
-
-    it('should ignore ancestor weight when no variant is provided', () => {
-      expect(getVariantAndWeightValues(undefined, undefined, 'bold', null)).toEqual({
-        weight: undefined,
-        variant: undefined,
-      });
-    });
-  });
-});

package/src/system/content/typography/utils/getVariantAndWeightValues.tsx

@@ -1,40 +0,0 @@
-import { BODY_VARIANTS, HEADING_VARIANTS, LABEL_VARIANTS } from '../../../core/tokens/GTStandardFont';
-import { CONTENT_CAPS_VARIANTS } from '../../../core/tokens/GTStandardNarrowFont';
-import type { FontVariants } from '../../../core/tokens/fonts';
-import type { TypographyTextProps } from '../Typography';
-import type { TypographyVariantContextValue, TypographyWeightContextValue } from './typographyContext';
-
-interface VariantAndWeightValues {
-  weight: TypographyTextProps['weight'] | undefined;
-  variant: FontVariants | undefined;
-}
-
-export function getVariantAndWeightValues(
-  weightProp: TypographyTextProps['weight'],
-  variantProp: TypographyTextProps['variant'],
-  typographyWeightAncestorValue: TypographyWeightContextValue,
-  typographyVariantAncestorValue: TypographyVariantContextValue,
-): VariantAndWeightValues {
-  const computedVariant = variantProp || typographyVariantAncestorValue || undefined;
-
-  if (computedVariant) {
-    if ((BODY_VARIANTS as readonly string[]).includes(computedVariant)) {
-      const computedWeight = weightProp || typographyWeightAncestorValue || undefined;
-      return { weight: computedWeight, variant: computedVariant };
-    }
-    // Content Caps variant have fixed weights so we override any provided weight
-    if ((CONTENT_CAPS_VARIANTS as readonly string[]).includes(computedVariant)) {
-      return { weight: 'bold', variant: computedVariant };
-    }
-    // Heading variants have fixed weights so we override any provided weight
-    if ((HEADING_VARIANTS as readonly string[]).includes(computedVariant)) {
-      return { weight: 'semibold', variant: computedVariant };
-    }
-    // Label variants have fixed weights so we override any provided weight
-    if ((LABEL_VARIANTS as readonly string[]).includes(computedVariant)) {
-      return { weight: 'semibold', variant: computedVariant };
-    }
-  }
-
-  return { weight: weightProp, variant: undefined };
-}