fix: broken cell redering with span tag using table-merged-cell plugin (

fix #1059)
nhn · Jun 24, 2020 · 8fb6eb1 · 8fb6eb1
1 parent dba0438
commit 8fb6eb1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/plugins/table-merged-cell/src/js/renderer.js b/plugins/table-merged-cell/src/js/renderer.js
@@ -1,3 +1,5 @@
+import encodeHTMLEntity from 'tui-code-snippet/string/encodeHTMLEntity';
+
 export const renderer = {
   tableRow(node, { entering, origin }) {
     if (entering) {
@@ -47,7 +49,7 @@ export const renderer = {
       const { attributes = {} } = result;
 
       if (node.orgStringContent) {
-        attributes['data-org-content'] = node.orgStringContent;
+        attributes['data-org-content'] = encodeHTMLEntity(node.orgStringContent);
       }
       if (node.colspan) {
         attributes.colspan = node.colspan;

diff --git a/plugins/table-merged-cell/src/js/tableRenderer.js b/plugins/table-merged-cell/src/js/tableRenderer.js
@@ -2,6 +2,8 @@
  * @fileoverview Implements tableRenderer
  * @author NHN FE Development Lab <dl_javascript@nhn.com>
  */
+import encodeHTMLEntity from 'tui-code-snippet/string/encodeHTMLEntity';
+
 import tableDataHandler from './tableDataHandler';
 
 /**
@@ -27,7 +29,7 @@ function _createCellHtml(cell) {
 
   if (orgContent) {
     orgContent += content;
-    attrs += ` data-org-content="${orgContent}"`;
+    attrs += ` data-org-content="${encodeHTMLEntity(orgContent)}"`;
   }
 
   return `<${nodeName}${attrs}>${content}</${nodeName}>`;