fix: provide updated props to resolveFields

measuredco · Jan 29, 2025 · b7ff689 · b7ff689
1 parent c22b3a9
commit b7ff689
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/packages/core/lib/__tests__/use-resolved-fields.spec.tsx b/packages/core/lib/__tests__/use-resolved-fields.spec.tsx
@@ -247,7 +247,7 @@ describe("use-resolved-fields", () => {
       });
     });
 
-    it("tracks lastFields when rerendering", async () => {
+    it("calls resolver with appropriate fields on props change", async () => {
       const mockResolveFields = jest.fn().mockResolvedValue({
         title: { type: "textarea" },
       });
@@ -261,9 +261,13 @@ describe("use-resolved-fields", () => {
         params = renderHook(() => useResolvedFields());
       });
 
+      // update state and trigger re-render
       useAppContextMock.mockReturnValue({
         ...context,
-        state: { ...context.state, data: { root: { foo: "bar" } } }, // trigger re-render
+        state: {
+          ...context.state,
+          data: { ...context.state.data, root: { props: { foo: "bar" } } },
+        },
       });
 
       await act(() => {
@@ -275,20 +279,20 @@ describe("use-resolved-fields", () => {
       expect(result.current[0]).toEqual({ title: { type: "textarea" } });
       expect(result.current[1]).toBe(false);
       expect(mockResolveFields).toHaveBeenCalledTimes(2);
-      expect(mockResolveFields).toHaveBeenCalledWith(
-        { props: {}, readOnly: undefined },
+      expect(mockResolveFields.mock.calls[1]).toEqual([
+        { props: { foo: "bar" }, readOnly: undefined },
         {
           appState: {
-            data: { content: [], root: { props: {} } },
+            data: { content: [], root: { props: { foo: "bar" } } }, // props changed
             ui: { itemSelector: null },
           },
-          changed: {},
+          changed: { foo: true }, // track changed
           fields: { title: { type: "text" } },
-          lastData: {},
-          lastFields: { title: { type: "textarea" } },
+          lastData: { props: {}, readOnly: undefined },
+          lastFields: { title: { type: "textarea" } }, // track previous fields due to re-render
           parent: null,
-        }
-      );
+        },
+      ]);
     });
   });
 

diff --git a/packages/core/lib/use-resolved-fields.ts b/packages/core/lib/use-resolved-fields.ts
@@ -55,9 +55,13 @@ export const useResolvedFields = (): [FieldsType, boolean] => {
     }
   ) => defaultFields;
 
-  const componentData: ComponentOrRootData = selectedItem
-    ? selectedItem
-    : { props: rootProps, readOnly: data.root.readOnly };
+  const componentData: ComponentOrRootData = useMemo(
+    () =>
+      selectedItem
+        ? selectedItem
+        : { props: rootProps, readOnly: data.root.readOnly },
+    [selectedItem, rootProps, data.root.readOnly]
+  );
 
   const hasComponentResolver = selectedItem && componentConfig?.resolveFields;
   const hasRootResolver = !selectedItem && config.root?.resolveFields;
@@ -131,7 +135,13 @@ export const useResolvedFields = (): [FieldsType, boolean] => {
       }
     }
     setResolvedFields(defaultFields);
-  }, [defaultFields, state.ui.itemSelector, hasResolver, parent]);
+  }, [
+    defaultFields,
+    state.ui.itemSelector,
+    hasResolver,
+    parent,
+    resolveFields,
+  ]);
 
   useOnValueChange<ItemSelector | null>(
     state.ui.itemSelector,