diff --git a/components/FileUploader/FileUploader.cjsx b/components/FileUploader/FileUploader.cjsx index 4b78dd1f4..7af0d9016 100644 --- a/components/FileUploader/FileUploader.cjsx +++ b/components/FileUploader/FileUploader.cjsx @@ -8,7 +8,7 @@ Dropzone = require 'react-dropzone' Loader = require '../Loader/Loader.cjsx' classNames = require 'classnames' -FileUploader = ({ multiple, onChange, loading, dragAndDrop }) -> +FileUploader = ({ multiple, onChange, loading, dragAndDrop, disableClick }) -> dzContainerClassNames = classNames 'dropzone-container': true 'drag-and-drop': dragAndDrop @@ -21,12 +21,17 @@ FileUploader = ({ multiple, onChange, loading, dragAndDrop }) ->
- + { - if dragAndDrop + if dragAndDrop && !disableClick

click or drag files here to upload

- else - + else if dragAndDrop && disableClick +

file upload disabled

+ else if !dragAndDrop + if disableClick + + else + }
diff --git a/components/FileUploader/FileUploaderExamples.cjsx b/components/FileUploader/FileUploaderExamples.cjsx index fe97acc82..b849609d7 100644 --- a/components/FileUploader/FileUploaderExamples.cjsx +++ b/components/FileUploader/FileUploaderExamples.cjsx @@ -16,6 +16,14 @@ FileUploaderExamples = ->

dragNdrop is true

+ +

disabled is true with drag

+ + + +

disabled is true with button

+ + module.exports = FileUploaderExamples diff --git a/package.json b/package.json index ae917729c..06811f166 100644 --- a/package.json +++ b/package.json @@ -15,12 +15,15 @@ "build": "webpack --config webpack.config.js; cp example/index.html dist/" }, "dependencies": { - "appirio-styles": "0.0.23", + "appirio-styles": "0.0.25", "appirio-tech-api-schemas": "^5.0.69", + "appirio-tech-client-app-layer": "^0.1.3", "classnames": "^2.2.3", "lodash": "^4.0.0", "moment": "^2.11.2", + "react": "^0.14.7", "react-datetime": "^2.0.2", + "react-dom": "^0.14.7", "react-dropzone": "^3.3.2", "react-redux": "^4.2.1", "react-select": "^0.9.1"