From 6174e3bde11a453bccf0cf684c012b7c2da0b6de Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 29 Jul 2022 19:54:35 -0400
Subject: [PATCH] fix(@remix-run/react): undefinedoptionals should preserve
 `null` types

---
 packages/remix-react/components.tsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/remix-react/components.tsx b/packages/remix-react/components.tsx
index 0c3f7eae6a0..3adb0c6546b 100644
--- a/packages/remix-react/components.tsx
+++ b/packages/remix-react/components.tsx
@@ -1364,12 +1364,20 @@ type SerializeObject<T> = {
   >;
 };
 
-type UndefinedOptionals<T> = Merge<
+/*
+ * For an object T, if it has any properties that are a union with `undefined`,
+ * make those into optional properties instead.
+ * 
+ * Example: { a: string | undefined} --> { a?: string}
+ */
+type UndefinedOptionals<T extends object> = Merge<
   {
-    [k in keyof T as undefined extends T[k] ? never : k]: NonNullable<T[k]>;
+    // Property is not a union with `undefined`, keep as-is
+    [k in keyof T as undefined extends T[k] ? never : k]: T[k];
   },
   {
-    [k in keyof T as undefined extends T[k] ? k : never]?: NonNullable<T[k]>;
+    // Property _is_ a union with `defined`. Set as optional (via `?`) and remove `undefined` from the union
+    [k in keyof T as undefined extends T[k] ? k : never]?: Exclude<T[k], undefined>;
   }
 >;