diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx index 2366f5ab7344..54f1dfcdb7c5 100644 --- a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx @@ -1,10 +1,10 @@ import styled from '@emotion/styled'; -import { Fragment } from 'react'; +import { CSSProperties, Fragment } from 'react'; import { Link } from 'react-router-dom'; type BreadcrumbProps = { className?: string; - links: { children: string; href?: string }[]; + links: { children: string; href?: string; styles?: CSSProperties }[]; }; const StyledWrapper = styled.nav` @@ -39,11 +39,13 @@ export const Breadcrumb = ({ className, links }: BreadcrumbProps) => ( {links.map((link, index) => ( {link.href ? ( - + {link.children} ) : ( - {link.children} + + {link.children} + )} {index < links.length - 1 && '/'} diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx index 80633976871a..a1ef582aaef3 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx @@ -8,7 +8,12 @@ import styled from '@emotion/styled'; import { isNonEmptyString } from '@sniptt/guards'; import { Link, useNavigate } from 'react-router-dom'; import { useSetRecoilState } from 'recoil'; -import { IconComponent, MOBILE_VIEWPORT, Pill } from 'twenty-ui'; +import { + IconComponent, + MOBILE_VIEWPORT, + Pill, + TablerIconsProps, +} from 'twenty-ui'; import { isDefined } from '~/utils/isDefined'; const DEFAULT_INDENTATION_LEVEL = 1; @@ -22,7 +27,7 @@ export type NavigationDrawerItemProps = { subItemState?: NavigationDrawerSubItemState; to?: string; onClick?: () => void; - Icon: IconComponent; + Icon: IconComponent | ((props: TablerIconsProps) => JSX.Element); active?: boolean; danger?: boolean; soon?: boolean; @@ -185,7 +190,11 @@ export const NavigationDrawerItem = ({ )} {Icon && ( - + )} {label} {soon && } diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx index 8453e6837f73..d20bb8260183 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx @@ -176,10 +176,15 @@ export const SettingsObjectFieldEdit = () => { title={ {