fix: cache fix for empty runs

Author: VladaHarbour

packages/super-editor/src/editors/v1/core/layout-adapter/converters/paragraph.ts

@@ -1147,22 +1147,23 @@ export function handleParagraphNode(node: PMNode, context: NodeHandlerContext):
     // get() returns both the entry (if hit) and pre-computed nodeJson to avoid double serialization
     const { entry: cached, nodeJson, nodeRev } = flowBlockCache.get(prefixedStableId, node);
     if (cached) {
-      // Cache hit: reuse blocks with position adjustment
-      // Cache hit reuses previously-converted blocks as-is. That means we don't
-      // recompute previousParagraphFont (used for empty list items without
-      // explicit run properties). If the user changes the font on the prior
-      // paragraph (e.g. paragraph A), an empty list item (paragraph B) can keep
-      // the old font until the cache entry is invalidated. Narrow case, but
-      // avoids confusing incremental-edit behavior.
+      // Cache hit: reuse blocks with position adjustment, then re-sync marker font
+      // from live PM state. Empty list items have no textStyle marks, so pass
+      // previousParagraphFont instead of falling back to stale cached runs.
       const delta = pmStart - cached.pmStart;
       const reusedBlocks = shiftCachedBlocks(cached.blocks, delta);
+      const paragraphProps = node.attrs?.paragraphProperties as ParagraphProperties | undefined;
+      const previousParagraphFont = !hasExplicitParagraphRunProperties(paragraphProps)
+        ? getLastParagraphFont(blocks)
+        : undefined;
       reusedBlocks.forEach((block) => {
         if (block.kind === 'paragraph') {
           syncListMarkerFontFromParagraphRuns({
             block,
             converterContext,
             para: node,
             contentFontSource: 'paragraph',
+            previousParagraphFont,
           });
         }
       });

packages/super-editor/src/editors/v1/core/layout-adapter/list-marker-font.test.ts

@@ -123,7 +123,7 @@ describe('syncListMarkerFontFromParagraphRuns', () => {
     expect(block.attrs.wordLayout?.marker?.run?.fontSize).toBe(40);
   });
 
-  it('merges partial PM textStyle with cached runs on cache hits', () => {
+  it('syncs only live PM textStyle properties on cache hits without using cached runs', () => {
     const block = listBlock({
       runs: [{ text: 'item', fontFamily: 'Georgia, serif', fontSize: 12 }],
     });
@@ -135,10 +135,46 @@ describe('syncListMarkerFontFromParagraphRuns', () => {
       contentFontSource: 'paragraph',
     });
 
-    expect(block.attrs.wordLayout?.marker?.run?.fontFamily).toContain('Georgia');
+    expect(block.attrs.wordLayout?.marker?.run?.fontFamily).toContain('Times New Roman');
     expect(block.attrs.wordLayout?.marker?.run?.fontSize).toBe(40);
   });
 
+  it('uses previousParagraphFont on cache hits when empty list items have no textStyle marks', () => {
+    const block = listBlock({
+      runs: [{ text: '', fontFamily: 'Times New Roman, serif', fontSize: 12 }],
+      markerSize: 12,
+    });
+
+    syncListMarkerFontFromParagraphRuns({
+      block,
+      converterContext: minimalContext as never,
+      para: { content: { forEach: () => {} } } as never,
+      contentFontSource: 'paragraph',
+      previousParagraphFont: { fontFamily: 'Georgia, serif', fontSize: 30 },
+    });
+
+    expect(block.attrs.wordLayout?.marker?.run?.fontFamily).toContain('Georgia');
+    expect(block.attrs.wordLayout?.marker?.run?.fontSize).toBe(30);
+  });
+
+  it('does not fall back to stale cached runs on cache hits without textStyle or previousParagraphFont', () => {
+    const block = listBlock({
+      runs: [{ text: '', fontFamily: 'Times New Roman, serif', fontSize: 12 }],
+      markerFamily: 'Times New Roman, serif',
+      markerSize: 12,
+    });
+
+    syncListMarkerFontFromParagraphRuns({
+      block,
+      converterContext: minimalContext as never,
+      para: { content: { forEach: () => {} } } as never,
+      contentFontSource: 'paragraph',
+    });
+
+    expect(block.attrs.wordLayout?.marker?.run?.fontFamily).toContain('Times New Roman');
+    expect(block.attrs.wordLayout?.marker?.run?.fontSize).toBe(12);
+  });
+
   it('preserves numbering-defined marker font family but still syncs font size when size is unset', () => {
     const block = listBlock({
       runs: [{ text: 'item', fontFamily: 'Georgia, serif', fontSize: 30 }],

packages/super-editor/src/editors/v1/core/layout-adapter/list-marker-font.ts

@@ -15,6 +15,8 @@ export type SyncListMarkerFontParams = {
   converterContext?: ConverterContext;
   para?: PMNode;
   contentFontSource?: ListMarkerContentFontSource;
+  /** Used on cache hits for empty list items with no live textStyle marks. */
+  previousParagraphFont?: ParagraphFont;
 };
 
 const isTextRun = (run: Run): run is TextRun => 'text' in run;
@@ -88,10 +90,16 @@ const resolveContentFont = (
   block: { runs: ReadonlyArray<Run> },
   para: PMNode | undefined,
   source: ListMarkerContentFontSource,
+  previousParagraphFont?: ParagraphFont,
 ): Partial<ParagraphFont> | undefined => {
   const fromRuns = getFontFromRuns(block.runs);
   const fromPara = para ? getFontFromParagraphContent(para) : undefined;
-  return source === 'paragraph' ? mergeContentFont(fromPara, fromRuns) : (fromRuns ?? fromPara);
+  if (source === 'paragraph') {
+    // Cache hits must not fall back to stale cached runs. Empty list items have no
+    // textStyle marks, so inherit from the preceding paragraph when available.
+    return mergeContentFont(fromPara, previousParagraphFont);
+  }
+  return fromRuns ?? fromPara;
 };
 
 const getNumberingMarkerFontOverrides = (
@@ -118,11 +126,12 @@ export const syncListMarkerFontFromParagraphRuns = ({
   converterContext,
   para,
   contentFontSource = 'runs',
+  previousParagraphFont,
 }: SyncListMarkerFontParams): void => {
   const markerRun = block.attrs?.wordLayout?.marker?.run;
   if (!markerRun) return;
 
-  const contentFont = resolveContentFont(block, para, contentFontSource);
+  const contentFont = resolveContentFont(block, para, contentFontSource, previousParagraphFont);
   if (!contentFont) return;
 
   const numberingOverrides = getNumberingMarkerFontOverrides(block.attrs?.numberingProperties, converterContext);