Open a note to start editing
@@ -187,7 +217,15 @@ export default function Home() {
value={content}
onChange={setContent}
links={linkIndex}
- onOpenLink={(rel) => void openNote(rel)}
+ onOpenLink={(path, blockId) => void openNote(path, blockId)}
+ scrollToPos={scrollToPos}
+ />
+ )}
+ {currentRel && (
+ void openNote(path)}
/>
)}
diff --git a/packages/core/src/index/index.ts b/packages/core/src/index/index.ts
index 679d807..cf653b3 100644
--- a/packages/core/src/index/index.ts
+++ b/packages/core/src/index/index.ts
@@ -1,4 +1,10 @@
export { Indexer, type IndexerDeps } from "./indexer.js";
export { MemoryIndexDriver, type IndexDriver } from "./driver.js";
-export { extractIndexContent, extractHeadings, extractLinks, extractTags } from "./parser/md.js";
+export {
+ extractIndexContent,
+ extractHeadings,
+ extractLinks,
+ extractTags,
+ findBlockPosition,
+} from "./parser/md.js";
export { type IndexedFileMeta, type IndexEvent, type ExtractedNote } from "./types.js";
diff --git a/packages/core/src/index/parser/index.ts b/packages/core/src/index/parser/index.ts
new file mode 100644
index 0000000..d801745
--- /dev/null
+++ b/packages/core/src/index/parser/index.ts
@@ -0,0 +1,7 @@
+export {
+ extractIndexContent,
+ extractHeadings,
+ extractLinks,
+ extractTags,
+ findBlockPosition,
+} from "./md.js";
diff --git a/packages/core/src/index/parser/md.ts b/packages/core/src/index/parser/md.ts
index 133579f..f42dec7 100644
--- a/packages/core/src/index/parser/md.ts
+++ b/packages/core/src/index/parser/md.ts
@@ -51,3 +51,11 @@ export function extractTags(markdown: string): string[] {
}
return [...seen];
}
+
+export function findBlockPosition(markdown: string, blockId: string): number | null {
+ const re = new RegExp(`\\^${blockId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\s*$`, "gm");
+ const match = re.exec(markdown);
+ if (!match) return null;
+ const lineStart = markdown.lastIndexOf("\n", match.index) + 1;
+ return lineStart;
+}
diff --git a/packages/editor/package.json b/packages/editor/package.json
index ba18e1f..fec5225 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -10,20 +10,20 @@
"test": "vitest run"
},
"dependencies": {
- "react": "catalog:",
- "codemirror": "^6.0.2",
+ "@codemirror/commands": "^6.8.2",
"@codemirror/lang-markdown": "^6.5.1",
"@codemirror/state": "^6.5.2",
"@codemirror/view": "^6.43.6",
- "@codemirror/commands": "^6.8.2",
- "@trachyte/core": "workspace:*"
+ "@trachyte/core": "workspace:*",
+ "codemirror": "^6.0.2",
+ "react": "catalog:"
},
"peerDependencies": {
"react": "^19.0.0"
},
"devDependencies": {
"@types/react": "catalog:",
- "vitest": "^4",
- "jsdom": "^29"
+ "jsdom": "^29",
+ "vitest": "^4"
}
}
diff --git a/packages/editor/src/CodeMirrorEditor.tsx b/packages/editor/src/CodeMirrorEditor.tsx
index 055e5ff..e5e1981 100644
--- a/packages/editor/src/CodeMirrorEditor.tsx
+++ b/packages/editor/src/CodeMirrorEditor.tsx
@@ -9,10 +9,11 @@ interface Props {
value: string;
onChange?: (value: string) => void;
links?: ReadonlyMap;
- onOpenLink?: (path: string) => void;
+ onOpenLink?: (path: string, blockId?: string) => void;
+ scrollToPos?: { from: number; to: number } | null;
}
-export function CodeMirrorEditor({ value, onChange, links, onOpenLink }: Props) {
+export function CodeMirrorEditor({ value, onChange, links, onOpenLink, scrollToPos }: Props) {
const editorRef = useRef(null);
const viewRef = useRef(null);
const initialValueRef = useRef(value);
@@ -43,7 +44,7 @@ export function CodeMirrorEditor({ value, onChange, links, onOpenLink }: Props)
markdown(),
wikilinks({
getIndex: () => linksRef.current,
- onOpen: (path) => onOpenLinkRef.current?.(path),
+ onOpen: (path, blockId) => onOpenLinkRef.current?.(path, blockId),
}),
blockRefs(),
EditorView.updateListener.of((update: ViewUpdate) => {
@@ -60,11 +61,23 @@ export function CodeMirrorEditor({ value, onChange, links, onOpenLink }: Props)
return () => view.destroy();
}, []);
+ const scrollToPosRef = useRef(scrollToPos);
+ useEffect(() => {
+ scrollToPosRef.current = scrollToPos;
+ }, [scrollToPos]);
+
useEffect(() => {
const view = viewRef.current;
if (view && value !== view.state.doc.toString()) {
view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: value } });
}
+ // NEW: handle scrollTo after content is set
+ if (view && scrollToPosRef.current) {
+ view.dispatch({
+ selection: { anchor: scrollToPosRef.current.from, head: scrollToPosRef.current.to },
+ scrollIntoView: true,
+ });
+ }
}, [value]);
return ;
diff --git a/packages/editor/src/extensions/wikilinks/__tests__/wikilinks.spec.ts b/packages/editor/src/extensions/wikilinks/__tests__/wikilinks.spec.ts
index fdb6f15..385842a 100644
--- a/packages/editor/src/extensions/wikilinks/__tests__/wikilinks.spec.ts
+++ b/packages/editor/src/extensions/wikilinks/__tests__/wikilinks.spec.ts
@@ -42,25 +42,36 @@ describe("wikilinks extension", () => {
view.destroy();
});
- it("opens a resolved link on click", () => {
+ it("opens a resolved link on click (no blockId)", () => {
const { view, onOpen } = makeView("[[Java]]", new Map([["Java", "Notes/Java.md"]]));
const path = handleWikilinkClick(view, insideLinkPos(view, "Java"), {
getIndex: () => new Map([["Java", "Notes/Java.md"]]),
onOpen,
});
expect(path).toBe("Notes/Java.md");
- expect(onOpen).toHaveBeenCalledWith("Notes/Java.md");
+ expect(onOpen).toHaveBeenCalledWith("Notes/Java.md", undefined);
view.destroy();
});
- it("opens an escape-hatch path on click", () => {
+ it("opens an escape-hatch path on click (no blockId)", () => {
const { view, onOpen } = makeView("[[Notes/Java.md]]", new Map());
const path = handleWikilinkClick(view, insideLinkPos(view, "Notes/Java.md"), {
getIndex: () => new Map(),
onOpen,
});
expect(path).toBe("Notes/Java.md");
- expect(onOpen).toHaveBeenCalledWith("Notes/Java.md");
+ expect(onOpen).toHaveBeenCalledWith("Notes/Java.md", undefined);
+ view.destroy();
+ });
+
+ it("opens a link with blockId on click", () => {
+ const { view, onOpen } = makeView("[[Java#^block123]]", new Map([["Java", "Notes/Java.md"]]));
+ const path = handleWikilinkClick(view, insideLinkPos(view, "Java#^block123"), {
+ getIndex: () => new Map([["Java", "Notes/Java.md"]]),
+ onOpen,
+ });
+ expect(path).toBe("Notes/Java.md");
+ expect(onOpen).toHaveBeenCalledWith("Notes/Java.md", "block123");
view.destroy();
});
diff --git a/packages/editor/src/extensions/wikilinks/wikilinks.ts b/packages/editor/src/extensions/wikilinks/wikilinks.ts
index eb6cf57..c7735f1 100644
--- a/packages/editor/src/extensions/wikilinks/wikilinks.ts
+++ b/packages/editor/src/extensions/wikilinks/wikilinks.ts
@@ -6,12 +6,12 @@ import {
type EditorView,
type ViewUpdate,
} from "@codemirror/view";
-import { resolveWikilink } from "../resolver/resolver.js";
+import { parseLinkTarget, resolveWikilink } from "../resolver/resolver.js";
import "./wikilinks.css";
export interface WikilinkOptions {
getIndex: () => ReadonlyMap;
- onOpen: (path: string) => void;
+ onOpen: (path: string, blockId?: string) => void;
}
const linkRe = /\[\[([^\[\]\n]+)\]\]/g;
@@ -62,8 +62,10 @@ export function handleWikilinkClick(
const from = line.from + match.index;
const to = from + match[0].length;
if (pos >= from && pos <= to) {
- const path = resolveWikilink(match[1]!, opts.getIndex());
- if (path !== null) opts.onOpen(path);
+ const raw = match[1]!;
+ const { note, blockId } = parseLinkTarget(raw);
+ const path = resolveWikilink(note, opts.getIndex());
+ if (path !== null) opts.onOpen(path, blockId ?? undefined);
return path;
}
}