mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-09-23 00:36:50 +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
61 lines
2 KiB
CoffeeScript
61 lines
2 KiB
CoffeeScript
React = require "react"
|
|
proxyquire = require("proxyquire").noPreserveCache()
|
|
ReactTestUtils = require('react-addons-test-utils')
|
|
|
|
{Thread,
|
|
Message,
|
|
ComponentRegistry,
|
|
DraftStore} = require 'nylas-exports'
|
|
|
|
class StubMessageItem extends React.Component
|
|
@displayName: "StubMessageItem"
|
|
render: -> <span></span>
|
|
|
|
class StubComposer extends React.Component
|
|
@displayName: "StubComposer"
|
|
render: -> <span></span>
|
|
|
|
MessageItemContainer = proxyquire '../lib/message-item-container',
|
|
"./message-item": StubMessageItem
|
|
|
|
testThread = new Thread(id: "t1", accountId: TEST_ACCOUNT_ID)
|
|
testClientId = "local-id"
|
|
testMessage = new Message(id: "m1", draft: false, unread: true, accountId: TEST_ACCOUNT_ID)
|
|
testDraft = new Message(id: "d1", draft: true, unread: true, accountId: TEST_ACCOUNT_ID)
|
|
|
|
describe 'MessageItemContainer', ->
|
|
|
|
beforeEach ->
|
|
@isSendingDraft = false
|
|
spyOn(DraftStore, "isSendingDraft").andCallFake => @isSendingDraft
|
|
ComponentRegistry.register(StubComposer, role: 'Composer')
|
|
|
|
afterEach ->
|
|
ComponentRegistry.register(StubComposer, role: 'Composer')
|
|
|
|
renderContainer = (message) ->
|
|
ReactTestUtils.renderIntoDocument(
|
|
<MessageItemContainer thread={testThread}
|
|
message={message}
|
|
draftClientId={testClientId} />
|
|
)
|
|
|
|
it "shows composer if it's a draft", ->
|
|
@isSendingDraft = false
|
|
doc = renderContainer(testDraft)
|
|
items = ReactTestUtils.scryRenderedComponentsWithType(doc, StubComposer)
|
|
expect(items.length).toBe 1
|
|
|
|
it "renders a message if it's a draft that is sending", ->
|
|
@isSendingDraft = true
|
|
doc = renderContainer(testDraft)
|
|
items = ReactTestUtils.scryRenderedComponentsWithType(doc, StubMessageItem)
|
|
expect(items.length).toBe 1
|
|
expect(items[0].props.pending).toBe true
|
|
|
|
it "renders a message if it's not a draft", ->
|
|
@isSendingDraft = false
|
|
doc = renderContainer(testMessage)
|
|
items = ReactTestUtils.scryRenderedComponentsWithType(doc, StubMessageItem)
|
|
expect(items.length).toBe 1
|