Merge remote-tracking branch 'origin/develop' into develop

epam · Oct 8, 2024 · 3fa144c · 3fa144c
2 parents 3ac1d81 + 8058a95
commit 3fa144c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/public/docs/content/examples-labeledInput-Basic.json b/public/docs/content/examples-labeledInput-Basic.json
@@ -1 +1,11 @@
-{"object":"value","document":{"object":"document","data":{},"nodes":[{"object":"block","type":"paragraph","data":{},"nodes":[{"object":"text","text":"Basic LabeledInput usage","marks":[]}]}]}}
+[
+  {
+    "type": "paragraph",
+    "data": {},
+    "children": [
+      {
+        "text": "Basic LabeledInput usage"
+      }
+    ]
+  }
+]
diff --git a/uui-core/src/data/forms/__tests__/useForm.test.tsx b/uui-core/src/data/forms/__tests__/useForm.test.tsx
@@ -625,7 +625,7 @@ describe('useForm', () => {
 
         it('Should unblock router when form is saved', async () => {
             const saveMock = jest.fn().mockResolvedValue(true);
-            const beforeLeaveMock = jest.fn().mockResolvedValue(false);
+            const beforeLeaveMock = jest.fn().mockRejectedValue(false);
             const { wrapper, testUuiCtx: svc } = getDefaultUUiContextWrapper();
             const props = {
                 value: testData,
@@ -676,7 +676,7 @@ describe('useForm', () => {
             expect(beforeLeaveMock).toHaveBeenCalledTimes(1);
         });
 
-        it('Should make redirect and lock form aging if  beforeLeave return "remain"', async () => {
+        it('Should make redirect and lock form aging if beforeLeave returns "remain"', async () => {
             const saveMock = jest.fn().mockResolvedValue(true);
             const beforeLeaveMock = jest.fn().mockResolvedValue('remain');
             const { wrapper, testUuiCtx: svc } = getDefaultUUiContextWrapper();

diff --git a/uui-core/src/data/forms/useForm.ts b/uui-core/src/data/forms/useForm.ts
@@ -259,9 +259,9 @@ export function useForm<T>(props: UseFormProps<T>): IFormApi<T> {
         }
         flushSync(() => {
             resetForm(newState);
+            removeUnsavedChanges();
+            unblock();
         });
-        removeUnsavedChanges();
-        unblock();
 
         if (propsRef.current.onSuccess && response) {
             propsRef.current.onSuccess(response.form, isSavedBeforeLeave);