admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

added scroll wrapper for ShowPageActivityContainer (#6903)

Browse Source 
fixes #6902
This commit is contained in:
nitin
2024-09-06 14:10:55 +05:30
committed by GitHub
parent b9ee313923
commit 6c15033511
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageActivityContainer.tsx
View File

@ -1,6 +1,7 @@
import { RichTextEditor } from '@/activities/components/RichTextEditor'; import { RichTextEditor } from '@/activities/components/RichTextEditor';
import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity'; import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
const StyledShowPageActivityContainer = styled.div` const StyledShowPageActivityContainer = styled.div`
@ -16,16 +17,18 @@ export const ShowPageActivityContainer = ({
>; >;
}) => { }) => {
return ( return (
<StyledShowPageActivityContainer> <ScrollWrapper contextProviderName="showPageActivityContainer">
<RichTextEditor <StyledShowPageActivityContainer>
activityId={targetableObject.id} <RichTextEditor
fillTitleFromBody={false} activityId={targetableObject.id}
activityObjectNameSingular={ fillTitleFromBody={false}
targetableObject.targetObjectNameSingular as activityObjectNameSingular={
| CoreObjectNameSingular.Note targetableObject.targetObjectNameSingular as
| CoreObjectNameSingular.Task | CoreObjectNameSingular.Note
} | CoreObjectNameSingular.Task
/> }
</StyledShowPageActivityContainer> />
</StyledShowPageActivityContainer>
</ScrollWrapper>
); );
}; };

7
packages/twenty-front/src/modules/ui/utilities/scroll/contexts/ScrollWrapperContexts.tsx
View File

@ -16,7 +16,8 @@ export type ContextProviderName =
| 'showPageLeftContainer' | 'showPageLeftContainer'
| 'tabList' | 'tabList'
| 'releases' | 'releases'
| 'test'; | 'test'
| 'showPageActivityContainer';
const createScrollWrapperContext = (id: string) => const createScrollWrapperContext = (id: string) =>
createContext<ScrollWrapperContextValue>({ createContext<ScrollWrapperContextValue>({
@ -44,6 +45,8 @@ export const TabListScrollWrapperContext =
createScrollWrapperContext('tabList'); createScrollWrapperContext('tabList');
export const ReleasesScrollWrapperContext = export const ReleasesScrollWrapperContext =
createScrollWrapperContext('releases'); createScrollWrapperContext('releases');
export const ShowPageActivityContainerScrollWrapperContext =
createScrollWrapperContext('showPageActivityContainer');
export const TestScrollWrapperContext = createScrollWrapperContext('test'); export const TestScrollWrapperContext = createScrollWrapperContext('test');
export const getContextByProviderName = ( export const getContextByProviderName = (
@ -72,6 +75,8 @@ export const getContextByProviderName = (
return ReleasesScrollWrapperContext; return ReleasesScrollWrapperContext;
case 'test': case 'test':
return TestScrollWrapperContext; return TestScrollWrapperContext;
case 'showPageActivityContainer':
return ShowPageActivityContainerScrollWrapperContext;
default: default:
throw new Error('Context Provider not available'); throw new Error('Context Provider not available');
} }