minecodex 2.0.14 → 2.0.15

package/features/markdown-reading/src/adapters/codex/rich-text.mjs

@@ -176,7 +176,8 @@ export function installMarkdownRichText(view, api, native, codex) {
         button.dataset.mcxFootnoteRef = this.options.id;
         button.addEventListener('click', (event) => {
           event.preventDefault();
-          footnoteReturns.set(this.options.id, view.scrollDOM.scrollTop);
+          // 虚拟段落重新测量后像素高度会变化，使用原生文档锚点恢复阅读位置。
+          footnoteReturns.set(this.options.id, view.scrollSnapshot());
           jump(this.options.to);
         });
         sup.append(button);
@@ -201,8 +202,7 @@ export function installMarkdownRichText(view, api, native, codex) {
           const previous = footnoteReturns.get(this.options.id);
           if (previous === undefined) jump(this.options.to);
           else {
-            view.scrollDOM.scrollTop = previous;
-            view.requestMeasure();
+            view.dispatch({ effects: previous });
           }
         });
         element.append(back);
@@ -478,7 +478,14 @@ export function installMarkdownRichText(view, api, native, codex) {
         );
       }
     }
-    const { definitions: footnotes, references } = collectMarkdownFootnotes(text, protectedRanges);
+    const { definitions: footnotes, references, definitionRanges } = collectMarkdownFootnotes(text, protectedRanges);
+    // 同名定义沿用最后一条；早期定义不再被误作引用或普通正文。
+    for (const note of definitionRanges) {
+      if (footnotes.get(note.id).from === note.from) continue;
+      replace(note.from, note.to);
+      for (let i = doc.lineAt(note.from).number; i <= doc.lineAt(note.to).number; i++)
+        hiddenLines.add(doc.line(i).from);
+    }
     for (const reference of references)
       replace(
         reference.from,
@@ -505,7 +512,7 @@ export function installMarkdownRichText(view, api, native, codex) {
       const line = doc.line(i);
       if (
         protectedAt(line.from) ||
-        [...footnotes.values()].some((n) => line.from >= n.from && line.from <= n.to)
+        definitionRanges.some((n) => line.from >= n.from && line.from <= n.to)
       )
         continue;
       for (const m of line.text.matchAll(/(?<![\\$])\$(?![\s$])([^$\n]+?)(?<![\s\\])\$(?!\$)/g)) {

package/features/markdown-reading/src/adapters/codex/table-actions.mjs

@@ -1,6 +1,17 @@
 import { loadNativeMarkdownRenderer } from './markdown-native.mjs';
 import { captureMarkdownProviders } from './providers.mjs';
 
+export function markdownExportAlias(source, name) {
+  const start = source.lastIndexOf('export{');
+  if (start < 0) return undefined;
+  const entries = source.slice(start + 7).split('}')[0].split(',');
+  for (const entry of entries) {
+    const [local, alias = local] = entry.trim().split(/\s+as\s+/);
+    if (local === name) return alias;
+  }
+  return undefined;
+}
+
 // 从 Chat Markdown 的公开组件发现悬浮操作栏和控件，不绑定构建 hash。
 export async function loadNativeMarkdownTableActions(native) {
   const url = [...document.querySelectorAll('link[rel="modulepreload"],script[src]')]
@@ -21,7 +32,7 @@ export async function loadNativeMarkdownTableActions(native) {
   const exported = source.slice(source.lastIndexOf('export{'));
   const module = await import(url);
   const publicBinding = (name) => {
-    const alias = exported.match(new RegExp(`\\b${name} as ([\\w$]+)`))?.[1];
+    const alias = markdownExportAlias(exported, name);
     if (!alias || !module[alias]) throw new Error('native-table-actions-export-unavailable');
     return module[alias];
   };
@@ -56,7 +67,7 @@ export async function loadNativeMarkdownTableActions(native) {
   );
   if (wrapAt < 0 || !wrapPair) throw new Error('native-code-wrap-icons-unavailable');
   const sharedExports = sharedSource.slice(sharedSource.lastIndexOf('export{'));
-  const sharedBinding = (name) => shared[sharedExports.match(new RegExp(`\\b${name} as ([\\w$]+)`))?.[1]];
+  const sharedBinding = (name) => shared[markdownExportAlias(sharedExports, name)];
   const assignment = sharedSource.indexOf(`${wrapPair[1]}=`);
   const initialize = sharedSource
     .slice(sharedSource.lastIndexOf('function ', assignment))

package/features/markdown-reading/src/domain/footnotes.mjs

@@ -8,6 +8,7 @@ export function collectMarkdownFootnotes(text, excludedRanges) {
   });
   const excluded = (position) => excludedRanges.some(([from, to]) => position >= from && position < to);
   const definitions = new Map();
+  const definitionRanges = [];
   for (let index = 0; index < lines.length; index++) {
     const line = lines[index];
     const match = line.text.match(/^ {0,3}\[\^([^\]]+)\]:\s*(.*)$/);
@@ -25,6 +26,7 @@ export function collectMarkdownFootnotes(text, excludedRanges) {
       refs: [],
       number: 0,
     });
+    definitionRanges.push({ id: match[1], from: line.from, to: lines[end].to });
     index = end;
   }
   const notes = [...definitions.values()];
@@ -37,7 +39,7 @@ export function collectMarkdownFootnotes(text, excludedRanges) {
       escaped ||
       !note ||
       excluded(match.index) ||
-      notes.some((note) => match.index >= note.from && match.index < note.to)
+      definitionRanges.some((note) => match.index >= note.from && match.index < note.to)
     )
       continue;
     if (!note.number) note.number = ++number;
@@ -52,5 +54,5 @@ export function collectMarkdownFootnotes(text, excludedRanges) {
   }
   // 没有引用的定义仍保留，沿用正文末尾的连续编号。
   for (const note of notes) if (!note.number) note.number = ++number;
-  return { definitions, references };
+  return { definitions, references, definitionRanges };
 }

package/features/markdown-reading/src/injection-source.mjs

@@ -7,6 +7,7 @@ import {
 } from './adapters/codex/reading-runtime.mjs';
 import { loadNativeMarkdownRichText, installMarkdownRichText } from './adapters/codex/rich-text.mjs';
 import {
+  markdownExportAlias,
   loadNativeMarkdownTableActions,
   installMarkdownTableActions,
 } from './adapters/codex/table-actions.mjs';
@@ -32,6 +33,7 @@ export async function createPageScriptSource() {
     loadNativeMarkdownToc,
     installMarkdownToc,
     loadNativeMarkdownRenderer,
+    markdownExportAlias,
     loadNativeMarkdownTableActions,
     installMarkdownTableActions,
     loadNativeMarkdownRichText,

package/features/markdown-reading/src/reading.css

@@ -313,18 +313,18 @@
   padding-inline-start: calc(var(--mcx-list-indent) + var(--mcx-list-marker-width));
 }
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-alert-title {font-weight:var(--font-weight-semibold,600); color:var(--color-text-primary);}
-.cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich-code {margin-block:16px; max-width:100%;}
+.cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich-code {padding-block:16px; max-width:100%;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-code-block {position:relative; min-width:0;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-code-block [data-block-actions] {top:4px; right:4px; transform:none; transition:opacity 120ms linear;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-code-block:focus-within [data-block-actions],
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-code-block:hover [data-block-actions] {opacity:1; pointer-events:auto;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-code-scroll {max-width:100%; scrollbar-width:thin;}
-.cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich-html-block {margin-block:1em;}
+.cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich-html-block {padding-block:1em;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich mark {background:color-mix(in srgb, var(--color-content-yellow) 25%, transparent); color:inherit; border-radius:2px; padding-inline:2px;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich kbd {font-family:var(--font-mono,monospace); font-size:.9em; background:var(--color-token-bg-secondary); border:1px solid var(--color-border); border-radius:4px; padding:1px 4px;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich a,
 .cm-editor[data-minecodex-markdown-reading] :is(.mcx-reading-rich-footnote-ref,.mcx-reading-footnote-body) button {color:var(--color-text-accent, var(--color-token-text-link-foreground)); cursor:var(--cursor-interaction,pointer);}
-.cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich-footnote-ref button {font:inherit; padding:0 2px; background:transparent; border:0;}
+.cm-editor[data-minecodex-markdown-reading] .mcx-reading-rich-footnote-ref button {font:inherit; line-height:1; padding:0 2px; background:transparent; border:0;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-footnote-body {font-size:.9em; color:var(--color-text-secondary);}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-footnote-body button {margin-inline-start:8px; background:transparent; border:0;}
 .cm-editor[data-minecodex-markdown-reading] .mcx-reading-definition-term {font-weight:var(--font-weight-semibold,600);}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecodex",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "Lightweight, local-first plugins for the Codex desktop app.",
   "license": "MIT",
   "type": "module",