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.

chore: improve "git blame" feature (#5263)

Wolf Mermelstein1ca5fbf0bb77
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/BlameTooltip.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/BlameTooltip.tsx
index 077a7fda77..25969e449e 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/BlameTooltip.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/BlameTooltip.tsx
@@ -82,7 +82,7 @@ export function BlameTooltip(props: {
<Show when={visible() && query.data?.userId ? query.data : undefined}>
{(b) => (
<div
- class="fixed z-50 text-xs text-ink-secondary/70 pointer-events-none"
+ class="fixed z-50 rounded-md bg-surface px-2 py-1 text-xs text-ink-secondary/70 pointer-events-none"
style={{
left: `${props.state.x + 12}px`,
top: `${props.state.y + 12}px`,
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/blameTooltipPlugin.ts b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/blameTooltipPlugin.ts
index fa1f448f27..9e63d7f65e 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/blameTooltipPlugin.ts
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/blameTooltipPlugin.ts
@@ -87,17 +87,22 @@ function registerBlameTooltipPlugin(
props.setState({ hovering: false, nodeId: null });
};
+ document.addEventListener('scroll', dismiss, true);
+
return mergeRegister(
+ () => document.removeEventListener('scroll', dismiss, true),
editor.registerRootListener((root, prevRoot) => {
if (root) {
root.addEventListener('pointermove', handlePointerMove);
root.addEventListener('pointerleave', dismiss);
root.addEventListener('pointerdown', dismiss);
+ root.addEventListener('beforeinput', dismiss);
}
if (prevRoot) {
prevRoot.removeEventListener('pointermove', handlePointerMove);
prevRoot.removeEventListener('pointerleave', dismiss);
prevRoot.removeEventListener('pointerdown', dismiss);
+ prevRoot.removeEventListener('beforeinput', dismiss);
}
})
);
diff --git a/services/sync-service/src/state.rs b/services/sync-service/src/state.rs
index d534003c84..6267d18bfd 100644
--- a/services/sync-service/src/state.rs
+++ b/services/sync-service/src/state.rs
@@ -151,6 +151,7 @@ impl DocumentState {
let Some(LoroValue::String(id)) = id_voc.into_value().ok() else {
continue;
};
+
return Some(id.to_string());
}
None