From 6c1503351133686007fe5dbe05c6bb8b62acc3f5 Mon Sep 17 00:00:00 2001
From: nitin <142569587+ehconitin@users.noreply.github.com>
Date: Fri, 6 Sep 2024 14:10:55 +0530
Subject: [PATCH] added scroll wrapper for ShowPageActivityContainer (#6903)

fixes #6902
---
 .../components/ShowPageActivityContainer.tsx  | 25 +++++++++++--------
 .../scroll/contexts/ScrollWrapperContexts.tsx |  7 +++++-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageActivityContainer.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageActivityContainer.tsx
index bdd81f97c..a69f54528 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageActivityContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageActivityContainer.tsx
@@ -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>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/contexts/ScrollWrapperContexts.tsx b/packages/twenty-front/src/modules/ui/utilities/scroll/contexts/ScrollWrapperContexts.tsx
index 1141b3363..b6f7d2103 100644
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/contexts/ScrollWrapperContexts.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/contexts/ScrollWrapperContexts.tsx
@@ -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');
   }