From 6f16659a302926242ae60a79863fb18a78c35b0c Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Mon, 15 Jun 2015 14:48:37 -0700
Subject: [PATCH] fix(T1758): Handle initial focus properly if draft is not yet
 ready

---
 internal_packages/composer/lib/composer-view.cjsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/internal_packages/composer/lib/composer-view.cjsx b/internal_packages/composer/lib/composer-view.cjsx
index e7df54436..f7a04eef5 100644
--- a/internal_packages/composer/lib/composer-view.cjsx
+++ b/internal_packages/composer/lib/composer-view.cjsx
@@ -360,6 +360,10 @@ class ComposerView extends React.Component
   # focused depending on the draft type, or you can pass a field as
   # the first parameter.
   focus: (field = null) =>
+    if not @_proxy
+      @_focusRequested = true
+      return
+
     if @isForwardedMessage()
       field ?= "textFieldTo"
     else
@@ -375,9 +379,15 @@ class ComposerView extends React.Component
   _onDraftChanged: =>
     return unless @_proxy
     draft = @_proxy.draft()
+
     if not @_initialHistorySave
       @_saveToHistory()
       @_initialHistorySave = true
+
+    if @_focusRequested
+      @_focusRequested = false
+      @focus()
+
     state =
       to: draft.to
       cc: draft.cc