feat: close #3222 share message list should start from clear context index

This commit is contained in:
Yidadaa 2023-11-12 01:21:39 +08:00
parent 64647b0bb3
commit be6d45e49f
4 changed files with 57 additions and 17 deletions

View File

@ -27,7 +27,7 @@ import { Avatar } from "./emoji";
import dynamic from "next/dynamic"; import dynamic from "next/dynamic";
import NextImage from "next/image"; import NextImage from "next/image";
import { toBlob, toJpeg, toPng } from "html-to-image"; import { toBlob, toPng } from "html-to-image";
import { DEFAULT_MASK_AVATAR } from "../store/mask"; import { DEFAULT_MASK_AVATAR } from "../store/mask";
import { api } from "../client/api"; import { api } from "../client/api";
import { prettyObject } from "../utils/format"; import { prettyObject } from "../utils/format";
@ -41,7 +41,22 @@ const Markdown = dynamic(async () => (await import("./markdown")).Markdown, {
export function ExportMessageModal(props: { onClose: () => void }) { export function ExportMessageModal(props: { onClose: () => void }) {
return ( return (
<div className="modal-mask"> <div className="modal-mask">
<Modal title={Locale.Export.Title} onClose={props.onClose}> <Modal
title={Locale.Export.Title}
onClose={props.onClose}
footer={
<div
style={{
width: "100%",
textAlign: "center",
fontSize: 14,
opacity: 0.5,
}}
>
</div>
}
>
<div style={{ minHeight: "40vh" }}> <div style={{ minHeight: "40vh" }}>
<MessageExporter /> <MessageExporter />
</div> </div>
@ -149,7 +164,7 @@ export function MessageExporter() {
if (exportConfig.includeContext) { if (exportConfig.includeContext) {
ret.push(...session.mask.context); ret.push(...session.mask.context);
} }
ret.push(...session.messages.filter((m, i) => selection.has(m.id))); ret.push(...session.messages.filter((m) => selection.has(m.id)));
return ret; return ret;
}, [ }, [
exportConfig.includeContext, exportConfig.includeContext,
@ -437,13 +452,13 @@ export function ImagePreviewer(props: {
showToast(Locale.Export.Image.Toast); showToast(Locale.Export.Image.Toast);
const dom = previewRef.current; const dom = previewRef.current;
if (!dom) return; if (!dom) return;
const isApp = getClientConfig()?.isApp; const isApp = getClientConfig()?.isApp;
try { try {
const blob = await toPng(dom); const blob = await toPng(dom);
if (!blob) return; if (!blob) return;
if (isMobile || (isApp && window.__TAURI__)) { if (isMobile || (isApp && window.__TAURI__)) {
if (isApp && window.__TAURI__) { if (isApp && window.__TAURI__) {
const result = await window.__TAURI__.dialog.save({ const result = await window.__TAURI__.dialog.save({
@ -459,7 +474,7 @@ export function ImagePreviewer(props: {
}, },
], ],
}); });
if (result !== null) { if (result !== null) {
const response = await fetch(blob); const response = await fetch(blob);
const buffer = await response.arrayBuffer(); const buffer = await response.arrayBuffer();

View File

@ -58,8 +58,8 @@
} }
.body { .body {
flex-grow: 1; flex: 1;
max-width: calc(100% - 40px); max-width: calc(100% - 80px);
.date { .date {
font-size: 12px; font-size: 12px;
@ -71,6 +71,12 @@
font-size: 12px; font-size: 12px;
} }
} }
.checkbox {
display: flex;
justify-content: flex-end;
flex: 1;
}
} }
} }
} }

View File

@ -1,4 +1,4 @@
import { useEffect, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import { ChatMessage, useAppConfig, useChatStore } from "../store"; import { ChatMessage, useAppConfig, useChatStore } from "../store";
import { Updater } from "../typing"; import { Updater } from "../typing";
import { IconButton } from "./button"; import { IconButton } from "./button";
@ -73,11 +73,23 @@ export function MessageSelector(props: {
const chatStore = useChatStore(); const chatStore = useChatStore();
const session = chatStore.currentSession(); const session = chatStore.currentSession();
const isValid = (m: ChatMessage) => m.content && !m.isError && !m.streaming; const isValid = (m: ChatMessage) => m.content && !m.isError && !m.streaming;
const messages = session.messages.filter( const allMessages = useMemo(() => {
(m, i) => let startIndex = Math.max(0, session.clearContextIndex ?? 0);
m.id && // message must have id if (startIndex === session.messages.length - 1) {
isValid(m) && startIndex = 0;
(i >= session.messages.length - 1 || isValid(session.messages[i + 1])), }
return session.messages.slice(startIndex);
}, [session.messages, session.clearContextIndex]);
const messages = useMemo(
() =>
allMessages.filter(
(m, i) =>
m.id && // message must have id
isValid(m) &&
(i >= allMessages.length - 1 || isValid(allMessages[i + 1])),
),
[allMessages],
); );
const messageCount = messages.length; const messageCount = messages.length;
const config = useAppConfig(); const config = useAppConfig();
@ -176,6 +188,8 @@ export function MessageSelector(props: {
<div className={styles["messages"]}> <div className={styles["messages"]}>
{messages.map((m, i) => { {messages.map((m, i) => {
if (!isInSearchResult(m.id!)) return null; if (!isInSearchResult(m.id!)) return null;
const id = m.id ?? i;
const isSelected = props.selection.has(id);
return ( return (
<div <div
@ -185,7 +199,6 @@ export function MessageSelector(props: {
key={i} key={i}
onClick={() => { onClick={() => {
props.updateSelection((selection) => { props.updateSelection((selection) => {
const id = m.id ?? i;
selection.has(id) ? selection.delete(id) : selection.add(id); selection.has(id) ? selection.delete(id) : selection.add(id);
}); });
onClickIndex(i); onClickIndex(i);
@ -206,6 +219,10 @@ export function MessageSelector(props: {
{m.content} {m.content}
</div> </div>
</div> </div>
<div className={styles["checkbox"]}>
<input type="checkbox" checked={isSelected}></input>
</div>
</div> </div>
); );
})} })}

View File

@ -97,8 +97,9 @@ export function Loading() {
interface ModalProps { interface ModalProps {
title: string; title: string;
children?: any; children?: any;
actions?: JSX.Element[]; actions?: React.ReactNode[];
defaultMax?: boolean; defaultMax?: boolean;
footer?: React.ReactNode;
onClose?: () => void; onClose?: () => void;
} }
export function Modal(props: ModalProps) { export function Modal(props: ModalProps) {
@ -147,6 +148,7 @@ export function Modal(props: ModalProps) {
<div className={styles["modal-content"]}>{props.children}</div> <div className={styles["modal-content"]}>{props.children}</div>
<div className={styles["modal-footer"]}> <div className={styles["modal-footer"]}>
{props.footer}
<div className={styles["modal-actions"]}> <div className={styles["modal-actions"]}>
{props.actions?.map((action, i) => ( {props.actions?.map((action, i) => (
<div key={i} className={styles["modal-action"]}> <div key={i} className={styles["modal-action"]}>