mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-11-12 04:25:31 +08:00
b4434f6617
Summary:
- Removes controlled focus in the composer!
- No React components ever perfom focus in lifecycle methods. Never again.
- A new `Utils.schedule({action, after, timeout})` helper makes it easy to say "setState or load draft, etc. and then focus"
- The DraftStore issues a focusDraft action after creating a draft, which causes the MessageList to focus and scroll to the desired composer, which itself decides which field to focus.
- The MessageList never focuses anything automatically.
- Refactors ComposerView apart — ComposerHeader handles all top fields, DraftSessionContainer handles draft session initialization and exposes props to ComposerView
- ComposerHeader now uses a KeyCommandRegion (with focusIn and focusOut) to do the expanding and collapsing of the participants fields. May rename that container very soon.
- Removes all CommandRegistry handling of tab and shift-tab. Unless you preventDefault, the browser does it's thing.
- Removes all tabIndexes greater than 1. This is an anti-pattern—assigning everything a tabIndex of 0 tells the browser to move between them based on their order in the DOM, and is almost always what you want.
- Adds "TabGroupRegion" which allows you to create a tab/shift-tabbing group, (so tabbing does not leave the active composer). Can't believe this isn't a browser feature.
Todos:
- Occasionally, clicking out of the composer contenteditable requires two clicks. This is because atomicEdit is restoring selection within the contenteditable and breaking blur.
- Because the ComposerView does not render until it has a draft, we're back to it being white in popout composers for a brief moment. We will fix this another way - all the "return unless draft" statements were untenable.
- Clicking a row in the thread list no longer shifts focus to the message list and focuses the last draft. This will be restored soon.
Test Plan: Broken
Reviewers: juan, evan
Reviewed By: juan, evan
Differential Revision: https://phab.nylas.com/D2814
54 lines
1.5 KiB
JavaScript
54 lines
1.5 KiB
JavaScript
import path from 'path';
|
|
import React from 'react';
|
|
import {RetinaImg, Flexbox} from 'nylas-component-kit';
|
|
import {
|
|
Actions,
|
|
} from 'nylas-exports';
|
|
|
|
export default class FileUpload extends React.Component {
|
|
static displayName = 'FileUpload';
|
|
|
|
static propTypes = {
|
|
upload: React.PropTypes.object,
|
|
};
|
|
|
|
_onClickRemove = (event) => {
|
|
event.preventDefault();
|
|
Actions.removeAttachment(this.props.upload);
|
|
}
|
|
|
|
_extension = () => {
|
|
const ext = path.extname(this.props.upload.filename.toLowerCase())
|
|
return ext.slice(1); // remove leading .
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<div className="file-wrap file-upload">
|
|
<div className="inner">
|
|
<Flexbox direction="row" style={{alignItems: 'center'}}>
|
|
<div className="file-info-wrap">
|
|
<RetinaImg
|
|
className="file-icon"
|
|
fallback="file-fallback.png"
|
|
mode={RetinaImg.Mode.ContentPreserve}
|
|
name={`file-${this._extension()}.png`}
|
|
/>
|
|
<span className="file-name">
|
|
<span className="uploading">
|
|
{this.props.upload.filename}
|
|
</span>
|
|
</span>
|
|
</div>
|
|
<div className="file-action-icon" onClick={this._onClickRemove}>
|
|
<RetinaImg
|
|
name="remove-attachment.png"
|
|
mode={RetinaImg.Mode.ContentIsMask}
|
|
/>
|
|
</div>
|
|
</Flexbox>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
}
|