Switch defaultProps argument order

solidjs · Jul 1, 2023 · 596a719 · 596a719
1 parent 5a125ce
commit 596a719
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/packages/solid/src/render/component.ts b/packages/solid/src/render/component.ts
@@ -267,8 +267,8 @@ export function mergeProps<T extends unknown[]>(...sources: T): MergeProps<T> {
 
 export type DefaultProps<T, K extends keyof T> = MergeProps<[Required<Pick<T, K>>, T]>;
 export function defaultProps<T, K extends keyof T>(
-  defaults: Required<Pick<T, K>>,
-  props: T
+  props: T,
+  defaults: Required<Pick<T, K>>
 ): DefaultProps<T, K> {
   return mergeProps(defaults, props);
 }

diff --git a/packages/solid/test/component.spec.ts b/packages/solid/test/component.spec.ts
@@ -235,7 +235,7 @@ describe("defaultProps", () => {
       b: null,
       c: "boop"
     };
-    props = defaultProps({}, props);
+    props = defaultProps(props, {});
     expect(props.a).toBe("beep");
     expect(props.b).toBe(null);
     expect(props.c).toBe("boop");
@@ -249,15 +249,12 @@ describe("defaultProps", () => {
       b: null,
       c: "boop"
     };
-    props = defaultProps(
-      {
-        a: "xxx",
-        b: "xxx",
-        c: "xxx",
-        d: "xxx"
-      },
-      props
-    );
+    props = defaultProps(props, {
+      a: "xxx",
+      b: "xxx",
+      c: "xxx",
+      d: "xxx"
+    });
     expect(props.a).toBe("beep");
     expect(props.b).toBe(null);
     expect(props.c).toBe("boop");
@@ -268,14 +265,11 @@ describe("defaultProps", () => {
       a: "defined",
       c: null
     };
-    props = defaultProps(
-      {
-        a: null,
-        b: null,
-        c: null
-      },
-      props
-    );
+    props = defaultProps(props, {
+      a: null,
+      b: null,
+      c: null
+    });
     expect(props.a).toBe("defined");
     expect(props.b).toBe(null);
     expect(props.c).toBe(null);

diff --git a/packages/solid/test/component.type-tests.ts b/packages/solid/test/component.type-tests.ts
@@ -195,25 +195,25 @@ type D1Props = {
   i?: null;
   j: null;
 };
-const d1 = defaultProps({}, {} as D1Props);
+const d1 = defaultProps({} as D1Props, {});
 type D1 = typeof d1;
 type TestD1 = Assert<IsExact<D1, D1Props>>;
 
 // d2: defaultProps removes undefined on merged props
 const d2 = defaultProps(
-  {
-    a: "hello",
-    b: "two",
-    c: [1, 2, 3],
-    d: ["string", 99, "one", 4],
-    e: null
-  },
   {} as {
     a?: string;
     b?: "one" | "two" | "three";
     c?: [1, 2, 3];
     d?: [string, number, "one" | "two", 3 | 4];
     e?: null;
+  },
+  {
+    a: "hello",
+    b: "two",
+    c: [1, 2, 3],
+    d: ["string", 99, "one", 4],
+    e: null
   }
 );
 type D2 = typeof d2;