@atlaskit/editor-jira-transformer 8.2.3 → 8.2.5

package/dist/es2019/utils.js

@@ -2,27 +2,27 @@ import { normalizeHexColor } from '@atlaskit/adf-schema';
 import { isSchemaWithLists, isSchemaWithMentions, isSchemaWithLinks, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithCodeBlock, isSchemaWithBlockQuotes, isSchemaWithMedia, isSchemaWithSubSupMark, isSchemaWithTextColor, isSchemaWithTables } from '@atlaskit/adf-schema/schema-jira';
 import { Fragment } from 'prosemirror-model';
 import { mapImageToEmoji } from './emojiHelper';
+
 /**
  * Ensure that each node in the fragment is a block, wrapping
  * in a block node if necessary.
  */
-
 export function ensureBlocks(fragment, schema, nodeType) {
   // If all the nodes are inline, we want to wrap in a single paragraph.
   if (schema.nodes.paragraph.validContent(fragment)) {
     return Fragment.fromArray([schema.nodes.paragraph.createChecked({}, fragment)]);
-  } // Either all the nodes are blocks, or a mix of inline and blocks.
-  // We convert each (if any) inline nodes to blocks.
+  }
 
+  // Either all the nodes are blocks, or a mix of inline and blocks.
+  // We convert each (if any) inline nodes to blocks.
+  const blockNodes = [];
 
-  const blockNodes = []; // Following if condition has been added as fix for #ED-3431.
+  // Following if condition has been added as fix for #ED-3431.
   // First child of list-item should be paragraph,
   // if that is not the case paragraph requires to be added.
-
   if (nodeType && nodeType === schema.nodes.listItem && fragment.firstChild && (fragment.firstChild.type === schema.nodes.bulletList || fragment.firstChild.type === schema.nodes.orderedList)) {
     blockNodes.push(schema.nodes.paragraph.createAndFill());
   }
-
   fragment.forEach(child => {
     if (child.isBlock) {
       blockNodes.push(child);
@@ -32,10 +32,10 @@ export function ensureBlocks(fragment, schema, nodeType) {
   });
   return Fragment.fromArray(blockNodes);
 }
+
 /**
  * This function will convert all content to inline nodes
  */
-
 export const ensureInline = (schema, content, supportedMarks) => {
   const result = [];
   content.forEach(node => {
@@ -43,9 +43,8 @@ export const ensureInline = (schema, content, supportedMarks) => {
       const filteredMarks = node.marks.filter(mark => mark.isInSet(supportedMarks));
       result.push(node.mark(filteredMarks));
       return;
-    } // We replace an non-inline node with UnsupportedInline node
-
-
+    }
+    // We replace an non-inline node with UnsupportedInline node
     result.push(schema.text(node.textContent));
   });
   return Fragment.fromArray(result);
@@ -55,59 +54,47 @@ export function convert(content, node, schema) {
   if (node.nodeType === Node.TEXT_NODE) {
     const text = node.textContent;
     return text ? schema.text(text) : null;
-  } // marks and nodes
-
+  }
 
+  // marks and nodes
   if (node instanceof HTMLElement) {
     const tag = node.tagName.toUpperCase();
-
     switch (tag) {
       // Marks
       case 'DEL':
         if (!isSchemaWithAdvancedTextFormattingMarks(schema)) {
           return null;
         }
-
         return addMarks(content, [schema.marks.strike.create()]);
-
       case 'B':
         return addMarks(content, [schema.marks.strong.create()]);
-
       case 'EM':
         return addMarks(content, [schema.marks.em.create()]);
-
       case 'TT':
         if (!isSchemaWithAdvancedTextFormattingMarks(schema)) {
           return null;
         }
-
         return addMarks(content, [schema.marks.code.create()]);
-
       case 'SUB':
       case 'SUP':
         if (!isSchemaWithSubSupMark(schema)) {
           return null;
         }
-
         const type = tag === 'SUB' ? 'sub' : 'sup';
         return addMarks(content, [schema.marks.subsup.create({
           type
         })]);
-
       case 'INS':
         return addMarks(content, [schema.marks.underline.create()]);
-
       case 'FONT':
         if (!isSchemaWithTextColor(schema)) {
           return null;
         }
-
         const color = normalizeHexColor(node.getAttribute('color'), '#333333');
         return color ? addMarks(content, [schema.marks.textColor.create({
           color
         })]) : content;
       // Nodes
-
       case 'A':
         if (node.className === 'user-hover' && isSchemaWithMentions(schema)) {
           return schema.nodes.mention.createChecked({
@@ -115,18 +102,15 @@ export function convert(content, node, schema) {
             text: node.textContent
           });
         }
-
         if (node.className.match('jira-issue-macro-key') || !content || !isSchemaWithLinks(schema)) {
           return null;
         }
-
         const href = node.getAttribute('href');
         const title = node.getAttribute('title');
         return href ? addMarks(content, [schema.marks.link.create({
           href,
           title
         })]) : content;
-
       case 'SPAN':
         /**
          * JIRA ISSUE MACROS
@@ -144,14 +128,12 @@ export function convert(content, node, schema) {
         if (node.className.split(' ').indexOf('jira-issue-macro') > -1) {
           const jiraKey = node.getAttribute('data-jira-key');
           const link = node.getElementsByTagName('a')[0];
-
           if (jiraKey && link) {
             return addMarks(Fragment.from(schema.text(jiraKey)), [schema.marks.link.create({
               href: link.getAttribute('href'),
               title: link.getAttribute('title')
             })]);
           }
-
           return null;
         } else if (node.className.match('jira-macro-single-issue-export-pdf')) {
           return null;
@@ -160,7 +142,6 @@ export function convert(content, node, schema) {
           return null;
         } else if (isMedia(node) && isSchemaWithMedia(schema)) {
           const dataNode = node.querySelector('[data-media-services-id]');
-
           if (dataNode && dataNode instanceof HTMLElement) {
             const id = dataNode.getAttribute('data-media-services-id');
             const type = dataNode.getAttribute('data-media-services-type');
@@ -182,22 +163,17 @@ export function convert(content, node, schema) {
             });
           }
         }
-
         break;
-
       case 'IMG':
         if (node.parentElement && node.parentElement.className.match('jira-issue-macro-key')) {
           return null;
         } else if (node.className === 'emoticon') {
           let emojiResult = mapImageToEmoji(node);
-
           if (emojiResult) {
             return schema.text(emojiResult);
           }
         }
-
         break;
-
       case 'H1':
       case 'H2':
       case 'H3':
@@ -206,20 +182,19 @@ export function convert(content, node, schema) {
       case 'H6':
         const level = Number(tag.charAt(1));
         const supportedMarks = [schema.marks.link].filter(mark => !!mark);
-        return schema.nodes.heading.createChecked( // @see ED-4708
+        return schema.nodes.heading.createChecked(
+        // @see ED-4708
         {
           level: level === 6 ? 5 : level
         }, schema.nodes.heading.validContent(content) ? content : ensureInline(schema, content, supportedMarks));
-
       case 'BR':
         return schema.nodes.hardBreak.createChecked();
-
       case 'HR':
         return schema.nodes.rule.createChecked();
-
       case 'P':
         if (node.firstElementChild && isMedia(node.firstElementChild)) {
           // Filter out whitespace text nodes
+
           const {
             mediaSingle,
             mediaGroup,
@@ -236,45 +211,37 @@ export function convert(content, node, schema) {
             } else if (!(child.isText && /^\s*$/.test(child.text || ''))) {
               hasNonMediaChildren = true;
             }
-
             contentArray.push(child);
           });
-
           if (hasNonMediaChildren && contentArray.length) {
             fragmentArray.push(paragraph.createChecked({}, contentArray));
           }
-
           if (isSchemaWithMedia(schema) && mediaArray.length) {
             const mediaNodeType = isMediaSingle(node.firstElementChild) ? mediaSingle : mediaGroup;
             fragmentArray.push(mediaNodeType.createChecked({}, mediaArray));
           }
-
           if (fragmentArray.length) {
             return Fragment.fromArray(fragmentArray);
           }
-
           return null;
         }
-
         return schema.nodes.paragraph.createChecked({}, content);
-    } // lists
-
+    }
 
+    // lists
     if (isSchemaWithLists(schema)) {
       switch (tag) {
         case 'UL':
           return schema.nodes.bulletList.createChecked({}, content);
-
         case 'OL':
           return schema.nodes.orderedList.createChecked({}, content);
-
         case 'LI':
           const compatibleContent = schema.nodes.listItem.validContent(content) ? content : ensureBlocks(content, schema, schema.nodes.listItem);
           return schema.nodes.listItem.createChecked({}, compatibleContent);
       }
-    } // code block
-
+    }
 
+    // code block
     if (isSchemaWithCodeBlock(schema)) {
       switch (tag) {
         case 'DIV':
@@ -282,109 +249,89 @@ export function convert(content, node, schema) {
             return null;
           } else if (node.className === 'code panel' || node.className === 'preformatted panel') {
             const pre = node.querySelector('pre');
-
             if (!pre) {
               return null;
             }
-
             const language = node.className === 'preformatted panel' ? 'plain' : pre.className.split('-')[1];
             const textContent = (pre.textContent || '').replace(/\r\n/g, '\n');
             return schema.nodes.codeBlock.createChecked({
               language
             }, textContent ? schema.text(textContent) : undefined);
           }
-
           break;
-
         case 'PRE':
           return null;
       }
     }
-
     if (isSchemaWithBlockQuotes(schema) && tag === 'BLOCKQUOTE') {
       let blockquoteContent = content && content.content.length ? content : schema.nodes.paragraph.createChecked();
       return schema.nodes.blockquote.createChecked({}, blockquoteContent);
-    } // table
-
+    }
 
+    // table
     if (isSchemaWithTables(schema)) {
       switch (tag) {
         case 'TABLE':
           return schema.nodes.table.createChecked({}, content);
-
         case 'TR':
           return schema.nodes.tableRow.createChecked({}, content);
-
         case 'TD':
           const tdContent = schema.nodes.tableCell.validContent(content) ? content : ensureBlocks(content, schema);
           return schema.nodes.tableCell.createChecked({}, tdContent);
-
         case 'TH':
           const thContent = schema.nodes.tableHeader.validContent(content) ? content : ensureBlocks(content, schema);
           return schema.nodes.tableHeader.createChecked({}, thContent);
       }
     }
   }
-
   return;
 }
+
 /*
  * Flattens DOM tree into single array
  */
-
 export function bfsOrder(root) {
   const inqueue = [root];
   const outqueue = [];
   let elem;
-
   while (elem = inqueue.shift()) {
     outqueue.push(elem);
     let childIndex;
-
     for (childIndex = 0; childIndex < elem.childNodes.length; childIndex++) {
       const child = elem.childNodes[childIndex];
-
       switch (child.nodeType) {
         case Node.ELEMENT_NODE:
         case Node.TEXT_NODE:
           inqueue.push(child);
           break;
-
         default:
           // eslint-disable-next-line no-console
           console.error(`Not pushing: ${child.nodeType} ${child.nodeName}`);
       }
     }
   }
-
   outqueue.shift();
   return outqueue;
 }
+
 /**
  * Create a fragment by adding a set of marks to each node.
  */
-
 function addMarks(fragment, marks) {
   let result = fragment;
-
   for (let i = 0; i < fragment.childCount; i++) {
     const child = result.child(i);
     let newChild = child;
-
     for (const mark of marks) {
       newChild = newChild.mark(mark.addToSet(newChild.marks));
     }
-
     result = result.replaceChild(i, newChild);
   }
-
   return result;
 }
-
 function getNodeName(node) {
   return node.nodeName.toUpperCase();
 }
-
 function isMedia(node) {
   if (node && node instanceof HTMLElement) {
     if (node.parentNode && getNodeName(node.parentNode) === 'P') {
@@ -393,23 +340,18 @@ function isMedia(node) {
       }
     }
   }
-
   return false;
 }
-
 function isMediaSingle(node) {
   if (isMedia(node)) {
     const dataNode = node.querySelector('[data-media-services-id]');
-
     if (dataNode instanceof HTMLElement) {
       const width = parseInt(dataNode.getAttribute('data-width') || '', 10);
       const height = parseInt(dataNode.getAttribute('data-height') || '', 10);
-
       if (node.parentNode.classList.contains('mediaSingle') && width && height) {
         return true;
       }
     }
   }
-
   return false;
 }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-jira-transformer",
-	"version": "8.2.3",
+	"version": "8.2.5",
 	"sideEffects": false
 }

package/dist/esm/fix-doc.js

@@ -1,54 +1,44 @@
 function getNodeName(node) {
   return node && node.nodeName.toUpperCase();
 }
-
 function isMedia(node) {
   if (!node) {
     return false;
   }
-
   if (getNodeName(node) === 'SPAN' && node instanceof HTMLElement) {
     return !!node.querySelector('a > jira-attachment-thumbnail > img[data-attachment-type="thumbnail"], ' + 'a[data-attachment-type="file"]');
   }
-
   return false;
 }
-
 function repairParagraph(p) {
   var paragraphs = [];
   var buffer = [];
   var mediaGroupFound = false;
   var skipBuffer = false;
-
   var processMedia = function processMedia() {
     if (buffer.length) {
       var head = buffer[0];
-
       if (getNodeName(head) === 'BR') {
         buffer.shift();
       }
-
       paragraphs.push(buffer);
       buffer = [];
     }
   };
-
   for (var i = 0, length = p.childNodes.length; i < length; i++) {
     var node = p.childNodes[i];
-    skipBuffer = false; // [..., M, BR, ...]
-
+    skipBuffer = false;
+    // [..., M, BR, ...]
     if (getNodeName(node) === 'BR') {
       // [mmm, M, BR, ...]
       if (mediaGroupFound) {
         processMedia();
         mediaGroupFound = false;
         skipBuffer = true;
-      } // [..., BR, M, ...]
-
-
+      }
+      // [..., BR, M, ...]
       if (isMedia(node.nextSibling)) {
         mediaGroupFound = true;
-
         if (buffer.length) {
           paragraphs.push(buffer);
           buffer = [];
@@ -65,23 +55,19 @@ function repairParagraph(p) {
         if (getNodeName(node) === '#TEXT' && (node.textContent || '').trim() === '') {
           continue;
         }
-
         buffer = (paragraphs.pop() || []).concat(buffer);
         mediaGroupFound = false;
       }
     }
-
     if (!skipBuffer) {
       buffer.push(node);
     }
   }
-
   if (mediaGroupFound) {
     processMedia();
   } else {
     paragraphs.push(buffer);
   }
-
   if (paragraphs.length > 1) {
     var fragment = document.createDocumentFragment();
     paragraphs.forEach(function (childP) {
@@ -90,21 +76,19 @@ function repairParagraph(p) {
         return innerP.appendChild(child);
       });
       fragment.appendChild(innerP);
-    }); // Replace old P
+    });
 
+    // Replace old P
     var parent = p.parentNode;
-    parent.insertBefore(fragment, p.nextSibling); // IE11 doesn't support remove
-
+    parent.insertBefore(fragment, p.nextSibling);
+    // IE11 doesn't support remove
     parent.removeChild(p);
   }
 }
-
 export default function (doc) {
   var paragraphs = doc.querySelectorAll('p');
-
   for (var i = 0, length = paragraphs.length; i < length; i++) {
     repairParagraph(paragraphs[i]);
   }
-
   return doc;
 }