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
fix(mentions): offer @here in channel composers hosted outside a block (#7486)
Wolf Mermelsteinbc691b04004c
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/MentionsMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/MentionsMenu.tsxindex c197149b99..aeb45142d4 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/MentionsMenu.tsx+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/MentionsMenu.tsx@@ -144,7 +144,6 @@ function MentionsMenuInner(props: MentionsMenuProps) {users: props.users,searchTerm,isChannelBlock: props.block === 'channel',- blockId: useMaybeBlockId(),});const customDocs = props.entitiesdiff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useUsersMention.test.ts b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useUsersMention.test.tsindex afd36a9d88..58b529fe75 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useUsersMention.test.ts+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useUsersMention.test.ts@@ -110,3 +110,36 @@ it('preserves explicitly empty participant lists', () => {dispose();});});++it('offers @here to channel composers without a block context', () => {+ createRoot((dispose) => {+ const [searchTerm, setSearchTerm] = createSignal('');+ const mention = useUsersMention({+ searchTerm,+ users: () => [sean],+ isChannelBlock: true,+ });+ expect(mention.groups().map((item) => item.id)).toEqual(['here']);+ expect(mention.usersAndGroups().map((item) => item.id)).toEqual([+ 'here',+ sean.id,+ ]);+ setSearchTerm('he');+ expect(mention.groups().map((item) => item.id)).toEqual(['here']);+ setSearchTerm('sea');+ expect(mention.groups()).toEqual([]);+ dispose();+ });+});++it('keeps @here out of composers that do not post to a channel', () => {+ createRoot((dispose) => {+ const mention = useUsersMention({+ searchTerm: () => '',+ users: () => [sean],+ });+ expect(mention.groups()).toEqual([]);+ expect(mention.usersAndGroups().map((item) => item.id)).toEqual([sean.id]);+ dispose();+ });+});diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useUsersMention.ts b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useUsersMention.tsindex e45566a37a..42dfb25fec 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useUsersMention.ts+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useUsersMention.ts@@ -11,8 +11,13 @@ type UseUsersMentionOptions = {/** Custom users list if necessary */users?: Accessor<IUser[]>;searchTerm: Accessor<string>;+ /**+ * Whether the composer posts to a channel. Group mentions are an editor+ * configuration, not a block-context lookup: the channels view hosts a+ * conversation outside the block system, where `useMaybeBlockId()` is+ * undefined, and `@here` must still be offered there.+ */isChannelBlock?: boolean;- blockId?: string;};type UseUsersMentionResult = {@@ -39,7 +44,7 @@ const BOT_MENTION_BOOST = 10;export function useUsersMention(options: UseUsersMentionOptions): UseUsersMentionResult {- const { users: customUsers, searchTerm, isChannelBlock, blockId } = options;+ const { users: customUsers, searchTerm, isChannelBlock } = options;const quickAccess = useQuickAccess();const workspaceUsers = quickAccess.useList('person').items;const currentUserEmail = useEmail();@@ -99,11 +104,11 @@ export function useUsersMention(});/**- * Special groups like @here that are only available in channel blocks.+ * Special groups like @here that are only available in channel composers.* These are filtered based on the current search term.*/const groups = (): GroupMentionItem[] => {- if (!isChannelBlock || !blockId) return [];+ if (!isChannelBlock) return [];const term = searchTerm().toLowerCase();