🐛 fix: Fix ActionBar props and regenerate btn with error message (#337)

src/app/chat/features/Conversation/ChatList/Messages/Assistant.tsx

@@ -13,12 +13,11 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/slices/agentConfig';
-import { currentFunctionCallProps } from '@/store/session/slices/chat/selectors/chat';
+import { chatSelectors } from '@/store/session/slices/chat/selectors';
 import { isFunctionMessage } from '@/utils/message';
 
 import FunctionCall from '../Plugins/FunctionCall';
 import { DefautMessage } from './Default';
-import { SystemActionsBar } from './System';
 
 const useStyles = createStyles(({ css }) => ({
   container: css`
@@ -34,7 +33,7 @@ const useStyles = createStyles(({ css }) => ({
 
 export const AssistantMessage: RenderMessage = memo(
   ({ id, plugin, function_call, content, ...props }) => {
-    const genFunctionCallProps = useSessionStore(currentFunctionCallProps);
+    const genFunctionCallProps = useSessionStore(chatSelectors.currentFunctionCallProps);
 
     if (!isFunctionMessage(content)) return <DefautMessage content={content} id={id} {...props} />;
 
@@ -65,16 +64,15 @@ export const AssistantMessageExtra: RenderMessageExtra = memo(({ extra, function
   );
 });
 
-export const AssistantActionsBar: RenderAction = memo(({ text, error, id, ...props }) => {
+export const AssistantActionsBar: RenderAction = memo(({ text, error, id, onActionClick }) => {
   const { regenerate, edit, copy, divider, del } = useChatListActionsBar(text);
   if (id === 'default') return;
-  if (error) return <SystemActionsBar id={id} text={text} {...props} />;
   return (
     <ActionIconGroup
-      dropdownMenu={[edit, copy, regenerate, divider, del]}
-      items={[regenerate, copy]}
+      dropdownMenu={error ? [regenerate, divider, del] : [edit, copy, regenerate, divider, del]}
+      items={[regenerate]}
+      onActionClick={onActionClick}
       type="ghost"
-      {...props}
     />
   );
 });

src/app/chat/features/Conversation/ChatList/Messages/Function.tsx

@@ -3,14 +3,14 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import { useSessionStore } from '@/store/session';
-import { currentFunctionCallProps } from '@/store/session/slices/chat/selectors/chat';
+import { chatSelectors } from '@/store/session/selectors';
 
 import FunctionCall from '../Plugins/FunctionCall';
 import PluginMessage from '../Plugins/PluginMessage';
 
 export const FunctionMessage: RenderMessage = memo(
   ({ id, content, plugin, function_call, ...props }) => {
-    const genFunctionCallProps = useSessionStore(currentFunctionCallProps);
+    const genFunctionCallProps = useSessionStore(chatSelectors.currentFunctionCallProps);
     const fcProps = genFunctionCallProps({ content, function_call, id, plugin });
 
     return (
@@ -29,14 +29,14 @@ export const FunctionMessage: RenderMessage = memo(
   },
 );
 
-export const FunctionActionsBar: RenderAction = memo(({ text, ...props }) => {
+export const FunctionActionsBar: RenderAction = memo(({ text, onActionClick }) => {
   const { regenerate, divider, del } = useChatListActionsBar(text);
   return (
     <ActionIconGroup
       dropdownMenu={[regenerate, divider, del]}
       items={[regenerate]}
+      onActionClick={onActionClick}
       type="ghost"
-      {...props}
     />
   );
 });

src/app/chat/features/Conversation/ChatList/Messages/System.tsx

@@ -1,7 +1,9 @@
 import { ActionIconGroup, RenderAction, useChatListActionsBar } from '@lobehub/ui';
 import { memo } from 'react';
 
-export const SystemActionsBar: RenderAction = memo(({ text, ...props }) => {
+export const SystemActionsBar: RenderAction = memo(({ text, onActionClick }) => {
   const { del } = useChatListActionsBar(text);
-  return <ActionIconGroup dropdownMenu={[del]} items={[]} type="ghost" {...props} />;
+  return (
+    <ActionIconGroup dropdownMenu={[del]} items={[]} onActionClick={onActionClick} type="ghost" />
+  );
 });

src/app/chat/features/Conversation/ChatList/Messages/User.tsx

@@ -1,14 +1,14 @@
 import { ActionIconGroup, RenderAction, useChatListActionsBar } from '@lobehub/ui';
 import { memo } from 'react';
 
-export const UserActionsBar: RenderAction = memo(({ text, ...props }) => {
+export const UserActionsBar: RenderAction = memo(({ text, onActionClick }) => {
   const { regenerate, edit, copy, divider, del } = useChatListActionsBar(text);
   return (
     <ActionIconGroup
       dropdownMenu={[edit, copy, regenerate, divider, del]}
       items={[regenerate, edit]}
+      onActionClick={onActionClick}
       type="ghost"
-      {...props}
     />
   );
 });

src/store/session/slices/chat/selectors/index.ts

@@ -3,6 +3,7 @@ import {
   currentChats,
   currentChatsWithGuideMessage,
   currentChatsWithHistoryConfig,
+  currentFunctionCallProps,
   getChatsById,
 } from './chat';
 import { currentTopics, getTopicMessages } from './topic';
@@ -12,6 +13,7 @@ export const chatSelectors = {
   currentChats,
   currentChatsWithGuideMessage,
   currentChatsWithHistoryConfig,
+  currentFunctionCallProps,
   getChatsById,
 };