fix: improve onClick and disableClick props (fixes #530) (#694)

- Let onClick callback on container propagate when `{disableClick }` is true
- Do not open file dialog if `.preventDefault()` was called on the event

src/index.js

@@ -233,12 +233,16 @@ class Dropzone extends React.Component {
 
   onClick(evt) {
     const { onClick, disableClick } = this.props
-    if (!disableClick) {
-      evt.stopPropagation()
 
-      if (onClick) {
-        onClick.call(this, evt)
-      }
+    // if onClick prop is given, run it first
+    if (onClick) {
+      onClick.call(this, evt)
+    }
+
+    // if disableClick is not set and the event hasn't been default prefented within
+    // the onClick listener, open the file dialog
+    if (!disableClick && !evt.isDefaultPrevented()) {
+      evt.stopPropagation()
 
       // in IE11/Edge the file-browser dialog is blocking, ensure this is behind setTimeout
       // this is so react can handle state changes in the onClick prop above above

src/index.spec.js

@@ -242,6 +242,24 @@ describe('Dropzone', () => {
       expect(onClick).toHaveBeenCalled()
     })
 
+    it('should call `onClick` if provided even if `disableClick` is set', () => {
+      const onClick = jest.fn()
+      const dropzone = mount(<Dropzone disableClick onClick={onClick} />)
+      const open = jest.spyOn(dropzone.instance(), 'open')
+      dropzone.simulate('click')
+      expect(open).toHaveBeenCalledTimes(0)
+      expect(onClick).toHaveBeenCalled()
+    })
+
+    it('should not call `open` if event was prevented in `onClick`', () => {
+      const onClick = jest.fn(event => event.preventDefault())
+      const dropzone = mount(<Dropzone onClick={onClick} />)
+      const open = jest.spyOn(dropzone.instance(), 'open')
+      dropzone.simulate('click')
+      expect(open).toHaveBeenCalledTimes(0)
+      expect(onClick).toHaveBeenCalled()
+    })
+
     it('should reset the value of input', () => {
       const dropzone = mount(<Dropzone />)
       expect(