Merge remote-tracking branch 'dpopovms/final-form:main' from final-fo…

…rm PR final-form#490; solves issue final-form#489;
Deckstar · Mar 25, 2024 · 73ea512 · 73ea512
2 parents ef201af + 012fd2c
commit 73ea512
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/final-form/src/FinalForm.ts b/packages/final-form/src/FinalForm.ts
@@ -238,8 +238,8 @@ function createForm<FormValues extends FormValuesShape = FormValuesShape>(
 
   const state: InternalState<FormValues> = {
     subscribers: { index: 0, entries: {} },
-    fieldSubscribers: {},
-    fields: {},
+    fieldSubscribers: Object.create(null),
+    fields: Object.create(null),
     formState: {
       asyncErrors: {},
       dirtySinceLastSubmit: false,

diff --git a/packages/final-form/tests/FinalForm.registerField.test.ts b/packages/final-form/tests/FinalForm.registerField.test.ts
@@ -44,4 +44,17 @@ describe("FinalForm.registerField", () => {
     expect(typeof spy.mock.calls[0][0].focus).toBe("function");
     expect(typeof spy.mock.calls[0][0].change).toBe("function");
   });
+
+  it("should handle non-prototype fields correctly", () => {
+    const submitSpy = jest.fn();
+    const changeSpy = jest.fn();
+
+    const form = createForm({ onSubmit: submitSpy });
+    form.registerField("constructor", changeSpy);
+
+    expect(changeSpy).toHaveBeenCalledTimes(1);
+    form.change("constructor", "bar");
+    form.submit();
+    expect(submitSpy).toHaveBeenCalledTimes(1);
+  });
 });