Skip to content

Refactor Topic component and add AddTopic component #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
small-stone merged 1 commit into from
Jan 18, 2024
Merged

Refactor Topic component and add AddTopic component #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/views/components/InputMessage/AddTopic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from "react";
import { Button } from "@mantine/core";
import { IconPlus } from "@tabler/icons-react";
import messageUtil from "@/util/MessageUtil";

export default function Topic({ buttonStyles, disabled }) {
const setNewTopic = () => {
messageUtil.sendMessage({
command: "setNewTopic",
});
};

return (
<Button
variant="default"
size="xs"
radius="xl"
leftIcon={<IconPlus size="1rem" />}
styles={buttonStyles}
onClick={setNewTopic}
disabled={disabled}
>
New Topic
</Button>
);
}
14 changes: 2 additions & 12 deletions src/views/components/InputMessage/Topic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ import {
import {
IconClock,
IconChevronDown,
IconPlus,
IconRefresh,
IconTrash,
} from "@tabler/icons-react";
import { useDisclosure } from "@mantine/hooks";
import messageUtil from "@/util/MessageUtil";
import dayjs from "dayjs";

export default function Topic({ styleName }) {
export default function Topic({ styleName, disabled }) {
const [drawerOpened, { open: openDrawer, close: closeDrawer }] =
useDisclosure(false);
const [loading, setLoading] = useState(false);
Expand Down Expand Up @@ -55,13 +54,6 @@ export default function Topic({ styleName }) {
});
};

const setNewTopic = () => {
messageUtil.sendMessage({
command: "setNewTopic",
});
closeDrawer();
};

const deleteTopic = (topicHash: string) => {
const newTopicList = topicList.filter(
(topic) => topic.root_prompt.hash !== topicHash
Expand All @@ -82,9 +74,6 @@ export default function Topic({ styleName }) {
<Flex justify="space-between">
<Text>Devchat Topic</Text>
<Flex>
<ActionIcon onClick={setNewTopic}>
<IconPlus size="1rem" />
</ActionIcon>
<ActionIcon onClick={refreshTopicList}>
<IconRefresh size="1rem" />
</ActionIcon>
Expand Down Expand Up @@ -178,6 +167,7 @@ export default function Topic({ styleName }) {
</Drawer>
<ActionIcon
className={styleName}
disabled={disabled}
radius="xl"
variant="default"
onClick={openDrawer}
Expand Down
14 changes: 13 additions & 1 deletion src/views/components/InputMessage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
import messageUtil from "@/util/MessageUtil";
import InputContexts from "./InputContexts";
import Topic from "./Topic";
import AddTopic from "./AddTopic";
import { observer } from "mobx-react-lite";
import { useMst } from "@/views/stores/RootStore";
import { ChatContext } from "@/views/stores/InputStore";
Expand Down Expand Up @@ -481,7 +482,18 @@ const InputMessage = observer((props: any) => {
</ScrollArea.Autosize>
</Menu.Dropdown>
</Menu>
{showTopic && <Topic styleName={classes.actionIcon} />}
{showTopic && (
<>
<Topic
styleName={classes.actionIcon}
disabled={generating || chat.disabled}
/>
<AddTopic
buttonStyles={buttonStyles}
disabled={generating || chat.disabled}
/>
</>
)}
</Group>
{contexts && contexts.length > 0 && (
<Drawer
Expand Down