@react-aria/dnd 3.0.0-alpha.0 → 3.0.0-alpha.11

package/src/useVirtualDrop.ts

@@ -10,16 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
+import {DOMAttributes} from '@react-types/shared';
 import * as DragManager from './DragManager';
-import {HTMLAttributes} from 'react';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {useDescription} from '@react-aria/utils';
 import {useDragModality} from './utils';
-import {useMessageFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from '@react-aria/i18n';
 
 interface VirtualDropResult {
-  dropProps: HTMLAttributes<HTMLElement>
+  dropProps: DOMAttributes
 }
 
 const MESSAGES = {
@@ -29,10 +29,10 @@ const MESSAGES = {
 };
 
 export function useVirtualDrop(): VirtualDropResult {
-  let formatMessage = useMessageFormatter(intlMessages);
+  let stringFormatter = useLocalizedStringFormatter(intlMessages);
   let modality = useDragModality();
   let dragSession = DragManager.useDragSession();
-  let descriptionProps = useDescription(dragSession ? formatMessage(MESSAGES[modality]) : '');
+  let descriptionProps = useDescription(dragSession ? stringFormatter.format(MESSAGES[modality]) : '');
 
   return {
     dropProps: {

package/src/utils.ts

@@ -154,7 +154,7 @@ export class DragTypes implements IDragTypes {
 
     // In Safari, when dragging files, the dataTransfer.items list is empty, but dataTransfer.types contains "Files".
     // Unfortunately, this doesn't tell us what types of files the user is dragging, so we need to assume that any
-    // type the user checks for is included.
+    // type the user checks for is included. See https://bugs.webkit.org/show_bug.cgi?id=223517.
     this.includesUnknownTypes = !hasFiles && dataTransfer.types.includes('Files');
   }
 
@@ -208,10 +208,11 @@ export function readFromDataTransfer(dataTransfer: DataTransfer) {
         if (typeof item.webkitGetAsEntry === 'function') {
           let entry: FileSystemEntry = item.webkitGetAsEntry();
           if (!entry) {
-            // For some reason, Chrome and Firefox include an item with type image/png when copy
-            // and pasting any file or directory (no matter the type), but return `null` for both
+            // For some reason, Firefox includes an item with type image/png when copy
+            // and pasting any file or directory (no matter the type), but returns `null` for both
             // item.getAsFile() and item.webkitGetAsEntry(). Safari works as expected. Ignore this
-            // item if this happens.
+            // item if this happens. See https://bugzilla.mozilla.org/show_bug.cgi?id=1699743.
+            // This was recently fixed in Chrome Canary: https://bugs.chromium.org/p/chromium/issues/detail?id=1175483.
             continue;
           }
 
@@ -276,25 +277,6 @@ function createDirectoryItem(entry: any): DirectoryItem {
   };
 }
 
-interface FileSystemFileEntry {
-  isFile: true,
-  isDirectory: false,
-  name: string,
-  file(successCallback: (file: File) => void, errorCallback?: (error: Error) => void): void
-}
-
-interface FileSystemDirectoryEntry {
-  isDirectory: true,
-  isFile: false,
-  name: string,
-  createReader(): FileSystemDirectoryReader
-}
-
-type FileSystemEntry = FileSystemFileEntry | FileSystemDirectoryEntry;
-interface FileSystemDirectoryReader {
-  readEntries(successCallback: (entries: FileSystemEntry[]) => void, errorCallback?: (error: Error) => void): void
-}
-
 async function *getEntries(item: FileSystemDirectoryEntry): AsyncIterable<FileItem | DirectoryItem> {
   let reader = item.createReader();
 
@@ -308,7 +290,7 @@ async function *getEntries(item: FileSystemDirectoryEntry): AsyncIterable<FileIt
 
     for (let entry of entries) {
       if (entry.isFile) {
-        let file = await getEntryFile(entry);
+        let file = await getEntryFile(entry as FileSystemFileEntry);
         yield createFileItem(file);
       } else if (entry.isDirectory) {
         yield createDirectoryItem(entry);