mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-11-12 04:25:31 +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
112 lines
3.3 KiB
JavaScript
112 lines
3.3 KiB
JavaScript
/** @babel */
|
|
import Rx from 'rx-lite'
|
|
import React, {Component, PropTypes} from 'react'
|
|
import ReactDOM from 'react-dom'
|
|
import {Actions, DateUtils, Message, DatabaseStore} from 'nylas-exports'
|
|
import {RetinaImg} from 'nylas-component-kit'
|
|
import SendLaterPopover from './send-later-popover'
|
|
import SendLaterActions from './send-later-actions'
|
|
import {PLUGIN_ID} from './send-later-constants'
|
|
|
|
|
|
class SendLaterButton extends Component {
|
|
static displayName = 'SendLaterButton';
|
|
|
|
static propTypes = {
|
|
draftClientId: PropTypes.string.isRequired,
|
|
};
|
|
|
|
constructor() {
|
|
super()
|
|
this.state = {
|
|
scheduledDate: null,
|
|
}
|
|
}
|
|
|
|
componentDidMount() {
|
|
this._subscription = Rx.Observable.fromQuery(
|
|
DatabaseStore.findBy(Message, {clientId: this.props.draftClientId})
|
|
).subscribe(this.onMessageChanged);
|
|
}
|
|
|
|
componentWillUnmount() {
|
|
this._subscription.dispose();
|
|
}
|
|
|
|
onSendLater = (formattedDate, dateLabel) => {
|
|
SendLaterActions.sendLater(this.props.draftClientId, formattedDate, dateLabel);
|
|
this.setState({scheduledDate: 'saving'});
|
|
};
|
|
|
|
onCancelSendLater = () => {
|
|
SendLaterActions.cancelSendLater(this.props.draftClientId);
|
|
};
|
|
|
|
onClick = () => {
|
|
const buttonRect = ReactDOM.findDOMNode(this).getBoundingClientRect()
|
|
Actions.openPopover(
|
|
<SendLaterPopover
|
|
scheduledDate={this.state.scheduledDate}
|
|
onSendLater={this.onSendLater}
|
|
onCancelSendLater={this.onCancelSendLater}
|
|
/>,
|
|
{originRect: buttonRect, direction: 'up'}
|
|
)
|
|
};
|
|
|
|
onMessageChanged = (message) => {
|
|
if (!message) return;
|
|
const {scheduledDate} = this.state;
|
|
const messageMetadata = message.metadataForPluginId(PLUGIN_ID) || {}
|
|
const nextScheduledDate = messageMetadata.sendLaterDate
|
|
|
|
if (nextScheduledDate !== scheduledDate) {
|
|
const isComposer = NylasEnv.isComposerWindow()
|
|
const isFinishedSelecting = ((scheduledDate === 'saving') && (nextScheduledDate !== null));
|
|
if (isComposer && isFinishedSelecting) {
|
|
NylasEnv.close();
|
|
}
|
|
this.setState({scheduledDate: nextScheduledDate});
|
|
}
|
|
};
|
|
|
|
render() {
|
|
const {scheduledDate} = this.state;
|
|
let className = 'btn btn-toolbar btn-send-later';
|
|
|
|
if (scheduledDate === 'saving') {
|
|
return (
|
|
<button className={className} title="Saving send date..." tabIndex={-1}>
|
|
<RetinaImg
|
|
name="inline-loading-spinner.gif"
|
|
mode={RetinaImg.Mode.ContentDark}
|
|
style={{width: 14, height: 14}}
|
|
/>
|
|
</button>
|
|
);
|
|
}
|
|
|
|
let dateInterpretation;
|
|
if (scheduledDate) {
|
|
className += ' btn-enabled';
|
|
const momentDate = DateUtils.futureDateFromString(scheduledDate);
|
|
if (momentDate) {
|
|
dateInterpretation = <span className="at">Sending in {momentDate.fromNow(true)}</span>;
|
|
}
|
|
}
|
|
return (
|
|
<button className={className} title="Send later…" onClick={this.onClick} tabIndex={-1}>
|
|
<RetinaImg name="icon-composer-sendlater.png" mode={RetinaImg.Mode.ContentIsMask} />
|
|
{dateInterpretation}
|
|
<span> </span>
|
|
<RetinaImg name="icon-composer-dropdown.png" mode={RetinaImg.Mode.ContentIsMask} />
|
|
</button>
|
|
);
|
|
}
|
|
}
|
|
|
|
SendLaterButton.containerStyles = {
|
|
order: -99,
|
|
};
|
|
|
|
export default SendLaterButton;
|