More type fixes

oxidecomputer · Dec 17, 2024 · f8e52a3 · f8e52a3
1 parent bf47ae8
commit f8e52a3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/app/components/Dropdown.tsx b/app/components/Dropdown.tsx
@@ -47,7 +47,7 @@ export const DropdownSubTrigger = ({
   children: JSX.Element | string
   className?: string
 }) => (
-  <Dropdown.SubTrigger className={cn(dropdownOuterStyles, classNames, dropdownInnerStyles)}>
+  <Dropdown.SubTrigger className={cn(dropdownOuterStyles, className, dropdownInnerStyles)}>
     {children}
     <Icon
       name="carat-down"

diff --git a/app/components/SelectRfdCombobox.tsx b/app/components/SelectRfdCombobox.tsx
@@ -220,7 +220,7 @@ const ComboboxItem = ({
 }) => {
   const [shouldPrefetch, setShouldPrefetch] = useState(false)
 
-  const timer = useRef<NodeJS.Timeout | null>(null)
+  const timer = useRef<ReturnType<typeof setTimeout> | null>(null)
 
   function clear() {
     if (timer.current) clearTimeout(timer.current)

diff --git a/app/components/home/FilterDropdown.tsx b/app/components/home/FilterDropdown.tsx
@@ -149,7 +149,7 @@ const DropdownFilterItem = ({
 }) => (
   <DropdownItem
     onSelect={onSelect}
-    classNames={selected ? 'bg-accent-secondary text-accent' : ''}
+    className={selected ? 'text-accent bg-accent-secondary' : ''}
   >
     {selected && <Outline />}
     <div className="flex items-center justify-between">

diff --git a/app/components/note/NoteForm.tsx b/app/components/note/NoteForm.tsx
@@ -171,7 +171,7 @@ export const NoteForm = ({
               body={body}
               onChange={(val) => {
                 setStatus('unsaved')
-                setBody(val)
+                setBody(val || '')
               }}
             />
           </div>

diff --git a/app/routes/notes.$id.publish.tsx b/app/routes/notes.$id.publish.tsx
@@ -5,11 +5,11 @@
  *
  * Copyright Oxide Computer Company
  */
-import { json, type ActionArgs } from '@remix-run/node'
+import { json, type ActionFunction } from '@remix-run/node'
 
 import { isAuthenticated } from '~/services/authn.server'
 
-export async function action({ request, params }: ActionArgs) {
+export const action: ActionFunction = async ({ request, params }) => {
   const user = await isAuthenticated(request)
 
   if (!user) throw new Response('User not found', { status: 401 })