mirror of
https://github.com/Foundry376/Mailspring.git
synced 2025-02-23 23:54:13 +08:00
f1c0a1615d
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
83 lines
2 KiB
JavaScript
83 lines
2 KiB
JavaScript
import React from 'react';
|
|
import classnames from 'classnames';
|
|
|
|
import {AccountStore} from 'nylas-exports';
|
|
import {Menu, ButtonDropdown} from 'nylas-component-kit';
|
|
|
|
export default class AccountContactField extends React.Component {
|
|
static displayName = 'AccountContactField';
|
|
|
|
static propTypes = {
|
|
value: React.PropTypes.object,
|
|
accounts: React.PropTypes.array.isRequired,
|
|
onChange: React.PropTypes.func.isRequired,
|
|
};
|
|
|
|
_onChooseContact = (contact) => {
|
|
this.props.onChange({from: [contact]});
|
|
this.refs.dropdown.toggleDropdown();
|
|
}
|
|
|
|
_renderAccountSelector() {
|
|
if (!this.props.value) {
|
|
return (
|
|
<span/>
|
|
);
|
|
}
|
|
|
|
const label = this.props.value.toString();
|
|
const multipleAccounts = this.props.accounts.length > 1;
|
|
const hasAliases = this.props.accounts[0] && this.props.accounts[0].aliases.length > 0;
|
|
|
|
if (multipleAccounts || hasAliases) {
|
|
return (
|
|
<ButtonDropdown
|
|
ref="dropdown"
|
|
bordered={false}
|
|
primaryItem={<span>{label}</span>}
|
|
menu={this._renderAccounts(this.props.accounts)}
|
|
/>
|
|
);
|
|
}
|
|
return this._renderAccountSpan(label);
|
|
}
|
|
|
|
_renderAccountSpan = (label) => {
|
|
return (
|
|
<span className="from-picker" style={{position: "relative", top: 13, left: "0.5em"}}>
|
|
{label}
|
|
</span>
|
|
);
|
|
}
|
|
|
|
_renderMenuItem = (contact) => {
|
|
const className = classnames({
|
|
'contact': true,
|
|
'is-alias': contact.isAlias,
|
|
});
|
|
return (
|
|
<span className={className}>{contact.toString()}</span>
|
|
);
|
|
}
|
|
|
|
_renderAccounts(accounts) {
|
|
const items = AccountStore.aliasesFor(accounts);
|
|
return (
|
|
<Menu
|
|
items={items}
|
|
itemKey={contact => contact.id}
|
|
itemContent={this._renderMenuItem}
|
|
onSelect={this._onChooseContact}
|
|
/>
|
|
);
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<div className="composer-participant-field">
|
|
<div className="composer-field-label">From:</div>
|
|
{this._renderAccountSelector()}
|
|
</div>
|
|
);
|
|
}
|
|
}
|