fix: ooxml issues

Author: harbournick

packages/super-editor/src/core/super-converter/v3/handlers/wp/helpers/chart-helpers.js

@@ -158,7 +158,7 @@ export function parseChartXml(chartXml) {
 
   const { element: chartTypeEl, chartType } = chartTypeEntry;
 
-  const subType = getAttr(chartTypeEl, 'val') || extractGrouping(chartTypeEl);
+  const subType = extractGrouping(chartTypeEl);
   const barDirection = extractBarDirection(chartTypeEl);
   const series = parseSeries(chartTypeEl, chartType);
   const categoryAxis = parseAxis(plotArea, 'c:catAx');
@@ -398,7 +398,7 @@ function parseLegendPosition(chart) {
 
 /**
  * Parse chart style ID from chartSpace.
- * Checks mc:AlternateContent for c14:style, then falls back to c:style.
+ * Checks mc:AlternateContent for c14:style, then mc:Fallback c:style, then direct c:style.
  * @param {Object} chartSpace - c:chartSpace element
  * @returns {number|undefined}
  */
@@ -410,6 +410,12 @@ function parseStyleId(chartSpace) {
     const c14Style = findChild(choice, 'c14:style');
     const val = getAttr(c14Style, 'val');
     if (val != null) return Number(val);
+
+    // Fallback branch for consumers that do not support c14
+    const fallback = findChild(altContent, 'mc:Fallback');
+    const fallbackStyle = findChild(fallback, 'c:style');
+    const fallbackVal = getAttr(fallbackStyle, 'val');
+    if (fallbackVal != null) return Number(fallbackVal);
   }
 
   // Fallback to c:style

packages/super-editor/src/core/super-converter/v3/handlers/wp/helpers/chart-helpers.test.js

@@ -230,11 +230,38 @@ describe('chart-helpers', () => {
         },
         {
           name: 'c:style',
-          attributes: { val: '102' },
+          attributes: { val: '2' },
         },
       ],
     });
 
+    const makeBarChartXmlWithAlternateContentStyle = ({ choiceStyle, fallbackStyle }) => {
+      const xml = makeBarChartXml();
+      xml.elements = xml.elements.filter((el) => el.name !== 'c:style');
+
+      const altContent = {
+        name: 'mc:AlternateContent',
+        elements: [
+          {
+            name: 'mc:Choice',
+            attributes: { Requires: 'c14' },
+            elements: choiceStyle != null ? [{ name: 'c14:style', attributes: { val: String(choiceStyle) } }] : [],
+          },
+          ...(fallbackStyle != null
+            ? [
+                {
+                  name: 'mc:Fallback',
+                  elements: [{ name: 'c:style', attributes: { val: String(fallbackStyle) } }],
+                },
+              ]
+            : []),
+        ],
+      };
+
+      xml.elements.unshift(altContent);
+      return xml;
+    };
+
     it('parses a bar chart with series, categories, and values', () => {
       const result = parseChartXml(makeBarChartXml());
 
@@ -257,9 +284,19 @@ describe('chart-helpers', () => {
 
     it('parses style ID', () => {
       const result = parseChartXml(makeBarChartXml());
+      expect(result.styleId).toBe(2);
+    });
+
+    it('prefers c14 style in mc:AlternateContent when present', () => {
+      const result = parseChartXml(makeBarChartXmlWithAlternateContentStyle({ choiceStyle: 102, fallbackStyle: 2 }));
       expect(result.styleId).toBe(102);
     });
 
+    it('falls back to mc:Fallback c:style when c14 style is missing', () => {
+      const result = parseChartXml(makeBarChartXmlWithAlternateContentStyle({ choiceStyle: null, fallbackStyle: 3 }));
+      expect(result.styleId).toBe(3);
+    });
+
     it('parses category axis orientation', () => {
       const result = parseChartXml(makeBarChartXml());
       expect(result.categoryAxis).toEqual({ orientation: 'minMax' });