Fix: Editing a task assignee relation from the list opens both the command menu and the multi item picker (#12138)
Fixes https://github.com/twentyhq/twenty/issues/12129 To fix this, we need to stop the click event from propagating up from the ActivityTargetsInlineCell --------- Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
@ -9,10 +9,11 @@ import { ActivityRow } from '@/activities/components/ActivityRow';
|
|||||||
import { Task } from '@/activities/types/Task';
|
import { Task } from '@/activities/types/Task';
|
||||||
import { useOpenRecordInCommandMenu } from '@/command-menu/hooks/useOpenRecordInCommandMenu';
|
import { useOpenRecordInCommandMenu } from '@/command-menu/hooks/useOpenRecordInCommandMenu';
|
||||||
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
||||||
|
import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';
|
||||||
import { FieldContextProvider } from '@/object-record/record-field/components/FieldContextProvider';
|
import { FieldContextProvider } from '@/object-record/record-field/components/FieldContextProvider';
|
||||||
import { useCompleteTask } from '../hooks/useCompleteTask';
|
|
||||||
import { Checkbox, CheckboxShape } from 'twenty-ui/input';
|
|
||||||
import { IconCalendar, OverflowingTextWithTooltip } from 'twenty-ui/display';
|
import { IconCalendar, OverflowingTextWithTooltip } from 'twenty-ui/display';
|
||||||
|
import { Checkbox, CheckboxShape } from 'twenty-ui/input';
|
||||||
|
import { useCompleteTask } from '../hooks/useCompleteTask';
|
||||||
|
|
||||||
const StyledTaskBody = styled.div`
|
const StyledTaskBody = styled.div`
|
||||||
color: ${({ theme }) => theme.font.color.tertiary};
|
color: ${({ theme }) => theme.font.color.tertiary};
|
||||||
@ -124,13 +125,15 @@ export const TaskRow = ({ task }: { task: Task }) => {
|
|||||||
fieldMetadataName={'taskTargets'}
|
fieldMetadataName={'taskTargets'}
|
||||||
fieldPosition={0}
|
fieldPosition={0}
|
||||||
>
|
>
|
||||||
<ActivityTargetsInlineCell
|
<StopPropagationContainer>
|
||||||
activityObjectNameSingular={CoreObjectNameSingular.Task}
|
<ActivityTargetsInlineCell
|
||||||
activityRecordId={task.id}
|
activityObjectNameSingular={CoreObjectNameSingular.Task}
|
||||||
showLabel={false}
|
activityRecordId={task.id}
|
||||||
maxWidth={200}
|
showLabel={false}
|
||||||
componentInstanceId={`task-row-targets-${task.id}`}
|
maxWidth={200}
|
||||||
/>
|
componentInstanceId={`task-row-targets-${task.id}`}
|
||||||
|
/>
|
||||||
|
</StopPropagationContainer>
|
||||||
</FieldContextProvider>
|
</FieldContextProvider>
|
||||||
}
|
}
|
||||||
</StyledRightSideContainer>
|
</StyledRightSideContainer>
|
||||||
|
|||||||
Reference in New Issue
Block a user