Revert "Merge branch 'main' of https://github.com/cdsctf/cdsuno"

This reverts commit 9dacfc3, reversing changes made to 1b99b6e.
cdsctf · Nov 22, 2024 · 4a923fc · 4a923fc
1 parent 9dacfc3
commit 4a923fc
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 162 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,6 @@
         "nanoid": "^5.0.8",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-error-boundary": "^4.1.2",
         "react-markdown": "^9.0.1",
         "react-router-dom": "^6.26.1",
         "react-transition-group": "^4.4.5",

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,6 +1,5 @@
 import { useThemeStore } from "@/stores/theme";
 import { RouterProvider } from "react-router-dom";
-import { ErrorBoundary } from "react-error-boundary";
 import { useEffect } from "react";
 import { router } from "@/routers";
 

diff --git a/src/components/core/Box/Box.module.scss b/src/components/core/Box/Box.module.scss
diff --git a/src/components/core/Box/Box.tsx b/src/components/core/Box/Box.tsx
diff --git a/src/components/core/Box/index.ts b/src/components/core/Box/index.ts
diff --git a/src/components/core/Flex/Flex.module.scss b/src/components/core/Flex/Flex.module.scss
diff --git a/src/components/core/Flex/Flex.tsx b/src/components/core/Flex/Flex.tsx
diff --git a/src/components/core/Flex/index.ts b/src/components/core/Flex/index.ts
diff --git a/src/components/core/InputBase/InputBase.module.scss b/src/components/core/InputBase/InputBase.module.scss
@@ -1,13 +1,11 @@
 @use "@/styles/mixins";
 
 $width: var(--input-width);
-$height: var(--input-height);
 $bg-color: var(--input-bg-color);
 $border-color: var(--input-border-color);
 
 .root {
     width: $width;
-    height: $height;
     display: flex;
     flex-direction: column;
     align-items: start;
@@ -47,7 +45,6 @@ $border-color: var(--input-border-color);
 
 .wrapper {
     width: 100%;
-    height: 100%;
     border-radius: 15px;
     box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1);
     display: flex;

diff --git a/src/components/core/InputBase/InputBase.tsx b/src/components/core/InputBase/InputBase.tsx
@@ -5,7 +5,6 @@ import clsx from "clsx";
 
 export interface InputBaseProps extends ComponentProps<"div"> {
     width?: string;
-    height?: string;
     color?: string;
     variant?: "outlined" | "solid";
     invalid?: boolean;
@@ -21,7 +20,6 @@ export const InputBase = forwardRef<HTMLDivElement, InputBaseProps>(
     (props, ref) => {
         const {
             width = "fit-content",
-            height = "fit-content",
             color = "primary",
             invalid = false,
             variant = "outlined",
@@ -38,7 +36,6 @@ export const InputBase = forwardRef<HTMLDivElement, InputBaseProps>(
 
         const variables = {
             "--input-width": width,
-            "--input-height": height,
             "--input-bg-color": baseColor,
             "--input-border-color": baseColor,
         } as React.CSSProperties;

diff --git a/src/components/core/Stack/Stack.module.scss b/src/components/core/Stack/Stack.module.scss
diff --git a/src/components/core/Stack/Stack.tsx b/src/components/core/Stack/Stack.tsx
diff --git a/src/components/core/Stack/index.ts b/src/components/core/Stack/index.ts
diff --git a/src/components/core/Textarea/Textarea.module.scss b/src/components/core/Textarea/Textarea.module.scss
@@ -41,7 +41,6 @@
 .textarea {
     flex: 1;
     width: 100%;
-    height: 100%;
     background: transparent;
     border: none;
     outline: none;

diff --git a/src/components/core/Textarea/Textarea.tsx b/src/components/core/Textarea/Textarea.tsx
@@ -4,25 +4,21 @@ import styles from "./Textarea.module.scss";
 
 export interface TextareaProps extends Omit<InputBaseProps, "onChange"> {
     width?: string;
-    height?: string;
     value?: string;
     onChange?: (value: string) => void;
     icon?: React.ReactElement;
 }
 
 export function Textarea(props: TextareaProps) {
-    const {
-        width = "fit-content",
-        height = "fit-content",
-        value,
-        onChange,
-        icon,
-        ...rest
-    } = props;
+    const { width = "fit-content", value, onChange, icon, ...rest } = props;
 
     return (
         <InputBase className={styles["root"]} width={width}>
-            {icon && <Icon icon={icon} className={styles["icon"]} />}
+            {icon && (
+                <div className={styles["icon"]}>
+                    <Icon icon={icon} />
+                </div>
+            )}
             <textarea
                 className={styles["textarea"]}
                 value={value}

diff --git a/src/components/utils/ErrorFallback/ErrorFallback.module.scss b/src/components/utils/ErrorFallback/ErrorFallback.module.scss
diff --git a/src/components/utils/ErrorFallback/ErrorFallback.tsx b/src/components/utils/ErrorFallback/ErrorFallback.tsx
diff --git a/src/components/utils/ErrorFallback/index.ts b/src/components/utils/ErrorFallback/index.ts
diff --git a/src/layouts/Base/Base.tsx b/src/layouts/Base/Base.tsx
@@ -1,7 +1,5 @@
-import { ErrorFallback } from "@/components/utils/ErrorFallback/ErrorFallback";
 import { Toaster } from "@/components/widgets/Toaster";
 import globalRouter from "@/utils/globalRouter";
-import { ErrorBoundary } from "react-error-boundary";
 import { Outlet, useNavigate } from "react-router-dom";
 
 export function Base() {
@@ -10,10 +8,8 @@ export function Base() {
 
     return (
         <>
-            <ErrorBoundary FallbackComponent={ErrorFallback}>
-                <Outlet />
-                <Toaster />
-            </ErrorBoundary>
+            <Outlet />
+            <Toaster />
         </>
     );
 }
diff --git a/src/pages/page.tsx b/src/pages/page.tsx
@@ -38,8 +38,6 @@ export function Page() {
 
     const [checked, setChecked] = useState<boolean>(false);
 
-    // throw new Error("123");
-
     const markdownText = `
 # welcome Heading1
 ## welcome Heading2