[@mantine/form] Fix useForm initialDirty stops form.isDirty from work…

…ing as expected (#3372)
mantinedev · Jan 17, 2023 · 05075e6 · 05075e6
1 parent 4a81ed2
commit 05075e6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/mantine-form/src/get-status/get-status.test.ts b/src/mantine-form/src/get-status/get-status.test.ts
@@ -27,5 +27,6 @@ describe('@mantine/form/get-status', () => {
     expect(getStatus(TEST_STATUS, 'a.5')).toBe(false);
     expect(getStatus(TEST_STATUS, 'l.d.0')).toBe(true);
     expect(getStatus(TEST_STATUS, 'l.d.0.2')).toBe(false);
+    expect(getStatus(TEST_STATUS, 'd.0')).toBe(false);
   });
 });
diff --git a/src/mantine-form/src/get-status/get-status.ts b/src/mantine-form/src/get-status/get-status.ts
@@ -4,7 +4,7 @@ export function getStatus(status: FormStatus, path?: unknown) {
   const paths = Object.keys(status);
 
   if (typeof path === 'string') {
-    const nestedPaths = paths.filter((statusPath) => statusPath.includes(`${path}.`));
+    const nestedPaths = paths.filter((statusPath) => statusPath.startsWith(`${path}.`));
     return status[path] || nestedPaths.some((statusPath) => status[statusPath]) || false;
   }
 

diff --git a/src/mantine-form/src/use-form.ts b/src/mantine-form/src/use-form.ts
@@ -217,18 +217,22 @@ export function useForm<
   }, []);
 
   const isDirty: GetFieldStatus<Values> = (path) => {
-    const isOverridden = Object.keys(dirty).length > 0;
-
-    if (isOverridden) {
-      return getStatus(dirty, path);
-    }
-
     if (path) {
+      const overridenValue = getPath(path, dirty);
+      if (typeof overridenValue === 'boolean') {
+        return overridenValue;
+      }
+
       const sliceOfValues = getPath(path, values);
       const sliceOfInitialValues = getPath(path, _dirtyValues.current);
       return !isEqual(sliceOfValues, sliceOfInitialValues);
     }
 
+    const isOverridden = Object.keys(dirty).length > 0;
+    if (isOverridden) {
+      return getStatus(dirty);
+    }
+
     return !isEqual(values, _dirtyValues.current);
   };