Merge pull request #403 from Harbour-Enterprises/HAR-8992_sample-doc-formatting

HAR-8992 Get run properties from styles.xml by the styleID

Author: harbournick

package-lock.json

@@ -17,7 +17,7 @@ export const handleAnnotationNode = (params) => {
 
   const docPartObj = sdtPr?.elements.find((el) => el.name === 'w:docPartObj');
   if (docPartObj) {
-    return handleDocPartObj(nodes, docx, nodeListHandler, insideTrackChange);
+    return handleDocPartObj({ nodes, docx, nodeListHandler, insideTrackChange });
   }
 
   const alias = sdtPr?.elements.find((el) => el.name === 'w:alias');

packages/super-editor/src/core/super-converter/v2/importer/annotationImporter.js

@@ -169,7 +169,7 @@ const createNodeListHandler = (nodeHandlers) => {
     };
   };
 
-  const nodeListHandlerFn = ({ nodes: elements, docx, insideTrackChange, converter, editor, filename }) => {
+  const nodeListHandlerFn = ({ nodes: elements, docx, insideTrackChange, converter, editor, filename, parentStyleId }) => {
     if (!elements || !elements.length) return [];
 
     const processedElements = [];
@@ -193,7 +193,8 @@ const createNodeListHandler = (nodeHandlers) => {
                 insideTrackChange,
                 converter,
                 editor,
-                filename
+                filename,
+                parentStyleId
               });
             },
             { nodes: [], consumed: 0 }

packages/super-editor/src/core/super-converter/v2/importer/docxImporter.js

@@ -187,8 +187,7 @@ function handleListNodes(
       nodeAttributes['numId'] = numId;
 
       if (docx) {
-        const defaultStyleId = attributes['w:rsidRDefault'];
-        nodeAttributes['spacing'] = getParagraphSpacing(defaultStyleId, item, docx);
+        nodeAttributes['spacing'] = getParagraphSpacing(item, docx);
       }
 
       const newListItem = createListItem(schemaElements, nodeAttributes, []);

packages/super-editor/src/core/super-converter/v2/importer/listImporter.js

@@ -50,6 +50,10 @@ export function parseMarks(property, unknownMarks = [], docx = null) {
       // Marks with attrs: we need to get their values
       if (Object.keys(attributes).length) {
         const value = getMarkValue(m.type, attributes, docx);
+        
+        // If there is no value for mark it can't be applied
+        if (value === null || value === undefined) return;
+        
         newMark.attrs = {};
         newMark.attrs[m.property] = value;
       }
@@ -159,7 +163,7 @@ function getFontFamilyValue(attributes, docx) {
   const typeface = latin.attributes['typeface'];
   return typeface;
 
-};
+}
 
 function getIndentValue(attributes) {
   let value = attributes['w:left'];

packages/super-editor/src/core/super-converter/v2/importer/markImporter.js

@@ -51,7 +51,7 @@ export const handleParagraphNode = (params) => {
   const styleTag = pPr?.elements?.find((el) => el.name === 'w:pStyle');
   if (styleTag) {
     schemaNode.attrs['styleId'] = styleTag.attributes['w:val'];
-  };
+  }
 
   const indent = pPr?.elements?.find((el) => el.name === 'w:ind');
   if (indent && indent.attributes) {
@@ -62,7 +62,7 @@ export const handleParagraphNode = (params) => {
       if (left) schemaNode.attrs['indent'].left = twipsToPixels(left);
       if (right) schemaNode.attrs['indent'].right = twipsToPixels(right);
       if (firstLine) schemaNode.attrs['indent'].firstLine = twipsToPixels(firstLine);
-    };
+    }
 
     const textIndentVal = left || firstLine || 0;
     schemaNode.attrs['textIndent'] = `${twipsToInches(textIndentVal)}in`;
@@ -75,7 +75,7 @@ export const handleParagraphNode = (params) => {
 
   if (docx) {
     const defaultStyleId = node.attributes?.['w:rsidRDefault'];
-    schemaNode.attrs['spacing'] = getParagraphSpacing(defaultStyleId, node, docx);
+    schemaNode.attrs['spacing'] = getParagraphSpacing(node, docx);
     schemaNode.attrs['rsidRDefault'] = defaultStyleId;
   }
 
@@ -92,7 +92,7 @@ export const handleParagraphNode = (params) => {
   return { nodes: schemaNode ? [schemaNode] : [], consumed: 1 };
 };
 
-export const getParagraphSpacing = (defaultStyleId, node, docx) => {
+export const getParagraphSpacing = (node, docx) => {
   // Check if we have default paragraph styles to override
   const spacing = {
     lineSpaceAfter: 0,

packages/super-editor/src/core/super-converter/v2/importer/paragraphNodeImporter.js

@@ -5,23 +5,48 @@ import { createImportMarks } from './markImporter.js';
  * @type {import("docxImporter").NodeHandler}
  */
 const handleRunNode = (params) => {
-  const { nodes, nodeListHandler } = params;
+  const { nodes, nodeListHandler, parentStyleId, docx } = params;
   if (nodes.length === 0 || nodes[0].name !== 'w:r') {
     return { nodes: [], consumed: 0 };
   }
-  
   const node = nodes[0];
+
   const childParams = { ...params, nodes: node.elements };
   let processedRun = nodeListHandler.handler(childParams)?.filter((n) => n) || [];
   const hasRunProperties = node.elements?.some((el) => el.name === 'w:rPr');
+  const defaultNodeStyles = getMarksFromStyles(docx, parentStyleId);
   if (hasRunProperties) {
     const { marks = [], attributes = {} } = parseProperties(node);
+    
+    // Apply fonts from related style definition if there is no marks
+    const textStyleMark = marks.find(m => m.type === 'textStyle');
+    const hasFontStyle = textStyleMark && Object.keys(textStyleMark.attrs).length > 0;
+    if (defaultNodeStyles.marks && !hasFontStyle) {
+      marks.push(...defaultNodeStyles.marks);
+    }
+    
     if (node.marks) marks.push(...node.marks);
     processedRun = processedRun.map((n) => ({ ...n, marks: createImportMarks(marks), attributes }));
+  } else if (defaultNodeStyles.marks) {
+    processedRun = processedRun.map((n) => ({ ...n, marks: createImportMarks(defaultNodeStyles.marks) }));
   }
   return { nodes: processedRun, consumed: 1 };
 };
 
+const getMarksFromStyles = (docx, styleId) => {
+  const styles = docx?.['word/styles.xml'];
+  if (!styles) {
+    return {};
+  }
+
+  const styleTags = styles.elements[0].elements.filter((style) => style.name === 'w:style');
+  const style = styleTags.find((tag) => tag.attributes['w:styleId'] === styleId) || {};
+
+  if (!style) return {};
+
+  return parseProperties(style, docx);
+}
+
 /**
  * @type {import("docxImporter").NodeHandlerEntry}
  */

packages/super-editor/src/core/super-converter/v2/importer/runNodeImporter.js

@@ -43,14 +43,15 @@ export const handleStandardNode = (params) => {
   // Iterate through the children and build the schemaNode content
   // Skip run properties since they are formatting only elements
   const content = [];
+  const parentStyleId = getParentStyleId(node);
   if (elements && elements.length) {
     const updatedElements = elements.map((el) => {
       if (!el.marks) el.marks = [];
       el.marks.push(...marks);
       return el;
     });
-
-    const childParams = { ...params, nodes: updatedElements };
+    
+    const childParams = { ...params, nodes: updatedElements, parentStyleId };
     const childContent = nodeListHandler.handler(childParams);
     content.push(...childContent);
   }
@@ -65,6 +66,12 @@ export const handleStandardNode = (params) => {
   return { nodes: [resultNode], consumed: 1 };
 };
 
+const getParentStyleId = node => {
+  const pPr = node.elements?.find((el) => el.name === 'w:pPr');
+  const styleTag = pPr?.elements?.find((el) => el.name === 'w:pStyle');
+  return styleTag ? styleTag.attributes['w:val'] : null;
+}
+
 /**
  * @type {import("docxImporter").NodeHandlerEntry}
  */

packages/super-editor/src/core/super-converter/v2/importer/standardNodeImporter.js

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import { readFile } from 'fs/promises';
-import { Editor, getRichTextExtensions } from '@core/Editor.js';
+import { Editor } from '@core/Editor.js';
 import { getRichTextExtensions } from '@harbour-enterprises/super-editor';
 import { getStarterExtensions } from '@extensions/index.js';
 import { exportSchemaToJson } from '@converter/exporter';