mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2025-12-22 17:00:14 +08:00
fix: input bar covers chat nav buttons (#8935)
refactor(消息组件): 将ChatNavigation从Messages移到Chat组件中 重构消息组件结构,将ChatNavigation组件从Messages.tsx移动到Chat.tsx中
This commit is contained in:
parent
339b915437
commit
40282cd39d
@ -18,6 +18,7 @@ import styled from 'styled-components'
|
|||||||
|
|
||||||
import ChatNavbar from './ChatNavbar'
|
import ChatNavbar from './ChatNavbar'
|
||||||
import Inputbar from './Inputbar/Inputbar'
|
import Inputbar from './Inputbar/Inputbar'
|
||||||
|
import ChatNavigation from './Messages/ChatNavigation'
|
||||||
import Messages from './Messages/Messages'
|
import Messages from './Messages/Messages'
|
||||||
import Tabs from './Tabs'
|
import Tabs from './Tabs'
|
||||||
|
|
||||||
@ -32,7 +33,7 @@ interface Props {
|
|||||||
|
|
||||||
const Chat: FC<Props> = (props) => {
|
const Chat: FC<Props> = (props) => {
|
||||||
const { assistant } = useAssistant(props.assistant.id)
|
const { assistant } = useAssistant(props.assistant.id)
|
||||||
const { topicPosition, messageStyle } = useSettings()
|
const { topicPosition, messageStyle, messageNavigation } = useSettings()
|
||||||
const { showTopics } = useShowTopics()
|
const { showTopics } = useShowTopics()
|
||||||
const { isMultiSelectMode } = useChatContext(props.activeTopic)
|
const { isMultiSelectMode } = useChatContext(props.activeTopic)
|
||||||
const { isTopNavbar } = useNavbarPosition()
|
const { isTopNavbar } = useNavbarPosition()
|
||||||
@ -140,6 +141,7 @@ const Chat: FC<Props> = (props) => {
|
|||||||
includeUser={filterIncludeUser}
|
includeUser={filterIncludeUser}
|
||||||
onIncludeUserChange={userOutlinedItemClickHandler}
|
onIncludeUserChange={userOutlinedItemClickHandler}
|
||||||
/>
|
/>
|
||||||
|
{messageNavigation === 'buttons' && <ChatNavigation containerId="messages" />}
|
||||||
<QuickPanelProvider>
|
<QuickPanelProvider>
|
||||||
<Inputbar assistant={assistant} setActiveTopic={props.setActiveTopic} topic={props.activeTopic} />
|
<Inputbar assistant={assistant} setActiveTopic={props.setActiveTopic} topic={props.activeTopic} />
|
||||||
{isMultiSelectMode && <MultiSelectActionPopup topic={props.activeTopic} />}
|
{isMultiSelectMode && <MultiSelectActionPopup topic={props.activeTopic} />}
|
||||||
|
|||||||
@ -36,7 +36,6 @@ import { useTranslation } from 'react-i18next'
|
|||||||
import InfiniteScroll from 'react-infinite-scroll-component'
|
import InfiniteScroll from 'react-infinite-scroll-component'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
|
|
||||||
import ChatNavigation from './ChatNavigation'
|
|
||||||
import MessageAnchorLine from './MessageAnchorLine'
|
import MessageAnchorLine from './MessageAnchorLine'
|
||||||
import MessageGroup from './MessageGroup'
|
import MessageGroup from './MessageGroup'
|
||||||
import NarrowLayout from './NarrowLayout'
|
import NarrowLayout from './NarrowLayout'
|
||||||
@ -319,7 +318,6 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic, o
|
|||||||
{showPrompt && <Prompt assistant={assistant} key={assistant.prompt} topic={topic} />}
|
{showPrompt && <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" />}
|
|
||||||
<SelectionBox
|
<SelectionBox
|
||||||
isMultiSelectMode={isMultiSelectMode}
|
isMultiSelectMode={isMultiSelectMode}
|
||||||
scrollContainerRef={scrollContainerRef}
|
scrollContainerRef={scrollContainerRef}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user