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.

fix(recip-selector): cleanup esc handling in recip selector (#5626)

Seamusbe0dfe74ae0a
diff --git a/apps/web/src/components/ui/components/Tooltip.tsx b/apps/web/src/components/ui/components/Tooltip.tsx
index f72808bf5b..2e5503493e 100644
--- a/apps/web/src/components/ui/components/Tooltip.tsx
+++ b/apps/web/src/components/ui/components/Tooltip.tsx
@@ -32,6 +32,10 @@ export function Tooltip(props: TooltipProps) {
const [triggerRef, setTriggerRef] = createSignal<HTMLElement>();
const [open, setOpen] = createSignal(false);
+ if (import.meta.env.MODE === 'test') {
+ return <>{props.children}</>;
+ }
+
function tokens(): HotkeyToken[] {
return props.hotkey == null
? []
diff --git a/apps/web/src/features/block-channel/component/Compose.tsx b/apps/web/src/features/block-channel/component/Compose.tsx
index a8899d1dfd..bae615d069 100644
--- a/apps/web/src/features/block-channel/component/Compose.tsx
+++ b/apps/web/src/features/block-channel/component/Compose.tsx
@@ -240,6 +240,7 @@ export function ChannelCompose() {
placeholder="To: Macro users or email addresses"
triedToSubmit={triedToSubmit}
focusOnMount
+ hideMenuOnEscape
/>
<div class="mt-6 p-3 flex flex-row items-center border border-edge-muted text-ink-placeholder rounded-md">
<InfoIcon class="shrink-0 size-8 mr-4 fill-edge" />
diff --git a/apps/web/src/features/block-email/component/BaseInput.tsx b/apps/web/src/features/block-email/component/BaseInput.tsx
index e9b024c5a5..a00a19d06b 100644
--- a/apps/web/src/features/block-email/component/BaseInput.tsx
+++ b/apps/web/src/features/block-email/component/BaseInput.tsx
@@ -1815,6 +1815,11 @@ export function BaseInput(props: {
form().setSubject(e.currentTarget.value);
scheduleDraftSave();
}}
+ onKeyDown={(e) => {
+ if (e.key !== 'Escape') return;
+ e.preventDefault();
+ e.currentTarget.blur();
+ }}
placeholder="Subject"
/>
</div>
@@ -1952,6 +1957,11 @@ export function BaseInput(props: {
form().setSubject(e.currentTarget.value);
scheduleDraftSave();
}}
+ onKeyDown={(e) => {
+ if (e.key !== 'Escape') return;
+ e.preventDefault();
+ e.currentTarget.blur();
+ }}
placeholder="Subject:"
/>
</div>
diff --git a/apps/web/src/features/block-email/component/compose/ComposeSubject.tsx b/apps/web/src/features/block-email/component/compose/ComposeSubject.tsx
index df1068d754..3d85414e79 100644
--- a/apps/web/src/features/block-email/component/compose/ComposeSubject.tsx
+++ b/apps/web/src/features/block-email/component/compose/ComposeSubject.tsx
@@ -21,6 +21,14 @@ export function ComposeSubject(props: {
const showSummary = () =>
isMobile() && !editing() && ctx.subject().length > 0;
+ const blurOnEscape = (
+ e: KeyboardEvent & { currentTarget: HTMLInputElement }
+ ) => {
+ if (e.key !== 'Escape') return;
+ e.preventDefault();
+ e.currentTarget.blur();
+ };
+
return (
<div
class={cn(
@@ -47,6 +55,7 @@ export function ComposeSubject(props: {
placeholder="Subject"
class="w-full resize-none text-sm placeholder:text-ink-placeholder p-1"
onInput={(e) => ctx.setSubject(e.currentTarget.value)}
+ onKeyDown={blurOnEscape}
disabled={ctx.disabled()}
/>
}
@@ -82,6 +91,11 @@ export function ComposeSubject(props: {
onFocus={() => setEditing(true)}
onBlur={() => setEditing(false)}
onKeyDown={(e) => {
+ if (e.key === 'Escape') {
+ e.preventDefault();
+ e.currentTarget.blur();
+ return;
+ }
if (e.key === 'Enter') {
e.preventDefault();
e.currentTarget.blur();
diff --git a/apps/web/src/lib/core/component/RecipientSelector.tsx b/apps/web/src/lib/core/component/RecipientSelector.tsx
index 2e9d20d699..369d575f6f 100644
--- a/apps/web/src/lib/core/component/RecipientSelector.tsx
+++ b/apps/web/src/lib/core/component/RecipientSelector.tsx
@@ -799,6 +799,20 @@ export function RecipientSelector<K extends CombinedRecipientKind>(
return;
}
+ if (e.key === 'Escape') {
+ e.preventDefault();
+ const inputEl = inputRef();
+ const currentSearch = inputValue().trim();
+ if (currentSearch.length > 0) {
+ setInputValue('');
+ if (inputEl) inputEl.value = '';
+ return;
+ }
+
+ inputEl?.blur();
+ return;
+ }
+
if (e.key === 'Tab' && context.isOpen()) {
e.preventDefault();
e.stopPropagation();