react-dropzone - npm Package Compare versions

Comparing version 3.5.0 to 3.5.1

CHANGELOG.md

@@ -0,1 +1,5 @@
+# 3.5.1
+
+* Fixed: `onDrop` is now called only if all files are passing the `accept` check. [#173](https://github.com/okonet/react-dropzone/pull/173) Closes #138, #145
+
 # 3.5.0
@@ -2,0 +6,0 @@

dist/index.js

@@ -196,7 +196,7 @@ (function webpackUniversalModuleDefinition(root, factory) {
 	
-	      if (this.props.onDrop) {
-	        this.props.onDrop.call(this, files, e);
-	      }
+	      if (this.allFilesAccepted(files)) {
+	        if (this.props.onDrop) {
+	          this.props.onDrop.call(this, files, e);
+	        }
 	
-	      if (this.allFilesAccepted(files)) {
 	        if (this.props.onDropAccepted) {
@@ -363,3 +363,3 @@ this.props.onDropAccepted.call(this, files, e);
 	
-	  inputProps: _react2.default.PropTypes.object, // Pass additional attributes to the <file type="input"/> tag
+	  inputProps: _react2.default.PropTypes.object, // Pass additional attributes to the <input type="file"/> tag
 	  multiple: _react2.default.PropTypes.bool, // Allow dropping multiple files
@@ -366,0 +366,0 @@ accept: _react2.default.PropTypes.string, // Allow specific types of files. See https://github.com/okonet/attr-accept for more information

package.json

 {
   "name": "react-dropzone",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "Simple HTML5 drag-drop zone with React.js",
@@ -11,3 +11,3 @@ "main": "dist/index.js",
     "release": "npmpub",
-    "test": "mocha --require ./mocha-environment.js ./src/test.js",
+    "test": "npm run eslint && mocha --require ./mocha-environment.js ./src/test.js",
     "test:build": "NODE_ENV=production npm run build && npm run test",
@@ -32,3 +32,3 @@ "eslint": "eslint ./src ./*.js",
     "type": "git",
-    "url": "[e-mail]:okonet/react-dropzone.git"
+    "url": "git+https://github.com/okonet/react-dropzone.git"
   },
@@ -35,0 +35,0 @@ "bugs": {

src/index.js

@@ -106,7 +106,7 @@ /* eslint prefer-template: 0 */
 
-    if (this.props.onDrop) {
-      this.props.onDrop.call(this, files, e);
-    }
+    if (this.allFilesAccepted(files)) {
+      if (this.props.onDrop) {
+        this.props.onDrop.call(this, files, e);
+      }
 
-    if (this.allFilesAccepted(files)) {
       if (this.props.onDropAccepted) {
@@ -266,3 +266,3 @@ this.props.onDropAccepted.call(this, files, e);
 
-  inputProps: React.PropTypes.object, // Pass additional attributes to the <file type="input"/> tag
+  inputProps: React.PropTypes.object, // Pass additional attributes to the <input type="file"/> tag
   multiple: React.PropTypes.bool, // Allow dropping multiple files
@@ -269,0 +269,0 @@ accept: React.PropTypes.string, // Allow specific types of files. See https://github.com/okonet/attr-accept for more information

src/test.js

@@ -16,3 +16,4 @@ /* eslint no-unused-expressions: 0 */
       name: 'file1.pdf',
-      size: 1111
+      size: 1111,
+      type: 'application/pdf'
     }];
@@ -118,2 +119,52 @@ });
 
+    it('applies the accept prop to the dropped files', () => {
+      const images = [{
+        name: 'cats.gif',
+        size: 1234,
+        type: 'image/gif'
+      }, {
+        name: 'dogs.jpg',
+        size: 2345,
+        type: 'image/jpeg'
+      }];
+      const dropSpy = spy();
+      const dropzone = TestUtils.renderIntoDocument(
+        <Dropzone onDrop={dropSpy} accept="image/*">
+          <div className="dropzone-content">some content</div>
+        </Dropzone>
+      );
+      const content = TestUtils.findRenderedDOMComponentWithClass(dropzone, 'dropzone-content');
+
+      TestUtils.Simulate.drop(content, { dataTransfer: { files } });
+      expect(dropSpy.callCount).to.equal(0);
+      TestUtils.Simulate.drop(content, { dataTransfer: { files: images } });
+      expect(dropSpy.callCount).to.equal(1);
+      expect(dropSpy.firstCall.args[0]).to.have.length(2);
+    });
+
+    it('accepts all dropped files when no accept prop is specified', () => {
+      const images = [{
+        name: 'cats.gif',
+        size: 1234,
+        type: 'image/gif'
+      }, {
+        name: 'dogs.jpg',
+        size: 2345,
+        type: 'image/jpeg'
+      }];
+      const dropSpy = spy();
+      const dropzone = TestUtils.renderIntoDocument(
+        <Dropzone onDrop={dropSpy}>
+          <div className="dropzone-content">some content</div>
+        </Dropzone>
+      );
+      const content = TestUtils.findRenderedDOMComponentWithClass(dropzone, 'dropzone-content');
+
+      TestUtils.Simulate.drop(content, { dataTransfer: { files } });
+      expect(dropSpy.callCount).to.equal(1);
+      TestUtils.Simulate.drop(content, { dataTransfer: { files: images } });
+      expect(dropSpy.callCount).to.equal(2);
+      expect(dropSpy.secondCall.args[0]).to.have.length(2);
+    });
+
     it('applies the name prop to the child input', () => {
@@ -120,0 +171,0 @@ const component = TestUtils.renderIntoDocument(

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No README

Quality

Package does not have a README. This may indicate a failed publish or a low quality package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

121591

increased by9.13%

Number of package files

28

increased by3.7%

Lines of code

797

increased by6.27%

Number of medium quality alerts

0

decreased by-100%

Number of lines in readme file

148

increased byInfinity%

Published versions last week

3

increased by50%

No dependency changes