From edcf0b0ede43c1961408f81a7e0554dfdf191317 Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Thu, 5 Oct 2023 12:11:42 -0500
Subject: [PATCH] actually fix the type error by getting rid of the spread

---
 app/components/form/fields/NumberField.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/components/form/fields/NumberField.tsx b/app/components/form/fields/NumberField.tsx
index a752561e6b..f4fff12b67 100644
--- a/app/components/form/fields/NumberField.tsx
+++ b/app/components/form/fields/NumberField.tsx
@@ -10,7 +10,6 @@ import { useId } from 'react'
 import type { FieldPathByValue, FieldValues } from 'react-hook-form'
 import { Controller } from 'react-hook-form'
 
-import type { NumberInputProps as UINumberFieldProps } from '@oxide/ui'
 import { FieldLabel, TextInputHint, NumberInput as UINumberField } from '@oxide/ui'
 import { capitalize } from '@oxide/util'
 
@@ -70,8 +69,7 @@ export const NumberFieldInner = <
   description,
   required,
   id: idProp,
-  ...props
-}: TextFieldProps<TFieldValues, TName> & UINumberFieldProps) => {
+}: TextFieldProps<TFieldValues, TName>) => {
   const generatedId = useId()
   const id = idProp || generatedId
 
@@ -85,19 +83,17 @@ export const NumberFieldInner = <
           <>
             <UINumberField
               id={id}
-              title={label}
+              // title={label}
               error={!!error}
               aria-labelledby={cn(`${id}-label`, {
                 [`${id}-help-text`]: !!description,
               })}
               aria-describedby={description ? `${id}-label-tip` : undefined}
-              {...fieldRest}
-              {...props}
-              // these have to go after the spread so they take precedence
               defaultValue={value}
               onChange={(val) => {
                 onChange(val)
               }}
+              {...fieldRest}
             />
             <ErrorMessage error={error} label={label} />
           </>