From 9d30f341d367481662647d518b017a48e8d53dc0 Mon Sep 17 00:00:00 2001
From: Remco Haszing <remcohaszing@gmail.com>
Date: Mon, 3 Aug 2026 16:32:42 +0200
Subject: [PATCH 1/5] Fix all $TSFixMe instances

There are some slight logic changes because of issues revealed by the
new type errors that surfaced.

Also some type errors have now been suppressed and need a closer look
later.
---
 packages/@uppy/core/src/UIPlugin.ts           |  2 +-
 packages/@uppy/dashboard/src/Dashboard.tsx    | 11 ++--
 .../dashboard/src/components/AddFiles.tsx     |  2 +-
 .../src/components/AddFilesPanel.tsx          | 11 +++-
 .../dashboard/src/components/Dashboard.tsx    | 12 ++--
 .../dashboard/src/components/EditorPanel.tsx  | 47 ++++++++++++++--
 .../components/FileCard/RenderMetaFields.tsx  | 19 +++++--
 .../src/components/FileCard/index.tsx         | 39 ++++++++++---
 .../src/components/FileItem/Buttons/index.tsx |  9 ++-
 .../FileItem/FilePreviewAndLink/index.tsx     | 14 ++++-
 .../components/FileItem/MetaErrorMessage.tsx  | 35 +++++++++---
 .../dashboard/src/components/FilePreview.tsx  | 10 +++-
 .../src/components/PickerPanelContent.tsx     | 23 ++++++--
 .../src/components/PickerPanelTopBar.tsx      | 55 ++++++++++++++-----
 packages/@uppy/dashboard/src/index.test.ts    |  5 +-
 .../dashboard/src/utils/copyToClipboard.ts    | 35 +++++-------
 .../dashboard/src/utils/createSuperFocus.ts   | 34 +++++++-----
 .../dashboard/src/utils/getActiveOverlayEl.ts | 12 ++--
 .../dashboard/src/utils/getFileTypeIcon.tsx   |  9 ++-
 .../@uppy/dashboard/src/utils/ignoreEvent.ts  |  6 +-
 .../@uppy/dashboard/src/utils/trapFocus.ts    | 26 ++++-----
 .../@uppy/screen-capture/src/StopWatch.tsx    | 24 +++++---
 .../@uppy/screen-capture/src/StreamStatus.tsx | 13 ++++-
 23 files changed, 311 insertions(+), 142 deletions(-)

diff --git a/packages/@uppy/core/src/UIPlugin.ts b/packages/@uppy/core/src/UIPlugin.ts
index 774d0b4b44..eb9cde9763 100644
--- a/packages/@uppy/core/src/UIPlugin.ts
+++ b/packages/@uppy/core/src/UIPlugin.ts
@@ -45,7 +45,7 @@ class UIPlugin<
 
   isTargetDOMEl!: boolean
 
-  el!: HTMLElement | null
+  el: HTMLElement | null = null
 
   parent: unknown
 
diff --git a/packages/@uppy/dashboard/src/Dashboard.tsx b/packages/@uppy/dashboard/src/Dashboard.tsx
index a2a674b331..efcbe3589c 100644
--- a/packages/@uppy/dashboard/src/Dashboard.tsx
+++ b/packages/@uppy/dashboard/src/Dashboard.tsx
@@ -78,11 +78,12 @@ type PreactRender = (
   ...children: any[]
 ) => VNode<any>
 
-interface MetaField {
+export interface MetaField {
   id: string
   name: string
   placeholder?: string
   render?: (field: FieldRenderOptions, h: PreactRender) => VNode<any>
+  type?: string
 }
 
 interface Target {
@@ -98,7 +99,7 @@ export interface TargetWithRender extends Target {
 
 export interface DashboardState<M extends Meta, B extends Body> {
   targets: Target[]
-  activePickerPanel: Target | undefined
+  activePickerPanel: Target
   showAddFilesPanel: boolean
   activeOverlayType: string | null
   fileCardFor: string | null
@@ -747,7 +748,7 @@ export default class Dashboard<M extends Meta, B extends Body> extends UIPlugin<
       trapFocus.forModal(
         event,
         this.getPluginState().activeOverlayType,
-        this.el,
+        this.el!,
       )
   }
 
@@ -902,7 +903,7 @@ export default class Dashboard<M extends Meta, B extends Body> extends UIPlugin<
       trapFocus.forInline(
         event,
         this.getPluginState().activeOverlayType,
-        this.el,
+        this.el!,
       )
   }
 
@@ -1076,7 +1077,7 @@ export default class Dashboard<M extends Meta, B extends Body> extends UIPlugin<
         //                     try to press space multiple times. Focus will jump to Uppy.
         (isFocusNowhere && this.ifFocusedOnUppyRecently))
     ) {
-      this.superFocus(this.el, this.getPluginState().activeOverlayType)
+      this.superFocus(this.el!, this.getPluginState().activeOverlayType)
     } else {
       this.superFocus.cancel()
     }
diff --git a/packages/@uppy/dashboard/src/components/AddFiles.tsx b/packages/@uppy/dashboard/src/components/AddFiles.tsx
index 267f40016a..c72df20030 100644
--- a/packages/@uppy/dashboard/src/components/AddFiles.tsx
+++ b/packages/@uppy/dashboard/src/components/AddFiles.tsx
@@ -7,7 +7,7 @@ import {
 } from '@uppy/core/utils/preact'
 import type { DashboardState, TargetWithRender } from '../Dashboard.js'
 
-interface AddFilesProps {
+export interface AddFilesProps {
   i18n: I18n
   i18nArray: Translator['translateArray']
   acquirers: TargetWithRender[]
diff --git a/packages/@uppy/dashboard/src/components/AddFilesPanel.tsx b/packages/@uppy/dashboard/src/components/AddFilesPanel.tsx
index 40964abe90..56581c6432 100644
--- a/packages/@uppy/dashboard/src/components/AddFilesPanel.tsx
+++ b/packages/@uppy/dashboard/src/components/AddFilesPanel.tsx
@@ -1,9 +1,15 @@
 import classNames from 'classnames'
+import type { ComponentChildren } from 'preact'
+import type { AddFilesProps } from './AddFiles.js'
 import AddFiles from './AddFiles.js'
 
-type $TSFixMe = any
+interface AddFilesPanelProps extends AddFilesProps {
+  className?: string | undefined
+  showAddFilesPanel: boolean
+  toggleAddFilesPanel: (enabled: boolean) => void
+}
 
-const AddFilesPanel = (props: $TSFixMe): $TSFixMe => {
+const AddFilesPanel = (props: AddFilesPanelProps): ComponentChildren => {
   return (
     <div
       className={classNames('uppy-Dashboard-AddFilesPanel', props.className)}
@@ -26,7 +32,6 @@ const AddFilesPanel = (props: $TSFixMe): $TSFixMe => {
           {props.i18n('back')}
         </button>
       </div>
-      {}
       <AddFiles {...props} />
     </div>
   )
diff --git a/packages/@uppy/dashboard/src/components/Dashboard.tsx b/packages/@uppy/dashboard/src/components/Dashboard.tsx
index 4f5072dc92..091ab29969 100644
--- a/packages/@uppy/dashboard/src/components/Dashboard.tsx
+++ b/packages/@uppy/dashboard/src/components/Dashboard.tsx
@@ -57,7 +57,7 @@ type DashboardUIProps<M extends Meta, B extends Body> = {
   disabled: boolean
   disableLocalFiles: boolean
   direction: UIPluginOptions['direction']
-  activePickerPanel: DashboardState<M, B>['activePickerPanel']
+  activePickerPanel: NonNullable<DashboardState<M, B>['activePickerPanel']>
   showFileEditor: boolean
   saveFileEditor: () => void
   closeFileEditor: () => void
@@ -108,7 +108,7 @@ type DashboardUIProps<M extends Meta, B extends Body> = {
   parentElement: HTMLElement | null
   allowedFileTypes: string[] | null
   maxNumberOfFiles: number | null
-  requiredMetaFields: any
+  requiredMetaFields: string[]
   showSelectedFiles: boolean
   showNativePhotoCameraButton: boolean
   showNativeVideoCameraButton: boolean
@@ -131,9 +131,9 @@ type DashboardUIProps<M extends Meta, B extends Body> = {
 export default function Dashboard<M extends Meta, B extends Body>(
   props: DashboardUIProps<M, B>,
 ) {
+  const { fileCardFor } = props
   const isNoFiles = props.totalFileCount === 0
   const isSingleFile = props.totalFileCount === 1
-  const isSizeMD = props.containerWidth > WIDTH_MD
   const isSizeHeightMD = props.containerHeight > HEIGHT_MD
 
   const dashboardClassName = classNames({
@@ -320,12 +320,14 @@ export default function Dashboard<M extends Meta, B extends Body>(
 
           <Slide>
             {props.showAddFilesPanel ? (
-              <AddFilesPanel key="AddFiles" {...props} isSizeMD={isSizeMD} />
+              <AddFilesPanel key="AddFiles" {...props} />
             ) : null}
           </Slide>
 
           <Slide>
-            {props.fileCardFor ? <FileCard key="FileCard" {...props} /> : null}
+            {fileCardFor ? (
+              <FileCard key="FileCard" {...props} fileCardFor={fileCardFor} />
+            ) : null}
           </Slide>
 
           <Slide>
diff --git a/packages/@uppy/dashboard/src/components/EditorPanel.tsx b/packages/@uppy/dashboard/src/components/EditorPanel.tsx
index e6771b9e3d..0e543c3ca7 100644
--- a/packages/@uppy/dashboard/src/components/EditorPanel.tsx
+++ b/packages/@uppy/dashboard/src/components/EditorPanel.tsx
@@ -1,9 +1,39 @@
+import type Uppy from '@uppy/core'
+import type { Body, State, UIPlugin } from '@uppy/core'
+import type {
+  I18n,
+  Meta,
+  Translator,
+  UppyFile,
+  UppyFileId,
+} from '@uppy/core/utils'
 import classNames from 'classnames'
+import type { ComponentChildren, MouseEventHandler } from 'preact'
+import type { TargetWithRender } from '../Dashboard.js'
 
-type $TSFixMe = any
+declare module '@uppy/core' {
+  export interface UppyEventMap<M extends Meta, B extends Body> {
+    'file-editor:cancel': (file: UppyFile<M, B>) => void
+  }
+}
+
+type EditorPanelProps<M extends Meta, B extends Body> = {
+  className?: string | undefined
+  closeFileEditor: () => void
+  editors: TargetWithRender[]
+  fileCardFor: UppyFileId | null
+  files: State<M, B>['files']
+  i18n: I18n
+  i18nArray: Translator['translateArray']
+  saveFileEditor: MouseEventHandler<HTMLButtonElement>
+  state: State<M, B>
+  uppy: Uppy<M, B>
+}
 
-function EditorPanel(props: $TSFixMe) {
-  const file = props.files[props.fileCardFor]
+function EditorPanel<M extends Meta, B extends Body>(
+  props: EditorPanelProps<M, B>,
+): ComponentChildren {
+  const file = props.files[props.fileCardFor!]
 
   const handleCancel = () => {
     props.uppy.emit('file-editor:cancel', file)
@@ -47,8 +77,15 @@ function EditorPanel(props: $TSFixMe) {
         </button>
       </div>
       <div className="uppy-DashboardContent-panelBody">
-        {props.editors.map((target: $TSFixMe) => {
-          return props.uppy.getPlugin(target.id).render(props.state)
+        {props.editors.map((target) => {
+          return (
+            props.uppy.getPlugin(target.id) as UIPlugin<
+              // biome-ignore lint/complexity/noBannedTypes: {} means anything except null or undefined.
+              {},
+              M,
+              B
+            >
+          ).render(props.state)
         })}
       </div>
     </div>
diff --git a/packages/@uppy/dashboard/src/components/FileCard/RenderMetaFields.tsx b/packages/@uppy/dashboard/src/components/FileCard/RenderMetaFields.tsx
index cff940a22d..845f63ae7e 100644
--- a/packages/@uppy/dashboard/src/components/FileCard/RenderMetaFields.tsx
+++ b/packages/@uppy/dashboard/src/components/FileCard/RenderMetaFields.tsx
@@ -1,8 +1,17 @@
-import { h } from '@uppy/core/utils/preact'
+import { type ComponentChildren, h } from '@uppy/core/utils/preact'
+import type { MetaField } from '../../Dashboard.js'
 
-type $TSFixMe = any
+interface RenderMetaFieldsProps {
+  computedMetaFields: MetaField[]
+  requiredMetaFields: string[]
+  updateMeta: (newVal: string, fieldId: string) => void
+  form: HTMLFormElement
+  formState: Record<string, string>
+}
 
-export default function RenderMetaFields(props: $TSFixMe) {
+export default function RenderMetaFields(
+  props: RenderMetaFieldsProps,
+): ComponentChildren {
   const {
     computedMetaFields,
     requiredMetaFields,
@@ -15,7 +24,7 @@ export default function RenderMetaFields(props: $TSFixMe) {
     text: 'uppy-u-reset uppy-c-textInput uppy-Dashboard-FileCard-input',
   }
 
-  return computedMetaFields.map((field: $TSFixMe) => {
+  return computedMetaFields.map((field) => {
     const id = `uppy-Dashboard-FileCard-input-${field.id}`
     const required = requiredMetaFields.includes(field.id)
     return (
@@ -27,7 +36,7 @@ export default function RenderMetaFields(props: $TSFixMe) {
           field.render(
             {
               value: formState[field.id],
-              onChange: (newVal: $TSFixMe) => updateMeta(newVal, field.id),
+              onChange: (newVal) => updateMeta(newVal, field.id),
               fieldCSSClasses,
               required,
               form: form.id,
diff --git a/packages/@uppy/dashboard/src/components/FileCard/index.tsx b/packages/@uppy/dashboard/src/components/FileCard/index.tsx
index dad0b3fb07..12cfe2156d 100644
--- a/packages/@uppy/dashboard/src/components/FileCard/index.tsx
+++ b/packages/@uppy/dashboard/src/components/FileCard/index.tsx
@@ -1,3 +1,5 @@
+import type { Body, Meta, State } from '@uppy/core'
+import type { I18n, Translator, UppyFile } from '@uppy/core/utils'
 import {
   useCallback,
   useEffect,
@@ -6,14 +8,30 @@ import {
 } from '@uppy/core/utils/preact/hooks'
 import classNames from 'classnames'
 import { nanoid } from 'nanoid/non-secure'
+import type { ComponentChildren, TargetedMouseEvent } from 'preact'
+import type { DashboardState } from '../../Dashboard.js'
 import getFileTypeIcon from '../../utils/getFileTypeIcon.js'
 import ignoreEvent from '../../utils/ignoreEvent.js'
 import FilePreview from '../FilePreview.js'
 import RenderMetaFields from './RenderMetaFields.js'
 
-type $TSFixMe = any
+interface FileCardProps<M extends Meta, B extends Body> {
+  canEditFile: (file: UppyFile<M, B>) => boolean
+  className?: string | undefined
+  fileCardFor: string
+  files: State<M, B>['files']
+  i18n: I18n
+  i18nArray: Translator['translateArray']
+  metaFields: DashboardState<M, B>['metaFields']
+  openFileEditor: (file: UppyFile<M, B>) => void
+  requiredMetaFields: string[]
+  saveFileCard: (meta: M, fileID: string) => void
+  toggleFileCard: (show: boolean, fileID: string) => void
+}
 
-export default function FileCard(props: $TSFixMe) {
+export default function FileCard<M extends Meta, B extends Body>(
+  props: FileCardProps<M, B>,
+): ComponentChildren {
   const {
     files,
     fileCardFor,
@@ -30,30 +48,31 @@ export default function FileCard(props: $TSFixMe) {
 
   const getMetaFields = () => {
     return typeof metaFields === 'function'
-      ? metaFields(files[fileCardFor])
+      ? metaFields(files[fileCardFor!])
       : metaFields
   }
 
-  const file = files[fileCardFor]
+  const file = files[fileCardFor!]
   const computedMetaFields = getMetaFields() ?? []
   const showEditButton = canEditFile(file)
 
-  const storedMetaData: Record<string, string> = {}
-  computedMetaFields.forEach((field: $TSFixMe) => {
+  const storedMetaData = {} as M
+  computedMetaFields.forEach((field) => {
+    // @ts-expect-error TODO fix me
     storedMetaData[field.id] = file.meta[field.id] ?? ''
   })
 
   const [formState, setFormState] = useState(storedMetaData)
 
   const handleSave = useCallback(
-    (ev: $TSFixMe) => {
+    (ev: SubmitEvent | TargetedMouseEvent<HTMLElement>) => {
       ev.preventDefault()
       saveFileCard(formState, fileCardFor)
     },
     [saveFileCard, formState, fileCardFor],
   )
 
-  const updateMeta = (newVal: $TSFixMe, name: $TSFixMe) => {
+  const updateMeta = (newVal: string, name: string) => {
     setFormState({
       ...formState,
       [name]: newVal,
@@ -61,6 +80,7 @@ export default function FileCard(props: $TSFixMe) {
   }
 
   const handleCancel = () => {
+    // @ts-expect-error TODO fix me
     toggleFileCard(false)
   }
 
@@ -152,7 +172,7 @@ export default function FileCard(props: $TSFixMe) {
             <button
               type="button"
               className="uppy-u-reset uppy-c-btn uppy-Dashboard-FileCard-edit"
-              onClick={(event: $TSFixMe) => {
+              onClick={(event) => {
                 // When opening the image editor we want to save any meta fields changes.
                 // Otherwise it's confusing for the user to click save in the editor,
                 // but the changes here are discarded. This bypasses validation,
@@ -175,6 +195,7 @@ export default function FileCard(props: $TSFixMe) {
             requiredMetaFields={requiredMetaFields}
             updateMeta={updateMeta}
             form={form}
+            // @ts-expect-error TODO fix me
             formState={formState}
           />
         </div>
diff --git a/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx
index ba79d66df7..0265f21f97 100644
--- a/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx
+++ b/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx
@@ -1,11 +1,10 @@
 import type Uppy from '@uppy/core'
 import type { Body, Meta, UppyFile } from '@uppy/core'
 import type { I18n } from '@uppy/core/utils'
+import type { MouseEventHandler } from 'preact'
 import type { DashboardState } from '../../../Dashboard.js'
 import copyToClipboard from '../../../utils/copyToClipboard.js'
 
-type $TSFixMe = any
-
 function EditButton<M extends Meta, B extends Body>({
   file,
   uploadInProgressOrComplete,
@@ -103,15 +102,15 @@ function CopyLinkButton<M extends Meta, B extends Body>({
   uppy: Uppy<M, B>
   i18n: I18n
 }) {
-  const copyLinkToClipboard = (event: $TSFixMe) => {
-    copyToClipboard(file.uploadURL, i18n('copyLinkToClipboardFallback'))
+  const copyLinkToClipboard: MouseEventHandler<HTMLButtonElement> = (event) => {
+    copyToClipboard(file.uploadURL!, i18n('copyLinkToClipboardFallback'))
       .then(() => {
         uppy.log('Link copied to clipboard.')
         uppy.info(i18n('copyLinkToClipboardSuccess'), 'info', 3000)
       })
       .catch(uppy.log)
       // avoid losing focus
-      .then(() => event.target.focus({ preventScroll: true }))
+      .then(() => event.currentTarget.focus({ preventScroll: true }))
   }
 
   return (
diff --git a/packages/@uppy/dashboard/src/components/FileItem/FilePreviewAndLink/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/FilePreviewAndLink/index.tsx
index cee54438b2..31d3f6a362 100644
--- a/packages/@uppy/dashboard/src/components/FileItem/FilePreviewAndLink/index.tsx
+++ b/packages/@uppy/dashboard/src/components/FileItem/FilePreviewAndLink/index.tsx
@@ -1,10 +1,20 @@
+import type { Body, I18n, Meta, UppyFile } from '@uppy/core/utils'
+import type { DashboardState } from '../../../Dashboard.js'
 import getFileTypeIcon from '../../../utils/getFileTypeIcon.js'
 import FilePreview from '../../FilePreview.js'
 import MetaErrorMessage from '../MetaErrorMessage.js'
 
-type $TSFixMe = any
+interface FilePreviewAndLinkProps<M extends Meta, B extends Body> {
+  i18n: I18n
+  file: UppyFile<M, B>
+  metaFields: DashboardState<M, B>['metaFields']
+  showLinkToFileUploadResult: boolean
+  toggleFileCard: (show: boolean, fileId: string) => void
+}
 
-export default function FilePreviewAndLink(props: $TSFixMe) {
+export default function FilePreviewAndLink<M extends Meta, B extends Body>(
+  props: FilePreviewAndLinkProps<M, B>,
+) {
   const { file, i18n, toggleFileCard, metaFields, showLinkToFileUploadResult } =
     props
   const white = 'rgba(255, 255, 255, 0.5)'
diff --git a/packages/@uppy/dashboard/src/components/FileItem/MetaErrorMessage.tsx b/packages/@uppy/dashboard/src/components/FileItem/MetaErrorMessage.tsx
index 09269e7c6f..fc739cfd89 100644
--- a/packages/@uppy/dashboard/src/components/FileItem/MetaErrorMessage.tsx
+++ b/packages/@uppy/dashboard/src/components/FileItem/MetaErrorMessage.tsx
@@ -1,22 +1,39 @@
-type $TSFixMe = any
+import type { Body, I18n, Meta, UppyFile } from '@uppy/core/utils'
+import type { ComponentChildren } from 'preact'
+import type { DashboardState } from '../../Dashboard.js'
 
-const metaFieldIdToName = (metaFieldId: $TSFixMe, metaFields: $TSFixMe) => {
-  const fields = typeof metaFields === 'function' ? metaFields() : metaFields
-  const field = fields.filter((f: $TSFixMe) => f.id === metaFieldId)
+function metaFieldIdToName<M extends Meta, B extends Body>(
+  metaFieldId: string,
+  metaFields: DashboardState<M, B>['metaFields'],
+) {
+  const fields =
+    typeof metaFields === 'function'
+      ? // @ts-expect-error TODO This should not be an error.
+        metaFields()
+      : metaFields
+  // @ts-expect-error TODO This should not be an error.
+  const field = fields.filter((f) => f.id === metaFieldId)
   return field[0].name
 }
 
-export default function MetaErrorMessage(props: $TSFixMe) {
+type MetaErrorMessageProps<M extends Meta, B extends Body> = {
+  i18n: I18n
+  file: UppyFile<M, B>
+  metaFields: DashboardState<M, B>['metaFields']
+  toggleFileCard: (show: boolean, fileId: string) => void
+}
+
+export default function MetaErrorMessage<M extends Meta, B extends Body>(
+  props: MetaErrorMessageProps<M, B>,
+): ComponentChildren {
   const { file, toggleFileCard, i18n, metaFields } = props
   const { missingRequiredMetaFields } = file
   if (!missingRequiredMetaFields?.length) {
-    return null as $TSFixMe
+    return null
   }
 
   const metaFieldsString = missingRequiredMetaFields
-    .map((missingMetaField: $TSFixMe) =>
-      metaFieldIdToName(missingMetaField, metaFields),
-    )
+    .map((missingMetaField) => metaFieldIdToName(missingMetaField, metaFields))
     .join(', ')
 
   return (
diff --git a/packages/@uppy/dashboard/src/components/FilePreview.tsx b/packages/@uppy/dashboard/src/components/FilePreview.tsx
index 084332f402..ac9cf9729e 100644
--- a/packages/@uppy/dashboard/src/components/FilePreview.tsx
+++ b/packages/@uppy/dashboard/src/components/FilePreview.tsx
@@ -1,8 +1,14 @@
+import type { Body, Meta, UppyFile } from '@uppy/core'
+import type { ComponentChildren } from 'preact'
 import getFileTypeIcon from '../utils/getFileTypeIcon.js'
 
-type $TSFixMe = any
+interface FilePreviewProps<M extends Meta, B extends Body> {
+  file: UppyFile<M, B>
+}
 
-export default function FilePreview(props: $TSFixMe) {
+export default function FilePreview<M extends Meta, B extends Body>(
+  props: FilePreviewProps<M, B>,
+): ComponentChildren {
   const { file } = props
 
   if (file.preview) {
diff --git a/packages/@uppy/dashboard/src/components/PickerPanelContent.tsx b/packages/@uppy/dashboard/src/components/PickerPanelContent.tsx
index 2750c9f792..78e11ad34b 100644
--- a/packages/@uppy/dashboard/src/components/PickerPanelContent.tsx
+++ b/packages/@uppy/dashboard/src/components/PickerPanelContent.tsx
@@ -1,17 +1,28 @@
+import type { Body, Meta, State, UIPlugin, Uppy } from '@uppy/core'
+import type { I18n } from '@uppy/core/utils'
 import { useRef } from '@uppy/core/utils/preact/hooks'
 import classNames from 'classnames'
+import type { ComponentChildren, MouseEventHandler } from 'preact'
+import type { DashboardState } from '../Dashboard.js'
 import ignoreEvent from '../utils/ignoreEvent.js'
 
-type $TSFixMe = any
+interface PickerPanelContentProps<M extends Meta, B extends Body> {
+  activePickerPanel: NonNullable<DashboardState<M, B>['activePickerPanel']>
+  className?: string | undefined
+  hideAllPanels: MouseEventHandler<HTMLButtonElement>
+  i18n: I18n
+  state: State<M, B>
+  uppy: Uppy<M, B>
+}
 
-function PickerPanelContent({
+function PickerPanelContent<M extends Meta, B extends Body>({
   activePickerPanel,
   className,
   hideAllPanels,
   i18n,
   state,
   uppy,
-}: $TSFixMe) {
+}: PickerPanelContentProps<M, B>): ComponentChildren {
   const ref = useRef<HTMLDivElement>(null)
   return (
     <div
@@ -42,7 +53,11 @@ function PickerPanelContent({
       </div>
 
       <div ref={ref} className="uppy-DashboardContent-panelBody">
-        {uppy.getPlugin(activePickerPanel.id).render(state, ref.current)}
+        {/** biome-ignore lint/complexity/noBannedTypes: {} means anything except null or undefined */}
+        {(uppy.getPlugin(activePickerPanel.id) as UIPlugin<{}, M, B>).render(
+          state,
+          ref.current!,
+        )}
       </div>
     </div>
   )
diff --git a/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx b/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx
index 064f2e8ee0..301d8da81d 100644
--- a/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx
+++ b/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx
@@ -1,6 +1,6 @@
-import type { UppyFile } from '@uppy/core'
-
-type $TSFixMe = any
+import type { State, Uppy, UppyFile } from '@uppy/core'
+import type { Body, I18n, Meta } from '@uppy/core/utils'
+import type { ComponentChildren } from 'preact'
 
 const uploadStates = {
   STATE_ERROR: 'error',
@@ -10,14 +10,16 @@ const uploadStates = {
   STATE_POSTPROCESSING: 'postprocessing',
   STATE_COMPLETE: 'complete',
   STATE_PAUSED: 'paused',
-}
+} as const
+
+export type UploadState = (typeof uploadStates)[keyof typeof uploadStates]
 
 function getUploadingState(
-  isAllErrored: $TSFixMe,
-  isAllComplete: $TSFixMe,
-  isAllPaused: $TSFixMe,
+  isAllErrored: boolean | undefined,
+  isAllComplete: boolean,
+  isAllPaused: boolean,
   files: Record<string, UppyFile<any, any>> = {},
-): $TSFixMe {
+): UploadState {
   if (isAllErrored) {
     return uploadStates.STATE_ERROR
   }
@@ -30,7 +32,7 @@ function getUploadingState(
     return uploadStates.STATE_PAUSED
   }
 
-  let state = uploadStates.STATE_WAITING
+  let state: UploadState = uploadStates.STATE_WAITING
   const fileIDs = Object.keys(files)
   for (let i = 0; i < fileIDs.length; i++) {
     const { progress } = files[fileIDs[i] as keyof typeof files]
@@ -40,6 +42,7 @@ function getUploadingState(
     }
     // If files are being preprocessed AND postprocessed at this time, we show the
     // preprocess state. If any files are being uploaded we show uploading.
+    // @ts-expect-error TODO TypeScript catches a runtime issue here.
     if (progress.preprocess && state !== uploadStates.STATE_UPLOADING) {
       state = uploadStates.STATE_PREPROCESSING
     }
@@ -47,6 +50,7 @@ function getUploadingState(
     // being postprocessed, show the postprocess state.
     if (
       progress.postprocess &&
+      // @ts-expect-error TODO TypeScript catches a runtime issue here.
       state !== uploadStates.STATE_UPLOADING &&
       state !== uploadStates.STATE_PREPROCESSING
     ) {
@@ -56,7 +60,18 @@ function getUploadingState(
   return state
 }
 
-function UploadStatus({
+interface UploadStatusProps<M extends Meta, B extends Body> {
+  files: State<M, B>['files']
+  i18n: I18n
+  isAllComplete: boolean
+  isAllErrored?: boolean | undefined
+  isAllPaused: boolean
+  inProgressNotPausedFiles: UppyFile<M, B>[]
+  newFiles: UppyFile<M, B>[]
+  processingFiles: UppyFile<M, B>[]
+}
+
+function UploadStatus<M extends Meta, B extends Body>({
   files,
   i18n,
   isAllComplete,
@@ -65,7 +80,7 @@ function UploadStatus({
   inProgressNotPausedFiles,
   newFiles,
   processingFiles,
-}: $TSFixMe) {
+}: UploadStatusProps<M, B>): ComponentChildren {
   const uploadingState = getUploadingState(
     isAllErrored,
     isAllComplete,
@@ -93,19 +108,33 @@ function UploadStatus({
   }
 }
 
-function PanelTopBar(props: $TSFixMe) {
+interface PanelTopBarProps<M extends Meta, B extends Body>
+  extends UploadStatusProps<M, B> {
+  allowNewUpload: boolean
+  i18n: I18n
+  hideCancelButton: boolean
+  maxNumberOfFiles: number | null
+  totalFileCount: number
+  toggleAddFilesPanel: (enabled: boolean) => void
+  uppy: Uppy<M, B>
+}
+
+function PanelTopBar<M extends Meta, B extends Body>(
+  props: PanelTopBarProps<M, B>,
+): ComponentChildren {
   const {
     i18n,
     isAllComplete,
     hideCancelButton,
     maxNumberOfFiles,
     toggleAddFilesPanel,
+    totalFileCount,
     uppy,
   } = props
   let { allowNewUpload } = props
   // TODO maybe this should be done in ../Dashboard.js, then just pass that down as `allowNewUpload`
   if (allowNewUpload && maxNumberOfFiles) {
-    allowNewUpload = props.totalFileCount < props.maxNumberOfFiles
+    allowNewUpload = totalFileCount < maxNumberOfFiles
   }
 
   return (
diff --git a/packages/@uppy/dashboard/src/index.test.ts b/packages/@uppy/dashboard/src/index.test.ts
index b11723b618..19722d6079 100644
--- a/packages/@uppy/dashboard/src/index.test.ts
+++ b/packages/@uppy/dashboard/src/index.test.ts
@@ -6,8 +6,6 @@ import resizeObserverPolyfill from 'resize-observer-polyfill'
 import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import DashboardPlugin from './index.js'
 
-type $TSFixMe = any
-
 describe('Dashboard', () => {
   beforeAll(() => {
     globalThis.ResizeObserver =
@@ -39,7 +37,8 @@ describe('Dashboard', () => {
         target: 'body',
       })
       core.use(GoogleDrivePlugin, {
-        target: DashboardPlugin as $TSFixMe,
+        // @ts-expect-error TODO fix me
+        target: DashboardPlugin,
         companionUrl: 'https://fake.uppy.io/',
       })
     }).not.toThrow()
diff --git a/packages/@uppy/dashboard/src/utils/copyToClipboard.ts b/packages/@uppy/dashboard/src/utils/copyToClipboard.ts
index c845e5eb82..a7f5f2ab05 100644
--- a/packages/@uppy/dashboard/src/utils/copyToClipboard.ts
+++ b/packages/@uppy/dashboard/src/utils/copyToClipboard.ts
@@ -8,27 +8,22 @@
  * @param {string} fallbackString
  * @returns {Promise}
  */
-
-type $TSFixMe = any
-
 export default function copyToClipboard(
-  textToCopy: $TSFixMe,
+  textToCopy: string,
   fallbackString = 'Copy the URL below',
-): $TSFixMe {
-  return new Promise<void>((resolve) => {
+): Promise<void> {
+  return new Promise((resolve) => {
     const textArea = document.createElement('textarea')
-    textArea.setAttribute('style', {
-      position: 'fixed',
-      top: 0,
-      left: 0,
-      width: '2em',
-      height: '2em',
-      padding: 0,
-      border: 'none',
-      outline: 'none',
-      boxShadow: 'none',
-      background: 'transparent',
-    } as $TSFixMe as string)
+    textArea.style.position = 'fixed'
+    textArea.style.top = '0'
+    textArea.style.left = '0'
+    textArea.style.width = '2em'
+    textArea.style.height = '2em'
+    textArea.style.padding = '0'
+    textArea.style.border = 'none'
+    textArea.style.outline = 'none'
+    textArea.style.boxShadow = 'none'
+    textArea.style.background = 'transparent'
 
     textArea.value = textToCopy
     document.body.appendChild(textArea)
@@ -46,8 +41,8 @@ export default function copyToClipboard(
         return magicCopyFailed()
       }
       document.body.removeChild(textArea)
-      return resolve()
-    } catch (_err) {
+      resolve()
+    } catch {
       document.body.removeChild(textArea)
       return magicCopyFailed()
     }
diff --git a/packages/@uppy/dashboard/src/utils/createSuperFocus.ts b/packages/@uppy/dashboard/src/utils/createSuperFocus.ts
index 7344038f7b..7721ba77f9 100644
--- a/packages/@uppy/dashboard/src/utils/createSuperFocus.ts
+++ b/packages/@uppy/dashboard/src/utils/createSuperFocus.ts
@@ -1,9 +1,8 @@
 import { FOCUSABLE_ELEMENTS } from '@uppy/core/utils'
+import type { DebouncedFunc } from 'lodash'
 import debounce from 'lodash/debounce.js'
 import getActiveOverlayEl from './getActiveOverlayEl.js'
 
-type $TSFixMe = any
-
 /*
   Focuses on some element in the currently topmost overlay.
 
@@ -14,10 +13,21 @@ type $TSFixMe = any
   2. If there are no [data-uppy-super-focusable] elements yet (or ever) - focuses
      on the first focusable element, but switches focus if superfocusable elements appear on next render.
 */
-export default function createSuperFocus(): $TSFixMe {
+export default function createSuperFocus(): DebouncedFunc<
+  (
+    dashboardEl: HTMLElement,
+    activeOverlayType?: string | null | undefined,
+  ) => void
+> {
   let lastFocusWasOnSuperFocusableEl = false
 
-  const superFocus = (dashboardEl: $TSFixMe, activeOverlayType: $TSFixMe) => {
+  // ___Why do we need to debounce?
+  //    1. To deal with animations: overlay changes via animations, which results in the DOM updating AFTER plugin.update()
+  //       already executed.
+  //    [Practical check] without debounce, if we open the Url overlay, and click 'Done', Dashboard won't get focused again.
+  //    [Practical check] if we delay 250ms instead of 260ms - IE11 won't get focused in same situation.
+  //    2. Performance: there can be many state update()s in a second, and this function is called every time.
+  return debounce((dashboardEl, activeOverlayType) => {
     const overlayEl = getActiveOverlayEl(dashboardEl, activeOverlayType)
 
     const isFocusInOverlay = overlayEl.contains(document.activeElement)
@@ -26,7 +36,7 @@ export default function createSuperFocus(): $TSFixMe {
     // [Practical check] without this line, typing in the search input in googledrive overlay won't work.
     if (isFocusInOverlay && lastFocusWasOnSuperFocusableEl) return
 
-    const superFocusableEl = overlayEl.querySelector(
+    const superFocusableEl = overlayEl.querySelector<HTMLElement>(
       '[data-uppy-super-focusable]',
     )
     // If we are already in the topmost overlay, AND there are no super focusable elements yet, - leave focus up to the user.
@@ -38,17 +48,11 @@ export default function createSuperFocus(): $TSFixMe {
       superFocusableEl.focus({ preventScroll: true })
       lastFocusWasOnSuperFocusableEl = true
     } else {
-      const firstEl = overlayEl.querySelector(FOCUSABLE_ELEMENTS)
+      const firstEl = overlayEl.querySelector<HTMLElement>(
+        FOCUSABLE_ELEMENTS.join(','),
+      )
       firstEl?.focus({ preventScroll: true })
       lastFocusWasOnSuperFocusableEl = false
     }
-  }
-
-  // ___Why do we need to debounce?
-  //    1. To deal with animations: overlay changes via animations, which results in the DOM updating AFTER plugin.update()
-  //       already executed.
-  //    [Practical check] without debounce, if we open the Url overlay, and click 'Done', Dashboard won't get focused again.
-  //    [Practical check] if we delay 250ms instead of 260ms - IE11 won't get focused in same situation.
-  //    2. Performance: there can be many state update()s in a second, and this function is called every time.
-  return debounce(superFocus, 260)
+  }, 260)
 }
diff --git a/packages/@uppy/dashboard/src/utils/getActiveOverlayEl.ts b/packages/@uppy/dashboard/src/utils/getActiveOverlayEl.ts
index 2adc29b95d..cfb10d3b98 100644
--- a/packages/@uppy/dashboard/src/utils/getActiveOverlayEl.ts
+++ b/packages/@uppy/dashboard/src/utils/getActiveOverlayEl.ts
@@ -1,18 +1,16 @@
-type $TSFixMe = any
-
 /**
- * @returns {HTMLElement} - either dashboard element, or the overlay that's most on top
+ * @returns - either dashboard element, or the overlay that's most on top
  */
 export default function getActiveOverlayEl(
-  dashboardEl: $TSFixMe,
-  activeOverlayType: $TSFixMe,
-): $TSFixMe {
+  dashboardEl: HTMLElement,
+  activeOverlayType?: string | null | undefined,
+): HTMLElement {
   if (activeOverlayType) {
     const overlayEl = dashboardEl.querySelector(
       `[data-uppy-paneltype="${activeOverlayType}"]`,
     )
     // if an overlay is already mounted
-    if (overlayEl) return overlayEl
+    if (overlayEl) return overlayEl as HTMLElement
   }
   return dashboardEl
 }
diff --git a/packages/@uppy/dashboard/src/utils/getFileTypeIcon.tsx b/packages/@uppy/dashboard/src/utils/getFileTypeIcon.tsx
index 8721a87ba6..c89844372a 100644
--- a/packages/@uppy/dashboard/src/utils/getFileTypeIcon.tsx
+++ b/packages/@uppy/dashboard/src/utils/getFileTypeIcon.tsx
@@ -1,4 +1,4 @@
-type $TSFixMe = any
+import type { VNode } from 'preact'
 
 function iconImage() {
   return (
@@ -136,7 +136,12 @@ function iconText() {
   )
 }
 
-export default function getIconByMime(fileType: $TSFixMe): $TSFixMe {
+interface Icon {
+  color: string
+  icon: VNode
+}
+
+export default function getIconByMime(fileType: string): Icon {
   const defaultChoice = {
     color: '#838999',
     icon: iconFile(),
diff --git a/packages/@uppy/dashboard/src/utils/ignoreEvent.ts b/packages/@uppy/dashboard/src/utils/ignoreEvent.ts
index 9a4973bb64..0659644c65 100644
--- a/packages/@uppy/dashboard/src/utils/ignoreEvent.ts
+++ b/packages/@uppy/dashboard/src/utils/ignoreEvent.ts
@@ -3,10 +3,10 @@
 // draging UI elements or pasting anything into any field triggers those events —
 // Url treats them as URLs that need to be imported
 
-type $TSFixMe = any
+import type { TargetedEvent } from 'preact'
 
-function ignoreEvent(ev: $TSFixMe): void {
-  const { tagName } = ev.target
+function ignoreEvent(ev: TargetedEvent<Element>): void {
+  const { tagName } = ev.currentTarget
   if (tagName === 'INPUT' || tagName === 'TEXTAREA') {
     ev.stopPropagation()
     return
diff --git a/packages/@uppy/dashboard/src/utils/trapFocus.ts b/packages/@uppy/dashboard/src/utils/trapFocus.ts
index 60f7b4ad7f..cdb9e82fbb 100644
--- a/packages/@uppy/dashboard/src/utils/trapFocus.ts
+++ b/packages/@uppy/dashboard/src/utils/trapFocus.ts
@@ -1,9 +1,7 @@
 import { FOCUSABLE_ELEMENTS, toArray } from '@uppy/core/utils'
 import getActiveOverlayEl from './getActiveOverlayEl.js'
 
-type $TSFixMe = any
-
-function focusOnFirstNode(event: $TSFixMe, nodes: $TSFixMe) {
+function focusOnFirstNode(event: Event, nodes: HTMLElement[]) {
   const node = nodes[0]
   if (node) {
     node.focus()
@@ -11,7 +9,7 @@ function focusOnFirstNode(event: $TSFixMe, nodes: $TSFixMe) {
   }
 }
 
-function focusOnLastNode(event: $TSFixMe, nodes: $TSFixMe) {
+function focusOnLastNode(event: Event, nodes: HTMLElement[]) {
   const node = nodes[nodes.length - 1]
   if (node) {
     node.focus()
@@ -23,21 +21,23 @@ function focusOnLastNode(event: $TSFixMe, nodes: $TSFixMe) {
 //    Firefox thinks <ul> is focusable, but we don't have <ul>s in our FOCUSABLE_ELEMENTS. Which means that if we tab into
 //    the <ul>, code will think that we are not in the active overlay, and we should focusOnFirstNode() of the currently
 //    active overlay!
-function isFocusInOverlay(activeOverlayEl: $TSFixMe) {
+function isFocusInOverlay(activeOverlayEl: HTMLElement) {
   return activeOverlayEl.contains(document.activeElement)
 }
 
 function trapFocus(
-  event: $TSFixMe,
-  activeOverlayType: $TSFixMe,
-  dashboardEl: $TSFixMe,
+  event: KeyboardEvent,
+  activeOverlayType: string | null | undefined,
+  dashboardEl: HTMLElement,
 ): void {
   const activeOverlayEl = getActiveOverlayEl(dashboardEl, activeOverlayType)
   const focusableNodes = toArray(
-    activeOverlayEl.querySelectorAll(FOCUSABLE_ELEMENTS),
+    activeOverlayEl.querySelectorAll<HTMLElement>(FOCUSABLE_ELEMENTS.join(',')),
   )
 
-  const focusedItemIndex = focusableNodes.indexOf(document.activeElement)
+  const focusedItemIndex = focusableNodes.indexOf(
+    document.activeElement as HTMLElement,
+  )
 
   // If we pressed tab, and focus is not yet within the current overlay - focus on
   // the first element within the current overlay.
@@ -63,9 +63,9 @@ export { trapFocus as forModal }
 
 // Traps focus inside of the currently open overlay, unless overlay is null - then let the user tab away.
 export function forInline(
-  event: $TSFixMe,
-  activeOverlayType: $TSFixMe,
-  dashboardEl: $TSFixMe,
+  event: KeyboardEvent,
+  activeOverlayType: string | null,
+  dashboardEl: HTMLElement,
 ): void {
   // ___When we're in the bare 'Drop files here, paste, browse or import from' screen
   if (activeOverlayType === null) {
diff --git a/packages/@uppy/screen-capture/src/StopWatch.tsx b/packages/@uppy/screen-capture/src/StopWatch.tsx
index 6f928b0258..52fd99956b 100644
--- a/packages/@uppy/screen-capture/src/StopWatch.tsx
+++ b/packages/@uppy/screen-capture/src/StopWatch.tsx
@@ -1,13 +1,21 @@
+import type { I18n } from '@uppy/core/utils'
 import { Component } from '@uppy/core/utils/preact'
 
-type $TSFixMe = any
-
-function fmtMSS(s: number) {
+function fmtMSS(s: number): string {
   // biome-ignore lint/suspicious/noAssignInExpressions: ...
   return (s - (s %= 60)) / 60 + (s > 9 ? ':' : ':0') + s
 }
 
-class StopWatch extends Component {
+interface StopWatchProps {
+  i18n: I18n
+  recording: boolean
+}
+
+interface StopWatchState {
+  elapsedTime: number
+}
+
+class StopWatch extends Component<StopWatchProps, StopWatchState> {
   private wrapperStyle = {
     width: '100%',
     height: '100%',
@@ -51,7 +59,7 @@ class StopWatch extends Component {
 
   private timer?: ReturnType<typeof setTimeout>
 
-  constructor(props: $TSFixMe) {
+  constructor(props: StopWatchProps) {
     super(props)
     this.state = { elapsedTime: 0 }
   }
@@ -69,7 +77,7 @@ class StopWatch extends Component {
 
   timerTick() {
     this.timer = setTimeout(() => {
-      this.setState((state: $TSFixMe) => ({
+      this.setState((state) => ({
         elapsedTime: state.elapsedTime + 1,
       }))
       this.timerTick()
@@ -77,8 +85,8 @@ class StopWatch extends Component {
   }
 
   render() {
-    const { recording, i18n } = { ...this.props } as $TSFixMe
-    const { elapsedTime } = this.state as $TSFixMe
+    const { recording, i18n } = { ...this.props }
+    const { elapsedTime } = this.state
 
     // second to minutes and seconds
     const minAndSec = fmtMSS(elapsedTime)
diff --git a/packages/@uppy/screen-capture/src/StreamStatus.tsx b/packages/@uppy/screen-capture/src/StreamStatus.tsx
index 333ce32799..59ff9c1d4c 100644
--- a/packages/@uppy/screen-capture/src/StreamStatus.tsx
+++ b/packages/@uppy/screen-capture/src/StreamStatus.tsx
@@ -1,6 +1,15 @@
-type $TSFixMe = any
+import type { I18n } from '@uppy/core/utils'
+import type { ComponentChildren } from 'preact'
 
-export default function StreamStatus({ streamActive, i18n }: $TSFixMe) {
+interface StreamStatusProps {
+  i18n: I18n
+  streamActive: boolean
+}
+
+export default function StreamStatus({
+  streamActive,
+  i18n,
+}: StreamStatusProps): ComponentChildren {
   if (streamActive) {
     return (
       <div

From 7a55a89a5e9b838001696fd91e6a8445f61ff104 Mon Sep 17 00:00:00 2001
From: Remco Haszing <remcohaszing@gmail.com>
Date: Wed, 12 Aug 2026 10:33:51 +0200
Subject: [PATCH 2/5] Address feedback issues

---
 packages/@uppy/dashboard/src/Dashboard.tsx           |  7 ++++---
 .../@uppy/dashboard/src/components/Dashboard.tsx     | 12 ++++++++----
 .../src/components/FileItem/Buttons/index.tsx        |  3 ++-
 packages/@uppy/dashboard/src/utils/ignoreEvent.ts    |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/@uppy/dashboard/src/Dashboard.tsx b/packages/@uppy/dashboard/src/Dashboard.tsx
index efcbe3589c..d4b45c9257 100644
--- a/packages/@uppy/dashboard/src/Dashboard.tsx
+++ b/packages/@uppy/dashboard/src/Dashboard.tsx
@@ -13,9 +13,10 @@ import { UIPlugin } from '@uppy/core'
 import { defaultPickerIcon } from '@uppy/core/provider-views'
 import type { LocaleStrings } from '@uppy/core/utils'
 import { findAllDOMElements, getDroppedFiles, toArray } from '@uppy/core/utils'
-import type { ComponentChild, h, VNode } from '@uppy/core/utils/preact'
+import type { ComponentChild, VNode } from '@uppy/core/utils/preact'
 import ThumbnailGenerator from '@uppy/thumbnail-generator'
 import { nanoid } from 'nanoid/non-secure'
+import type { TargetedEvent } from 'preact'
 import packageJson from '../package.json' with { type: 'json' }
 import DashboardUI from './components/Dashboard.js'
 import locale from './locale.js'
@@ -99,7 +100,7 @@ export interface TargetWithRender extends Target {
 
 export interface DashboardState<M extends Meta, B extends Body> {
   targets: Target[]
-  activePickerPanel: Target
+  activePickerPanel: Target | undefined
   showAddFilesPanel: boolean
   activeOverlayType: string | null
   fileCardFor: string | null
@@ -774,7 +775,7 @@ export default class Dashboard<M extends Meta, B extends Body> extends UIPlugin<
   }
 
   private handleInputChange = (
-    event: h.JSX.TargetedEvent<HTMLInputElement, Event>,
+    event: TargetedEvent<HTMLInputElement, Event>,
   ) => {
     event.preventDefault()
     const files = toArray(event.currentTarget.files || [])
diff --git a/packages/@uppy/dashboard/src/components/Dashboard.tsx b/packages/@uppy/dashboard/src/components/Dashboard.tsx
index 091ab29969..1a6cd2539c 100644
--- a/packages/@uppy/dashboard/src/components/Dashboard.tsx
+++ b/packages/@uppy/dashboard/src/components/Dashboard.tsx
@@ -57,7 +57,7 @@ type DashboardUIProps<M extends Meta, B extends Body> = {
   disabled: boolean
   disableLocalFiles: boolean
   direction: UIPluginOptions['direction']
-  activePickerPanel: NonNullable<DashboardState<M, B>['activePickerPanel']>
+  activePickerPanel: DashboardState<M, B>['activePickerPanel']
   showFileEditor: boolean
   saveFileEditor: () => void
   closeFileEditor: () => void
@@ -131,7 +131,7 @@ type DashboardUIProps<M extends Meta, B extends Body> = {
 export default function Dashboard<M extends Meta, B extends Body>(
   props: DashboardUIProps<M, B>,
 ) {
-  const { fileCardFor } = props
+  const { activePickerPanel, fileCardFor } = props
   const isNoFiles = props.totalFileCount === 0
   const isSingleFile = props.totalFileCount === 1
   const isSizeHeightMD = props.containerHeight > HEIGHT_MD
@@ -331,8 +331,12 @@ export default function Dashboard<M extends Meta, B extends Body>(
           </Slide>
 
           <Slide>
-            {props.activePickerPanel ? (
-              <PickerPanelContent key="Picker" {...props} />
+            {activePickerPanel ? (
+              <PickerPanelContent
+                key="Picker"
+                {...props}
+                activePickerPanel={activePickerPanel}
+              />
             ) : null}
           </Slide>
 
diff --git a/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx b/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx
index 0265f21f97..bf3864cd9c 100644
--- a/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx
+++ b/packages/@uppy/dashboard/src/components/FileItem/Buttons/index.tsx
@@ -103,6 +103,7 @@ function CopyLinkButton<M extends Meta, B extends Body>({
   i18n: I18n
 }) {
   const copyLinkToClipboard: MouseEventHandler<HTMLButtonElement> = (event) => {
+    const { currentTarget } = event
     copyToClipboard(file.uploadURL!, i18n('copyLinkToClipboardFallback'))
       .then(() => {
         uppy.log('Link copied to clipboard.')
@@ -110,7 +111,7 @@ function CopyLinkButton<M extends Meta, B extends Body>({
       })
       .catch(uppy.log)
       // avoid losing focus
-      .then(() => event.currentTarget.focus({ preventScroll: true }))
+      .then(() => currentTarget.focus({ preventScroll: true }))
   }
 
   return (
diff --git a/packages/@uppy/dashboard/src/utils/ignoreEvent.ts b/packages/@uppy/dashboard/src/utils/ignoreEvent.ts
index 0659644c65..1862629595 100644
--- a/packages/@uppy/dashboard/src/utils/ignoreEvent.ts
+++ b/packages/@uppy/dashboard/src/utils/ignoreEvent.ts
@@ -6,7 +6,7 @@
 import type { TargetedEvent } from 'preact'
 
 function ignoreEvent(ev: TargetedEvent<Element>): void {
-  const { tagName } = ev.currentTarget
+  const { tagName } = ev.target as Element
   if (tagName === 'INPUT' || tagName === 'TEXTAREA') {
     ev.stopPropagation()
     return

From ddffd2c68fc4d0aa0be2dd966297e6eecfdb7e5f Mon Sep 17 00:00:00 2001
From: Remco Haszing <remcohaszing@gmail.com>
Date: Wed, 12 Aug 2026 10:35:24 +0200
Subject: [PATCH 3/5] Add a changeset

---
 .changeset/eighty-words-wink.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/eighty-words-wink.md

diff --git a/.changeset/eighty-words-wink.md b/.changeset/eighty-words-wink.md
new file mode 100644
index 0000000000..675a8d1369
--- /dev/null
+++ b/.changeset/eighty-words-wink.md
@@ -0,0 +1,7 @@
+---
+"@uppy/screen-capture": minor
+"@uppy/dashboard": minor
+"@uppy/core": minor
+---
+
+Narrow a number of `any` types to real types. Some affect the public interface.

From 2608128d47243e1049d2ef3b5b59390571c280c0 Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Wed, 12 Aug 2026 22:44:23 +0200
Subject: [PATCH 4/5] Fix file card cancel and drop dead upload-state checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- FileCard: `toggleFileCard(false)` dropped the required `fileID`, so
  `dashboard:file-edit-complete` was emitted with `undefined` — the
  implementation looks the file up before branching on `show`. Pass
  `fileCardFor` and remove the suppression.
- PickerPanelTopBar: `state` is only ever WAITING/PREPROCESSING/
  POSTPROCESSING because the uploading branch returns early, so both
  `state !== STATE_UPLOADING` checks were always true. Removing them is
  behaviour preserving and drops two suppressions.
- EditorPanel: replace the `fileCardFor!` assertion with an early return,
  since the prop admits `null`.
- FileCard, getActiveOverlayEl: drop a redundant `!` and an `as HTMLElement`.
- Mention the two user visible behaviour changes in the changeset.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .changeset/eighty-words-wink.md                      |  5 +++++
 .../@uppy/dashboard/src/components/EditorPanel.tsx   |  6 +++++-
 .../dashboard/src/components/FileCard/index.tsx      |  7 +++----
 .../dashboard/src/components/PickerPanelTopBar.tsx   | 12 +++---------
 .../@uppy/dashboard/src/utils/getActiveOverlayEl.ts  |  4 ++--
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.changeset/eighty-words-wink.md b/.changeset/eighty-words-wink.md
index 675a8d1369..8600484130 100644
--- a/.changeset/eighty-words-wink.md
+++ b/.changeset/eighty-words-wink.md
@@ -5,3 +5,8 @@
 ---
 
 Narrow a number of `any` types to real types. Some affect the public interface.
+
+This also fixes some bugs the new types revealed:
+
+- The "copy link" helper now actually applies its styles to the temporary textarea it creates. Previously the style object was stringified to `"[object Object]"`, leaving the textarea unstyled and able to scroll the page when selected.
+- Cancelling the file card now emits `dashboard:file-edit-complete` with the file being edited, instead of `undefined`.
diff --git a/packages/@uppy/dashboard/src/components/EditorPanel.tsx b/packages/@uppy/dashboard/src/components/EditorPanel.tsx
index 0e543c3ca7..2a7da1dff4 100644
--- a/packages/@uppy/dashboard/src/components/EditorPanel.tsx
+++ b/packages/@uppy/dashboard/src/components/EditorPanel.tsx
@@ -33,7 +33,11 @@ type EditorPanelProps<M extends Meta, B extends Body> = {
 function EditorPanel<M extends Meta, B extends Body>(
   props: EditorPanelProps<M, B>,
 ): ComponentChildren {
-  const file = props.files[props.fileCardFor!]
+  const file = props.fileCardFor ? props.files[props.fileCardFor] : undefined
+
+  if (!file) {
+    return null
+  }
 
   const handleCancel = () => {
     props.uppy.emit('file-editor:cancel', file)
diff --git a/packages/@uppy/dashboard/src/components/FileCard/index.tsx b/packages/@uppy/dashboard/src/components/FileCard/index.tsx
index 12cfe2156d..9d3c8a7684 100644
--- a/packages/@uppy/dashboard/src/components/FileCard/index.tsx
+++ b/packages/@uppy/dashboard/src/components/FileCard/index.tsx
@@ -48,11 +48,11 @@ export default function FileCard<M extends Meta, B extends Body>(
 
   const getMetaFields = () => {
     return typeof metaFields === 'function'
-      ? metaFields(files[fileCardFor!])
+      ? metaFields(files[fileCardFor])
       : metaFields
   }
 
-  const file = files[fileCardFor!]
+  const file = files[fileCardFor]
   const computedMetaFields = getMetaFields() ?? []
   const showEditButton = canEditFile(file)
 
@@ -80,8 +80,7 @@ export default function FileCard<M extends Meta, B extends Body>(
   }
 
   const handleCancel = () => {
-    // @ts-expect-error TODO fix me
-    toggleFileCard(false)
+    toggleFileCard(false, fileCardFor)
   }
 
   const [form] = useState(() => {
diff --git a/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx b/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx
index 301d8da81d..4755875e44 100644
--- a/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx
+++ b/packages/@uppy/dashboard/src/components/PickerPanelTopBar.tsx
@@ -41,19 +41,13 @@ function getUploadingState(
       return uploadStates.STATE_UPLOADING
     }
     // If files are being preprocessed AND postprocessed at this time, we show the
-    // preprocess state. If any files are being uploaded we show uploading.
-    // @ts-expect-error TODO TypeScript catches a runtime issue here.
-    if (progress.preprocess && state !== uploadStates.STATE_UPLOADING) {
+    // preprocess state. The uploading state is handled by the early return above.
+    if (progress.preprocess) {
       state = uploadStates.STATE_PREPROCESSING
     }
     // If NO files are being preprocessed or uploaded right now, but some files are
     // being postprocessed, show the postprocess state.
-    if (
-      progress.postprocess &&
-      // @ts-expect-error TODO TypeScript catches a runtime issue here.
-      state !== uploadStates.STATE_UPLOADING &&
-      state !== uploadStates.STATE_PREPROCESSING
-    ) {
+    if (progress.postprocess && state !== uploadStates.STATE_PREPROCESSING) {
       state = uploadStates.STATE_POSTPROCESSING
     }
   }
diff --git a/packages/@uppy/dashboard/src/utils/getActiveOverlayEl.ts b/packages/@uppy/dashboard/src/utils/getActiveOverlayEl.ts
index cfb10d3b98..6e1f9f3128 100644
--- a/packages/@uppy/dashboard/src/utils/getActiveOverlayEl.ts
+++ b/packages/@uppy/dashboard/src/utils/getActiveOverlayEl.ts
@@ -6,11 +6,11 @@ export default function getActiveOverlayEl(
   activeOverlayType?: string | null | undefined,
 ): HTMLElement {
   if (activeOverlayType) {
-    const overlayEl = dashboardEl.querySelector(
+    const overlayEl = dashboardEl.querySelector<HTMLElement>(
       `[data-uppy-paneltype="${activeOverlayType}"]`,
     )
     // if an overlay is already mounted
-    if (overlayEl) return overlayEl as HTMLElement
+    if (overlayEl) return overlayEl
   }
   return dashboardEl
 }

From 260812e52e5724821571d6221b6cec9d97c70027 Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Wed, 12 Aug 2026 23:37:19 +0200
Subject: [PATCH 5/5] fix `MetaErrorMessage` calling metaFields() with no
 argument

---
 .changeset/eighty-words-wink.md               |  1 +
 .../components/FileItem/MetaErrorMessage.tsx  | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.changeset/eighty-words-wink.md b/.changeset/eighty-words-wink.md
index 8600484130..833838691c 100644
--- a/.changeset/eighty-words-wink.md
+++ b/.changeset/eighty-words-wink.md
@@ -10,3 +10,4 @@ This also fixes some bugs the new types revealed:
 
 - The "copy link" helper now actually applies its styles to the temporary textarea it creates. Previously the style object was stringified to `"[object Object]"`, leaving the textarea unstyled and able to scroll the page when selected.
 - Cancelling the file card now emits `dashboard:file-edit-complete` with the file being edited, instead of `undefined`.
+- The "missing required meta fields" message now passes the file to a `metaFields` callback, which previously received `undefined`, and no longer throws when a field listed in the `requiredMetaFields` restriction has no matching entry in `metaFields`.
diff --git a/packages/@uppy/dashboard/src/components/FileItem/MetaErrorMessage.tsx b/packages/@uppy/dashboard/src/components/FileItem/MetaErrorMessage.tsx
index fc739cfd89..6958011315 100644
--- a/packages/@uppy/dashboard/src/components/FileItem/MetaErrorMessage.tsx
+++ b/packages/@uppy/dashboard/src/components/FileItem/MetaErrorMessage.tsx
@@ -5,15 +5,14 @@ import type { DashboardState } from '../../Dashboard.js'
 function metaFieldIdToName<M extends Meta, B extends Body>(
   metaFieldId: string,
   metaFields: DashboardState<M, B>['metaFields'],
-) {
+  file: UppyFile<M, B>,
+): string {
   const fields =
-    typeof metaFields === 'function'
-      ? // @ts-expect-error TODO This should not be an error.
-        metaFields()
-      : metaFields
-  // @ts-expect-error TODO This should not be an error.
-  const field = fields.filter((f) => f.id === metaFieldId)
-  return field[0].name
+    typeof metaFields === 'function' ? metaFields(file) : metaFields
+  const field = fields?.find((f) => f.id === metaFieldId)
+  // `requiredMetaFields` is a core restriction, so a field can be required
+  // without having a matching entry in the Dashboard `metaFields` option.
+  return field?.name ?? metaFieldId
 }
 
 type MetaErrorMessageProps<M extends Meta, B extends Body> = {
@@ -33,7 +32,9 @@ export default function MetaErrorMessage<M extends Meta, B extends Body>(
   }
 
   const metaFieldsString = missingRequiredMetaFields
-    .map((missingMetaField) => metaFieldIdToName(missingMetaField, metaFields))
+    .map((missingMetaField) =>
+      metaFieldIdToName(missingMetaField, metaFields, file),
+    )
     .join(', ')
 
   return (