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
153 lines
6.1 KiB
CoffeeScript
153 lines
6.1 KiB
CoffeeScript
# This tests just quoted text within a contenteditable.
|
|
#
|
|
# For a test of the basic component itself see
|
|
# contenteditable-component-spec.cjsx
|
|
#
|
|
_ = require "underscore"
|
|
React = require "react"
|
|
ReactDOM = require 'react-dom'
|
|
ReactTestUtils = require('react-addons-test-utils')
|
|
|
|
Fields = require '../lib/fields'
|
|
Composer = require "../lib/composer-view"
|
|
ComposerEditor = require '../lib/composer-editor'
|
|
|
|
{Message, DraftStore, ComponentRegistry} = require 'nylas-exports'
|
|
|
|
describe "Composer Quoted Text", ->
|
|
beforeEach ->
|
|
ComponentRegistry.register(ComposerEditor, role: "Composer:Editor")
|
|
|
|
@onChange = jasmine.createSpy('onChange')
|
|
@htmlNoQuote = 'Test <strong>HTML</strong><br>'
|
|
@htmlWithQuote = 'Test <strong>HTML</strong><br><blockquote class="gmail_quote">QUOTE</blockquote>'
|
|
|
|
@draft = new Message(draft: true, clientId: "client-123")
|
|
@session =
|
|
trigger: ->
|
|
changes:
|
|
add: ->
|
|
draft: => @draft
|
|
|
|
afterEach ->
|
|
DraftStore._cleanupAllSessions()
|
|
ComposerEditor.containerRequired = undefined
|
|
ComponentRegistry.unregister(ComposerEditor)
|
|
|
|
# Must be called with the test's scope
|
|
setHTML = (newHTML) ->
|
|
@$contentEditable.innerHTML = newHTML
|
|
@contentEditable._onDOMMutated(["mutated"])
|
|
|
|
describe "quoted-text-control toggle button", ->
|
|
|
|
describe "when there's no quoted text", ->
|
|
beforeEach ->
|
|
@draft.body = @htmlNoQuote
|
|
@composer = ReactTestUtils.renderIntoDocument(
|
|
<Composer draft={@draft} session={@session}/>
|
|
)
|
|
@composer.setState
|
|
showQuotedText: true
|
|
@contentEditable = @composer.refs[Fields.Body]
|
|
@$contentEditable = ReactDOM.findDOMNode(@contentEditable).querySelector('[contenteditable]')
|
|
@$composerBodyWrap = ReactDOM.findDOMNode(@composer.refs.composerBodyWrap)
|
|
|
|
it 'should not display any quoted text', ->
|
|
expect(@$contentEditable.innerHTML).toBe @htmlNoQuote
|
|
|
|
it "allows the text to update", ->
|
|
textToAdd = "MORE <strong>TEXT</strong>!"
|
|
spyOn(@composer, "_addToProxy")
|
|
expect(@$contentEditable.innerHTML).toBe @htmlNoQuote
|
|
setHTML.call(@, textToAdd + @htmlNoQuote)
|
|
ev = @composer._addToProxy.mostRecentCall.args[0].body
|
|
expect(ev).toEqual(textToAdd + @htmlNoQuote)
|
|
|
|
it 'should not render the quoted-text-control toggle', ->
|
|
toggles = ReactTestUtils.scryRenderedDOMComponentsWithClass(@composer, 'quoted-text-control')
|
|
expect(toggles.length).toBe 0
|
|
|
|
|
|
describe 'when there is quoted text, and showQuotedText is true', ->
|
|
beforeEach ->
|
|
@draft.body = @htmlWithQuote
|
|
@composer = ReactTestUtils.renderIntoDocument(
|
|
<Composer draft={@draft} session={@session}/>
|
|
)
|
|
@composer.setState
|
|
showQuotedText: true
|
|
@contentEditable = @composer.refs[Fields.Body]
|
|
@$contentEditable = ReactDOM.findDOMNode(@contentEditable).querySelector('[contenteditable]')
|
|
@$composerBodyWrap = ReactDOM.findDOMNode(@composer.refs.composerBodyWrap)
|
|
|
|
it 'should display the quoted text', ->
|
|
expect(@$contentEditable.innerHTML).toBe @htmlWithQuote
|
|
|
|
it "should call `_addToProxy` with the entire HTML string", ->
|
|
textToAdd = "MORE <strong>TEXT</strong>!"
|
|
spyOn(@composer, "_addToProxy")
|
|
expect(@$contentEditable.innerHTML).toBe @htmlWithQuote
|
|
setHTML.call(@, textToAdd + @htmlWithQuote)
|
|
ev = @composer._addToProxy.mostRecentCall.args[0].body
|
|
expect(ev).toEqual(textToAdd + @htmlWithQuote)
|
|
|
|
it "should allow the quoted text to be changed", ->
|
|
newText = 'Test <strong>NEW 1 HTML</strong><blockquote class="gmail_quote">QUOTE CHANGED!!!</blockquote>'
|
|
spyOn(@composer, "_addToProxy")
|
|
expect(@$contentEditable.innerHTML).toBe @htmlWithQuote
|
|
setHTML.call(@, newText)
|
|
ev = @composer._addToProxy.mostRecentCall.args[0].body
|
|
expect(ev).toEqual(newText)
|
|
|
|
describe 'quoted text control toggle button', ->
|
|
beforeEach ->
|
|
@toggle = ReactTestUtils.findRenderedDOMComponentWithClass(@composer, 'quoted-text-control')
|
|
|
|
it 'should be rendered', ->
|
|
expect(@toggle).toBeDefined()
|
|
|
|
describe 'when there is quoted text, an showQuotedText is false', ->
|
|
beforeEach ->
|
|
@draft.body = @htmlWithQuote
|
|
@composer = ReactTestUtils.renderIntoDocument(
|
|
<Composer draft={@draft} session={@session}/>
|
|
)
|
|
@composer.setState
|
|
showQuotedText: false
|
|
@contentEditable = @composer.refs[Fields.Body]
|
|
@$contentEditable = ReactDOM.findDOMNode(@contentEditable).querySelector('[contenteditable]')
|
|
@$composerBodyWrap = ReactDOM.findDOMNode(@composer.refs.composerBodyWrap)
|
|
|
|
# The quoted text dom parser wraps stuff inertly in body tags
|
|
wrapBody = (html) -> "<head></head><body>#{html}</body>"
|
|
|
|
it 'should not display any quoted text', ->
|
|
expect(@$contentEditable.innerHTML).toBe @htmlNoQuote
|
|
|
|
it "should let you change the text, and then append the quoted text part to the end before firing `_addToProxy`", ->
|
|
textToAdd = "MORE <strong>TEXT</strong>!"
|
|
spyOn(@composer, "_addToProxy")
|
|
expect(@$contentEditable.innerHTML).toBe @htmlNoQuote
|
|
setHTML.call(@, textToAdd + @htmlNoQuote)
|
|
ev = @composer._addToProxy.mostRecentCall.args[0].body
|
|
# Note that we expect the version WITH a quote while setting the
|
|
# version withOUT a quote.
|
|
expect(ev).toEqual(wrapBody(textToAdd + @htmlWithQuote))
|
|
|
|
it "should let you add more html that looks like quoted text, and still properly appends the old quoted text", ->
|
|
textToAdd = "Yo <blockquote class=\"gmail_quote\">I'm a fake quote</blockquote>"
|
|
spyOn(@composer, "_addToProxy")
|
|
expect(@$contentEditable.innerHTML).toBe @htmlNoQuote
|
|
setHTML.call(@, textToAdd + @htmlNoQuote)
|
|
ev = @composer._addToProxy.mostRecentCall.args[0].body
|
|
# Note that we expect the version WITH a quote while setting the
|
|
# version withOUT a quote.
|
|
expect(ev).toEqual(wrapBody(textToAdd + @htmlWithQuote))
|
|
|
|
describe 'quoted text control toggle button', ->
|
|
beforeEach ->
|
|
@toggle = ReactTestUtils.findRenderedDOMComponentWithClass(@composer, 'quoted-text-control')
|
|
|
|
it 'should be rendered', ->
|
|
expect(@toggle).toBeDefined()
|