From 5beb6c1979df4e45ed9712d559f19ee22b2e33a1 Mon Sep 17 00:00:00 2001
From: Amy Resnik <aresnik11@gmail.com>
Date: Fri, 14 Nov 2025 14:15:14 -0500
Subject: [PATCH 1/3] bump rhf

---
 packages/gamut/package.json | 2 +-
 yarn.lock                   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/gamut/package.json b/packages/gamut/package.json
index 757528ac3e..1a83322a76 100644
--- a/packages/gamut/package.json
+++ b/packages/gamut/package.json
@@ -21,7 +21,7 @@
     "react-aria-components": "1.8.0",
     "react-aria-tabpanel": "^4.4.0",
     "react-focus-on": "^3.10.0",
-    "react-hook-form": "^7.53.1",
+    "react-hook-form": "^7.65.0",
     "react-player": "^2.16.0",
     "react-select": "^5.2.2",
     "react-truncate-markup": "^5.1.2",
diff --git a/yarn.lock b/yarn.lock
index cdf1018cea..96ad6dd656 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15806,10 +15806,10 @@ react-helmet-async@^2.0.5:
     react-fast-compare "^3.2.2"
     shallowequal "^1.1.0"
 
-react-hook-form@^7.53.1:
-  version "7.53.1"
-  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.1.tgz#3f2cd1ed2b3af99416a4ac674da2d526625add67"
-  integrity sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==
+react-hook-form@^7.65.0:
+  version "7.66.0"
+  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.66.0.tgz#1a09ea9d0ebb3bdda5073b08a486538d37d9c0d4"
+  integrity sha512-xXBqsWGKrY46ZqaHDo+ZUYiMUgi8suYu5kdrS20EG8KiL7VRQitEbNjm+UcrDYrNi1YLyfpmAeGjCZYXLT9YBw==
 
 react-is@18.1.0:
   version "18.1.0"

From b2eff3f80639969dbad5e104cd17a3242cbe43bc Mon Sep 17 00:00:00 2001
From: Amy Resnik <aresnik11@gmail.com>
Date: Fri, 14 Nov 2025 14:30:00 -0500
Subject: [PATCH 2/3] export types

---
 packages/gamut/src/ConnectedForm/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/gamut/src/ConnectedForm/index.ts b/packages/gamut/src/ConnectedForm/index.ts
index e51e5340e1..720bd32319 100644
--- a/packages/gamut/src/ConnectedForm/index.ts
+++ b/packages/gamut/src/ConnectedForm/index.ts
@@ -12,3 +12,4 @@ export {
   useGetInitialFormValue,
   useSubmitState,
 } from './utils';
+export type { Validate, UseFormReturn, SubmitHandler } from 'react-hook-form';

From a41a0c2475d86ecaecb40cf587192fe8d623ba85 Mon Sep 17 00:00:00 2001
From: Amy Resnik <aresnik11@gmail.com>
Date: Mon, 17 Nov 2025 11:48:46 -0500
Subject: [PATCH 3/3] remove UnpackNestedValue

---
 packages/gamut/src/Form/types.ts         | 5 ++---
 packages/gamut/src/GridForm/GridForm.tsx | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/gamut/src/Form/types.ts b/packages/gamut/src/Form/types.ts
index be1f063a5c..1b8ee2a707 100644
--- a/packages/gamut/src/Form/types.ts
+++ b/packages/gamut/src/Form/types.ts
@@ -1,8 +1,7 @@
-import { UnpackNestedValue } from 'react-hook-form';
-
 export type FormValues<T> = {
-  [key in keyof T]?: UnpackNestedValue<T[key]>;
+  [key in keyof T]?: T[key];
 };
+
 export { CheckboxPaddingProps } from './inputs/Checkbox';
 
 export interface BaseInputProps {
diff --git a/packages/gamut/src/GridForm/GridForm.tsx b/packages/gamut/src/GridForm/GridForm.tsx
index fadb84b104..001e2ace88 100644
--- a/packages/gamut/src/GridForm/GridForm.tsx
+++ b/packages/gamut/src/GridForm/GridForm.tsx
@@ -5,7 +5,6 @@ import {
   DefaultValues,
   Mode,
   SubmitHandler,
-  UnpackNestedValue,
 } from 'react-hook-form';
 
 import { ButtonProps } from '../Button';
@@ -111,7 +110,7 @@ export function GridForm<Values extends FormValues<Values>>({
     isGridFormSection(field) ? field.fields : field
   );
 
-  type Defaults = UnpackNestedValue<DeepPartial<Values>>;
+  type Defaults = DeepPartial<Values>;
 
   const defaultValues = flatFields.reduce<Defaults>(
     // since our checkbox is a controlled input, it needs to be provided with a default value in order to reset correctly.