fix: preserve explicit numbering

Author: VladaHarbour

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

@@ -139,7 +139,7 @@ describe('syncListMarkerFontFromParagraphRuns', () => {
     expect(block.attrs.wordLayout?.marker?.run?.fontSize).toBe(40);
   });
 
-  it('preserves numbering-defined marker font family but still syncs font size', () => {
+  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 }],
       markerFamily: 'Symbol',
@@ -152,6 +152,75 @@ describe('syncListMarkerFontFromParagraphRuns', () => {
     expect(block.attrs.wordLayout?.marker?.run?.fontSize).toBe(30);
   });
 
+  it('preserves numbering-defined marker font size from w:sz', () => {
+    const sizedSymbolContext = {
+      ...symbolContext,
+      translatedNumbering: {
+        definitions: { '1': { numId: 1, abstractNumId: 1 } },
+        abstracts: {
+          '1': {
+            abstractNumId: 1,
+            levels: {
+              '0': {
+                ilvl: 0,
+                runProperties: {
+                  fontFamily: { ascii: 'Symbol' },
+                  fontSize: 20,
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const block = listBlock({
+      runs: [{ text: 'item', fontFamily: 'Georgia, serif', fontSize: 30 }],
+      markerFamily: 'Symbol',
+      markerSize: 10,
+      markerText: '•',
+    });
+
+    syncListMarkerFontFromParagraphRuns({ block, converterContext: sizedSymbolContext as never });
+
+    expect(block.attrs.wordLayout?.marker?.run?.fontFamily).toContain('Symbol');
+    expect(block.attrs.wordLayout?.marker?.run?.fontSize).toBe(10);
+  });
+
+  it('preserves numbering-defined marker font size from w:szCs', () => {
+    const sizedSymbolContext = {
+      ...symbolContext,
+      translatedNumbering: {
+        definitions: { '1': { numId: 1, abstractNumId: 1 } },
+        abstracts: {
+          '1': {
+            abstractNumId: 1,
+            levels: {
+              '0': {
+                ilvl: 0,
+                runProperties: {
+                  fontFamily: { ascii: 'Symbol' },
+                  fontSizeCs: 20,
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const block = listBlock({
+      runs: [{ text: 'item', fontFamily: 'Georgia, serif', fontSize: 30 }],
+      markerFamily: 'Symbol',
+      markerSize: 10,
+      markerText: '•',
+    });
+
+    syncListMarkerFontFromParagraphRuns({ block, converterContext: sizedSymbolContext as never });
+
+    expect(block.attrs.wordLayout?.marker?.run?.fontSize).toBe(10);
+  });
+
   it('reads numbering from block attrs on cache hits so Symbol font is preserved', () => {
     const block = listBlock({
       runs: [{ text: 'item', fontFamily: 'Georgia, serif', fontSize: 40 }],

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

@@ -94,17 +94,20 @@ const resolveContentFont = (
   return source === 'paragraph' ? mergeContentFont(fromPara, fromRuns) : (fromRuns ?? fromPara);
 };
 
-const numberingDefinesMarkerFontFamily = (
+const getNumberingMarkerFontOverrides = (
   numberingProperties: { numId?: number; ilvl?: number } | null | undefined,
   converterContext?: ConverterContext,
-): boolean => {
+): { fontFamily: boolean; fontSize: boolean } => {
   const numId = numberingProperties?.numId;
   if (numId == null || numId === 0 || !converterContext) {
-    return false;
+    return { fontFamily: false, fontSize: false };
   }
   const ilvl = numberingProperties?.ilvl ?? 0;
   const numberingRunProps = getNumberingProperties<RunProperties>('runProperties', converterContext, ilvl, numId);
-  return numberingRunProps.fontFamily != null;
+  return {
+    fontFamily: numberingRunProps.fontFamily != null,
+    fontSize: numberingRunProps.fontSize != null || numberingRunProps.fontSizeCs != null,
+  };
 };
 
 /**
@@ -122,12 +125,12 @@ export const syncListMarkerFontFromParagraphRuns = ({
   const contentFont = resolveContentFont(block, para, contentFontSource);
   if (!contentFont) return;
 
-  const preserveMarkerFontFamily = numberingDefinesMarkerFontFamily(block.attrs?.numberingProperties, converterContext);
+  const numberingOverrides = getNumberingMarkerFontOverrides(block.attrs?.numberingProperties, converterContext);
 
-  if (!preserveMarkerFontFamily && contentFont.fontFamily) {
+  if (!numberingOverrides.fontFamily && contentFont.fontFamily) {
     markerRun.fontFamily = contentFont.fontFamily;
   }
-  if (contentFont.fontSize) {
+  if (!numberingOverrides.fontSize && contentFont.fontSize) {
     markerRun.fontSize = contentFont.fontSize;
   }
 };