Restrict querySelectorAll to the upload form component

This commit is contained in:
Thibaut Girka 2018-08-30 11:46:45 +02:00 committed by ThibG
parent 1544ac4e27
commit c20b27a9f4
2 changed files with 16 additions and 5 deletions

View file

@ -222,7 +222,7 @@ const handlers = {
// Submits the status.
handleSubmit () {
const { textarea: { value } } = this;
const { textarea: { value }, uploadForm } = this;
const {
onChangeText,
onSubmit,
@ -249,9 +249,11 @@ const handlers = {
// Submit unless there are media with missing descriptions
if (mediaDescriptionConfirmation && onMediaDescriptionConfirm && media && media.some(item => !item.get('description'))) {
const firstWithoutDescription = media.findIndex(item => !item.get('description'));
const inputs = document.querySelectorAll('.composer--upload_form--item input');
if (inputs.length == media.size && firstWithoutDescription !== -1) {
inputs[firstWithoutDescription].focus();
if (uploadForm) {
const inputs = uploadForm.querySelectorAll('.composer--upload_form--item input');
if (inputs.length == media.size && firstWithoutDescription !== -1) {
inputs[firstWithoutDescription].focus();
}
}
onMediaDescriptionConfirm();
} else if (onSubmit) {
@ -259,6 +261,11 @@ const handlers = {
}
},
// Sets a reference to the upload form.
handleRefUploadForm (uploadFormComponent) {
this.uploadForm = uploadFormComponent;
},
// Sets a reference to the textarea.
handleRefTextarea (textareaComponent) {
if (textareaComponent) {
@ -365,6 +372,7 @@ class Composer extends React.Component {
handleSecondarySubmit,
handleSelect,
handleSubmit,
handleRefUploadForm,
handleRefTextarea,
handleRefSpoilerText,
} = this.handlers;
@ -455,6 +463,7 @@ class Composer extends React.Component {
onRemove={onUndoUpload}
progress={progress}
uploading={isUploading}
handleRef={handleRefUploadForm}
/>
) : null}
<ComposerOptions

View file

@ -17,12 +17,13 @@ export default function ComposerUploadForm ({
onRemove,
progress,
uploading,
handleRef,
}) {
const computedClass = classNames('composer--upload_form', { uploading });
// The result.
return (
<div className={computedClass}>
<div className={computedClass} ref={handleRef}>
{uploading ? <ComposerUploadFormProgress progress={progress} /> : null}
{media ? (
<div className='content'>
@ -55,4 +56,5 @@ ComposerUploadForm.propTypes = {
onRemove: PropTypes.func.isRequired,
progress: PropTypes.number,
uploading: PropTypes.bool,
handleRef: PropTypes.func,
};