diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx index 5e412dffc..9064cf9bf 100644 --- a/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx +++ b/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx @@ -1,7 +1,6 @@ import styled from '@emotion/styled'; -import { CircularProgressBar } from '@/ui/feedback/progress-bar/components/CircularProgressBar'; -import { MainButton } from 'twenty-ui'; +import { CircularProgressBar, MainButton } from 'twenty-ui'; import { Modal } from '@/ui/layout/modal/components/Modal'; import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull'; diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx index c3bdf3a5d..e8c3d52df 100644 --- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx +++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SpreadsheetImportStepper.tsx @@ -3,10 +3,10 @@ import styled from '@emotion/styled'; import { useCallback, useState } from 'react'; import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal'; -import { CircularProgressBar } from '@/ui/feedback/progress-bar/components/CircularProgressBar'; import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; import { Modal } from '@/ui/layout/modal/components/Modal'; +import { CircularProgressBar } from 'twenty-ui'; import { SpreadsheetImportStep } from '@/spreadsheet-import/steps/types/SpreadsheetImportStep'; import { SpreadsheetImportStepType } from '@/spreadsheet-import/steps/types/SpreadsheetImportStepType'; diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx index 2ee43e5f2..74be88cd8 100644 --- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx +++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx @@ -10,10 +10,10 @@ import { LightButton, LightIconButton, MOBILE_VIEWPORT, + ProgressBar, + useProgressAnimation, } from 'twenty-ui'; -import { ProgressBar } from '@/ui/feedback/progress-bar/components/ProgressBar'; -import { useProgressAnimation } from '@/ui/feedback/progress-bar/hooks/useProgressAnimation'; import { isDefined } from '~/utils/isDefined'; export enum SnackBarVariant { diff --git a/packages/twenty-front/tsup.ui.index.tsx b/packages/twenty-front/tsup.ui.index.tsx index cc6e700dd..b4f76b615 100644 --- a/packages/twenty-front/tsup.ui.index.tsx +++ b/packages/twenty-front/tsup.ui.index.tsx @@ -2,8 +2,7 @@ import { ThemeType } from 'twenty-ui'; export { ThemeProvider } from '@emotion/react'; export * from 'twenty-ui'; -export * from './src/modules/ui/feedback/progress-bar/components/CircularProgressBar'; -export * from './src/modules/ui/feedback/progress-bar/components/ProgressBar'; + export * from './src/modules/ui/input/components/AutosizeTextInput'; export * from './src/modules/ui/input/components/Checkbox'; export * from './src/modules/ui/input/components/EntityTitleDoubleTextInput'; diff --git a/packages/twenty-ui/src/feedback/index.ts b/packages/twenty-ui/src/feedback/index.ts new file mode 100644 index 000000000..dd4bb7739 --- /dev/null +++ b/packages/twenty-ui/src/feedback/index.ts @@ -0,0 +1,3 @@ +export * from './progress-bar/components/CircularProgressBar'; +export * from './progress-bar/components/ProgressBar'; +export * from './progress-bar/hooks/useProgressAnimation'; diff --git a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/CircularProgressBar.tsx b/packages/twenty-ui/src/feedback/progress-bar/components/CircularProgressBar.tsx similarity index 100% rename from packages/twenty-front/src/modules/ui/feedback/progress-bar/components/CircularProgressBar.tsx rename to packages/twenty-ui/src/feedback/progress-bar/components/CircularProgressBar.tsx diff --git a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/ProgressBar.tsx b/packages/twenty-ui/src/feedback/progress-bar/components/ProgressBar.tsx similarity index 100% rename from packages/twenty-front/src/modules/ui/feedback/progress-bar/components/ProgressBar.tsx rename to packages/twenty-ui/src/feedback/progress-bar/components/ProgressBar.tsx diff --git a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx b/packages/twenty-ui/src/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx similarity index 90% rename from packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx rename to packages/twenty-ui/src/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx index ee7a22e4c..08cd38e64 100644 --- a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx +++ b/packages/twenty-ui/src/feedback/progress-bar/components/__stories__/CircularProgressBar.stories.tsx @@ -1,7 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import { CatalogDecorator, CatalogStory, ComponentDecorator } from 'twenty-ui'; +import { CatalogDecorator, CatalogStory } from '@ui/testing'; import { CircularProgressBar } from '../CircularProgressBar'; +import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator'; const meta: Meta = { title: 'UI/Feedback/CircularProgressBar/CircularProgressBar', diff --git a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx b/packages/twenty-ui/src/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx similarity index 84% rename from packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx rename to packages/twenty-ui/src/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx index 1655518de..5319d94ea 100644 --- a/packages/twenty-front/src/modules/ui/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx +++ b/packages/twenty-ui/src/feedback/progress-bar/components/__stories__/ProgressBar.stories.tsx @@ -1,9 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; -import { ComponentDecorator } from 'twenty-ui'; - -import { useProgressAnimation } from '@/ui/feedback/progress-bar/hooks/useProgressAnimation'; - import { ProgressBar } from '../ProgressBar'; +import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator'; +import { useProgressAnimation } from '@ui/feedback/progress-bar/hooks/useProgressAnimation'; const meta: Meta = { title: 'UI/Feedback/ProgressBar/ProgressBar', diff --git a/packages/twenty-front/src/modules/ui/feedback/progress-bar/hooks/useProgressAnimation.ts b/packages/twenty-ui/src/feedback/progress-bar/hooks/useProgressAnimation.ts similarity index 96% rename from packages/twenty-front/src/modules/ui/feedback/progress-bar/hooks/useProgressAnimation.ts rename to packages/twenty-ui/src/feedback/progress-bar/hooks/useProgressAnimation.ts index 9c09f6107..be0ed3777 100644 --- a/packages/twenty-front/src/modules/ui/feedback/progress-bar/hooks/useProgressAnimation.ts +++ b/packages/twenty-ui/src/feedback/progress-bar/hooks/useProgressAnimation.ts @@ -6,7 +6,7 @@ import { ValueAnimationTransition, } from 'framer-motion'; -import { isDefined } from '~/utils/isDefined'; +import { isDefined } from '@ui/utilities'; export const useProgressAnimation = ({ autoPlay = true, diff --git a/packages/twenty-ui/src/index.ts b/packages/twenty-ui/src/index.ts index a05da5861..58024c5a0 100644 --- a/packages/twenty-ui/src/index.ts +++ b/packages/twenty-ui/src/index.ts @@ -2,6 +2,7 @@ export * from './accessibility'; export * from './components'; export * from './display'; export * from './input'; +export * from './feedback'; export * from './layout'; export * from './navigation'; export * from './testing'; diff --git a/packages/twenty-website/src/content/twenty-ui/progress-bar.mdx b/packages/twenty-website/src/content/twenty-ui/progress-bar.mdx index 143adcae3..549a763eb 100644 --- a/packages/twenty-website/src/content/twenty-ui/progress-bar.mdx +++ b/packages/twenty-website/src/content/twenty-ui/progress-bar.mdx @@ -10,7 +10,7 @@ Indicates progress or countdown and moves from right to left. - { return (