fix: remove unnecessary wrapping for fields

The fields object was previously necessary when list of fieldAtoms was permissible.
form-atoms · Mar 7, 2024 · bb1b1b4 · bb1b1b4
1 parent b04e297
commit bb1b1b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/src/atoms/list-atom/listAtom.ts b/src/atoms/list-atom/listAtom.ts
@@ -133,10 +133,7 @@ export function listAtom<
     const formLists = get(_formListAtom);
 
     return formLists.map((formAtom) => {
-      const formAtoms = get(formAtom);
-      const { fields } = get(formAtoms.fields);
-
-      return fields;
+      return get(get(formAtom).fields);
     });
   });
 
@@ -214,14 +211,9 @@ export function listAtom<
   const emptyAtom = atom((get) => get(_formListAtom).length === 0);
   const valueAtom = atom(
     (get) => {
-      const formLists = get(_formListAtom);
-
-      return formLists.map((formAtom) => {
-        const formAtoms = get(formAtom);
-        const { fields } = get(formAtoms.values);
-
-        return fields as Value;
-      });
+      return get(_formListAtom).map((formAtom) => {
+        return get(get(formAtom).values);
+      }) as Value[];
     },
     (
       get,

diff --git a/src/atoms/list-atom/listItemForm.ts b/src/atoms/list-atom/listItemForm.ts
@@ -97,9 +97,7 @@ type NamedFormAtom<Fields extends FormFields> = Atom<{
   ) => Promise<void>;
 }>;
 
-export type ListItemForm<Fields extends FormFields> = NamedFormAtom<{
-  fields: Fields;
-}>;
+export type ListItemForm<Fields extends FormFields> = NamedFormAtom<Fields>;
 
 export function listItemForm<Fields extends FormFields>({
   fields,
@@ -132,7 +130,7 @@ export function listItemForm<Fields extends FormFields>({
       >;
 }) {
   const itemFormAtom: ListItemForm<Fields> = extendAtom(
-    formAtom({ fields }) as unknown as PrimitiveFormAtom<Fields>,
+    formAtom(fields) as unknown as PrimitiveFormAtom<Fields>,
     (base, get) => {
       const nameAtom = atom((get) => {
         const list: ListItemForm<Fields>[] = get(formListAtom);