refactor(Messages): update message group styling and improve grouped message handling
This commit is contained in:
parent
06ff44f97c
commit
7ddd2cb9d5
@ -145,7 +145,7 @@ const MessageGroup = ({ messages, topic, hidePresetMessages }: Props) => {
|
|||||||
key={message.id}
|
key={message.id}
|
||||||
className={classNames({
|
className={classNames({
|
||||||
'group-message-wrapper': message.role === 'assistant' && isHorizontal && isGrouped,
|
'group-message-wrapper': message.role === 'assistant' && isHorizontal && isGrouped,
|
||||||
[multiModelMessageStyle]: true,
|
[multiModelMessageStyle]: isGrouped,
|
||||||
selected: 'foldSelected' in message ? message.foldSelected : index === 0
|
selected: 'foldSelected' in message ? message.foldSelected : index === 0
|
||||||
})}>
|
})}>
|
||||||
<MessageStream {...messageProps} />
|
<MessageStream {...messageProps} />
|
||||||
|
|||||||
@ -240,6 +240,7 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic })
|
|||||||
window.message.success(t('message.copy.success'))
|
window.message.success(t('message.copy.success'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container
|
<Container
|
||||||
id="messages"
|
id="messages"
|
||||||
@ -272,9 +273,7 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic })
|
|||||||
</InfiniteScroll>
|
</InfiniteScroll>
|
||||||
<Prompt assistant={assistant} key={assistant.prompt} topic={topic} />
|
<Prompt assistant={assistant} key={assistant.prompt} topic={topic} />
|
||||||
</NarrowLayout>
|
</NarrowLayout>
|
||||||
|
|
||||||
{messageNavigation === 'anchor' && <MessageAnchorLine messages={displayMessages} />}
|
{messageNavigation === 'anchor' && <MessageAnchorLine messages={displayMessages} />}
|
||||||
|
|
||||||
{messageNavigation === 'buttons' && <ChatNavigation containerId="messages" />}
|
{messageNavigation === 'buttons' && <ChatNavigation containerId="messages" />}
|
||||||
</Container>
|
</Container>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -175,6 +175,7 @@ export function getAssistantMessage({ assistant, topic }: { assistant: Assistant
|
|||||||
|
|
||||||
export function getGroupedMessages(messages: Message[]): { [key: string]: (Message & { index: number })[] } {
|
export function getGroupedMessages(messages: Message[]): { [key: string]: (Message & { index: number })[] } {
|
||||||
const groups: { [key: string]: (Message & { index: number })[] } = {}
|
const groups: { [key: string]: (Message & { index: number })[] } = {}
|
||||||
|
|
||||||
messages.forEach((message, index) => {
|
messages.forEach((message, index) => {
|
||||||
const key = message.askId ? 'assistant' + message.askId : 'user' + message.id
|
const key = message.askId ? 'assistant' + message.askId : 'user' + message.id
|
||||||
if (key && !groups[key]) {
|
if (key && !groups[key]) {
|
||||||
@ -182,6 +183,7 @@ export function getGroupedMessages(messages: Message[]): { [key: string]: (Messa
|
|||||||
}
|
}
|
||||||
groups[key].unshift({ ...message, index })
|
groups[key].unshift({ ...message, index })
|
||||||
})
|
})
|
||||||
|
|
||||||
return groups
|
return groups
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -805,6 +805,7 @@ const migrateConfig = {
|
|||||||
state.settings.autoCheckUpdate = !state.settings.manualUpdateCheck
|
state.settings.autoCheckUpdate = !state.settings.manualUpdateCheck
|
||||||
// @ts-ignore eslint-disable-next-line
|
// @ts-ignore eslint-disable-next-line
|
||||||
delete state.settings.manualUpdateCheck
|
delete state.settings.manualUpdateCheck
|
||||||
|
state.settings.gridPopoverTrigger = 'click'
|
||||||
return state
|
return state
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -138,7 +138,7 @@ const initialState: SettingsState = {
|
|||||||
codeStyle: 'auto',
|
codeStyle: 'auto',
|
||||||
foldDisplayMode: 'expanded',
|
foldDisplayMode: 'expanded',
|
||||||
gridColumns: 2,
|
gridColumns: 2,
|
||||||
gridPopoverTrigger: 'hover',
|
gridPopoverTrigger: 'click',
|
||||||
messageNavigation: 'none',
|
messageNavigation: 'none',
|
||||||
webdavHost: '',
|
webdavHost: '',
|
||||||
webdavUser: '',
|
webdavUser: '',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user