Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

chg(channel-input): remove trash from edit (#6620)

Seamus4ef3e93f2b50
diff --git a/apps/web/src/features/channel/Channel/InlineMessageEditor.tsx b/apps/web/src/features/channel/Channel/InlineMessageEditor.tsx
index 7252e7693f..2a0f31aee5 100644
--- a/apps/web/src/features/channel/Channel/InlineMessageEditor.tsx
+++ b/apps/web/src/features/channel/Channel/InlineMessageEditor.tsx
@@ -78,10 +78,6 @@ export function MessageEditorContent(props: MessageEditorContentProps) {
props.messageEditor.save(props.message, nextSnapshot)
}
>
- <Input.Layout.ActionsLeft>
- <Input.ToggleFormatAction />
- <Input.DiscardDraftAction />
- </Input.Layout.ActionsLeft>
<Input.Layout.ActionsRight>
<Input.SendAction />
</Input.Layout.ActionsRight>
diff --git a/apps/web/src/lib/core/comments/discussion/Discussion.tsx b/apps/web/src/lib/core/comments/discussion/Discussion.tsx
index c13b2c2882..2bcb87e805 100644
--- a/apps/web/src/lib/core/comments/discussion/Discussion.tsx
+++ b/apps/web/src/lib/core/comments/discussion/Discussion.tsx
@@ -499,7 +499,7 @@ function DiscussionMessageView(props: {
<Show when={isEditing()} fallback={<Message.Content />}>
<DiscussionInput
input={{
- mode: 'reply',
+ mode: 'channel',
placeholder: 'Edit comment...',
value: props.comment.text,
}}
diff --git a/bun.lock b/bun.lock
index 23caf5df86..3acac33e4a 100644
--- a/bun.lock
+++ b/bun.lock
@@ -996,7 +996,7 @@
"@img/sharp-win32-x64": ["@img/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw=="],
- "@inkibra/tauri-plugins": ["@inkibra/tauri-plugins@github:macro-inc/tauri-plugins#6ddd660", { "dependencies": { "react": "^18.3.1", "react-dom": "^18.3.1" } }, "macro-inc-tauri-plugins-6ddd660", "sha512-7+0ebEOYqedkOY67Clwu65Np3qJ3aJc/H/NjNxmjgA/7HIu0C+DSoKAArG7HTdTVpdcAtHyhrqsJujdEAyJf6Q=="],
+ "@inkibra/tauri-plugins": ["@inkibra/tauri-plugins@github:macro-inc/tauri-plugins#6ddd660", { "dependencies": { "react": "^18.3.1", "react-dom": "^18.3.1" } }, "macro-inc-tauri-plugins-6ddd660"],
"@inquirer/ansi": ["@inquirer/[email protected]", "", {}, "sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q=="],
@@ -3014,7 +3014,7 @@
"pathval": ["[email protected]", "", {}, "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ=="],
- "pdfjs-dist": ["pdfjs-dist@github:macro-inc/pdf.js#f9b2ce6", { "dependencies": { "dommatrix": "^1.0.3", "web-streams-polyfill": "^3.2.1" }, "peerDependencies": { "worker-loader": "^3.0.8" }, "optionalPeers": ["worker-loader"] }, "macro-inc-pdf.js-f9b2ce6", "sha512-HDFaPbCxLG2GHpf1smUG97nku5aPGBGaCcIbK05dGdp07TBLUlDcXsM4WcE82mO5W4RBPIBVYobX5N/6M6NFrA=="],
+ "pdfjs-dist": ["pdfjs-dist@github:macro-inc/pdf.js#f9b2ce6", { "dependencies": { "dommatrix": "^1.0.3", "web-streams-polyfill": "^3.2.1" }, "peerDependencies": { "worker-loader": "^3.0.8" }, "optionalPeers": ["worker-loader"] }, "macro-inc-pdf.js-f9b2ce6"],
"pend": ["[email protected]", "", {}, "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="],
diff --git a/docs/AGENT_GUIDE/channels.md b/docs/AGENT_GUIDE/channels.md
index fa48c22f2c..f858dd81c3 100644
--- a/docs/AGENT_GUIDE/channels.md
+++ b/docs/AGENT_GUIDE/channels.md
@@ -66,7 +66,8 @@ shorten it and resize the pane. It should expand when the text no longer fits
beside the buttons and collapse when it fits again, without flickering between
layouts. Also add and remove a line break or attachment and
confirm the draft and caret position survive. The attachment and send controls
-should remain usable in both layouts, including when editing an existing message.
+should remain usable in both layouts. Existing message and reply edit inputs show
+only the send control, with no format or discard button; Escape cancels the edit.
The iOS share sheet keeps its editor above the attachment and formatting controls.
Check this arrangement at both phone and tablet widths.
diff --git a/docs/AGENT_GUIDE/documents.md b/docs/AGENT_GUIDE/documents.md
index 52e50ef797..057e833167 100644
--- a/docs/AGENT_GUIDE/documents.md
+++ b/docs/AGENT_GUIDE/documents.md
@@ -405,7 +405,8 @@ Touch keeps separate `Attach images` and
`Format` buttons. `Send comment` is disabled until text exists. Click the
composer, `type_text`, then click `Send comment` (Enter also submits). The comment renders
above the composer with author + timestamp. `@`-mentions in comments notify the mentioned
-user. On mobile, the new-comment composer is docked above the navigation bar,
+user. Editing a discussion comment keeps the attachment and send controls, with no
+trash button. On mobile, the new-comment composer is docked above the navigation bar,
replacing Ask AI and New when commenting is available in documents and tasks.
When the comment composer is unavailable, the default Ask AI row appears instead.
Tap `Leave a comment...`