From edd6e5c8fc5df48348a7cc084c4a44bb43aeae13 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 15 Jan 2025 09:07:12 -0800
Subject: [PATCH] Add send button

---
 package-lock.json                          |  8 ++++----
 package.json                               |  2 +-
 src/app/components/ChannelCompose.svelte   | 19 ++++++++++++++-----
 src/app/components/ContentLinkBlock.svelte |  2 +-
 src/app/components/ReactionSummary.svelte  |  2 +-
 src/app/editor/index.ts                    |  7 -------
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 49c12260..d6944d6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
         "@welshman/app": "~0.0.37",
         "@welshman/content": "~0.0.15",
         "@welshman/dvm": "~0.0.13",
-        "@welshman/editor": "~0.0.5",
+        "@welshman/editor": "~0.0.6",
         "@welshman/feeds": "~0.0.30",
         "@welshman/lib": "~0.0.37",
         "@welshman/net": "~0.0.45",
@@ -4902,9 +4902,9 @@
       }
     },
     "node_modules/@welshman/editor": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@welshman/editor/-/editor-0.0.5.tgz",
-      "integrity": "sha512-4WOFoPT6LgX2bjM8RR+6YrfOm7Lk2BLlJ46aMYHFRyDcD737Rx5dtsct0ZlyQ8TzPR85TyYHrv6g98/J0cZKDQ==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@welshman/editor/-/editor-0.0.6.tgz",
+      "integrity": "sha512-7ZnjrsBX/5Z2OiHStCSBqNlspX/weURcP8yrH9CTcOEqJZfPx5UWfeYmzsbXttvCPBph+Cv9jfHkeVreyLkeKQ==",
       "peerDependencies": {
         "@tiptap/core": "^2.9.1",
         "@tiptap/extension-code": "^2.9.1",
diff --git a/package.json b/package.json
index dc00fbb1..fcd67126 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@welshman/app": "~0.0.37",
     "@welshman/content": "~0.0.15",
     "@welshman/dvm": "~0.0.13",
-    "@welshman/editor": "~0.0.5",
+    "@welshman/editor": "~0.0.6",
     "@welshman/feeds": "~0.0.30",
     "@welshman/lib": "~0.0.37",
     "@welshman/net": "~0.0.45",
diff --git a/src/app/components/ChannelCompose.svelte b/src/app/components/ChannelCompose.svelte
index 844069b5..8d254592 100644
--- a/src/app/components/ChannelCompose.svelte
+++ b/src/app/components/ChannelCompose.svelte
@@ -19,16 +19,18 @@
   const submit = () => {
     if ($uploading) return
 
-    onSubmit({
-      content: $editor!.getText({blockSeparator: "\n"}).trim(),
-      tags: $editor!.storage.nostr.getEditorTags(),
-    })
+    const content = $editor!.getText({blockSeparator: "\n"}).trim()
+    const tags = $editor!.storage.nostr.getEditorTags()
+
+    if (!content) return
+
+    onSubmit({content, tags})
 
     $editor!.chain().clearContent().run()
   }
 
   onMount(() => {
-    editor = getEditor({autofocus: !isMobile, aggressive: true, element, submit, uploading})
+    editor = getEditor({autofocus: !isMobile, element, submit, uploading})
 
     $editor!.chain().setContent(content).run()
   })
@@ -51,4 +53,11 @@
   <div class="chat-editor flex-grow overflow-hidden">
     <div bind:this={element} />
   </div>
+  <Button
+    data-tip="{window.navigator.platform.includes('Mac') ? 'cmd' : 'ctrl'}+enter to send"
+    class="center tooltip tooltip-left absolute right-4 h-10 w-10 min-w-10 rounded-full"
+    disabled={$uploading}
+    on:click={submit}>
+    <Icon icon="plain" />
+  </Button>
 </form>
diff --git a/src/app/components/ContentLinkBlock.svelte b/src/app/components/ContentLinkBlock.svelte
index 1f01eda3..0d40a135 100644
--- a/src/app/components/ContentLinkBlock.svelte
+++ b/src/app/components/ContentLinkBlock.svelte
@@ -22,7 +22,7 @@
   const expand = () => pushModal(ContentLinkDetail, {url}, {fullscreen: true})
 </script>
 
-<Link external href={url} class="my-2 inline-block">
+<Link external href={url} class="my-2 block">
   <div class="overflow-hidden rounded-box leading-[0]">
     {#if url.match(/\.(mov|webm|mp4)$/)}
       <video controls src={url} class="max-h-96 object-contain object-center">
diff --git a/src/app/components/ReactionSummary.svelte b/src/app/components/ReactionSummary.svelte
index 4a0558c7..a87a2e0c 100644
--- a/src/app/components/ReactionSummary.svelte
+++ b/src/app/components/ReactionSummary.svelte
@@ -54,7 +54,7 @@
     {#if url && $reports.length > 0}
       <button
         type="button"
-        data-tip={`This content has been reported as "${displayList(reportReasons)}".`}}
+        data-tip="{`This content has been reported as "${displayList(reportReasons)}".`}}"
         class="btn btn-error btn-xs tooltip-right flex items-center gap-1 rounded-full"
         class:tooltip={!noTooltip && !isMobile}
         on:click|preventDefault|stopPropagation={onReportClick}>
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index cc6749f9..9a45f5c0 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -26,7 +26,6 @@ export const signWithAssert = async (template: StampedEvent) => {
 }
 
 export const getEditor = ({
-  aggressive = false,
   autofocus = false,
   charCount,
   content = "",
@@ -36,7 +35,6 @@ export const getEditor = ({
   uploading,
   wordCount,
 }: {
-  aggressive?: boolean
   autofocus?: boolean
   charCount?: Writable<number>
   content?: string
@@ -62,11 +60,6 @@ export const getEditor = ({
               placeholder,
             },
           },
-          breakOrSubmit: {
-            config: {
-              aggressive,
-            },
-          },
           fileUpload: {
             config: {
               onDrop() {