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(calendar): keep the read-only mention card open when its chip is clicked (#6927)

gbirman62e4b73e80ff
diff --git a/apps/web/src/lib/core/component/HoverCard.test.tsx b/apps/web/src/lib/core/component/HoverCard.test.tsx
new file mode 100644
index 0000000000..e3d2e7ea91
--- /dev/null
+++ b/apps/web/src/lib/core/component/HoverCard.test.tsx
@@ -0,0 +1,57 @@
+/**
+ * @vitest-environment jsdom
+ */
+
+import { fireEvent, render, screen } from '@solidjs/testing-library';
+import { describe, expect, it, vi } from 'vitest';
+import { HoverCard } from './HoverCard';
+
+vi.mock('@core/mobile/isTouchDevice', () => ({
+ isTouchDevice: () => false,
+}));
+
+async function renderOpenCard(keepOpenOnTriggerPress?: boolean) {
+ const onOpenChange = vi.fn();
+ render(() => (
+ <>
+ <HoverCard
+ open
+ onOpenChange={onOpenChange}
+ keepOpenOnTriggerPress={keepOpenOnTriggerPress}
+ trigger={<span>Standup</span>}
+ content={<div>Card</div>}
+ />
+ <button type="button">Elsewhere</button>
+ </>
+ ));
+ await screen.findByText('Card');
+ // Kobalte attaches its outside pointer-down listener a tick after mount.
+ await new Promise((resolve) => setTimeout(resolve));
+ return onOpenChange;
+}
+
+describe('HoverCard', () => {
+ it('dismisses when its trigger is pressed', async () => {
+ const onOpenChange = await renderOpenCard();
+
+ fireEvent.pointerDown(screen.getByText('Standup'));
+
+ expect(onOpenChange).toHaveBeenCalledWith(false);
+ });
+
+ it('stays open when its trigger is pressed if asked to', async () => {
+ const onOpenChange = await renderOpenCard(true);
+
+ fireEvent.pointerDown(screen.getByText('Standup'));
+
+ expect(onOpenChange).not.toHaveBeenCalledWith(false);
+ });
+
+ it('still dismisses when pressed elsewhere if asked to keep open', async () => {
+ const onOpenChange = await renderOpenCard(true);
+
+ fireEvent.pointerDown(screen.getByText('Elsewhere'));
+
+ expect(onOpenChange).toHaveBeenCalledWith(false);
+ });
+});
diff --git a/apps/web/src/lib/core/component/HoverCard.tsx b/apps/web/src/lib/core/component/HoverCard.tsx
index 805b47218a..c2559075e5 100644
--- a/apps/web/src/lib/core/component/HoverCard.tsx
+++ b/apps/web/src/lib/core/component/HoverCard.tsx
@@ -114,6 +114,12 @@ export type HoverCardComponentProps = {
* real pointer movement first.
*/
requirePointerMovement?: boolean;
+ /**
+ * Keep the card open when a pointer-down lands on its own trigger. Use
+ * when clicking the trigger shows the card instead of navigating away;
+ * otherwise the pointer-down dismisses it and the click reopens it.
+ */
+ keepOpenOnTriggerPress?: boolean;
/** Callback when open state changes */
onOpenChange?: (open: boolean) => void;
/**
@@ -316,6 +322,20 @@ export function HoverCard(props: HoverCardComponentProps) {
});
});
+ // Kobalte forwards these to the content's DismissableLayer but leaves them
+ // out of the hover-card content types.
+ const dismissableLayerProps = {
+ onPointerDownOutside: (e: Event) => {
+ if (
+ props.keepOpenOnTriggerPress &&
+ e.target instanceof Node &&
+ entry.trigger?.contains(e.target)
+ ) {
+ e.preventDefault();
+ }
+ },
+ };
+
return (
<KobalteHoverCard
getAnchorRect={
@@ -355,6 +375,7 @@ export function HoverCard(props: HoverCardComponentProps) {
contentEl = el;
props.contentRef?.(el);
}}
+ {...dismissableLayerProps}
class={cn(
props.contentZIndexClass ?? 'z-tool-tip',
props.contentClass
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
index 5bf5e5fc51..2967626183 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
@@ -542,17 +542,23 @@ function DocumentMentionInner(props: DocumentMentionDecoratorProps) {
const [previewCardOpen, setPreviewCardOpen] = createSignal(false);
+ const calendarOpen = createMemo(() =>
+ verifyBlockName(props.blockName) === 'calendar'
+ ? calendarMentionOpen(
+ item(),
+ props.documentId,
+ props.blockParams?.occurrenceKey
+ )
+ : undefined
+ );
+
const open = createCallback((e: MouseEvent | KeyboardEvent | null) => {
// The calendar is a singleton block: open it aimed at the viewer's own
// copy of the meeting. A meeting shared through the channel but absent
// from the viewer's calendars has nothing to open, so its read-only
// preview card is shown instead.
- if (verifyBlockName(props.blockName) === 'calendar') {
- const target = calendarMentionOpen(
- item(),
- props.documentId,
- props.blockParams?.occurrenceKey
- );
+ const target = calendarOpen();
+ if (target) {
if (target.kind === 'read_only') {
setPreviewCardOpen(true);
return;
@@ -654,6 +660,7 @@ function DocumentMentionInner(props: DocumentMentionDecoratorProps) {
<HoverCard
open={previewCardOpen()}
onOpenChange={setPreviewCardOpen}
+ keepOpenOnTriggerPress={calendarOpen()?.kind === 'read_only'}
trigger={
<span class="relative">
<span