mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-09-22 16:26:08 +08:00
abcf2b7dad
Summary: consolidate all the "untitled" stuff into a convenience method on the File itself. Previously it'd show "Unnamed Attachment", download as "Untitled" and open as "<file.id>". Now it's consistent everywhere and chooses names based on the contenttype (Event.ics). Rewrite CSS rules for uploads and attachments to be simpler - remove container divs and classnames from things that have no CSS - switch to using Flexbox so it's not necesary to have so many containers - remove zIndex hacks, apply overflow rules to name div only, so long filenames don't make action button unclickable - consolidate CSS classnames for uploads/attachments - Other style fixes - cursor "default" instead of text insertion on image attachments - cursor "default" on action buttons - image uplaods / attachments with long filenames truncate with ellpsis - attachments are not indented by an extra 15px in message bodies Prevent progress bar overflow (was ending above 100%, 100.12315%...) Update FileDownloadStore so it never creates Download objects when file is downloaded already - Previously, the download itself decided if it would be a no-op, but this meant the download was around for a split second and you'd see progress indicators flash for a moment when opening/saving an attachment. Upgrade FileDownloadStore use of promises Restore Image attachment drag and drop - was broken because the name gradient thing was covering the entire drag region. Allow file attachments to be drag and dropped to the finder and other applications 😍😍😍 Test Plan: Tests still pass Reviewers: evan Reviewed By: evan Differential Revision: https://phab.nylas.com/D1745
32 lines
942 B
CoffeeScript
32 lines
942 B
CoffeeScript
path = require 'path'
|
|
React = require 'react'
|
|
FileUpload = require './file-upload'
|
|
{RetinaImg, DraggableImg} = require 'nylas-component-kit'
|
|
|
|
class ImageFileUpload extends FileUpload
|
|
@displayName: 'ImageFileUpload'
|
|
|
|
@propTypes:
|
|
uploadData: React.PropTypes.object
|
|
|
|
render: =>
|
|
<div className="file-wrap file-image-wrap file-upload">
|
|
<div className="file-action-icon" onClick={@_onClickRemove}>
|
|
<RetinaImg name="image-cancel-button.png"/>
|
|
</div>
|
|
|
|
<div className="file-preview">
|
|
<div className="file-name-container">
|
|
<div className="file-name">{@props.uploadData.fileName}</div>
|
|
</div>
|
|
|
|
<DraggableImg src={@props.uploadData.filePath} />
|
|
</div>
|
|
|
|
<div className={"progress-bar-wrap state-#{@props.uploadData.state}"}>
|
|
<span className="progress-foreground" style={@_uploadProgressStyle()}></span>
|
|
</div>
|
|
</div>
|
|
|
|
module.exports = ImageFileUpload
|