react-dropzone 11.2.0 → 11.2.4

package/src/utils/index.js

@@ -59,8 +59,8 @@ function isDefined(value) {
   return value !== undefined && value !== null
 }
 
-export function allFilesAccepted({ files, accept, minSize, maxSize, multiple }) {
-  if (!multiple && files.length > 1) {
+export function allFilesAccepted({ files, accept, minSize, maxSize, multiple, maxFiles }) {
+  if ((!multiple && files.length > 1) || (multiple && maxFiles >= 1 &&  files.length > maxFiles) ) {
     return false;
   }
 

package/src/utils/index.spec.js

@@ -230,6 +230,26 @@ it('rejects file when single accept criteria as array', () => {
 
 })
 
+describe('allFilesAccepted()', () => {
+  let utils
+  beforeEach(async done => {
+    utils = await import('./index')
+    done()
+  })
+  it('rejects file when multiple accept criteria', () => {
+    const files = [createFile('hamster.pdf', 100, 'application/pdf'),createFile('fish.pdf', 100, 'application/pdf')];
+    const images = [createFile('cats.gif', 1234, 'image/gif'), createFile('dogs.gif', 2345, 'image/jpeg')]
+    expect(utils.allFilesAccepted({ files, multiple: true})).toEqual(true)
+    expect(utils.allFilesAccepted({ files, multiple: true, maxFiles: 10 })).toEqual(true)
+    expect(utils.allFilesAccepted({ files, multiple: false, maxFiles: 10 })).toEqual(false)
+    expect(utils.allFilesAccepted({ files, multiple: true, accept:'image/jpeg' })).toEqual(false) 
+    expect(utils.allFilesAccepted({ files: images, multiple: true,accept:'image/*' })).toEqual(true) 
+    expect(utils.allFilesAccepted({ files, multiple: true, minSize: 110 })).toEqual(false)
+    expect(utils.allFilesAccepted({ files, multiple: true, maxSize: 99 })).toEqual(false)
+    expect(utils.allFilesAccepted({ files, multiple: true, maxFiles: 1 })).toEqual(false)
+  })
+})
+
 function createFile(name, size, type) {
   const file = new File([], name, { type })
   Object.defineProperty(file, 'size', {

package/styleguide.config.js

@@ -1,20 +1,30 @@
 /* eslint import/no-extraneous-dependencies: 0 */
 const path = require('path')
-const { createConfig, babel, css } = require('webpack-blocks')
+const { createConfig, babel, css, devServer } = require('webpack-blocks')
 
 // https://react-styleguidist.js.org/docs/configuration.html
 module.exports = {
   title: 'react-dropzone',
   styleguideDir: path.join(__dirname, 'styleguide'),
-  webpackConfig: createConfig([babel(), css()]),
+  template: {
+    favicon: 'https://github.com/react-dropzone/react-dropzone/raw/master/logo/logo.png'
+  },
+  webpackConfig: createConfig([babel(), css(), devServer({
+    disableHostCheck: true,
+    host: '0.0.0.0',
+  })]),
   exampleMode: 'expand',
   usageMode: 'expand',
-  showSidebar: false,
+  showSidebar: true,
   serverPort: 8080,
   moduleAliases: {
-    'react-dropzone': path.resolve(__dirname, './src')
+    'react-dropzone': path.resolve(__dirname, './src'),
+    'doka': path.resolve(__dirname, './vendor/doka/doka.esm.min.js')
   },
-  require: [path.join(__dirname, 'examples/theme.css')],
+  require: [
+    path.join(__dirname, 'examples/theme.css'),
+    path.join(__dirname, 'vendor/doka/doka.min.css'),
+  ],
   sections: [
     {
       name: '',
@@ -66,6 +76,15 @@ module.exports = {
           content: 'examples/plugins/README.md'
         }
       ]
+    },
+    {
+      name: 'Integrations',
+      sections: [
+        {
+          name: 'Doka',
+          content: 'examples/doka/README.md'
+        }
+      ]
     }
   ]
 }

package/testSetup.js

@@ -1,8 +1,2 @@
 // https://www.npmjs.com/package/jest-dom
 require('@testing-library/jest-dom/extend-expect')
-
-// TODO: Ignore warnings about act(), it refers to having async side effects updating the state;
-// This happens because our async getFilesFromEvent() fn
-// See https://github.com/kentcdodds/react-testing-library/issues/281,
-// https://github.com/facebook/react/issues/14769
-jest.spyOn(console, 'error').mockImplementation(() => jest.fn())