Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Firefox Drag'n'Drop Functionality #294

Merged
merged 3 commits into from
Apr 15, 2021
Merged

Fix Firefox Drag'n'Drop Functionality #294

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9f566a
Add isBrowserFirefox lib util
michaeljaltamirano Apr 13, 2021
181887f
Extract subject type logic into un-exported helper method
michaeljaltamirano Apr 13, 2021
1a4ca7b
Merge branch 'main' of https://github.com/abramenal/cypress-file-uplo…
michaeljaltamirano Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/browser/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// eslint-disable-next-line import/prefer-default-export
export { default as isManualEventHandling } from './isManualEventHandling';
export { default as isBrowserFirefox } from './isBrowserFirefox';
7 changes: 7 additions & 0 deletions lib/browser/isBrowserFirefox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const BROWSER_FIREFOX = 'firefox';

export default function isBrowserFirefox() {
const { name } = Cypress.browser;

return name === BROWSER_FIREFOX;
}
22 changes: 18 additions & 4 deletions src/helpers/attachFileToElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
import { dispatchEvent } from '../../lib/dom';
import { SUBJECT_TYPE, EVENTS_BY_SUBJECT_TYPE } from '../constants';
import { EVENTS_BY_SUBJECT_TYPE, SUBJECT_TYPE } from '../constants';
import { isBrowserFirefox } from '../../lib/browser';

function dispatchEvents(element, events, dataTransfer) {
events.forEach(event => {
dispatchEvent(element, event, dataTransfer);
});
}

function getEventsBySubjectType(subjectType) {
const events = EVENTS_BY_SUBJECT_TYPE[subjectType];

/**
* @see https://github.com/abramenal/cypress-file-upload/issues/293
*/
if (subjectType === SUBJECT_TYPE.DRAG_N_DROP && isBrowserFirefox()) {
events.push('change');
}

return events;
}

export default function attachFileToElement(subject, { files, subjectType, force, window }) {
const dataTransfer = new window.DataTransfer();
files.forEach(f => dataTransfer.items.add(f));
Expand All @@ -16,7 +30,7 @@ export default function attachFileToElement(subject, { files, subjectType, force
inputElement.files = dataTransfer.files;

if (force) {
dispatchEvents(inputElement, EVENTS_BY_SUBJECT_TYPE[subjectType], dataTransfer);
dispatchEvents(inputElement, getEventsBySubjectType(subjectType), dataTransfer);
}
} else if (subjectType === SUBJECT_TYPE.DRAG_N_DROP) {
const inputElements = subject[0].querySelectorAll('input[type="file"]');
Expand All @@ -30,14 +44,14 @@ export default function attachFileToElement(subject, { files, subjectType, force
inputElement.files = dataTransfer.files;

if (force) {
dispatchEvents(inputElement, EVENTS_BY_SUBJECT_TYPE[subjectType], dataTransfer);
dispatchEvents(inputElement, getEventsBySubjectType(subjectType), dataTransfer);
}
} else {
const inputElement = subject[0];
inputElement.files = dataTransfer.files;

if (force) {
dispatchEvents(inputElement, EVENTS_BY_SUBJECT_TYPE[subjectType], dataTransfer);
dispatchEvents(inputElement, getEventsBySubjectType(subjectType), dataTransfer);
}
}
}
Expand Down