Merge pull request ChatGPTNextWeb#1679 from Yidadaa/export

chore: mobile export image style
liaol · May 21, 2023 · f0b4ef5 · f0b4ef5
2 parents 0439d12 + 1f12753
commit f0b4ef5
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 42 deletions.
diff --git a/app/components/exporter.tsx b/app/components/exporter.tsx
@@ -3,7 +3,7 @@ import Locale from "../locales";
 import styles from "./exporter.module.scss";
 import { List, ListItem, Modal, showToast } from "./ui-lib";
 import { IconButton } from "./button";
-import { copyToClipboard, downloadAs } from "../utils";
+import { copyToClipboard, downloadAs, useMobileScreen } from "../utils";
 
 import CopyIcon from "../icons/copy.svg";
 import LoadingIcon from "../icons/three-dots.svg";
@@ -222,16 +222,19 @@ export function MessageExporter() {
 export function PreviewActions(props: {
   download: () => void;
   copy: () => void;
+  showCopy?: boolean;
 }) {
   return (
     <div className={styles["preview-actions"]}>
-      <IconButton
-        text={Locale.Export.Copy}
-        bordered
-        shadow
-        icon={<CopyIcon />}
-        onClick={props.copy}
-      ></IconButton>
+      {props.showCopy && (
+        <IconButton
+          text={Locale.Export.Copy}
+          bordered
+          shadow
+          icon={<CopyIcon />}
+          onClick={props.copy}
+        ></IconButton>
+      )}
       <IconButton
         text={Locale.Export.Download}
         bordered
@@ -282,23 +285,34 @@ export function ImagePreviewer(props: {
       }
     });
   };
+
+  const isMobile = useMobileScreen();
+
   const download = () => {
     const dom = previewRef.current;
     if (!dom) return;
     toPng(dom)
       .then((blob) => {
         if (!blob) return;
-        const link = document.createElement("a");
-        link.download = `${props.topic}.png`;
-        link.href = blob;
-        link.click();
+
+        if (isMobile) {
+          const image = new Image();
+          image.src = blob;
+          const win = window.open("");
+          win?.document.write(image.outerHTML);
+        } else {
+          const link = document.createElement("a");
+          link.download = `${props.topic}.png`;
+          link.href = blob;
+          link.click();
+        }
       })
       .catch((e) => console.log("[Export Image] ", e));
   };
 
   return (
     <div className={styles["image-previewer"]}>
-      <PreviewActions copy={copy} download={download} />
+      <PreviewActions copy={copy} download={download} showCopy={!isMobile} />
       <div
         className={`${styles["preview-body"]} ${styles["default-theme"]}`}
         ref={previewRef}

diff --git a/app/components/message-selector.module.scss b/app/components/message-selector.module.scss
@@ -5,10 +5,31 @@
     .search-bar {
       max-width: unset;
       flex-grow: 1;
+      margin-right: 10px;
     }
 
-    .filter-item:not(:last-child) {
-      margin-right: 10px;
+    .actions {
+      display: flex;
+
+      button:not(:last-child) {
+        margin-right: 10px;
+      }
+    }
+
+    @media screen and (max-width: 600px) {
+      flex-direction: column;
+
+      .search-bar {
+        margin-right: 0;
+      }
+
+      .actions {
+        margin-top: 20px;
+
+        button {
+          flex-grow: 1;
+        }
+      }
     }
   }
 

diff --git a/app/components/message-selector.tsx b/app/components/message-selector.tsx
@@ -140,33 +140,35 @@ export function MessageSelector(props: {
           }}
         ></input>
 
-        <IconButton
-          text={Locale.Select.All}
-          bordered
-          className={styles["filter-item"]}
-          onClick={selectAll}
-        />
-        <IconButton
-          text={Locale.Select.Latest}
-          bordered
-          className={styles["filter-item"]}
-          onClick={() =>
-            props.updateSelection((selection) => {
-              selection.clear();
-              messages
-                .slice(messageCount - 10)
-                .forEach((m) => selection.add(m.id!));
-            })
-          }
-        />
-        <IconButton
-          text={Locale.Select.Clear}
-          bordered
-          className={styles["filter-item"]}
-          onClick={() =>
-            props.updateSelection((selection) => selection.clear())
-          }
-        />
+        <div className={styles["actions"]}>
+          <IconButton
+            text={Locale.Select.All}
+            bordered
+            className={styles["filter-item"]}
+            onClick={selectAll}
+          />
+          <IconButton
+            text={Locale.Select.Latest}
+            bordered
+            className={styles["filter-item"]}
+            onClick={() =>
+              props.updateSelection((selection) => {
+                selection.clear();
+                messages
+                  .slice(messageCount - 10)
+                  .forEach((m) => selection.add(m.id!));
+              })
+            }
+          />
+          <IconButton
+            text={Locale.Select.Clear}
+            bordered
+            className={styles["filter-item"]}
+            onClick={() =>
+              props.updateSelection((selection) => selection.clear())
+            }
+          />
+        </div>
       </div>
 
       <div className={styles["messages"]}>