fix: fix regression with onSelect not passing an array

sanity-io · May 5, 2022 · dae8628 · dae8628
1 parent 8de8996
commit dae8628
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/src/app.tsx b/src/app.tsx
@@ -8,7 +8,7 @@ import {
   ToastProvider
 } from '@sanity/ui'
 import {AssetSourceComponentProps} from '@sanity/types'
-import React, {FC, forwardRef, MouseEvent, Ref} from 'react'
+import React, {forwardRef, MouseEvent, Ref} from 'react'
 import {ThemeProvider as LegacyThemeProvider} from 'theme-ui'
 import Browser from './components/Browser'
 import ReduxProvider from './components/ReduxProvider'
@@ -20,7 +20,7 @@ import theme from './styled/theme'
 
 type Props = AssetSourceComponentProps
 
-const AssetBrowser: FC<Props> = forwardRef((props: Props, ref: Ref<HTMLDivElement>) => {
+const AssetBrowser = forwardRef((props: Props, ref: Ref<HTMLDivElement>) => {
   const {onClose, onSelect} = props
 
   // Close on escape key press
@@ -40,6 +40,7 @@ const AssetBrowser: FC<Props> = forwardRef((props: Props, ref: Ref<HTMLDivElemen
         <LegacyThemeProvider theme={theme}>
           <PortalProvider element={document.body}>
             <ToastProvider zOffset={Z_INDEX_TOAST_PROVIDER}>
+              {/* @ts-expect-error */}
               <AssetBrowserDispatchProvider onSelect={onSelect}>
                 <GlobalStyle />
 

diff --git a/src/components/CardAsset/index.tsx b/src/components/CardAsset/index.tsx
@@ -100,10 +100,12 @@ const CardAsset = (props: Props) => {
     e.stopPropagation()
 
     if (onSelect) {
-      onSelect({
-        kind: 'assetDocumentId',
-        value: asset._id
-      })
+      onSelect([
+        {
+          kind: 'assetDocumentId',
+          value: asset._id
+        }
+      ])
     } else if (shiftPressed.current) {
       if (picked) {
         dispatch(assetsActions.pick({assetId: asset._id, picked: !picked}))

diff --git a/src/components/TableRowAsset/index.tsx b/src/components/TableRowAsset/index.tsx
@@ -99,10 +99,12 @@ const TableRowAsset = (props: Props) => {
     e.stopPropagation()
 
     if (onSelect) {
-      onSelect({
-        kind: 'assetDocumentId',
-        value: asset._id
-      })
+      onSelect([
+        {
+          kind: 'assetDocumentId',
+          value: asset._id
+        }
+      ])
     } else if (shiftPressed.current) {
       if (picked) {
         dispatch(assetsActions.pick({assetId: asset._id, picked: !picked}))

diff --git a/src/contexts/AssetSourceDispatchContext.tsx b/src/contexts/AssetSourceDispatchContext.tsx
@@ -2,12 +2,12 @@ import React, {ReactNode, createContext, useContext} from 'react'
 import type {AssetFromSource} from '@sanity/types'
 
 type ContextProps = {
-  onSelect?: (assetFromSource: AssetFromSource) => void
+  onSelect?: (assetFromSource: AssetFromSource[]) => void
 }
 
 type Props = {
   children: ReactNode
-  onSelect?: (assetFromSource: AssetFromSource) => void
+  onSelect?: (assetFromSource: AssetFromSource[]) => void
 }
 
 const AssetSourceDispatchContext = createContext<ContextProps | undefined>(undefined)