Merge branch 'feat-redesign-ui' into v3

app/components/Btn/index.tsx

@@ -42,7 +42,7 @@ export default function Btn(props: BtnProps) {
       } text-text-btn-primary `;
       break;
     case "danger":
-      btnClassName = `bg-danger-btn text-text-btn-danger hover:bg-hovered-btn`;
+      btnClassName = `bg-danger-btn text-text-btn-danger hover:bg-hovered-danger-btn`;
       break;
     default:
       btnClassName = `bg-default-btn text-text-btn-default hover:bg-hovered-btn`;

app/components/Input/index.tsx

@@ -4,7 +4,6 @@ import {
   DetailedHTMLProps,
   InputHTMLAttributes,
   useContext,
-  useEffect,
   useLayoutEffect,
   useState,
 } from "react";
@@ -17,6 +16,7 @@ export interface CommonInputProps
   > {
   className?: string;
 }
+
 export interface NumberInputProps {
   onChange?: (v: number) => void;
   type?: "number";
@@ -49,12 +49,16 @@ export default function Input(props: CommonInputProps & InputProps) {
 
   const internalType = (show && "text") || type;
 
-  const { update } = useContext(List.ListContext);
+  const { update, handleValidate } = useContext(List.ListContext);
 
   useLayoutEffect(() => {
     update?.({ type: "input" });
   }, []);
 
+  useLayoutEffect(() => {
+    handleValidate?.(value);
+  }, [value]);
+
   return (
     <div
       className={` group/input w-[100%] rounded-chat-input bg-input transition-colors duration-300 ease-in-out flex gap-3 items-center px-3 py-2 ${className} hover:bg-select-hover ${inputClassName}`}

app/components/List/index.tsx

@@ -17,6 +17,7 @@ interface WidgetStyle {
 
 interface ChildrenMeta {
   type?: "unknown" | "input" | "range";
+  error?: string;
 }
 
 export interface ListProps {
@@ -27,17 +28,31 @@ export interface ListProps {
   widgetStyle?: WidgetStyle;
 }
 
+type Error =
+  | {
+      error: true;
+      message: string;
+    }
+  | {
+      error: false;
+    };
+
 export interface ListItemProps {
   title: string;
   subTitle?: string;
   children?: JSX.Element | JSX.Element[];
   className?: string;
   onClick?: () => void;
   nextline?: boolean;
+  validator?: (v: any) => Error | Promise<Error>;
 }
 
 export const ListContext = createContext<
-  { isMobileScreen?: boolean; update?: (m: ChildrenMeta) => void } & WidgetStyle
+  {
+    isMobileScreen?: boolean;
+    update?: (m: ChildrenMeta) => void;
+    handleValidate?: (v: any) => void;
+  } & WidgetStyle
 >({ isMobileScreen: false });
 
 export function ListItem(props: ListItemProps) {
@@ -48,6 +63,7 @@ export function ListItem(props: ListItemProps) {
     subTitle,
     children,
     nextline,
+    validator,
   } = props;
 
   const context = useContext(ListContext);
@@ -56,9 +72,11 @@ export function ListItem(props: ListItemProps) {
 
   const { inputNextLine, rangeNextLine } = context;
 
+  const { type, error } = childrenMeta;
+
   let internalNextLine;
 
-  switch (childrenMeta.type) {
+  switch (type) {
     case "input":
       internalNextLine = !!(nextline || inputNextLine);
       break;
@@ -70,7 +88,22 @@ export function ListItem(props: ListItemProps) {
   }
 
   const update = useCallback((m: ChildrenMeta) => {
-    setMeta(m);
+    setMeta((pre) => ({ ...pre, ...m }));
+  }, []);
+
+  const handleValidate = useCallback((v: any) => {
+    const insideValidator = validator || (() => {});
+
+    Promise.resolve(insideValidator(v)).then((result) => {
+      if (result && result.error) {
+        return update({
+          error: result.message,
+        });
+      }
+      update({
+        error: undefined,
+      });
+    });
   }, []);
 
   return (
@@ -88,13 +121,18 @@ export function ListItem(props: ListItemProps) {
           <div className={` text-sm text-text-list-subtitle`}>{subTitle}</div>
         )}
       </div>
-      <ListContext.Provider value={{ ...context, update }}>
+      <ListContext.Provider value={{ ...context, update, handleValidate }}>
         <div
           className={`${
             internalNextLine ? "mt-[0.625rem]" : "max-w-[70%]"
-          } flex items-center justify-center`}
+          } flex flex-col items-center justify-center`}
         >
-          {children}
+          <div>{children}</div>
+          {!!error && (
+            <div className="text-text-btn-danger text-sm-mobile-tab mt-[0.3125rem] flex items-start w-[100%]">
+              <div className="">{error}</div>
+            </div>
+          )}
         </div>
       </ListContext.Provider>
     </div>

app/components/MenuLayout/index.tsx

@@ -61,6 +61,7 @@ export default function MenuLayout<
       <div
         className={`
           w-[100%] relative bg-center
+          max-md:h-[100%]
           md:flex md:my-2.5
         `}
       >

app/components/Select/index.tsx

@@ -96,7 +96,7 @@ const Select = <Value extends number | string>(props: SearchProps<Value>) => {
       className={selectClassName}
     >
       <div
-        className={`flex items-center gap-3 py-2 px-3 bg-select rounded-action-btn font-time text-sm-title  cursor-pointer hover:bg-select-hover transition duration-300 ease-in-out`}
+        className={`flex items-center gap-3 py-2 px-3 bg-select rounded-action-btn font-common text-sm-title  cursor-pointer hover:bg-select-hover transition duration-300 ease-in-out`}
         ref={contentRef}
       >
         <div

app/components/exporter.module.scss

@@ -2,6 +2,9 @@
   &-body {
     margin-top: 20px;
   }
+  div:not(.no-dark) > svg {
+    filter: invert(0.5);
+  }
 }
 
 .export-content {

app/components/mask.module.scss

@@ -4,6 +4,10 @@
   display: flex;
   flex-direction: column;
 
+  div:not(.no-dark) > svg {
+    filter: invert(0.5);
+  }
+
   .mask-page-body {
     padding: 20px;
     overflow-y: auto;

app/components/mask.tsx

@@ -398,7 +398,7 @@ export function ContextPrompts(props: {
   );
 }
 
-export function MaskPage() {
+export function MaskPage(props: { className?: string }) {
   const navigate = useNavigate();
 
   const maskStore = useMaskStore();
@@ -465,14 +465,13 @@ export function MaskPage() {
     });
   };
 
-  const isMobileScreen = useMobileScreen();
-
   return (
     <>
       <div
-        className={`${styles["mask-page"]} !bg-gray-50 ${
-          isMobileScreen ? "pb-chat-panel-mobile" : ""
-        }`}
+        className={`
+          ${styles["mask-page"]} 
+          ${props.className}
+          `}
       >
         <div className="window-header">
           <div className="window-header-title">

app/components/new-chat.module.scss

@@ -8,6 +8,10 @@
   justify-content: center;
   flex-direction: column;
 
+  div:not(.no-dark) > svg {
+    filter: invert(0.5);
+  }
+
   .mask-header {
     display: flex;
     justify-content: space-between;

app/components/new-chat.tsx

@@ -72,7 +72,7 @@ function useMaskGroup(masks: Mask[]) {
   return groups;
 }
 
-export function NewChat() {
+export function NewChat(props: { className?: string }) {
   const chatStore = useChatStore();
   const maskStore = useMaskStore();
 
@@ -115,9 +115,10 @@ export function NewChat() {
 
   return (
     <div
-      className={`${styles["new-chat"]} !bg-gray-50 px-1 ${
-        isMobileScreen ? "pb-chat-panel-mobile" : ""
-      }`}
+      className={`
+      ${styles["new-chat"]}
+      ${props.className}
+      `}
     >
       <div className={styles["mask-header"]}>
         <IconButton

app/containers/Chat/components/ChatInputPanel.tsx

@@ -301,7 +301,7 @@ export default forwardRef<ChatInputPanelInstance, ChatInputPanelProps>(
             {!isMobileScreen && (
               <div className="flex items-center justify-center text-sm gap-3">
                 <div className="flex-1">&nbsp;</div>
-                <div className="text-text-chat-input-placeholder text-time line-clamp-1">
+                <div className="text-text-chat-input-placeholder font-common line-clamp-1">
                   {Locale.Chat.Input(submitKey)}
                 </div>
                 <Btn

app/containers/Chat/components/ChatMessagePanel.tsx

@@ -185,7 +185,7 @@ export default function ChatMessagePanel(props: ChatMessagePanelProps) {
                 }`}
               >
                 <div
-                  className={` pointer-events-none  text-text-chat-message-date text-right text-time whitespace-nowrap transition-all duration-500 text-sm absolute z-1 ${
+                  className={` pointer-events-none  text-text-chat-message-date text-right font-common whitespace-nowrap transition-all duration-500 text-sm absolute z-1 ${
                     isUser ? "right-0" : "left-0"
                   } bottom-[100%] hidden group-hover:block`}
                 >

app/containers/Chat/components/ModelSelect.tsx

@@ -124,13 +124,17 @@ const ModelSelect = () => {
 
   return (
     <Popover
-      content={content({ close: () => {} })}
+      content={
+        <div className="max-h-chat-actions-select-model-popover overflow-y-auto">
+          {content({ close: () => {} })}
+        </div>
+      }
       trigger="click"
       noArrow
       placement={
         position?.poi.relativePosition[1] !== Orientation.bottom ? "lb" : "lt"
       }
-      popoverClassName="border border-select-popover rounded-lg shadow-select-popover-shadow w-actions-popover  bg-model-select-popover-panel max-h-chat-actions-select-model-popover  w-[280px]"
+      popoverClassName="border border-select-popover rounded-lg shadow-select-popover-shadow w-actions-popover  bg-model-select-popover-panel w-[280px]"
       onShow={(e) => {
         if (e) {
           autoScrollToSelectedModal();

app/containers/Chat/components/PromptHint.tsx

@@ -67,15 +67,14 @@ export default function PromptHints(props: {
   return (
     <div
       className={`
-      ${styles["prompt-hints"]} 
-      transition-all duration-300 shadow-prompt-hint-container rounded-none w-[100%] flex flex-col-reverse overflow-auto
-      ${
-        notShowPrompt
-          ? "max-h-[0vh] border-none"
-          : "border-b pt-2.5 max-h-[50vh]"
-      } 
-      ${props.className}
-    `}
+        transition-all duration-300 shadow-prompt-hint-container rounded-none  flex flex-col-reverse overflow-x-hidden
+        ${
+          notShowPrompt
+            ? "max-h-[0vh] border-none"
+            : "border-b pt-2.5 max-h-[50vh]"
+        } 
+        ${props.className}
+      `}
     >
       {internalPrompts.map((prompt, i) => (
         <div

app/containers/Chat/index.module.scss

@@ -525,38 +525,33 @@
   text-overflow: ellipsis;
 }
 
-.prompt-hints {
-  .prompt-hint {
-    color:var(--btn-default-text);
-    padding: 6px 10px;
-    // animation: slide-in ease 0.3s;
-    // cursor: pointer;
-    // transition: all ease 0.3s;
-    border: transparent 1px solid;
-    margin: 4px;
-    border-radius: 8px;
+.prompt-hint {
+  color:var(--btn-default-text);
+  padding: 6px 10px;
+  border: transparent 1px solid;
+  margin: 4px;
+  border-radius: 8px;
 
-    &:not(:last-child) {
-      margin-top: 0;
-    }
+  &:not(:last-child) {
+    margin-top: 0;
+  }
 
-    .hint-title {
-      font-size: 12px;
-      font-weight: bolder;
+  .hint-title {
+    font-size: 12px;
+    font-weight: bolder;
 
-      @include single-line();
-    }
+    @include single-line();
+  }
 
-    .hint-content {
-      font-size: 12px;
+  .hint-content {
+    font-size: 12px;
 
-      @include single-line();
-    }
+    @include single-line();
+  }
 
-    &-selected,
-    &:hover {
-      border-color: var(--primary);
-    }
+  &-selected,
+  &:hover {
+    border-color: var(--primary);
   }
 }
 

app/containers/Settings/components/ModelSetting.tsx

@@ -153,14 +153,23 @@ export default function ModelSetting(props: {
             title={Locale.Settings.InputTemplate.Title}
             subTitle={Locale.Settings.InputTemplate.SubTitle}
             nextline={isMobileScreen}
+            validator={(v: string) => {
+              if (!v.includes("{{input}}")) {
+                return {
+                  error: true,
+                  message: Locale.Settings.InputTemplate.Error,
+                };
+              }
+
+              return { error: false };
+            }}
           >
             <Input
               type="text"
               value={props.modelConfig.template}
               onChange={(e = "") =>
                 props.updateConfig((config) => (config.template = e))
               }
-              className="text-center"
             ></Input>
           </ListItem>
         </>