From fc8c9d9167a4402c24f956c0dabeb19758c97a0d Mon Sep 17 00:00:00 2001 From: "gitstart-app[bot]" <57568882+gitstart-app[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:36:58 +0100 Subject: [PATCH] Migrate to twenty-ui - input components (#7914) ### Description Migrate Input components: - CardPicker - Radio - RadioGroup - Checkbox - Toggle - IconListViewGrip ### Demo Radio Component on Storybook ![](https://assets-service.gitstart.com/4814/2d0c7436-9fab-4f3d-a5c4-be874e885789.png) Checkbox component on Storybook ![](https://assets-service.gitstart.com/4814/07bcc040-cc92-4c7e-9be8-ca1a5f454993.png) ###### Fixes twentyhq/private-issues#92 Co-authored-by: gitstart-twenty Co-authored-by: Charles Bochet --- .../src/modules/activities/tasks/components/TaskRow.tsx | 8 ++++++-- .../record-board-card/components/RecordBoardCard.tsx | 3 ++- .../components/RecordTableCellCheckbox.tsx | 2 +- .../record-table-cell/components/RecordTableCellGrip.tsx | 2 +- .../components/RecordTableHeaderCheckboxColumn.tsx | 2 +- .../components/SettingsAccountsRadioSettingsCard.tsx | 3 +-- .../modules/settings/components/SettingsRadioCard.tsx | 5 ++--- .../SettingsAvailableStandardObjectItemTableRow.tsx | 3 +-- .../SelectHeaderStep/components/SelectColumn.tsx | 2 +- .../steps/components/SelectSheetStep/SelectSheetStep.tsx | 3 +-- .../components/ValidationStep/components/columns.tsx | 3 +-- .../menu-item/components/MenuItemMultiSelect.tsx | 3 +-- .../menu-item/components/MenuItemMultiSelectAvatar.tsx | 6 ++---- .../menu-item/components/MenuItemMultiSelectTag.tsx | 6 +++--- .../twenty-front/src/pages/onboarding/ChooseYourPlan.tsx | 9 +++++++-- packages/twenty-front/tsup.ui.index.tsx | 3 --- .../ui => twenty-ui/src}/input/components/CardPicker.tsx | 2 +- .../ui => twenty-ui/src}/input/components/Checkbox.tsx | 2 +- .../src}/input/components/IconListViewGrip.tsx | 2 +- .../ui => twenty-ui/src}/input/components/Radio.tsx | 3 +-- .../ui => twenty-ui/src}/input/components/RadioGroup.tsx | 0 .../input/components/__stories__/Checkbox.stories.tsx | 6 +++++- .../src}/input/components/__stories__/Radio.stories.tsx | 6 +++++- .../src}/input/components/list-view-grip.svg | 0 packages/twenty-ui/src/input/index.ts | 5 +++++ .../src/content/twenty-ui/input/checkbox.mdx | 2 +- .../twenty-website/src/content/twenty-ui/input/radio.mdx | 5 ++--- 27 files changed, 53 insertions(+), 43 deletions(-) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/input/components/CardPicker.tsx (95%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/input/components/Checkbox.tsx (98%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/input/components/IconListViewGrip.tsx (81%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/input/components/Radio.tsx (99%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/input/components/RadioGroup.tsx (100%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/input/components/__stories__/Checkbox.stories.tsx (95%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/input/components/__stories__/Radio.stories.tsx (93%) rename packages/{twenty-front/src/modules/ui => twenty-ui/src}/input/components/list-view-grip.svg (100%) diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx index ad46a8a43..90e11ab06 100644 --- a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx +++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx @@ -1,11 +1,15 @@ import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; -import { IconCalendar, OverflowingTextWithTooltip } from 'twenty-ui'; +import { + Checkbox, + CheckboxShape, + IconCalendar, + OverflowingTextWithTooltip, +} from 'twenty-ui'; import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer'; import { ActivityTargetsInlineCell } from '@/activities/inline-cell/components/ActivityTargetsInlineCell'; import { getActivitySummary } from '@/activities/utils/getActivitySummary'; -import { Checkbox, CheckboxShape } from '@/ui/input/components/Checkbox'; import { beautifyExactDate, hasDatePassed } from '~/utils/date-utils'; import { ActivityRow } from '@/activities/components/ActivityRow'; diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx index 648fc221f..8e7e13396 100644 --- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx +++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx @@ -17,7 +17,6 @@ import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/ import { RecordValueSetterEffect } from '@/object-record/record-store/components/RecordValueSetterEffect'; import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox'; import { TextInput } from '@/ui/input/components/TextInput'; import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId'; import { RecordBoardScrollWrapperContext } from '@/ui/utilities/scroll/contexts/ScrollWrapperContexts'; @@ -29,6 +28,8 @@ import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'; import { AnimatedEaseInOut, AvatarChipVariant, + Checkbox, + CheckboxVariant, ChipSize, IconEye, IconEyeOff, diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellCheckbox.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellCheckbox.tsx index 597d38e61..c4c542314 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellCheckbox.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellCheckbox.tsx @@ -4,7 +4,7 @@ import { useCallback, useContext } from 'react'; import { RecordTableRowContext } from '@/object-record/record-table/contexts/RecordTableRowContext'; import { RecordTableTd } from '@/object-record/record-table/record-table-cell/components/RecordTableTd'; import { useSetCurrentRowSelected } from '@/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected'; -import { Checkbox } from '@/ui/input/components/Checkbox'; +import { Checkbox } from 'twenty-ui'; const StyledContainer = styled.div` align-items: center; diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellGrip.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellGrip.tsx index 563646604..d77131dd3 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellGrip.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellGrip.tsx @@ -3,7 +3,7 @@ import { useContext } from 'react'; import { RecordTableRowContext } from '@/object-record/record-table/contexts/RecordTableRowContext'; import { RecordTableTd } from '@/object-record/record-table/record-table-cell/components/RecordTableTd'; -import { IconListViewGrip } from '@/ui/input/components/IconListViewGrip'; +import { IconListViewGrip } from 'twenty-ui'; const StyledContainer = styled.div` cursor: grab; diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx index 912789351..3a053fe92 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx @@ -3,7 +3,7 @@ import { useRecoilValue } from 'recoil'; import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates'; import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable'; -import { Checkbox } from '@/ui/input/components/Checkbox'; +import { Checkbox } from 'twenty-ui'; const StyledContainer = styled.div` align-items: center; diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx index 81c8a6629..02e850363 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx @@ -1,8 +1,7 @@ import styled from '@emotion/styled'; import { ReactNode } from 'react'; -import { Radio } from '@/ui/input/components/Radio'; -import { Card, CardContent } from 'twenty-ui'; +import { Card, CardContent, Radio } from 'twenty-ui'; type SettingsAccountsRadioSettingsCardProps