Merge pull request #65 from contentstack/development

Development

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/json-rte-serializer",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "This Package converts Html Document to Json and vice-versa.",
   "main": "lib/index.js",
   "module": "lib/index.mjs",

src/fromRedactor.tsx

@@ -121,6 +121,7 @@ const TEXT_TAGS: IHtmlToJsonTextTags = {
   I: () => ({ italic: true }),
   S: () => ({ strikethrough: true }),
   STRONG: () => ({ bold: true }),
+  B: () => ({ bold: true }),
   U: () => ({ underline: true }),
   SUP: () => ({ superscript: true }),
   SUB: () => ({ subscript: true })
@@ -863,7 +864,7 @@ export const fromRedactor = (el: any, options?:IHtmlToJsonOptions) : IAnyObject
       }
       let noOfInlineElement = 0
       Array.from(el.parentNode?.childNodes || []).forEach((child: any) => {
-        if (child.nodeType === 3 || child.nodeName === 'SPAN' || child.nodeName === 'A' || (options?.allowNonStandardTags && child.getAttribute('inline'))) {
+        if (child.nodeType === 3 || child.nodeName === 'SPAN' || child.nodeName === 'A' || (options?.allowNonStandardTags && child.getAttribute('inline')) || child.nodeName in TEXT_TAGS) {
           noOfInlineElement += 1
         }
       })
@@ -1084,4 +1085,4 @@ function getTbodyChildren  (rows: any[]) {
 
   }, [])
   return newTbodyChildren
-}
+}

test/fromRedactor.test.ts

@@ -315,6 +315,19 @@ describe("Testing html to json conversion", () => {
         const json = htmlToJson(html)
         expect(json).toEqual({ type: "doc", attrs: {}, uid: "uid", children:[{ type: "social-embeds", uid: 'uid', attrs: { src: "https://www.***REMOVED***.com/embed/3V-Sq7_uHXQ" }, children: [{ text: ""}] }]})
     })
+
+    test("should replace all instances of <b> and <i> proper json marks", () => {
+        const html = `<p><b>Hello</b><i>Test2</i><b>World</b></p>`
+        const json = htmlToJson(html)
+        expect(json).toStrictEqual({"type":"doc","uid":"uid","attrs":{},"children":[{"type":"p","attrs":{},"uid":"uid","children":[{"text":"Hello","attrs":{"style":{}},"bold":true},{"text":"Test2","attrs":{"style":{}},"italic":true},{"text":"World","attrs":{"style":{}},"bold":true}]}]})
+    })
+
+    test("should not add fragment for html containing a text tag and span tag", () => {
+        const html = `<p><strong>Hello</strong><span> Hii</span></p>`
+        const json = htmlToJson(html)
+        expect(json).toStrictEqual({"type":"doc","uid":"uid","attrs":{},"children":[{"type":"p","attrs":{},"uid":"uid","children":[{"text":"Hello","attrs":{"style":{}},"bold":true},{"text":" Hii"}]}]})
+
+    })
 })