Merge branch 'fix/upload' of github.com:b2wads/bitservices-theme into…

… develop
b2wads · Sep 25, 2019 · 39e50b5 · 39e50b5
2 parents ab245fb + 5272714
commit 39e50b5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/source/components/button-upload/button-upload-component.js b/source/components/button-upload/button-upload-component.js
@@ -2,6 +2,8 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import CSSModules from 'react-css-modules';
 
+import { omit } from 'helpers';
+
 import Button from '../button';
 import Icon from '../icon';
 
@@ -57,10 +59,15 @@ class ButtonUpload extends PureComponent {
   fileValidation(file) {
     const { formatWhiteList, maxFileSize } = this.props;
     const extension = file.name.split('.').pop();
-    return {
-      valid: formatWhiteList.includes(`.${extension}`) && file.size <= maxFileSize,
+    const validation = {
       validFormat: formatWhiteList.includes(`.${extension}`),
       validSize: file.size <= maxFileSize,
+      hasNoRepeat: !this.state.list.filter(currentFile => currentFile.name === file.name).length,
+    };
+
+    return {
+      ...validation,
+      valid: validation.validFormat && validation.validSize && validation.hasNoRepeat,
     };
   }
 
@@ -116,7 +123,7 @@ class ButtonUpload extends PureComponent {
     const hasMaxFiles = this.state.list.length === limit;
 
     return (
-      <div {...rest}>
+      <div {...omit(rest, ['onChange'])}>
         <Button loading={loading} disabled={disabled || hasMaxFiles} iconLeft="publish" className={styles.button}>
           {btnText}
           <input
@@ -126,6 +133,7 @@ class ButtonUpload extends PureComponent {
             disabled={disabled || hasMaxFiles}
             multiple
             accept={accept || formatWhiteList.join(', ')}
+            key={this.state.list.length}
           />
         </Button>
 

diff --git a/source/components/select/elements/select-option.js b/source/components/select/elements/select-option.js
@@ -29,6 +29,7 @@ SelectOption.propTypes = {
   onSelect: PropTypes.func,
   selected: PropTypes.bool,
   children: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+  noCurrentValue: PropTypes.bool,
 };
 
 export default SelectOption;
diff --git a/source/components/select/select-component.js b/source/components/select/select-component.js
@@ -46,6 +46,7 @@ class Select extends Component {
     sortItems: PropTypes.bool,
     isMobile: PropTypes.bool,
     active: PropTypes.bool,
+    noCurrentValue: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -277,7 +278,7 @@ class Select extends Component {
               selected={selectedValue === option.value}
               onSelect={this.onSelectItem}
               value={option.value}
-              noneValue={noCurrentValue && selectedValue === option.value}
+              noCurrentValue={noCurrentValue && selectedValue === option.value}
             >
               {option.name}
             </SelectOption>

diff --git a/source/components/select/select.stories.js b/source/components/select/select.stories.js
@@ -84,7 +84,7 @@ stories.add('Select disabled', () => {
   );
 });
 
-stories.add('Select - None atual value', () => {
+stories.add('Select - No Current Value', () => {
   return (
     <Select
       label="Opções"