change parameters order in useValueIterator (#17)

Bloomca · May 27, 2024 · 41967bf · 41967bf
1 parent b3543d3
commit 41967bf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -135,6 +135,7 @@ function List() {
     children: [
       createElement("h1", { children: "list" }),
       listState.useValueIterator<{ id: number; name: string }>(
+        { key: "id" },
         ({ elementState }) => {
           return createElement("div", {
             children: [
@@ -143,8 +144,7 @@ function List() {
               ),
             ],
           });
-        },
-        { key: "id" }
+        }
       ),
     ],
   });

diff --git a/integration-tests/create-state.test.ts b/integration-tests/create-state.test.ts
@@ -412,20 +412,18 @@ describe("createState", () => {
           createElement("ul", {
             "data-testid": "listComponent",
             children: [
-              state.useValueIterator<Item>(
-                ({ elementState }) =>
-                  createElement(() => {
-                    onUnmount(unmountSpy);
-                    return createElement("li", {
-                      children: [
-                        elementState.useValueSelector(
-                          (element) => element.text,
-                          (text) => createElement("span", { children: text })
-                        ),
-                      ],
-                    });
-                  }),
-                { key: "id" }
+              state.useValueIterator<Item>({ key: "id" }, ({ elementState }) =>
+                createElement(() => {
+                  onUnmount(unmountSpy);
+                  return createElement("li", {
+                    children: [
+                      elementState.useValueSelector(
+                        (element) => element.text,
+                        (text) => createElement("span", { children: text })
+                      ),
+                    ],
+                  });
+                })
               ),
             ],
           }),

diff --git a/src/hooks/create-state.ts b/src/hooks/create-state.ts
@@ -37,13 +37,13 @@ export type State<ValueType> = {
   ): VelesElement | VelesComponent | VelesStringElement;
   useAttribute(cb: (value: ValueType) => string): AttributeHelper;
   useValueIterator<Element>(
+    options: {
+      key: string | ((options: { element: Element; index: number }) => string);
+    },
     cb: (props: {
       elementState: State<Element>;
       index: number;
-    }) => VelesElement | VelesComponent,
-    options: {
-      key: string | ((options: { element: Element; index: number }) => string);
-    }
+    }) => VelesElement | VelesComponent
   ): VelesComponent | VelesElement;
   getValue(): ValueType;
   getPreviousValue(): undefined | ValueType;
@@ -157,13 +157,13 @@ function createState<T>(
     },
     // TODO: add a version with a selector
     useValueIterator<Element>(
+      options: {
+        key: string | ((options: { element: any; index: number }) => string);
+      },
       cb: (props: {
         elementState: State<Element>;
         index: number;
-      }) => VelesElement | VelesComponent,
-      options: {
-        key: string | ((options: { element: any; index: number }) => string);
-      }
+      }) => VelesElement | VelesComponent
     ) {
       const children: [
         VelesElement | VelesComponent,