This commit addressed the comment and also add a unit test.
Attach a file by drag & drop or click to upload
