simplify SessionGroups and SessionMessages for basic implementation

reaviz · Aug 10, 2024 · 61bef21 · 61bef21
1 parent 27b9076
commit 61bef21
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 412 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/SessionMessages/SessionMessage/MessageQuestion.tsx b/src/SessionMessages/SessionMessage/MessageQuestion.tsx
@@ -20,37 +20,40 @@ export interface MessageQuestionProps extends PropsWithChildren {
 }
 
 export const MessageQuestion: FC<MessageQuestionProps> = ({
-  question,
-  files,
-  children
+  children,
+  ...props
 }) => {
-  const { theme, remarkPlugins } =
-    useContext(ChatContext);
+  const { theme, remarkPlugins } = useContext(ChatContext);
+  const { question, files } = props;
   const Comp = children ? Slot : 'div';
   const [expanded, setExpanded] = useState(false);
   const isLong = question.length > 500;
 
   return (
-    <Comp className={cn(theme.messages.message.question, {
-      [theme.messages.message.overlay]: isLong && !expanded
-    })}>
-      <MessageFiles files={files} />
+    <Comp
+      className={cn(theme.messages.message.question, {
+        [theme.messages.message.overlay]: isLong && !expanded
+      })}
+      {...props}
+    >
       {children || (
-        <Markdown remarkPlugins={remarkPlugins as PluggableList[]}>
-          {question}
-        </Markdown>
-      )}
-      {isLong && !expanded && (
-        <Button
-          variant="link"
-          size="small"
-          className={theme.messages.message.expand}
-          onClick={() => setExpanded(true)}
-        >
-          Show more
-        </Button>
+        <>
+          <MessageFiles files={files} />
+          <Markdown remarkPlugins={remarkPlugins as PluggableList[]}>
+            {question}
+          </Markdown>
+          {isLong && !expanded && (
+            <Button
+              variant="link"
+              size="small"
+              className={theme.messages.message.expand}
+              onClick={() => setExpanded(true)}
+            >
+              Show more
+            </Button>
+          )}
+        </>
       )}
     </Comp>
   );
 };
-
diff --git a/src/SessionMessages/SessionMessages.tsx b/src/SessionMessages/SessionMessages.tsx
@@ -11,6 +11,7 @@ import { ChatContext } from '@/ChatContext';
 import { Button, cn, useInfinityList } from 'reablocks';
 import { AnimatePresence, motion } from 'framer-motion';
 import { Conversation } from '@/types';
+import { SessionMessage } from './SessionMessage/SessionMessage';
 
 const containerVariants = {
   hidden: {},
@@ -113,7 +114,15 @@ export const SessionMessages: React.FC<SessionMessagesProps> = ({
             requestAnimationFrame(() => setIsAnimating(false));
           }}
         >
-          {children(convosToRender)}
+          {children
+            ? children(convosToRender)
+            : convosToRender.map((conversation, index) => (
+                <SessionMessage
+                  key={conversation.id}
+                  conversation={conversation}
+                  isLast={index === conversation.length - 1}
+                />
+              ))}
         </motion.div>
       </AnimatePresence>
     </div>

diff --git a/src/SessionsList/SessionGroups.tsx b/src/SessionsList/SessionGroups.tsx
@@ -1,17 +1,31 @@
 import { FC, ReactNode, useContext, useMemo } from 'react';
 import { GroupedSessions, groupSessionsByDate } from '@/utils/grouping';
 import { ChatContext } from '@/ChatContext';
+import { SessionsGroup } from './SessionsGroup';
+import { SessionListItem } from './SessionListItem';
 
 export interface SessionGroupsProps {
   /**
    * Render function for the session groups.
    */
-  children: (groups: GroupedSessions[]) => ReactNode;
+  children?: (groups: GroupedSessions[]) => ReactNode;
 }
 
 export const SessionGroups: FC<SessionGroupsProps> = ({ children }) => {
   const { sessions } = useContext(ChatContext);
   const groups = useMemo(() => groupSessionsByDate(sessions), [sessions]);
 
-  return <>{children(groups)}</>;
+  return (
+    <>
+      {children
+        ? children(groups)
+        : groups.map(({ heading, sessions }) => (
+            <SessionsGroup heading={heading}>
+              {sessions.map(session => (
+                <SessionListItem key={session.id} session={session} />
+              ))}
+            </SessionsGroup>
+          ))}
+    </>
+  );
 };
diff --git a/stories/Chat.stories.tsx b/stories/Chat.stories.tsx
@@ -67,17 +67,7 @@ export const Compact = () => {
         onDeleteSession={() => alert('delete!')}
       >
         <SessionMessagePanel>
-          <SessionMessages>
-            {conversations =>
-              conversations.map((conversation, index) => (
-                <SessionMessage
-                  key={conversation.id}
-                  conversation={conversation}
-                  isLast={index === conversations.length - 1}
-                />
-              ))
-            }
-          </SessionMessages>
+          <SessionMessages />
           <ChatInput />
         </SessionMessagePanel>
       </Chat>
@@ -129,17 +119,7 @@ export const FullScreen = () => {
         onDeleteSession={() => alert('delete!')}
       >
         <SessionMessagePanel>
-          <SessionMessages>
-            {conversations =>
-              conversations.map((conversation, index) => (
-                <SessionMessage
-                  key={conversation.id}
-                  conversation={conversation}
-                  isLast={index === conversations.length - 1}
-                />
-              ))
-            }
-          </SessionMessages>
+          <SessionMessages />
           <ChatInput />
         </SessionMessagePanel>
       </Chat>

diff --git a/stories/Companion.stories.tsx b/stories/Companion.stories.tsx
@@ -68,31 +68,11 @@ export const Basic = () => {
       >
         <SessionsList>
           <NewSessionButton />
-          <SessionGroups>
-            {groups =>
-              groups.map(({ heading, sessions }) => (
-                <SessionsGroup heading={heading} key={heading}>
-                  {sessions.map(s => (
-                    <SessionListItem key={s.id} session={s} />
-                  ))}
-                </SessionsGroup>
-              ))
-            }
-          </SessionGroups>
+          <SessionGroups />
         </SessionsList>
         <SessionMessagePanel>
           <SessionMessagesHeader />
-          <SessionMessages>
-            {conversations =>
-              conversations.map((conversation, index) => (
-                <SessionMessage
-                  key={conversation.id}
-                  conversation={conversation}
-                  isLast={index === conversations.length - 1}
-                />
-              ))
-            }
-          </SessionMessages>
+          <SessionMessages />
           <ChatInput />
         </SessionMessagePanel>
       </Chat>
@@ -118,17 +98,7 @@ export const Empty = () => {
       >
         <SessionsList>
           <NewSessionButton />
-          <SessionGroups>
-            {groups =>
-              groups.map(({ heading, sessions }) => (
-                <SessionsGroup heading={heading} key={heading}>
-                  {sessions.map(s => (
-                    <SessionListItem key={s.id} session={s} />
-                  ))}
-                </SessionsGroup>
-              ))
-            }
-          </SessionGroups>
+          <SessionGroups />
         </SessionsList>
         <div className="flex-1 h-full flex flex-col">
           <SessionMessages