mirror of
https://github.com/Foundry376/Mailspring.git
synced 2025-09-07 13:14:47 +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
73 lines
1.8 KiB
JavaScript
73 lines
1.8 KiB
JavaScript
/** @babel */
|
|
|
|
import _ from 'underscore'
|
|
import React from 'react';
|
|
import {Actions, FocusedContactsStore} from 'nylas-exports'
|
|
|
|
const SPLIT_KEY = "---splitvalue---"
|
|
|
|
export default class SidebarParticipantPicker extends React.Component {
|
|
static displayName = 'SidebarParticipantPicker';
|
|
|
|
constructor(props) {
|
|
super(props);
|
|
this.props = props;
|
|
this._onSelectContact = this._onSelectContact.bind(this);
|
|
this.state = this._getStateFromStores();
|
|
}
|
|
|
|
componentDidMount() {
|
|
this._usub = FocusedContactsStore.listen(() => {
|
|
return this.setState(this._getStateFromStores());
|
|
});
|
|
}
|
|
|
|
componentWillUnmount() {
|
|
this._usub();
|
|
}
|
|
|
|
static containerStyles = {
|
|
order: 0,
|
|
flexShrink: 0,
|
|
};
|
|
|
|
_getStateFromStores() {
|
|
return {
|
|
sortedContacts: FocusedContactsStore.sortedContacts(),
|
|
focusedContact: FocusedContactsStore.focusedContact(),
|
|
};
|
|
}
|
|
|
|
_renderSortedContacts() {
|
|
return this.state.sortedContacts.map((contact) => {
|
|
const selected = contact.email === (this.state.focusedContact || {}).email
|
|
const key = contact.email + SPLIT_KEY + contact.name;
|
|
|
|
return (
|
|
<option selected={selected} value={key} key={key}>
|
|
{contact.displayName({includeAccountLabel: true, forceAccountLabel: true})}
|
|
</option>
|
|
)
|
|
});
|
|
}
|
|
|
|
_onSelectContact = (event) => {
|
|
const [email, name] = event.target.value.split(SPLIT_KEY);
|
|
const contact = _.filter(this.state.sortedContacts, (c) => {
|
|
return c.name === name && c.email === email;
|
|
})[0];
|
|
return Actions.focusContact(contact);
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<div className="sidebar-participant-picker">
|
|
<select tabIndex={-1} onChange={this._onSelectContact}>
|
|
{this._renderSortedContacts()}
|
|
</select>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
|
|
}
|