Skip to content

The open alternative to Salesforce, designed for AI.

Move part class-name merging into shared utilities (#25621)

Raphaël Bosib22709dd7924
diff --git a/packages/twenty-ui/src/input/Field/internal/FieldDescription.tsx b/packages/twenty-ui/src/input/Field/internal/FieldDescription.tsx
index 776d0d53e15..fab271ac7b7 100644
--- a/packages/twenty-ui/src/input/Field/internal/FieldDescription.tsx
+++ b/packages/twenty-ui/src/input/Field/internal/FieldDescription.tsx
@@ -1,8 +1,9 @@
import { Field as FieldPrimitive } from '@base-ui/react/field';
import { forwardRef } from 'react';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
+
import styles from './FieldDescription.module.scss';
-import { mergeFieldPartClassName } from './mergeFieldPartClassName';
type FieldDescriptionProps = React.ComponentPropsWithoutRef<
typeof FieldPrimitive.Description
@@ -14,7 +15,7 @@ export const FieldDescription = forwardRef<
>(({ className, ...props }, ref) => (
<FieldPrimitive.Description
ref={ref}
- className={mergeFieldPartClassName(styles.description, className)}
+ className={mergeClassNames(styles.description, className)}
// oxlint-disable-next-line react/jsx-props-no-spreading
{...props}
/>
diff --git a/packages/twenty-ui/src/input/Field/internal/FieldError.tsx b/packages/twenty-ui/src/input/Field/internal/FieldError.tsx
index ae026505ab8..376c0f13eba 100644
--- a/packages/twenty-ui/src/input/Field/internal/FieldError.tsx
+++ b/packages/twenty-ui/src/input/Field/internal/FieldError.tsx
@@ -1,8 +1,9 @@
import { Field as FieldPrimitive } from '@base-ui/react/field';
import { forwardRef } from 'react';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
+
import styles from './FieldError.module.scss';
-import { mergeFieldPartClassName } from './mergeFieldPartClassName';
type FieldErrorProps = React.ComponentPropsWithoutRef<
typeof FieldPrimitive.Error
@@ -14,7 +15,7 @@ export const FieldError = forwardRef<
>(({ className, ...props }, ref) => (
<FieldPrimitive.Error
ref={ref}
- className={mergeFieldPartClassName(styles.error, className)}
+ className={mergeClassNames(styles.error, className)}
// oxlint-disable-next-line react/jsx-props-no-spreading
{...props}
/>
diff --git a/packages/twenty-ui/src/input/Field/internal/FieldLabel.tsx b/packages/twenty-ui/src/input/Field/internal/FieldLabel.tsx
index eaaea37d736..9a6b2ebbf26 100644
--- a/packages/twenty-ui/src/input/Field/internal/FieldLabel.tsx
+++ b/packages/twenty-ui/src/input/Field/internal/FieldLabel.tsx
@@ -1,8 +1,9 @@
import { Field as FieldPrimitive } from '@base-ui/react/field';
import { forwardRef } from 'react';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
+
import styles from './FieldLabel.module.scss';
-import { mergeFieldPartClassName } from './mergeFieldPartClassName';
type FieldLabelProps = React.ComponentPropsWithoutRef<
typeof FieldPrimitive.Label
@@ -14,7 +15,7 @@ export const FieldLabel = forwardRef<
>(({ className, ...props }, ref) => (
<FieldPrimitive.Label
ref={ref}
- className={mergeFieldPartClassName(styles.label, className)}
+ className={mergeClassNames(styles.label, className)}
// oxlint-disable-next-line react/jsx-props-no-spreading
{...props}
/>
diff --git a/packages/twenty-ui/src/input/Field/internal/mergeFieldPartClassName.ts b/packages/twenty-ui/src/input/Field/internal/mergeFieldPartClassName.ts
deleted file mode 100644
index 0be1b5b4d38..00000000000
--- a/packages/twenty-ui/src/input/Field/internal/mergeFieldPartClassName.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { isFunction } from '@sniptt/guards';
-import { clsx } from 'clsx';
-
-export const mergeFieldPartClassName =
- <TState>(
- partClassName: string,
- className: string | ((state: TState) => string | undefined) | undefined,
- ) =>
- (state: TState) =>
- clsx(partClassName, isFunction(className) ? className(state) : className);
diff --git a/packages/twenty-ui/src/input/Input/Input.tsx b/packages/twenty-ui/src/input/Input/Input.tsx
index 9ab7b961cef..7c2922e9e5b 100644
--- a/packages/twenty-ui/src/input/Input/Input.tsx
+++ b/packages/twenty-ui/src/input/Input/Input.tsx
@@ -2,8 +2,8 @@ import { Input as InputPrimitive } from '@base-ui/react/input';
import { clsx } from 'clsx';
import { useContext } from 'react';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
import { InputGroupContext } from '@ui/input/InputGroup/internal/InputGroupContext';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import { isDefined } from '@ui/utilities/utils/isDefined';
import styles from './Input.module.scss';
@@ -16,7 +16,7 @@ export const Input = ({ size, className, ...props }: InputProps) => {
return (
<InputPrimitive
{...props}
- className={mergeFieldPartClassName(
+ className={mergeClassNames(
clsx(styles.input, styles[resolvedSize]),
className,
)}
diff --git a/packages/twenty-ui/src/input/Textarea/Textarea.tsx b/packages/twenty-ui/src/input/Textarea/Textarea.tsx
index 2a45ebe9c50..6a98d5145a7 100644
--- a/packages/twenty-ui/src/input/Textarea/Textarea.tsx
+++ b/packages/twenty-ui/src/input/Textarea/Textarea.tsx
@@ -8,7 +8,7 @@ import {
useRef,
} from 'react';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import { isDefined } from '@ui/utilities/utils/isDefined';
import { formatInlineBlockSize } from './internal/formatInlineBlockSize';
@@ -79,7 +79,7 @@ export const Textarea = ({
ref={mergedRef}
render={render}
value={value}
- className={mergeFieldPartClassName(
+ className={mergeClassNames(
clsx(styles.textarea, styles[size]),
className,
)}
diff --git a/packages/twenty-ui/src/navigation/Tabs/internal/TabsList.tsx b/packages/twenty-ui/src/navigation/Tabs/internal/TabsList.tsx
index aba7aa660bd..09fed23f168 100644
--- a/packages/twenty-ui/src/navigation/Tabs/internal/TabsList.tsx
+++ b/packages/twenty-ui/src/navigation/Tabs/internal/TabsList.tsx
@@ -1,7 +1,7 @@
import { useDirection } from '@base-ui/react/direction-provider';
import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from '../Tabs.module.scss';
import { type TabsListProps } from '../types/TabsListProps';
@@ -36,7 +36,7 @@ export const TabsList = ({
{...props}
loopFocus={loopFocus}
onKeyDown={handleKeyDown}
- className={mergeFieldPartClassName(styles.list, className)}
+ className={mergeClassNames(styles.list, className)}
>
{children}
<TabsPrimitive.Indicator className={styles.indicator} />
diff --git a/packages/twenty-ui/src/navigation/Tabs/internal/TabsPanel.tsx b/packages/twenty-ui/src/navigation/Tabs/internal/TabsPanel.tsx
index 18380496913..fac3f4e13cc 100644
--- a/packages/twenty-ui/src/navigation/Tabs/internal/TabsPanel.tsx
+++ b/packages/twenty-ui/src/navigation/Tabs/internal/TabsPanel.tsx
@@ -1,6 +1,6 @@
import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from '../Tabs.module.scss';
import { type TabsPanelProps } from '../types/TabsPanelProps';
@@ -8,6 +8,6 @@ import { type TabsPanelProps } from '../types/TabsPanelProps';
export const TabsPanel = ({ className, ...props }: TabsPanelProps) => (
<TabsPrimitive.Panel
{...props}
- className={mergeFieldPartClassName(styles.panel, className)}
+ className={mergeClassNames(styles.panel, className)}
/>
);
diff --git a/packages/twenty-ui/src/navigation/Tabs/internal/TabsRoot.tsx b/packages/twenty-ui/src/navigation/Tabs/internal/TabsRoot.tsx
index a8f9848cbbf..916e0305c0d 100644
--- a/packages/twenty-ui/src/navigation/Tabs/internal/TabsRoot.tsx
+++ b/packages/twenty-ui/src/navigation/Tabs/internal/TabsRoot.tsx
@@ -1,6 +1,6 @@
import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from '../Tabs.module.scss';
import { type TabsRootProps } from '../types/TabsRootProps';
@@ -8,6 +8,6 @@ import { type TabsRootProps } from '../types/TabsRootProps';
export const TabsRoot = ({ className, ...props }: TabsRootProps) => (
<TabsPrimitive.Root
{...props}
- className={mergeFieldPartClassName(styles.root, className)}
+ className={mergeClassNames(styles.root, className)}
/>
);
diff --git a/packages/twenty-ui/src/navigation/Tabs/internal/TabsTab.tsx b/packages/twenty-ui/src/navigation/Tabs/internal/TabsTab.tsx
index af9dce04b51..a4be341ca88 100644
--- a/packages/twenty-ui/src/navigation/Tabs/internal/TabsTab.tsx
+++ b/packages/twenty-ui/src/navigation/Tabs/internal/TabsTab.tsx
@@ -1,6 +1,6 @@
import { Tabs as TabsPrimitive } from '@base-ui/react/tabs';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from '../Tabs.module.scss';
import { type TabsTabProps } from '../types/TabsTabProps';
@@ -16,7 +16,7 @@ export const TabsTab = ({
}: TabsTabProps) => (
<TabsPrimitive.Tab
{...props}
- className={mergeFieldPartClassName(styles.tab, className)}
+ className={mergeClassNames(styles.tab, className)}
data-size={size}
>
<span className={styles.content}>
diff --git a/packages/twenty-ui/src/surfaces/Popover/internal/PopoverDescription.tsx b/packages/twenty-ui/src/surfaces/Popover/internal/PopoverDescription.tsx
index 45e33a5b46d..f602baaa8f5 100644
--- a/packages/twenty-ui/src/surfaces/Popover/internal/PopoverDescription.tsx
+++ b/packages/twenty-ui/src/surfaces/Popover/internal/PopoverDescription.tsx
@@ -1,6 +1,6 @@
import { Popover as PopoverPrimitive } from '@base-ui/react/popover';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from '../Popover.module.scss';
import { type PopoverDescriptionProps } from '../types/PopoverDescriptionProps';
@@ -11,6 +11,6 @@ export const PopoverDescription = ({
}: PopoverDescriptionProps) => (
<PopoverPrimitive.Description
{...props}
- className={mergeFieldPartClassName(styles.description, className)}
+ className={mergeClassNames(styles.description, className)}
/>
);
diff --git a/packages/twenty-ui/src/surfaces/Popover/internal/PopoverPopup.tsx b/packages/twenty-ui/src/surfaces/Popover/internal/PopoverPopup.tsx
index e4194d39186..c3955d9d3fe 100644
--- a/packages/twenty-ui/src/surfaces/Popover/internal/PopoverPopup.tsx
+++ b/packages/twenty-ui/src/surfaces/Popover/internal/PopoverPopup.tsx
@@ -1,7 +1,7 @@
import { Popover as PopoverPrimitive } from '@base-ui/react/popover';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
import { useThemeContainer } from '@ui/theme-constants';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from '../Popover.module.scss';
import { type PopoverPopupProps } from '../types/PopoverPopupProps';
@@ -36,7 +36,7 @@ export const PopoverPopup = ({
>
<PopoverPrimitive.Popup
{...props}
- className={mergeFieldPartClassName(styles.popup, className)}
+ className={mergeClassNames(styles.popup, className)}
>
{arrow && <PopoverPrimitive.Arrow className={styles.arrow} />}
{children}
diff --git a/packages/twenty-ui/src/surfaces/Popover/internal/PopoverTitle.tsx b/packages/twenty-ui/src/surfaces/Popover/internal/PopoverTitle.tsx
index dcbe0221aee..d2d3bfb72d9 100644
--- a/packages/twenty-ui/src/surfaces/Popover/internal/PopoverTitle.tsx
+++ b/packages/twenty-ui/src/surfaces/Popover/internal/PopoverTitle.tsx
@@ -1,6 +1,6 @@
import { Popover as PopoverPrimitive } from '@base-ui/react/popover';
-import { mergeFieldPartClassName } from '@ui/input/Field/internal/mergeFieldPartClassName';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import styles from '../Popover.module.scss';
import { type PopoverTitleProps } from '../types/PopoverTitleProps';
@@ -8,6 +8,6 @@ import { type PopoverTitleProps } from '../types/PopoverTitleProps';
export const PopoverTitle = ({ className, ...props }: PopoverTitleProps) => (
<PopoverPrimitive.Title
{...props}
- className={mergeFieldPartClassName(styles.title, className)}
+ className={mergeClassNames(styles.title, className)}
/>
);
diff --git a/packages/twenty-ui/src/utilities/internal/mergeClassNames.ts b/packages/twenty-ui/src/utilities/internal/mergeClassNames.ts
new file mode 100644
index 00000000000..463597df497
--- /dev/null
+++ b/packages/twenty-ui/src/utilities/internal/mergeClassNames.ts
@@ -0,0 +1,18 @@
+import { isFunction } from '@sniptt/guards';
+import { clsx } from 'clsx';
+
+export const mergeClassNames =
+ <TState>(
+ baseClassName: string,
+ consumerClassName:
+ | string
+ | ((state: TState) => string | undefined)
+ | undefined,
+ ) =>
+ (state: TState) =>
+ clsx(
+ baseClassName,
+ isFunction(consumerClassName)
+ ? consumerClassName(state)
+ : consumerClassName,
+ );