Home Explore Help
Sign In
tuonq
/
ChatAI
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'Yidadaa:main' into main

Gan-Xing 1 year ago
parent
f2b81a2f23 c49dbab127
commit
dbd92b2db9
4 changed files with 24 additions and 6 deletions
Split View Show Diff Stats
  1. 15 2
      app/components/chat.tsx
  2. 4 3
      app/layout.tsx
  3. 1 1
      app/requests.ts
  4. 4 0
      app/store/access.ts

+ 15 - 2
app/components/chat.tsx
View File 

@@ -230,7 +230,9 @@ export function PromptHints(props: {
 
   useEffect(() => {
 
     const onKeyDown = (e: KeyboardEvent) => {
 
       if (noPrompts) return;
 
-
 
+      if (e.metaKey || e.altKey || e.ctrlKey) {
 
+        return;
 
+      }
 
       // arrow up / down to select prompt
 
       const changeIndex = (delta: number) => {
 
         e.stopPropagation();
 
@@ -491,7 +493,11 @@ export function Chat() {
 
   // check if should send message
 
   const onInputKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
 
     // if ArrowUp and no userInput, fill with last input
 
-    if (e.key === "ArrowUp" && userInput.length <= 0) {
 
+    if (
 
+      e.key === "ArrowUp" &&
 
+      userInput.length <= 0 &&
 
+      !(e.metaKey || e.altKey || e.ctrlKey)
 
+    ) {
 
       setUserInput(localStorage.getItem(LAST_INPUT_KEY) ?? "");
 
       e.preventDefault();
 
       return;
 
@@ -789,7 +795,14 @@ export function Chat() {
 
           scrollToBottom={scrollToBottom}
 
           hitBottom={hitBottom}
 
           showPromptHints={() => {
 
+            // Click again to close
 
+            if (promptHints.length > 0) {
 
+              setPromptHints([]);
 
+              return;
 
+            }
 
+
 
             inputRef.current?.focus();
 
+            setUserInput("/");
 
             onSearch("");
 
           }}
 
         />

+ 4 - 3
app/layout.tsx
View File 

@@ -13,7 +13,7 @@ export const metadata = {
 
     title: "ChatGPT Next Web",
 
     statusBarStyle: "default",
 
   },
 
-  themeColor: "#fafafa",
 
+  viewport: "width=device-width, initial-scale=1, maximum-scale=1",
 
 };
 
 
 export default function RootLayout({
 
@@ -25,8 +25,9 @@ export default function RootLayout({
 
     <html lang="en">
 
       <head>
 
         <meta
 
-          name="viewport"
 
-          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
 
+          name="theme-color"
 
+          content="#fafafa"
 
+          media="(prefers-color-scheme: light)"
 
         />
 
         <meta
 
           name="theme-color"

+ 1 - 1
app/requests.ts
View File 

@@ -43,7 +43,7 @@ const makeRequestParam = (
 
   };
 
 };
 
 
-function getHeaders() {
 
+export function getHeaders() {
 
   const accessStore = useAccessStore.getState();
 
   let headers: Record<string, string> = {};

+ 4 - 0
app/store/access.ts
View File 

@@ -1,6 +1,7 @@
 
 import { create } from "zustand";
 
 import { persist } from "zustand/middleware";
 
 import { StoreKey } from "../constant";
 
+import { getHeaders } from "../requests";
 
 import { BOT_HELLO } from "./chat";
 
 import { ALL_MODELS } from "./config";
 
 
@@ -55,6 +56,9 @@ export const useAccessStore = create<AccessControlStore>()(
 
         fetch("/api/config", {
 
           method: "post",
 
           body: null,
 
+          headers: {
 
+            ...getHeaders(),
 
+          },
 
         })
 
           .then((res) => res.json())
 
           .then((res: DangerConfig) => {