twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-10-03 20:38:02 +03:00
Code Issues 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 12 deletions
Show Stats 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 { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import styled from '@emotion/styled';
const StyledShowPageActivityContainer = styled.div`
@ -16,16 +17,18 @@ export const ShowPageActivityContainer = ({
>;
}) => {
return (
<StyledShowPageActivityContainer>
<RichTextEditor
activityId={targetableObject.id}
fillTitleFromBody={false}
activityObjectNameSingular={
targetableObject.targetObjectNameSingular as
| CoreObjectNameSingular.Note
| CoreObjectNameSingular.Task
}
/>
</StyledShowPageActivityContainer>
<ScrollWrapper contextProviderName="showPageActivityContainer">
<StyledShowPageActivityContainer>
<RichTextEditor
activityId={targetableObject.id}
fillTitleFromBody={false}
activityObjectNameSingular={
targetableObject.targetObjectNameSingular as
| CoreObjectNameSingular.Note
| CoreObjectNameSingular.Task
}
/>
</StyledShowPageActivityContainer>
</ScrollWrapper>
);
};

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

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