Skip to content

Commit 76a4033

Browse files
author
Roland Groza
committed
fix: remove redundant dataTransfer null check
1 parent 41b8c3d commit 76a4033

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/file-selector.spec.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ it('should return an empty array if the passed arg is not what we expect', async
1212
expect(files).toHaveLength(0);
1313
});
1414

15+
it('should return an empty array if drag event', async () => {
16+
const files = await fromEvent({});
17+
expect(files).toHaveLength(0);
18+
});
19+
1520
it('should return the evt {target} {files} if the passed event is an input evt', async () => {
1621
const name = 'test.json';
1722
const mockFile = createFile(name, {ping: true}, {

src/file-selector.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const FILES_TO_IGNORE = [
1919
* @param evt
2020
*/
2121
export async function fromEvent(evt: Event | any): Promise<(FileWithPath | DataTransferItem)[]> {
22-
if (isObject<DragEvent>(evt) && isDataTransfer(evt)) {
22+
if (isObject<DragEvent>(evt) && isDataTransfer(evt.dataTransfer)) {
2323
return getDataTransferFiles(evt.dataTransfer, evt.type);
2424
} else if (isChangeEvt(evt)) {
2525
return getInputFiles(evt);
@@ -30,7 +30,7 @@ export async function fromEvent(evt: Event | any): Promise<(FileWithPath | DataT
3030
}
3131

3232
function isDataTransfer(value: any): value is DataTransfer {
33-
return isObject(value.dataTransfer);
33+
return isObject(value);
3434
}
3535

3636
function isChangeEvt(value: any): value is Event {
@@ -52,11 +52,7 @@ async function getFsHandleFiles(handles: any[]) {
5252
}
5353

5454

55-
async function getDataTransferFiles(dt: DataTransfer | null, type: string) {
56-
if (dt === null) {
57-
return [];
58-
}
59-
55+
async function getDataTransferFiles(dt: DataTransfer, type: string) {
6056
// IE11 does not support dataTransfer.items
6157
// See https://developer.mozilla.org/en-US/docs/Web/API/DataTransfer/items#Browser_compatibility
6258
if (dt.items) {

0 commit comments

Comments
 (0)