Merge pull request #66 from solaoi/feature_suppress-reset-on-activate…

…-other-tabs suppress-reset-on-activate-other-tabs
solaoi · Aug 11, 2022 · 68dbd3b · 68dbd3b
2 parents 14b4921 + 7c1e713
commit 68dbd3b
Show file tree

Hide file tree

Showing 10 changed files with 1,675 additions and 1,560 deletions.
diff --git a/app/auth/components/LoginForm.tsx b/app/auth/components/LoginForm.tsx
@@ -3,7 +3,7 @@ import { LabeledTextField } from "app/core/components/LabeledTextField"
 import { Form, FORM_ERROR } from "app/core/components/Form"
 import login from "app/auth/mutations/login"
 import { Login } from "app/auth/validations"
-import Card from "../../core/layouts/Card"
+import Card from "app/core/layouts/Card"
 import { Flex } from "@chakra-ui/react"
 
 type LoginFormProps = {

diff --git a/app/auth/components/SignupForm.tsx b/app/auth/components/SignupForm.tsx
@@ -3,7 +3,7 @@ import { LabeledTextField } from "app/core/components/LabeledTextField"
 import { Form, FORM_ERROR } from "app/core/components/Form"
 import signup from "app/auth/mutations/signup"
 import { Signup } from "app/auth/validations"
-import Card from "../../core/layouts/Card"
+import Card from "app/core/layouts/Card"
 import { Flex } from "@chakra-ui/react"
 
 type SignupFormProps = {

diff --git a/app/core/components/Form.tsx b/app/core/components/Form.tsx
@@ -4,6 +4,7 @@ import { z } from "zod"
 import { validateZodSchema } from "blitz"
 export { FORM_ERROR } from "final-form"
 import { Button, Flex } from "@chakra-ui/react"
+import deepEqual from "fast-deep-equal"
 
 export interface FormProps<S extends z.ZodType<any, any>>
   extends Omit<PropsWithoutRef<JSX.IntrinsicElements["form"]>, "onSubmit"> {
@@ -27,6 +28,7 @@ export function Form<S extends z.ZodType<any, any>>({
   return (
     <FinalForm
       initialValues={initialValues}
+      initialValuesEqual={deepEqual}
       validate={validateZodSchema(schema)}
       onSubmit={onSubmit}
       render={({ handleSubmit, submitting, submitError }) => (

diff --git a/app/pages/projects/[projectId]/edit.tsx b/app/pages/projects/[projectId]/edit.tsx
@@ -5,7 +5,7 @@ import getProject from "app/projects/queries/getProject"
 import updateProject from "app/projects/mutations/updateProject"
 import { ProjectForm, FORM_ERROR } from "app/projects/components/ProjectForm"
 import { Spinner, Flex, Breadcrumb, BreadcrumbItem, BreadcrumbLink } from "@chakra-ui/react"
-import Card from "../../../core/layouts/Card"
+import Card from "app/core/layouts/Card"
 import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 
 const BreadCrumb = ({ project }) => {

diff --git a/app/pages/projects/new.tsx b/app/pages/projects/new.tsx
@@ -4,7 +4,7 @@ import createProject from "app/projects/mutations/createProject"
 import { ProjectForm, FORM_ERROR } from "app/projects/components/ProjectForm"
 import { Suspense } from "react"
 import { Spinner, Flex, Breadcrumb, BreadcrumbItem, BreadcrumbLink } from "@chakra-ui/react"
-import Card from "../../core/layouts/Card"
+import Card from "app/core/layouts/Card"
 import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 
 const BreadCrumb = () => (

diff --git a/app/pages/stubs/[stubId]/edit.tsx b/app/pages/stubs/[stubId]/edit.tsx
@@ -6,7 +6,7 @@ import updateStub from "app/stubs/mutations/updateStub"
 import { StubForm, FORM_ERROR } from "app/stubs/components/StubForm"
 import { Box, Spinner, Flex, Breadcrumb, BreadcrumbItem, BreadcrumbLink } from "@chakra-ui/react"
 import getProject from "app/projects/queries/getProject"
-import Card from "../../../core/layouts/Card"
+import Card from "app/core/layouts/Card"
 import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 
 const BreadCrumb = ({ stub }) => {

diff --git a/app/pages/stubs/new.tsx b/app/pages/stubs/new.tsx
@@ -5,7 +5,7 @@ import { StubForm, FORM_ERROR } from "app/stubs/components/StubForm"
 import { Spinner, Flex, Breadcrumb, BreadcrumbItem, BreadcrumbLink } from "@chakra-ui/react"
 import getProject from "app/projects/queries/getProject"
 import { Suspense } from "react"
-import Card from "../../core/layouts/Card"
+import Card from "app/core/layouts/Card"
 import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 
 const BreadCrumb = ({ projectId }) => {

diff --git a/app/stubs/components/StubForm.tsx b/app/stubs/components/StubForm.tsx
@@ -5,8 +5,7 @@ import { LabeledSelectField } from "app/core/components/LabeledSelectField"
 import { useRouterQuery } from "blitz"
 import { z } from "zod"
 export { FORM_ERROR } from "app/core/components/Form"
-import Card from "../../core/layouts/Card"
-import { border } from "@chakra-ui/styled-system"
+import Card from "app/core/layouts/Card"
 
 export function StubForm<S extends z.ZodType<any, any>>(props: FormProps<S>) {
   const query = useRouterQuery()