Skip to content

Commit 95bf011

Browse files
committed
drag and drop not default and configurable
1 parent 2a577cc commit 95bf011

File tree

4 files changed

+39
-13
lines changed

4 files changed

+39
-13
lines changed

components/ExampleNav/ExampleNav.cjsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ component = ({data, state}) ->
1414

1515
<Link to="/FileUploaderContainerExamples">FileUploaderContainer</Link>
1616

17+
<Link to="/FileUploaderExamples">FileUploader</Link>
18+
1719
<Link to="/UploadedFileExamples">UploadedFile</Link>
1820

1921
<Link to="/UploadedFilesExamples">UploadedFiles</Link>
2022

21-
<Link to="/FileUploaderExamples">FileUploader</Link>
22-
2323
<Link to="/CheckboxExamples">Checkbox</Link>
2424

2525
<Link to="/ImageViewerHeaderExamples">ImageViewerHeader</Link>

components/FileUploader/FileUploader.cjsx

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,30 @@ React = require 'react'
66
UploadedFilesContainer = require '../UploadedFiles/UploadedFilesContainer'
77
Dropzone = require 'react-dropzone'
88
Loader = require '../Loader/Loader.cjsx'
9+
classNames = require 'classnames'
10+
11+
FileUploader = ({ multiple, onChange, loading, dragAndDrop }) ->
12+
dzContainerClassNames = classNames
13+
'dropzone-container': true
14+
'drag-and-drop': dragAndDrop
915

10-
FileUploader = ({ multiple, onChange, loading}) ->
1116
<div className="FileUploader">
1217
{
1318
if loading
1419
<Loader />
1520
}
1621
<UploadedFilesContainer/>
1722

18-
<Dropzone multiple={multiple} onDrop={onChange} className="Dropzone">
19-
<p>click or drag files here to upload</p>
20-
</Dropzone>
23+
<div className={ dzContainerClassNames }>
24+
<Dropzone multiple={multiple} onDrop={onChange} className="Dropzone">
25+
{
26+
if dragAndDrop
27+
<p>click or drag files here to upload</p>
28+
else
29+
<button>choose files to upload</button>
30+
}
31+
</Dropzone>
32+
</div>
2133
</div>
2234

2335
module.exports = FileUploader

components/FileUploader/FileUploaderExamples.cjsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ FileUploaderExamples = ->
1212
<h1>loading is true</h1>
1313

1414
<FileUploader loading={true} id={'123'} assetType={'work'} category={'development'}/>
15+
16+
<h1>dragNdrop is true</h1>
17+
18+
<FileUploader id={'123'} assetType={'work'} category={'development'} dragAndDrop={true}/>
1519
</div>
1620

1721
module.exports = FileUploaderExamples

components/FileUploader/FileUploaderStyles.scss

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,25 @@
1212
}
1313

1414
.Dropzone {
15-
text-align: center;
16-
border: 3px dashed $grey;
17-
margin: 10px;
15+
display: inline-block;
16+
}
17+
18+
.drag-and-drop {
19+
.Dropzone {
20+
text-align: center;
21+
border : 3px dashed $grey;
22+
margin : 10px;
23+
display : block;
1824

19-
p {
20-
font-size: 20px;
21-
margin: 30px 0px;
22-
color: $grey;
25+
p {
26+
font-size: 20px;
27+
margin: 30px 0px;
28+
color: $grey;
29+
}
2330
}
2431
}
2532

33+
.dropzone-container {
34+
text-align: center;
35+
}
2636
}

0 commit comments

Comments
 (0)