Merge pull request #1286 from ssbc/publish-shortcut

Add publishing keyboard shortcuts

Author: christianbundy

lib/depject/message/html/compose.js

@@ -311,6 +311,8 @@ exports.create = function (api) {
             contentWarningInput.value = ''
             refreshHasContent()
             save()
+          } else {
+            textArea.focus()
           }
           if (cb) cb(null, msg)
         }

lib/depject/message/sheet/preview.js

@@ -46,6 +46,7 @@ exports.create = function (api) {
       // allow inspecting of raw message that is about to be sent
       messageElement.msg = msg
 
+      const cancelButton = h('button -cancel', { 'ev-click': cancel }, i18n('Cancel'))
       return {
         content: [
           messageElement
@@ -73,8 +74,22 @@ exports.create = function (api) {
             ])
           ),
           h('button -save', { 'ev-click': publish }, i18n('Confirm')),
-          h('button -cancel', { 'ev-click': cancel }, i18n('Cancel'))
-        ]
+          cancelButton
+        ],
+        onMount: () => {
+          cancelButton.focus()
+        },
+        attributes: {
+          'ev-keydown': ev => {
+            if (ev.key === 'Enter' && (ev.ctrlKey || ev.metaKey)) {
+              publish()
+              ev.preventDefault()
+            } else if (ev.key === 'Escape') {
+              cancel()
+              ev.preventDefault()
+            }
+          }
+        }
       }
 
       function publish () {

lib/depject/sheet/display.js

@@ -5,9 +5,13 @@ exports.gives = nest('sheet.display')
 
 exports.create = function () {
   return nest('sheet.display', function (handler) {
-    const { content, footer, classList, onMount } = handler(done)
+    const { content, footer, classList, onMount, attributes } = handler(done)
 
-    const container = h('div', { className: 'Sheet', classList }, [
+    let fullAttributes = { className: 'Sheet', classList }
+    if (attributes !== undefined) {
+      fullAttributes = { ...attributes, ...fullAttributes }
+    }
+    const container = h('div', fullAttributes, [
       h('section', [content]),
       h('footer', [footer])
     ])