diff --git a/front/src/modules/activities/components/ActivityEditor.tsx b/front/src/modules/activities/components/ActivityEditor.tsx index 9ff3ae3bf..e2f6bd6b8 100644 --- a/front/src/modules/activities/components/ActivityEditor.tsx +++ b/front/src/modules/activities/components/ActivityEditor.tsx @@ -7,7 +7,7 @@ import { ActivityBodyEditor } from '@/activities/components/ActivityBodyEditor'; import { ActivityComments } from '@/activities/components/ActivityComments'; import { ActivityTypeDropdown } from '@/activities/components/ActivityTypeDropdown'; import { GET_ACTIVITIES } from '@/activities/graphql/queries/getActivities'; -import { PropertyBox } from '@/ui/editable-field/property-box/components/PropertyBox'; +import { PropertyBox } from '@/ui/inline-cell/property-box/components/PropertyBox'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { diff --git a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx index a50f9fc10..a9dbbc25d 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx @@ -1,9 +1,9 @@ -import { InlineCell } from '@/ui/editable-field/components/InlineCell'; -import { EditableFieldHotkeyScope } from '@/ui/editable-field/types/EditableFieldHotkeyScope'; import { FieldContext } from '@/ui/field/contexts/FieldContext'; import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; import { FieldRelationMetadata } from '@/ui/field/types/FieldMetadata'; import { IconUserCircle } from '@/ui/icon'; +import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; +import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect'; import { Company, User, useUpdateActivityMutation } from '~/generated/graphql'; @@ -30,7 +30,7 @@ export const ActivityAssigneeEditableField = ({ activity }: OwnProps) => { }, } satisfies FieldDefinition, useUpdateEntityMutation: useUpdateActivityMutation, - hotkeyScope: EditableFieldHotkeyScope.EditableField, + hotkeyScope: InlineCellHotkeyScope.InlineCell, }} > diff --git a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx index 1087607dd..25d0ee79a 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; import { ActivityAssigneePicker } from '@/activities/components/ActivityAssigneePicker'; -import { useInlineCell } from '@/ui/editable-field/hooks/useInlineCell'; +import { useInlineCell } from '@/ui/inline-cell/hooks/useInlineCell'; import { Activity, User } from '~/generated/graphql'; const StyledContainer = styled.div` diff --git a/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx b/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx index 23758e390..c05eb579a 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx @@ -1,9 +1,9 @@ -import { InlineCell } from '@/ui/editable-field/components/InlineCell'; -import { EditableFieldHotkeyScope } from '@/ui/editable-field/types/EditableFieldHotkeyScope'; import { FieldContext } from '@/ui/field/contexts/FieldContext'; import { FieldDefinition } from '@/ui/field/types/FieldDefinition'; import { FieldDateMetadata } from '@/ui/field/types/FieldMetadata'; import { IconCalendar } from '@/ui/icon/index'; +import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; +import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { useUpdateActivityMutation } from '~/generated/graphql'; @@ -28,7 +28,7 @@ export const ActivityEditorDateField = ({ activityId }: OwnProps) => { }, } satisfies FieldDefinition, useUpdateEntityMutation: useUpdateActivityMutation, - hotkeyScope: EditableFieldHotkeyScope.EditableField, + hotkeyScope: InlineCellHotkeyScope.InlineCell, }} > diff --git a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx index d0e4fa589..aecd55dd7 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx @@ -1,7 +1,7 @@ import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips'; -import { InlineCellContainer } from '@/ui/editable-field/components/InlineCellContainer'; -import { FieldRecoilScopeContext } from '@/ui/editable-field/states/recoil-scope-contexts/FieldRecoilScopeContext'; import { IconArrowUpRight } from '@/ui/icon'; +import { InlineCellContainer } from '@/ui/inline-cell/components/InlineCellContainer'; +import { FieldRecoilScopeContext } from '@/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { Activity, ActivityTarget, Company, Person } from '~/generated/graphql'; diff --git a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx index d03a7996e..c35b694c7 100644 --- a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx +++ b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx @@ -5,7 +5,7 @@ import { useHandleCheckableActivityTargetChange } from '@/activities/hooks/useHa import { flatMapAndSortEntityForSelectArrayOfArrayByName } from '@/activities/utils/flatMapAndSortEntityForSelectArrayByName'; import { useFilteredSearchCompanyQuery } from '@/companies/hooks/useFilteredSearchCompanyQuery'; import { useFilteredSearchPeopleQuery } from '@/people/hooks/useFilteredSearchPeopleQuery'; -import { useInlineCell } from '@/ui/editable-field/hooks/useInlineCell'; +import { useInlineCell } from '@/ui/inline-cell/hooks/useInlineCell'; import { MultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect'; import { Activity, ActivityTarget } from '~/generated/graphql'; import { assertNotNull } from '~/utils/assert'; diff --git a/front/src/modules/companies/components/CompanyBoardCard.tsx b/front/src/modules/companies/components/CompanyBoardCard.tsx index a8011ea0f..bcfd91532 100644 --- a/front/src/modules/companies/components/CompanyBoardCard.tsx +++ b/front/src/modules/companies/components/CompanyBoardCard.tsx @@ -7,9 +7,9 @@ import { useBoardContext } from '@/ui/board/hooks/useBoardContext'; import { useCurrentCardSelected } from '@/ui/board/hooks/useCurrentCardSelected'; import { visibleBoardCardFieldsScopedSelector } from '@/ui/board/states/selectors/visibleBoardCardFieldsScopedSelector'; import { EntityChipVariant } from '@/ui/chip/components/EntityChip'; -import { InlineCell } from '@/ui/editable-field/components/InlineCell'; -import { EditableFieldHotkeyScope } from '@/ui/editable-field/types/EditableFieldHotkeyScope'; import { FieldContext } from '@/ui/field/contexts/FieldContext'; +import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; +import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox'; import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue'; import { useUpdateOnePipelineProgressMutation } from '~/generated/graphql'; @@ -172,7 +172,7 @@ export const CompanyBoardCard = () => { useEditButton: viewField.useEditButton, }, useUpdateEntityMutation: useUpdateOnePipelineProgressMutation, - hotkeyScope: EditableFieldHotkeyScope.EditableField, + hotkeyScope: InlineCellHotkeyScope.InlineCell, }} > diff --git a/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx b/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx index 9964b417e..6e5f25056 100644 --- a/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx +++ b/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import styled from '@emotion/styled'; -import { FieldRecoilScopeContext } from '@/ui/editable-field/states/recoil-scope-contexts/FieldRecoilScopeContext'; +import { FieldRecoilScopeContext } from '@/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { Company, useUpdateOneCompanyMutation } from '~/generated/graphql'; diff --git a/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx b/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx index 60531b6f9..3bf24401a 100644 --- a/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx +++ b/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { FieldRecoilScopeContext } from '@/ui/editable-field/states/recoil-scope-contexts/FieldRecoilScopeContext'; +import { FieldRecoilScopeContext } from '@/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext'; import { EntityTitleDoubleTextInput } from '@/ui/input/components/EntityTitleDoubleTextInput'; import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; import { Person, useUpdateOnePersonMutation } from '~/generated/graphql'; diff --git a/front/src/modules/ui/editable-field/contexts/EditableFieldMutationContext.ts b/front/src/modules/ui/editable-field/contexts/EditableFieldMutationContext.ts deleted file mode 100644 index 6d7b54992..000000000 --- a/front/src/modules/ui/editable-field/contexts/EditableFieldMutationContext.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { createContext } from 'react'; - -export const EditableFieldMutationContext = createContext(undefined); diff --git a/front/src/modules/ui/editable-field/types/EditableFieldHotkeyScope.ts b/front/src/modules/ui/editable-field/types/EditableFieldHotkeyScope.ts deleted file mode 100644 index 309495c8f..000000000 --- a/front/src/modules/ui/editable-field/types/EditableFieldHotkeyScope.ts +++ /dev/null @@ -1,3 +0,0 @@ -export enum EditableFieldHotkeyScope { - EditableField = 'editable-field', -} diff --git a/front/src/modules/ui/editable-field/variants/components/DateEditableField.tsx b/front/src/modules/ui/editable-field/variants/components/DateEditableField.tsx deleted file mode 100644 index e0556c09a..000000000 --- a/front/src/modules/ui/editable-field/variants/components/DateEditableField.tsx +++ /dev/null @@ -1,50 +0,0 @@ -import { InlineCellContainer } from '@/ui/editable-field/components/InlineCellContainer'; -import { FieldRecoilScopeContext } from '@/ui/editable-field/states/recoil-scope-contexts/FieldRecoilScopeContext'; -import { DateDisplay } from '@/ui/field/meta-types/display/content-display/components/DateDisplay'; -import { IconComponent } from '@/ui/icon/types/IconComponent'; -import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope'; -import { parseDate } from '~/utils/date-utils'; - -import { EditableFieldEditModeDate } from './EditableFieldEditModeDate'; - -type OwnProps = { - Icon?: IconComponent; - label?: string; - value: string | null | undefined; - onSubmit?: (newValue: string) => void; - hotkeyScope: string; -}; - -export const DateEditableField = ({ - Icon, - value, - label, - onSubmit, - hotkeyScope, -}: OwnProps) => { - const handleChange = async (newValue: string) => { - onSubmit?.(newValue); - }; - - const internalDateValue = value ? parseDate(value).toJSDate() : null; - - return ( - - { - handleChange(newValue); - }} - parentHotkeyScope={hotkeyScope} - /> - } - displayModeContent={} - isDisplayModeContentEmpty={!value} - /> - - ); -}; diff --git a/front/src/modules/ui/editable-field/variants/components/EditableFieldEditModeDate.tsx b/front/src/modules/ui/editable-field/variants/components/EditableFieldEditModeDate.tsx deleted file mode 100644 index 054e29066..000000000 --- a/front/src/modules/ui/editable-field/variants/components/EditableFieldEditModeDate.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { useEffect, useState } from 'react'; - -import { DateInput } from '@/ui/input/components/DateInput'; -import { Nullable } from '~/types/Nullable'; -import { parseDate } from '~/utils/date-utils'; - -import { useInlineCell } from '../../hooks/useInlineCell'; - -type OwnProps = { - value: string; - onChange?: (newValue: string) => void; - parentHotkeyScope: string; -}; - -// TODO: refactor this component to use the same logic as the GenericDateField component -export const EditableFieldEditModeDate = ({ - value, - onChange, - parentHotkeyScope, -}: OwnProps) => { - const [internalValue, setInternalValue] = useState(value); - - useEffect(() => { - setInternalValue(value); - }, [value]); - - const { closeInlineCell: closeEditableField } = useInlineCell(); - - const handleClickOutside = () => { - closeEditableField(); - }; - - const handleEnter = (newValue: Nullable) => { - onChange?.(newValue?.toISOString() ?? ''); - closeEditableField(); - }; - - const handleEscape = () => { - closeEditableField(); - }; - - return ( - - ); -}; diff --git a/front/src/modules/ui/editable-field/variants/components/__stories__/DateEditableField.stories.tsx b/front/src/modules/ui/editable-field/variants/components/__stories__/DateEditableField.stories.tsx deleted file mode 100644 index c990abcd0..000000000 --- a/front/src/modules/ui/editable-field/variants/components/__stories__/DateEditableField.stories.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import { Meta, StoryObj } from '@storybook/react'; - -import { IconCalendar } from '@/ui/icon'; -import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator'; - -import { DateEditableField } from '../DateEditableField'; - -const meta: Meta = { - title: 'UI/EditableField/DateEditableField', - component: DateEditableField, - decorators: [ComponentDecorator], - argTypes: { - Icon: { - type: 'boolean', - mapping: { - true: IconCalendar, - false: undefined, - }, - }, - value: { control: { type: 'date' } }, - }, - args: { - value: new Date().toISOString(), - Icon: IconCalendar, - }, -}; - -export default meta; -type Story = StoryObj; - -export const Default: Story = {}; diff --git a/front/src/modules/ui/editable-field/components/InlineCell.tsx b/front/src/modules/ui/inline-cell/components/InlineCell.tsx similarity index 100% rename from front/src/modules/ui/editable-field/components/InlineCell.tsx rename to front/src/modules/ui/inline-cell/components/InlineCell.tsx diff --git a/front/src/modules/ui/editable-field/components/InlineCellContainer.tsx b/front/src/modules/ui/inline-cell/components/InlineCellContainer.tsx similarity index 100% rename from front/src/modules/ui/editable-field/components/InlineCellContainer.tsx rename to front/src/modules/ui/inline-cell/components/InlineCellContainer.tsx diff --git a/front/src/modules/ui/editable-field/components/InlineCellDisplayMode.tsx b/front/src/modules/ui/inline-cell/components/InlineCellDisplayMode.tsx similarity index 84% rename from front/src/modules/ui/editable-field/components/InlineCellDisplayMode.tsx rename to front/src/modules/ui/inline-cell/components/InlineCellDisplayMode.tsx index 8ee759151..c9c469922 100644 --- a/front/src/modules/ui/editable-field/components/InlineCellDisplayMode.tsx +++ b/front/src/modules/ui/inline-cell/components/InlineCellDisplayMode.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import styled from '@emotion/styled'; -const StyledEditableFieldNormalModeOuterContainer = styled.div< +const StyledInlineCellNormalModeOuterContainer = styled.div< Pick< OwnProps, | 'isDisplayModeContentEmpty' @@ -32,7 +32,7 @@ const StyledEditableFieldNormalModeOuterContainer = styled.div< }} `; -const StyledEditableFieldNormalModeInnerContainer = styled.div` +const StyledInlineCellNormalModeInnerContainer = styled.div` align-items: center; color: ${({ theme }) => theme.font.color.primary}; font-size: 'inherit'; @@ -64,18 +64,18 @@ export const InlineCellDisplayMode = ({ isDisplayModeFixHeight, isHovered, }: React.PropsWithChildren) => ( - - + {isDisplayModeContentEmpty || !children ? ( {'Empty'} ) : ( children )} - - + + ); diff --git a/front/src/modules/ui/editable-field/components/InlineCellEditButton.tsx b/front/src/modules/ui/inline-cell/components/InlineCellEditButton.tsx similarity index 100% rename from front/src/modules/ui/editable-field/components/InlineCellEditButton.tsx rename to front/src/modules/ui/inline-cell/components/InlineCellEditButton.tsx diff --git a/front/src/modules/ui/editable-field/components/InlineCellEditMode.tsx b/front/src/modules/ui/inline-cell/components/InlineCellEditMode.tsx similarity index 100% rename from front/src/modules/ui/editable-field/components/InlineCellEditMode.tsx rename to front/src/modules/ui/inline-cell/components/InlineCellEditMode.tsx diff --git a/front/src/modules/ui/inline-cell/contexts/InlineCellMutationContext.ts b/front/src/modules/ui/inline-cell/contexts/InlineCellMutationContext.ts new file mode 100644 index 000000000..1505d6cea --- /dev/null +++ b/front/src/modules/ui/inline-cell/contexts/InlineCellMutationContext.ts @@ -0,0 +1,3 @@ +import { createContext } from 'react'; + +export const InlineCellMutationContext = createContext(undefined); diff --git a/front/src/modules/ui/editable-field/hooks/useInlineCell.ts b/front/src/modules/ui/inline-cell/hooks/useInlineCell.ts similarity index 87% rename from front/src/modules/ui/editable-field/hooks/useInlineCell.ts rename to front/src/modules/ui/inline-cell/hooks/useInlineCell.ts index 16f09950a..336d36db5 100644 --- a/front/src/modules/ui/editable-field/hooks/useInlineCell.ts +++ b/front/src/modules/ui/inline-cell/hooks/useInlineCell.ts @@ -6,7 +6,7 @@ import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousH import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope'; import { isInlineCellInEditModeScopedState } from '../states/isInlineCellInEditModeScopedState'; -import { EditableFieldHotkeyScope } from '../types/EditableFieldHotkeyScope'; +import { InlineCellHotkeyScope } from '../types/InlineCellHotkeyScope'; export const useInlineCell = () => { const { recoilScopeId } = useContext(FieldContext); @@ -35,9 +35,7 @@ export const useInlineCell = () => { customEditHotkeyScopeForField.customScopes, ); } else { - setHotkeyScopeAndMemorizePreviousScope( - EditableFieldHotkeyScope.EditableField, - ); + setHotkeyScopeAndMemorizePreviousScope(InlineCellHotkeyScope.InlineCell); } }; diff --git a/front/src/modules/ui/editable-field/property-box/components/PropertyBox.tsx b/front/src/modules/ui/inline-cell/property-box/components/PropertyBox.tsx similarity index 100% rename from front/src/modules/ui/editable-field/property-box/components/PropertyBox.tsx rename to front/src/modules/ui/inline-cell/property-box/components/PropertyBox.tsx diff --git a/front/src/modules/ui/editable-field/states/customEditHotkeyScopeForFieldScopedState.ts b/front/src/modules/ui/inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts similarity index 100% rename from front/src/modules/ui/editable-field/states/customEditHotkeyScopeForFieldScopedState.ts rename to front/src/modules/ui/inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts diff --git a/front/src/modules/ui/editable-field/states/isInlineCellInEditModeScopedState.ts b/front/src/modules/ui/inline-cell/states/isInlineCellInEditModeScopedState.ts similarity index 100% rename from front/src/modules/ui/editable-field/states/isInlineCellInEditModeScopedState.ts rename to front/src/modules/ui/inline-cell/states/isInlineCellInEditModeScopedState.ts diff --git a/front/src/modules/ui/editable-field/states/parentHotkeyScopeForFieldScopedState.ts b/front/src/modules/ui/inline-cell/states/parentHotkeyScopeForFieldScopedState.ts similarity index 100% rename from front/src/modules/ui/editable-field/states/parentHotkeyScopeForFieldScopedState.ts rename to front/src/modules/ui/inline-cell/states/parentHotkeyScopeForFieldScopedState.ts diff --git a/front/src/modules/ui/editable-field/states/recoil-scope-contexts/FieldRecoilScopeContext.ts b/front/src/modules/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts similarity index 100% rename from front/src/modules/ui/editable-field/states/recoil-scope-contexts/FieldRecoilScopeContext.ts rename to front/src/modules/ui/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts diff --git a/front/src/modules/ui/inline-cell/types/InlineCellHotkeyScope.ts b/front/src/modules/ui/inline-cell/types/InlineCellHotkeyScope.ts new file mode 100644 index 000000000..7f1b5ed10 --- /dev/null +++ b/front/src/modules/ui/inline-cell/types/InlineCellHotkeyScope.ts @@ -0,0 +1,3 @@ +export enum InlineCellHotkeyScope { + InlineCell = 'inline-cell', +} diff --git a/front/src/modules/ui/table/components/EntityTableCell.tsx b/front/src/modules/ui/table/components/EntityTableCell.tsx index 031590d2e..0d8009b6a 100644 --- a/front/src/modules/ui/table/components/EntityTableCell.tsx +++ b/front/src/modules/ui/table/components/EntityTableCell.tsx @@ -12,8 +12,8 @@ import { ColumnContext } from '../contexts/ColumnContext'; import { ColumnIndexContext } from '../contexts/ColumnIndexContext'; import { EntityUpdateMutationContext } from '../contexts/EntityUpdateMutationHookContext'; import { RowIdContext } from '../contexts/RowIdContext'; -import { TableCell } from '../editable-cell/components/TableCell'; import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected'; +import { TableCell } from '../table-cell/components/TableCell'; import { TableHotkeyScope } from '../types/TableHotkeyScope'; export const EntityTableCell = ({ cellIndex }: { cellIndex: number }) => { diff --git a/front/src/modules/ui/table/hooks/useCellInputEventHandlers.ts b/front/src/modules/ui/table/hooks/useCellInputEventHandlers.ts index 92d8fbf82..f733a357b 100644 --- a/front/src/modules/ui/table/hooks/useCellInputEventHandlers.ts +++ b/front/src/modules/ui/table/hooks/useCellInputEventHandlers.ts @@ -1,5 +1,5 @@ -import { useCurrentTableCellEditMode } from '../editable-cell/hooks/useCurrentTableCellEditMode'; -import { useTableCell } from '../editable-cell/hooks/useTableCell'; +import { useCurrentTableCellEditMode } from '../table-cell/hooks/useCurrentTableCellEditMode'; +import { useTableCell } from '../table-cell/hooks/useTableCell'; import { useMoveSoftFocus } from './useMoveSoftFocus'; diff --git a/front/src/modules/ui/table/editable-cell/components/TableCell.tsx b/front/src/modules/ui/table/table-cell/components/TableCell.tsx similarity index 100% rename from front/src/modules/ui/table/editable-cell/components/TableCell.tsx rename to front/src/modules/ui/table/table-cell/components/TableCell.tsx diff --git a/front/src/modules/ui/table/editable-cell/components/TableCellContainer.tsx b/front/src/modules/ui/table/table-cell/components/TableCellContainer.tsx similarity index 100% rename from front/src/modules/ui/table/editable-cell/components/TableCellContainer.tsx rename to front/src/modules/ui/table/table-cell/components/TableCellContainer.tsx diff --git a/front/src/modules/ui/table/editable-cell/components/TableCellDisplayContainer.tsx b/front/src/modules/ui/table/table-cell/components/TableCellDisplayContainer.tsx similarity index 100% rename from front/src/modules/ui/table/editable-cell/components/TableCellDisplayContainer.tsx rename to front/src/modules/ui/table/table-cell/components/TableCellDisplayContainer.tsx diff --git a/front/src/modules/ui/table/editable-cell/components/TableCellDisplayMode.tsx b/front/src/modules/ui/table/table-cell/components/TableCellDisplayMode.tsx similarity index 100% rename from front/src/modules/ui/table/editable-cell/components/TableCellDisplayMode.tsx rename to front/src/modules/ui/table/table-cell/components/TableCellDisplayMode.tsx diff --git a/front/src/modules/ui/table/editable-cell/components/TableCellEditButton.tsx b/front/src/modules/ui/table/table-cell/components/TableCellEditButton.tsx similarity index 100% rename from front/src/modules/ui/table/editable-cell/components/TableCellEditButton.tsx rename to front/src/modules/ui/table/table-cell/components/TableCellEditButton.tsx diff --git a/front/src/modules/ui/table/editable-cell/components/TableCellEditMode.tsx b/front/src/modules/ui/table/table-cell/components/TableCellEditMode.tsx similarity index 100% rename from front/src/modules/ui/table/editable-cell/components/TableCellEditMode.tsx rename to front/src/modules/ui/table/table-cell/components/TableCellEditMode.tsx diff --git a/front/src/modules/ui/table/editable-cell/components/TableCellSoftFocusMode.tsx b/front/src/modules/ui/table/table-cell/components/TableCellSoftFocusMode.tsx similarity index 100% rename from front/src/modules/ui/table/editable-cell/components/TableCellSoftFocusMode.tsx rename to front/src/modules/ui/table/table-cell/components/TableCellSoftFocusMode.tsx diff --git a/front/src/modules/ui/table/editable-cell/hooks/useCurrentCellPosition.ts b/front/src/modules/ui/table/table-cell/hooks/useCurrentCellPosition.ts similarity index 100% rename from front/src/modules/ui/table/editable-cell/hooks/useCurrentCellPosition.ts rename to front/src/modules/ui/table/table-cell/hooks/useCurrentCellPosition.ts diff --git a/front/src/modules/ui/table/editable-cell/hooks/useCurrentTableCellEditMode.ts b/front/src/modules/ui/table/table-cell/hooks/useCurrentTableCellEditMode.ts similarity index 100% rename from front/src/modules/ui/table/editable-cell/hooks/useCurrentTableCellEditMode.ts rename to front/src/modules/ui/table/table-cell/hooks/useCurrentTableCellEditMode.ts diff --git a/front/src/modules/ui/table/editable-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts b/front/src/modules/ui/table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts similarity index 100% rename from front/src/modules/ui/table/editable-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts rename to front/src/modules/ui/table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts diff --git a/front/src/modules/ui/table/editable-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts b/front/src/modules/ui/table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts similarity index 100% rename from front/src/modules/ui/table/editable-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts rename to front/src/modules/ui/table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts diff --git a/front/src/modules/ui/table/editable-cell/hooks/useTableCell.ts b/front/src/modules/ui/table/table-cell/hooks/useTableCell.ts similarity index 100% rename from front/src/modules/ui/table/editable-cell/hooks/useTableCell.ts rename to front/src/modules/ui/table/table-cell/hooks/useTableCell.ts diff --git a/front/src/modules/ui/table/editable-cell/states/isCreateModeScopedState.ts b/front/src/modules/ui/table/table-cell/states/isCreateModeScopedState.ts similarity index 100% rename from front/src/modules/ui/table/editable-cell/states/isCreateModeScopedState.ts rename to front/src/modules/ui/table/table-cell/states/isCreateModeScopedState.ts diff --git a/front/src/pages/companies/CompanyShow.tsx b/front/src/pages/companies/CompanyShow.tsx index adb4d47e6..1b3d65742 100644 --- a/front/src/pages/companies/CompanyShow.tsx +++ b/front/src/pages/companies/CompanyShow.tsx @@ -7,11 +7,11 @@ import { useCompanyQuery } from '@/companies/hooks/useCompanyQuery'; import { useFavorites } from '@/favorites/hooks/useFavorites'; import { AppPath } from '@/types/AppPath'; import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext'; -import { InlineCell } from '@/ui/editable-field/components/InlineCell'; -import { PropertyBox } from '@/ui/editable-field/property-box/components/PropertyBox'; -import { EditableFieldHotkeyScope } from '@/ui/editable-field/types/EditableFieldHotkeyScope'; import { FieldContext } from '@/ui/field/contexts/FieldContext'; import { IconBuildingSkyscraper } from '@/ui/icon'; +import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; +import { PropertyBox } from '@/ui/inline-cell/property-box/components/PropertyBox'; +import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; import { PageBody } from '@/ui/layout/components/PageBody'; import { PageContainer } from '@/ui/layout/components/PageContainer'; import { PageFavoriteButton } from '@/ui/layout/components/PageFavoriteButton'; @@ -102,7 +102,7 @@ export const CompanyShow = () => { recoilScopeId: company.id + fieldDefinition.key, fieldDefinition, useUpdateEntityMutation: useUpdateOneCompanyMutation, - hotkeyScope: EditableFieldHotkeyScope.EditableField, + hotkeyScope: InlineCellHotkeyScope.InlineCell, }} > diff --git a/front/src/pages/people/PersonShow.tsx b/front/src/pages/people/PersonShow.tsx index 317d8b5ed..a782c8759 100644 --- a/front/src/pages/people/PersonShow.tsx +++ b/front/src/pages/people/PersonShow.tsx @@ -8,11 +8,11 @@ import { GET_PERSON } from '@/people/graphql/queries/getPerson'; import { usePersonQuery } from '@/people/hooks/usePersonQuery'; import { AppPath } from '@/types/AppPath'; import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext'; -import { InlineCell } from '@/ui/editable-field/components/InlineCell'; -import { PropertyBox } from '@/ui/editable-field/property-box/components/PropertyBox'; -import { EditableFieldHotkeyScope } from '@/ui/editable-field/types/EditableFieldHotkeyScope'; import { FieldContext } from '@/ui/field/contexts/FieldContext'; import { IconUser } from '@/ui/icon'; +import { InlineCell } from '@/ui/inline-cell/components/InlineCell'; +import { PropertyBox } from '@/ui/inline-cell/property-box/components/PropertyBox'; +import { InlineCellHotkeyScope } from '@/ui/inline-cell/types/InlineCellHotkeyScope'; import { PageBody } from '@/ui/layout/components/PageBody'; import { PageContainer } from '@/ui/layout/components/PageContainer'; import { PageFavoriteButton } from '@/ui/layout/components/PageFavoriteButton'; @@ -127,7 +127,7 @@ export const PersonShow = () => { recoilScopeId: person.id + fieldDefinition.name, fieldDefinition, useUpdateEntityMutation: useUpdateOnePersonMutation, - hotkeyScope: EditableFieldHotkeyScope.EditableField, + hotkeyScope: InlineCellHotkeyScope.InlineCell, }} key={person.id + fieldDefinition.name} >