change logic of default chat size generation

daostack · Sep 13, 2023 · 6c750c6 · 6c750c6
1 parent 56f26db
commit 6c750c6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/pages/commonFeed/CommonFeedPage.tsx b/src/pages/commonFeed/CommonFeedPage.tsx
@@ -28,7 +28,6 @@ export const FEED_LAYOUT_OUTER_STYLES: FeedLayoutOuterStyles = {
 
 export const BASE_FEED_LAYOUT_SETTINGS: FeedLayoutSettings = {
   withDesktopChatTitle: false,
-  sidenavWidth: 0,
 };
 
 const renderContentWrapper: RenderCommonFeedContentWrapper = ({

diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -95,7 +95,6 @@ export interface FeedLayoutOuterStyles {
 
 export interface FeedLayoutSettings {
   withDesktopChatTitle?: boolean;
-  sidenavWidth?: number;
   getSplitViewMaxSize?: (width: number) => number;
 }
 
@@ -219,7 +218,7 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
     settings?.getSplitViewMaxSize?.(windowWidth) ??
     getSplitViewMaxSize(windowWidth);
   const [realChatWidth, setRealChatWidth] = useState(() =>
-    getDefaultSize(windowWidth, maxChatSize, settings?.sidenavWidth),
+    getDefaultSize(windowWidth, maxChatSize),
   );
   const chatWidth = Math.min(realChatWidth, maxChatSize);
   const [expandedFeedItemId, setExpandedFeedItemId] = useState<string | null>(

diff --git a/src/pages/commonFeed/components/FeedLayout/utils/getDefaultSize.ts b/src/pages/commonFeed/components/FeedLayout/utils/getDefaultSize.ts
@@ -4,12 +4,11 @@ import { getSavedChatSize } from "./chatSize";
 export const getDefaultSize = (
   windowWidth: number,
   maxChatSize: number,
-  sidenavWidth = 336,
 ): number => {
   const pageWidth = Math.min(windowWidth, 1920);
   const savedChatSize = getSavedChatSize();
-  const chatWidth =
-    savedChatSize || Math.floor((pageWidth - sidenavWidth) * 0.6);
+  const defaultLeftPaneWidth = Math.max(Math.floor(pageWidth / 4), 400);
+  const chatWidth = savedChatSize || pageWidth - defaultLeftPaneWidth;
 
   return Math.max(Math.min(maxChatSize, chatWidth), MIN_CHAT_WIDTH);
 };