feat(keymap): add cmd+1, cmd+2, etc to quick-select accounts

Fix "unique key" for react props

Fix composer styling bug in popout composer

internal_packages/composer/lib/composer-view.cjsx

@@ -154,8 +154,7 @@ class ComposerView extends React.Component
       @_proxy.changes.commit()
 
   render: ->
-    <KeyCommandsRegion localHandlers={@_keymapHandlers()}
+    <KeyCommandsRegion localHandlers={@_keymapHandlers()} >
-                       className="composer-outer-wrap">
       {@_renderComposerWrap()}
     </KeyCommandsRegion>
 
@@ -172,7 +171,7 @@ class ComposerView extends React.Component
       </div>
 
   _wrapClasses: =>
-    "message-item-white-wrap #{@props.className ? ""}"
+    "message-item-white-wrap composer-outer-wrap #{@props.className ? ""}"
 
   _renderComposer: =>
     <DropZone className="composer-inner-wrap"

internal_packages/thread-list/lib/thread-list.cjsx

@@ -74,9 +74,10 @@ class ThreadList extends React.Component
       name: "★"
       resolver: (thread) =>
         [
-          <ThreadListIcon thread={thread} />
+          <ThreadListIcon key="thread-list-icon" thread={thread} />
-          <MailImportantIcon thread={thread} />
+          <MailImportantIcon key="mail-important-icon" thread={thread} />
           <InjectedComponentSet
+            key="injected-component-set"
             inline={true}
             containersRequired={false}
             matching={role: "ThreadListIcon"}

keymaps/base-darwin.cson

@@ -7,7 +7,7 @@
 'body':
   'cmd-m': 'application:minimize'
   'cmd-h': 'application:hide'
-  'cmd-1': 'application:show-main-window'
+  'cmd-shift-1': 'application:show-main-window'
   'cmd-alt-h': 'application:hide-other-applications'
   'cmd-ctrl-f': 'window:toggle-full-screen'
   'alt-cmd-ctrl-m': 'application:zoom'

keymaps/base.cson

@@ -54,6 +54,16 @@
   'shift-pageup'  : 'core:list-page-up'
   'shift-pagedown': 'core:list-page-down'
 
+  'cmdctrl-1': 'application:select-account-0'
+  'cmdctrl-2': 'application:select-account-1'
+  'cmdctrl-3': 'application:select-account-2'
+  'cmdctrl-4': 'application:select-account-3'
+  'cmdctrl-5': 'application:select-account-4'
+  'cmdctrl-6': 'application:select-account-5'
+  'cmdctrl-7': 'application:select-account-6'
+  'cmdctrl-8': 'application:select-account-7'
+  'cmdctrl-9': 'application:select-account-8'
+
   ### N1 developer commands. ###
   'cmdctrl-alt-l': 'window:reload'
   'cmdctrl-alt-i': 'window:toggle-dev-tools'

src/flux/stores/account-store.coffee

@@ -33,16 +33,27 @@ class AccountStore
       if newAccountIds.length > 0
         Actions.selectAccountId(newAccountIds[0])
 
+    atom.commands.add 'body', @_accountSwitchCommands()
+
+  _accountSwitchCommands: ->
+    commands = {}
+    [0..8].forEach (index) =>
+      key = "application:select-account-#{index}"
+      commands[key] = _.partial(@_selectAccountByIndex, index)
+    return commands
+
+  _selectAccountByIndex: (index) =>
+    @_index = Math.min(@_accounts.length - 1, Math.max(0, index))
+    atom.config.set(saveIndexKey, @_index)
+    @trigger()
+
   _load: =>
     @_accounts = []
     for json in atom.config.get(saveObjectsKey) || []
       @_accounts.push((new Account).fromJSON(json))
 
     index = atom.config.get(saveIndexKey) || 0
-    @_index = Math.min(@_accounts.length - 1, Math.max(0, index))
+    @_selectAccountByIndex(index)
-
-    @_tokens = atom.config.get(saveTokensKey) || {}
-    @trigger()
 
   _save: =>
     atom.config.set(saveObjectsKey, @_accounts)