pull logic out from react component

transloadit · Nov 26, 2024 · 7a56978 · 7a56978
1 parent 8fd3ae9
commit 7a56978
Show file tree

Hide file tree

Showing 4 changed files with 547 additions and 432 deletions.
diff --git a/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx b/packages/@uppy/google-drive-picker/src/GoogleDrivePicker.tsx
@@ -7,11 +7,8 @@ import {
   tokenStorage,
 } from '@uppy/companion-client'
 
+import type { PickedItem } from '@uppy/provider-views/lib/GooglePicker/googlePicker.js'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
-import {
-  type PickedItem,
-  type PluginState,
-} from '@uppy/provider-views/lib/GooglePicker/GooglePickerView.js'
 import type { AsyncStore, BaseProviderPlugin } from '@uppy/core/lib/Uppy.js'
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -66,7 +63,7 @@ export default class GoogleDrivePicker<
     M extends Meta & { width: number; height: number },
     B extends Body,
   >
-  extends UIPlugin<GoogleDrivePickerOptions, M, B, PluginState>
+  extends UIPlugin<GoogleDrivePickerOptions, M, B>
   implements BaseProviderPlugin
 {
   static VERSION = packageJson.version
@@ -144,7 +141,6 @@ export default class GoogleDrivePicker<
     <GooglePickerView
       storage={this.storage}
       pickerType="drive"
-      plugin={this}
       uppy={this.uppy}
       clientId={this.opts.clientId}
       apiKey={this.opts.apiKey}

diff --git a/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx b/packages/@uppy/google-photos-picker/src/GooglePhotosPicker.tsx
@@ -7,11 +7,8 @@ import {
   tokenStorage,
 } from '@uppy/companion-client'
 
+import type { PickedItem } from '@uppy/provider-views/lib/GooglePicker/googlePicker.js'
 import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
-import {
-  type PickedItem,
-  type PluginState,
-} from '@uppy/provider-views/lib/GooglePicker/GooglePickerView.js'
 import type { AsyncStore, BaseProviderPlugin } from '@uppy/core/lib/Uppy.js'
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -59,7 +56,7 @@ export default class GooglePhotosPicker<
     M extends Meta & { width: number; height: number },
     B extends Body,
   >
-  extends UIPlugin<GooglePhotosPickerOptions, M, B, PluginState>
+  extends UIPlugin<GooglePhotosPickerOptions, M, B>
   implements BaseProviderPlugin
 {
   static VERSION = packageJson.version
@@ -137,7 +134,6 @@ export default class GooglePhotosPicker<
     <GooglePickerView
       storage={this.storage}
       pickerType="photos"
-      plugin={this}
       uppy={this.uppy}
       clientId={this.opts.clientId}
       onFilesPicked={this.handleFilesPicked}