Skip to content
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

feat: support copy conversation content #76

Merged
merged 2 commits into from
Jun 3, 2023
+62 −38
Merged

feat: support copy conversation content #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
869e3f2
fix(ui): add side max width
lvqq Jun 3, 2023
f88550d
feat: support copy content
lvqq Jun 3, 2023
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
2 changes: 1 addition & 1 deletion src/components/MessageBox/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.message-box:hover + .message-box-time {
.message-box:hover + .message-box-hover {
visibility: visible;
}
68 changes: 43 additions & 25 deletions src/components/MessageBox/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { FC, useCallback, useContext, useEffect } from 'react';
import { throttle } from 'lodash-es';
import type { MessageType } from 'midjourney-fetch';
import { Tag, message as GlobalMessage } from 'antd';
import GlobalContext from '@contexts/global';
import { ConversationMode, Message } from '@interfaces';
import markdown from '@utils/markdown';
Expand All @@ -10,6 +11,9 @@ import useCopyCode from '@hooks/useCopyCode';
import MidjourneyOperations from '@components/MidjourneyOperations';
import { hasUpscaleOrVariation } from '@utils/midjourney';
import './index.css';
import { copyToClipboard } from '@utils';

const { CheckableTag } = Tag;

const MessageItem: FC<{
message: Message;
Expand All @@ -22,40 +26,19 @@ const MessageItem: FC<{
mode?: ConversationMode;
index?: number;
}> = ({ message, onOperationClick, mode, index }) => {
const { i18n } = useContext(GlobalContext);
const { i18n, isMobile } = useContext(GlobalContext);
const isExpired = message.expiredAt && message.expiredAt <= Date.now();
const createdAt = getRelativeTime(message.createdAt, true);
return (
<div
className={`msg-fade-in flex items-start relative ${
className={`msg-fade-in flex items-start ${
index === 0 ? '' : 'mt-[24px]'
} ${message.role === 'user' ? 'flex-row-reverse ml-16' : 'mr-6'}`}
>
{message.role === 'assistant' ? (
<SystemAvatar className="mt-[14px] mr-2" role={message.imageModel} />
<SystemAvatar className="mt-[38px] mr-2" role={message.imageModel} />
) : null}
<div>
<div
dangerouslySetInnerHTML={{
__html: isExpired
? i18n.status_image_expired
: markdown.render(message.content),
}}
className={`prose message-box shadow-sm p-4 ${
message.role === 'user' ? 'bg-gradient text-white' : 'bg-[#ebeced]'
} ${
mode === 'image' ? 'img-no-margin' : ''
} break-words overflow-hidden rounded-[16px]`}
/>
{createdAt ? (
<div
className={`message-box-time hover:visible invisible text-[#a1a7a8] text-sm absolute top-[-20px] ${
message.role === 'user' ? 'right-0' : 'left-[calc(32px+0.5rem)]'
}`}
>
{createdAt}
</div>
) : null}
<div className="overflow-hidden flex flex-col-reverse">
{message.midjourneyMessage &&
hasUpscaleOrVariation(message.midjourneyMessage) ? (
<MidjourneyOperations
Expand All @@ -70,6 +53,41 @@ const MessageItem: FC<{
}
/>
) : null}
<div
dangerouslySetInnerHTML={{
__html: isExpired
? i18n.status_image_expired
: markdown.render(message.content),
}}
className={`prose message-box shadow-sm p-4 ${
message.role === 'user' ? 'bg-gradient text-white' : 'bg-[#ebeced]'
} ${
mode === 'image' ? 'img-no-margin' : ''
} break-words rounded-[16px]`}
/>
<div
className={`message-box-hover hover:visible flex justify-between items-end ${
isMobile ? '' : 'invisible'
}`}
>
{createdAt ? (
<div className="text-[#a1a7a8] text-sm">{createdAt}</div>
) : (
<div />
)}
<div className="flex items-center">
<CheckableTag
checked={false}
className="mb-[2px] mr-0 text-[#a1a7a8]"
onClick={() => {
copyToClipboard(message.content);
GlobalMessage.success(i18n.success_copy);
}}
>
{i18n.action_copy}
</CheckableTag>
</div>
</div>
</div>
</div>
);
Expand Down
20 changes: 11 additions & 9 deletions src/modules/Content/ContentHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,17 @@ const ContentHeader: FC<ContentHeaderProps> = ({
}}
/>
</Tooltip>
<Tooltip title={i18n.action_prompt}>
<ConfigIcon
name="ri-user-add-line mr-2"
onClick={() => {
setText('/');
setShowPrompt(true);
}}
/>
</Tooltip>
{conversation.mode === 'image' ? null : (
<Tooltip title={i18n.action_prompt}>
<ConfigIcon
name="ri-user-add-line mr-2"
onClick={() => {
setText('/');
setShowPrompt(true);
}}
/>
</Tooltip>
)}
<ConfigIcon
name="ri-settings-3-line"
onClick={() => setActiveSetting((active) => !active)}
Expand Down
10 changes: 7 additions & 3 deletions src/modules/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,14 @@ const Main: FC<{ lang: Lang; inVercel: boolean }> = ({ lang, inVercel }) => {
</>
) : (
<>
<div className={activeSetting ? 'w-1/4' : 'w-1/3'}>
<div
className={`${activeSetting ? 'w-1/4' : 'w-1/3'} max-w-[400px]`}
>
{getSidebar()}
</div>
<div className={`${activeSetting ? 'w-3/4' : 'w-2/3'} flex`}>
<div
className={`${activeSetting ? 'w-3/4' : 'w-2/3'} flex flex-1`}
>
<div
className={`h-full ${
activeSetting ? 'w-2/3' : 'w-full'
Expand All @@ -206,7 +210,7 @@ const Main: FC<{ lang: Lang; inVercel: boolean }> = ({ lang, inVercel }) => {
{currentId ? getContent() : getEmpty()}
</div>
{activeSetting ? (
<div className="w-1/3">{getConfigration()}</div>
<div className="w-1/3 max-w-[400px]">{getConfigration()}</div>
) : null}
</div>
</>
Expand Down