Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
style(email): move reply zone away from email body (#4941)
Seamus943fa0a1da24
diff --git a/apps/web/src/features/block-email/component/BottomReplyButtons.tsx b/apps/web/src/features/block-email/component/BottomReplyButtons.tsxindex e09d6437a9..e437b21fe3 100644--- a/apps/web/src/features/block-email/component/BottomReplyButtons.tsx+++ b/apps/web/src/features/block-email/component/BottomReplyButtons.tsx@@ -8,7 +8,7 @@ import ArrowBendUpRight from '@phosphor/arrow-bend-up-right.svg';import type { ApiMessage } from '@service-email/generated/schemas';import { createCallback } from '@solid-primitives/rootless';import { Button, cn } from '@ui';-import type { Component } from 'solid-js';+import { type Component, Show } from 'solid-js';import type { ReplyType } from '../util/replyType';import { useEmailContext } from './EmailContext';import { getEmailFormRegistry } from './EmailFormContext';@@ -62,42 +62,43 @@ export function BottomReplyButtons(props: { lastMessage: ApiMessage }) {return email ? inboxIconProps(email) : { email: '' };};- if (!isMobile()) {- return (- <div class="flex w-full items-center pt-4">- <button- type="button"- class="flex min-w-0 flex-1 items-center gap-2 rounded-md text-left text-sm text-ink-placeholder hover:text-ink-muted"- onClick={open('reply-all')}- >- <UserIcon- {...currentUserIconProps()}- size="md"- showTooltip={false}- suppressClick- />- <span class="truncate">Reply...</span>- </button>- </div>- );- }-return (- <FloatRegionOrInline region="accessory">- <div class="w-full p-2 pb-2 pt-4 mobile:px-(--mobile-chrome-gutter) mobile:py-0">- <div class="flex flex-row items-center gap-2 mobile:pointer-events-auto">- <ReplyActionButton- icon={ArrowBendUpLeft}- label="Reply"+ <Show+ when={isMobile()}+ fallback={+ <div class="flex w-full items-center pt-4">+ <button+ type="button"+ class="flex min-w-0 flex-1 items-center gap-2 rounded-md text-left text-sm text-ink-placeholder hover:text-ink-muted"onClick={open('reply-all')}- />- <ReplyActionButton- icon={ArrowBendUpRight}- label="Forward"- onClick={open('forward')}- />+ >+ <UserIcon+ {...currentUserIconProps()}+ size="md"+ showTooltip={false}+ suppressClick+ />+ <span class="truncate">Reply...</span>+ </button>+ </div>+ }+ >+ <FloatRegionOrInline region="accessory">+ <div class="w-full p-2 pb-2 pt-4 mobile:px-(--mobile-chrome-gutter) mobile:py-0">+ <div class="flex flex-row items-center gap-2 mobile:pointer-events-auto">+ <ReplyActionButton+ icon={ArrowBendUpLeft}+ label="Reply"+ onClick={open('reply-all')}+ />+ <ReplyActionButton+ icon={ArrowBendUpRight}+ label="Forward"+ onClick={open('forward')}+ />+ </div></div>- </div>- </FloatRegionOrInline>+ </FloatRegionOrInline>+ </Show>);}diff --git a/apps/web/src/features/block-email/component/MessageContainer.tsx b/apps/web/src/features/block-email/component/MessageContainer.tsxindex ec55a4be8d..eb8a201696 100644--- a/apps/web/src/features/block-email/component/MessageContainer.tsx+++ b/apps/web/src/features/block-email/component/MessageContainer.tsx@@ -20,7 +20,6 @@ import { emailClient } from '@service-email/client';import type { ApiMessage, Attachment } from '@service-email/generated/schemas';import { storageServiceClient } from '@service-storage/client';import type { FileType } from '@service-storage/generated/schemas/fileType';-import { cn } from '@ui';import { createMemo, createSignal, For, Match, Show, Switch } from 'solid-js';import { BottomReplyButtons } from './BottomReplyButtons';@@ -356,15 +355,7 @@ export function MessageContainer(props: MessageContainerProps) {</Show></div><Show when={showInlineReplyArea()}>- <div- class={cn(- 'relative -mx-4 mb-0 border-t border-ink/20',- (visibleAttachments().length > 0 ||- draftAttachments().length > 0 ||- forwardedAttachments().length > 0) &&- 'mt-2'- )}- >+ <div class="relative -mx-4 mb-0 border-t border-ink/20 mt-4"><Show when={props.isLastMessage && !isMobile()}><FloatingInputLoaderisLoading={context.query.isFetching}