Merge pull request #431 from Harbour-Enterprises/artem-HAR-9246

HAR-9246 - handle import issues

Author: harbournick

packages/super-editor/src/core/helpers/createDocument.js

@@ -5,11 +5,19 @@
  * @param editor Editor
  * @returns Document.
  */
-export function createDocument(converter, schema, editor) {
+
+export function createDocument(converter, schema, editor, { check = false } = {}) {
   const documentData = converter.getSchema(editor);
 
   if (documentData) {
-    return schema.nodeFromJSON(documentData);
+    const documentNode = schema.nodeFromJSON(documentData);
+
+    // for testing
+    if (check) {
+      documentNode.check();
+    }
+    
+    return documentNode;
   }
 
   return schema.topNodeType.createAndFill();

packages/super-editor/src/core/super-converter/SuperConverter.js

@@ -53,7 +53,7 @@ class SuperConverter {
     { name: 'w:spacing', type: 'lineHeight', mark: 'textStyle', property: 'lineHeight' },
     { name: 'link', type: 'link', mark: 'link', property: 'href' },
     { name: 'w:highlight', type: 'highlight', mark: 'highlight', property: 'color' },
-    { name: 'w:shd', type: 'highlight', mark: 'highlight', property: 'color'}
+    // { name: 'w:shd', type: 'highlight', mark: 'highlight', property: 'color'}
   ];
 
   static propertyTypes = Object.freeze({

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

@@ -35,6 +35,10 @@ export const handleAnnotationNode = (params) => {
     fieldColor,
     multipleImage: isMultipleImage === 'true',
   };
+
+  if (!attrs.fieldId || !attrs.displayLabel) {
+    return { nodes: [], consumed: 0 };
+  }
 
   let result = {
     type: 'text',

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

@@ -110,7 +110,7 @@ function handleListNodes(
     // Spacers in the XML and need to be appended to the last item.
     if (item.elements && !hasTextNode(item.elements)) {
       const n = handleStandardNode({ ...params, nodes: [item] }).nodes[0];
-      parsedListItems[parsedListItems.length - 1]?.content.push(n);
+      if (n) parsedListItems[parsedListItems.length - 1]?.content.push(n); 
       item.seen = true;
       continue;
     }

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

@@ -13,6 +13,10 @@ export const handleStandardNode = (params) => {
   const node = nodes[0];
   const { name } = node;
   const { attributes, elements, marks = [] } = parseProperties(node, docx);
+
+  if (name === 'w:sdt') {
+    return { nodes: [], consumed: 0 };
+  }
 
   // Formatting only nodes
   if (isPropertiesElement(node)) {