@uppy/core: fix types (#4842)

packages/@uppy/core/src/BasePlugin.ts

@@ -15,7 +15,11 @@ import type { I18n, Locale } from '@uppy/utils/lib/Translator'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
 import type { Uppy } from '.'
 
-export type PluginOpts = { locale?: Locale; [key: string]: unknown }
+export type PluginOpts = {
+  locale?: Locale
+  id?: string
+  [key: string]: unknown
+}
 
 export default class BasePlugin<
   Opts extends PluginOpts,

packages/@uppy/core/src/UIPlugin.ts

@@ -32,6 +32,11 @@ function debounce<T extends (...args: any[]) => any>(
   }
 }
 
+export interface UIPluginOptions extends PluginOpts {
+  replaceTargetContent?: boolean
+  direction?: 'ltr' | 'rtl'
+}
+
 /**
  * UIPlugin is the extended version of BasePlugin to incorporate rendering with Preact.
  * Use this for plugins that need a user interface.
@@ -39,7 +44,7 @@ function debounce<T extends (...args: any[]) => any>(
  * For plugins without an user interface, see BasePlugin.
  */
 class UIPlugin<
-  Opts extends PluginOpts & { direction?: 'ltr' | 'rtl' },
+  Opts extends UIPluginOptions,
   M extends Meta,
   B extends Body,
 > extends BasePlugin<Opts, M, B> {
@@ -51,6 +56,8 @@ class UIPlugin<
 
   parent: unknown
 
+  title: string
+
   getTargetPlugin(target: unknown): UIPlugin<any, any, any> | undefined {
     let targetPlugin
     if (typeof target === 'object' && target instanceof UIPlugin) {

packages/@uppy/core/src/Uppy.ts

@@ -98,7 +98,7 @@ export interface State<M extends Meta, B extends Body>
   }
   currentUploads: Record<string, CurrentUpload<M, B>>
   allowNewUpload: boolean
-  recoveredState: null
+  recoveredState: null | State<M, B>
   error: string | null
   files: {
     [key: string]: UppyFile<M, B>
@@ -254,6 +254,7 @@ export interface _UppyEventMap<M extends Meta, B extends Body> {
   progress: ProgressCallback
   'reset-progress': GenericEventCallback
   restored: GenericEventCallback
+  'restore-confirmed': GenericEventCallback
   'restriction-failed': RestrictionFailedCallback<M, B>
   'resume-all': GenericEventCallback
   'retry-all': RetryAllCallback

packages/@uppy/core/src/index.ts

@@ -3,3 +3,5 @@ export { default as Uppy } from './Uppy.ts'
 export { default as UIPlugin } from './UIPlugin.ts'
 export { default as BasePlugin } from './BasePlugin.ts'
 export { debugLogger } from './loggers.ts'
+
+export type { UIPluginOptions } from './UIPlugin.ts'