From 233bdce408229fbd41c964617e01f8b832c91700 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Mon, 25 May 2026 15:33:02 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9(frontend)=20fix=20circular=20impor?= =?UTF-8?q?ts=20in=20Dialog=20and=20Form=20primitives?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While attempting to lazy-load routes, Vite/Rollup warnings revealed that the Dialog and Form primitives were causing circular imports through their use of the barrel file. Easy to address: when using primitive elements inside those primitives, rely on direct imports instead of the barrel file. --- src/frontend/src/primitives/Dialog.tsx | 5 ++++- src/frontend/src/primitives/Form.tsx | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/primitives/Dialog.tsx b/src/frontend/src/primitives/Dialog.tsx index 4b0cc523..fcddc4c2 100644 --- a/src/frontend/src/primitives/Dialog.tsx +++ b/src/frontend/src/primitives/Dialog.tsx @@ -8,7 +8,10 @@ import { type DialogProps as RACDialogProps, Heading, } from 'react-aria-components' -import { Div, Button, Box, VerticallyOffCenter } from '@/primitives' +import { Div } from './Div' +import { Button } from './Button' +import { Box } from './Box' +import { VerticallyOffCenter } from './VerticallyOffCenter' import { text } from './Text' import { MutableRefObject } from 'react' import { css } from '@/styled-system/css' diff --git a/src/frontend/src/primitives/Form.tsx b/src/frontend/src/primitives/Form.tsx index 3be5a68c..0c87656f 100644 --- a/src/frontend/src/primitives/Form.tsx +++ b/src/frontend/src/primitives/Form.tsx @@ -2,8 +2,8 @@ import { type FormEvent } from 'react' import { Form as RACForm, type FormProps } from 'react-aria-components' import { useTranslation } from 'react-i18next' import { HStack } from '@/styled-system/jsx' -import { Button, useCloseDialog } from '@/primitives' -import { type ButtonProps } from '@/primitives/Button' +import { useCloseDialog } from './useCloseDialog' +import { type ButtonProps, Button } from './Button' /** * From wrapper that exposes form data on submit and adds submit/cancel buttons