Merge remote-tracking branch 'upstream/master'

Author: Kyle Kim

lib/FormFields/renderFileUpload.js

@@ -170,7 +170,7 @@ var renderFileUpload = function (_React$Component) {
                     _react2.default.createElement(
                         _reactDropzone2.default,
                         {
-                            name: '' + name,
+                            name: '' + input.name,
                             multiple: false,
                             maxSize: maxFileSize,
                             style: {
@@ -205,7 +205,7 @@ var renderFileUpload = function (_React$Component) {
                                         });
                                     } else if (rejectedFiles[0].size > maxFileSize) {
                                         _this2.setState({
-                                            fileError: '' + errorFileSize.replace('{maxFileSize}', maxFileSize)
+                                            fileError: '' + errorFileSize.replace('{maxFileSize}', Math.round(maxFileSize / 1000000))
                                         });
                                     } else {
                                         _this2.setState({
@@ -291,7 +291,7 @@ renderFileUpload.defaultProps = {
     txtRemove: 'Remove',
     txtUpload: 'Upload',
     errorFileType: 'Only files with the following extensions are allowed:',
-    errorFileSize: 'The file is exceeding the maximum file size of <i>{maxFileSize}</i>',
+    errorFileSize: 'The file is exceeding the maximum file size of <i>{maxFileSize} MB</i>',
     errorReject: 'The file is rejected to upload.',
     mimeTypes: {
         pdf: ['application/pdf'],

lib/FormFields/renderPhoto.js

@@ -144,6 +144,7 @@ var renderPhoto = function (_React$Component) {
                     _reactDropzone2.default,
                     _extends({}, input, {
                         name: input.name,
+                        accept: 'image/png,image/jpeg,image/pjpeg,image/gif',
                         className: 'wfui-form-photo choose-file',
                         onDrop: function onDrop(acceptedFiles) {
                             var reader = new FileReader();

src/FormFields/renderFileUpload.jsx

@@ -114,7 +114,7 @@ class renderFileUpload extends React.Component {
                         </div>
                     )}
                     <Dropzone
-                        name={`${name}`}
+                        name={`${input.name}`}
                         multiple={false}
                         maxSize={maxFileSize}
                         style={{
@@ -155,7 +155,7 @@ class renderFileUpload extends React.Component {
                                     this.setState({
                                         fileError: `${errorFileSize.replace(
                                             '{maxFileSize}',
-                                            maxFileSize,
+                                            Math.round(maxFileSize / 1000000),
                                         )}`,
                                     });
                                 } else {
@@ -233,7 +233,7 @@ renderFileUpload.defaultProps = {
     txtUpload: 'Upload',
     errorFileType: 'Only files with the following extensions are allowed:',
     errorFileSize:
-        'The file is exceeding the maximum file size of <i>{maxFileSize}</i>',
+        'The file is exceeding the maximum file size of <i>{maxFileSize} MB</i>',
     errorReject: 'The file is rejected to upload.',
     mimeTypes: {
         pdf: ['application/pdf'],

src/FormFields/renderPhoto.jsx

@@ -66,16 +66,18 @@ class renderPhoto extends React.Component {
                             disabled={disabled}
                         />
                     </p>
-                    {!disabled && <Button
-                        className="btn-remove"
-                        onClick={() => {
-                            input.onChange();
-                            onStateChange();
-                            this.setState({ value: undefined });
-                        }}
-                    >
-                        Remove Image
-                    </Button>}
+                    {!disabled && (
+                        <Button
+                            className="btn-remove"
+                            onClick={() => {
+                                input.onChange();
+                                onStateChange();
+                                this.setState({ value: undefined });
+                            }}
+                        >
+                            Remove Image
+                        </Button>
+                    )}
                 </div>
             </div>
         ) : (
@@ -85,6 +87,7 @@ class renderPhoto extends React.Component {
                 <Dropzone
                     {...input}
                     name={input.name}
+                    accept={'image/png,image/jpeg,image/pjpeg,image/gif'}
                     className="wfui-form-photo choose-file"
                     onDrop={acceptedFiles => {
                         const reader = new FileReader();