@zipify/wysiwyg 1.0.0-dev.4 → 1.0.0-dev.5

package/lib/extensions/__tests__/__snapshots__/StylePreset.test.js.snap

@@ -241,6 +241,171 @@ Object {
 }
 `;
 
+exports[`parsing html should get by fallback class 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "alignment": null,
+        "preset": Object {
+          "id": "regular-2",
+        },
+      },
+      "content": Array [
+        Object {
+          "text": "lorem ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get by heading tag 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "alignment": null,
+        "level": 3,
+        "preset": Object {
+          "id": "h3",
+        },
+      },
+      "content": Array [
+        Object {
+          "text": "lorem ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "heading",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get by preset class 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "alignment": null,
+        "preset": Object {
+          "id": "regular-2",
+        },
+      },
+      "content": Array [
+        Object {
+          "text": "lorem ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should set default preset to unstyled paragraph 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "alignment": null,
+        "preset": Object {
+          "id": "regular-1",
+        },
+      },
+      "content": Array [
+        Object {
+          "text": "lorem ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should set null to list item 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "bullet": Object {
+          "type": "disc",
+        },
+      },
+      "content": Array [
+        Object {
+          "content": Array [
+            Object {
+              "attrs": Object {
+                "alignment": null,
+                "preset": null,
+              },
+              "content": Array [
+                Object {
+                  "text": "lorem ipsum",
+                  "type": "text",
+                },
+              ],
+              "type": "paragraph",
+            },
+          ],
+          "type": "listItem",
+        },
+      ],
+      "type": "list",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should set null to list item with preset 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "bullet": Object {
+          "type": "disc",
+        },
+      },
+      "content": Array [
+        Object {
+          "content": Array [
+            Object {
+              "attrs": Object {
+                "alignment": null,
+                "preset": null,
+              },
+              "content": Array [
+                Object {
+                  "text": "lorem ipsum",
+                  "type": "text",
+                },
+              ],
+              "type": "paragraph",
+            },
+          ],
+          "type": "listItem",
+        },
+      ],
+      "type": "list",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
 exports[`remove preset customization should remove all attributes 1`] = `
 Object {
   "content": Array [
@@ -305,6 +470,6 @@ Object {
 
 exports[`render preset styles should render node without preset 1`] = `"<p class=\\"zw-style\\">test</p>"`;
 
-exports[`render preset styles should render preset class 1`] = `"<p class=\\"zw-style zw-preset--regular-1\\">test</p>"`;
+exports[`render preset styles should render preset class 1`] = `"<p class=\\"zw-style zw ts-regular-1\\">test</p>"`;
 
-exports[`render preset styles should render styles 1`] = `" .zw-preset--regular-1 { --zw-preset-font-weight: var(--common-regular-1-font-weight, inherit); --zw-preset-mobile-font-size: var(--mobile-regular-1-font-size, inherit); --zw-preset-tablet-font-size: var(--tablet-regular-1-font-size, inherit); --zw-preset-desktop-font-size: var(--desktop-regular-1-font-size, inherit); }"`;
+exports[`render preset styles should render styles 1`] = `" .zw.ts-regular-1 { --zw-preset-font-weight: var(--common-regular-1-font-weight, inherit); --zw-preset-mobile-font-size: var(--mobile-regular-1-font-size, inherit); --zw-preset-tablet-font-size: var(--tablet-regular-1-font-size, inherit); --zw-preset-desktop-font-size: var(--desktop-regular-1-font-size, inherit); }"`;

package/lib/extensions/__tests__/__snapshots__/TextDecoration.test.js.snap

@@ -199,6 +199,213 @@ Object {
 }
 `;
 
+exports[`parsing html should get both from paragraph 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "test",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get both from text 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "lorem",
+          "type": "text",
+        },
+        Object {
+          "text": " ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get strike through from paragraph 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": false,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "test",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get strike through from text 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": false,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "lorem",
+          "type": "text",
+        },
+        Object {
+          "text": " ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get underline from paragraph 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "test",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get underline from text 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "lorem",
+          "type": "text",
+        },
+        Object {
+          "text": " ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should merge paragraph and text settings 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": false,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "lorem",
+          "type": "text",
+        },
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": " ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
 exports[`rendering should render both 1`] = `"<p class=\\"zw-style\\"><span style=\\"--zw-text-decoration: underline line-through;\\" class=\\"zw-style\\">hello world</span></p>"`;
 
 exports[`rendering should render strike through only 1`] = `"<p class=\\"zw-style\\"><span style=\\"--zw-text-decoration: line-through;\\" class=\\"zw-style\\">hello world</span></p>"`;

package/lib/extensions/core/__tests__/NodeProcessor.test.js

@@ -2,6 +2,7 @@ import { Editor, Extension } from '@tiptap/vue-2';
 import { NodeFactory } from '../../../__tests__/utils';
 import { CORE_EXTENSIONS } from '../index';
 import { NodeTypes } from '../../../enums';
+import { ContentNormalizer } from '../../../services';
 
 const LineHeight = Extension.create({
     name: 'line_height',
@@ -20,8 +21,10 @@ const LineHeight = Extension.create({
 });
 
 function createEditor({ content }) {
+    const normalizer = new ContentNormalizer();
+
     return new Editor({
-        content,
+        content: normalizer.normalize(content),
         extensions: CORE_EXTENSIONS.concat(LineHeight) // Included to core extensions
     });
 }

package/lib/extensions/core/__tests__/SelectionProcessor.test.js

@@ -1,13 +1,18 @@
 import { Editor } from '@tiptap/vue-2';
 import { CORE_EXTENSIONS } from '../index';
 import { NodeFactory } from '../../../__tests__/utils';
+import { ContentNormalizer } from '../../../services';
 
 function createEditor() {
+    const normalizer = new ContentNormalizer();
+
+    const content = NodeFactory.doc([
+        NodeFactory.paragraph('Lorem ipsum dolor sit amet'),
+        NodeFactory.paragraph('consectetur adipisicing elit')
+    ]);
+
     return new Editor({
-        content: NodeFactory.doc([
-            NodeFactory.paragraph('Lorem ipsum dolor sit amet'),
-            NodeFactory.paragraph('consectetur adipisicing elit')
-        ]),
+        content: normalizer.normalize(content),
         extensions: CORE_EXTENSIONS // included to core
     });
 }

package/lib/extensions/core/__tests__/TextProcessor.test.js

@@ -1,6 +1,7 @@
 import { Editor, Mark } from '@tiptap/vue-2';
 import { NodeFactory } from '../../../__tests__/utils';
 import { CORE_EXTENSIONS } from '../index';
+import { ContentNormalizer } from '../../../services';
 
 const MockFontWeight = Mark.create({
     name: 'font_weight',
@@ -17,8 +18,10 @@ const MockFontWeight = Mark.create({
 });
 
 function createEditor({ content }) {
+    const normalizer = new ContentNormalizer();
+
     return new Editor({
-        content,
+        content: normalizer.normalize(content),
         element: document.createElement('div'),
         extensions: CORE_EXTENSIONS.concat(MockFontWeight)
     });

package/lib/extensions/index.js

@@ -22,6 +22,7 @@ export const getExtensions = (options) => CORE_EXTENSIONS.concat([
     StylePreset.configure({
         presetsRef: options.presetsRef,
         defaultId: options.defaultPresetId,
+        baseClass: options.basePresetClass,
         makeVariable: options.makePresetVariable
     }),
     List.configure({

package/lib/extensions/list/List.js

@@ -21,6 +21,40 @@ export const List = Node.create({
         bullet: { isRequired: true }
     }),
 
+    parseHTML() {
+        const HTML_TYPES = {
+            a: ListTypes.ROMAN,
+            i: ListTypes.LATIN,
+            '1': ListTypes.DECIMAL
+        };
+
+        const getBulletType = (element) => {
+            for (const type of ListTypes.values) {
+                const bulletClass = `.${this.options.baseClass}${type}`;
+
+                if (element.matches(bulletClass)) return type;
+                if (HTML_TYPES[element.type.toLowerCase()] === type) return type;
+            }
+        };
+
+        return [
+            {
+                tag: 'ol',
+
+                getAttrs: (element) => ({
+                    bullet: { type: getBulletType(element) || ListTypes.DECIMAL }
+                })
+            },
+            {
+                tag: 'ul',
+
+                getAttrs: (element) => ({
+                    bullet: { type: getBulletType(element) || ListTypes.DISC }
+                })
+            }
+        ];
+    },
+
     renderHTML({ HTMLAttributes: attrs }) {
         const isOrdered = ListTypes.ordered.includes(attrs.bullet.type);
         const tag = isOrdered ? 'ol' : 'ul';

package/lib/extensions/list/__tests__/List.test.js

@@ -5,13 +5,18 @@ import { ListTypes } from '../../../enums';
 import { CORE_EXTENSIONS } from '../../core';
 import { StylePreset } from '../../StylePreset';
 import { List } from '../List';
+import { ContentNormalizer } from '../../../services';
 
 function createEditor({ content }) {
+    const normalizer = new ContentNormalizer();
+
     return new Editor({
-        content,
+        content: normalizer.normalize(content),
         element: document.createElement('div'),
         extensions: CORE_EXTENSIONS.concat(
-            List,
+            List.configure({
+                baseClass: 'zw-list--'
+            }),
             StylePreset.configure({
                 presetsRef: ref([
                     {
@@ -22,7 +27,8 @@ function createEditor({ content }) {
                         desktop: {}
                     }
                 ]),
-                defaultId: 'regular-1'
+                defaultId: 'regular-1',
+                baseClass: 'zw ts-'
             })
         )
     });
@@ -128,3 +134,109 @@ describe('apply list', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 });
+
+describe('parsing html', () => {
+    test('should parse disc type by class', () => {
+        const editor = createEditor({
+            content: '<ul class="zw-list--disc"><li>lorem ipsum</li></ul>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse disc as default', () => {
+        const editor = createEditor({
+            content: '<ul><li>lorem ipsum</li></ul>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse circle type by class', () => {
+        const editor = createEditor({
+            content: '<ul class="zw-list--circle"><li>lorem ipsum</li></ul>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse square type by class', () => {
+        const editor = createEditor({
+            content: '<ul class="zw-list--square"><li>lorem ipsum</li></ul>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse decimal type by class', () => {
+        const editor = createEditor({
+            content: '<ol class="zw-list--decimal"><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse decimal as default', () => {
+        const editor = createEditor({
+            content: '<ol><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse decimal type by attribute', () => {
+        const editor = createEditor({
+            content: '<ol type="1"><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse roman type by class', () => {
+        const editor = createEditor({
+            content: '<ol class="zw-list--roman"><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse roman type by lower attribute', () => {
+        const editor = createEditor({
+            content: '<ol type="a"><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse roman type by upper attribute', () => {
+        const editor = createEditor({
+            content: '<ol type="A"><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse latin type by class', () => {
+        const editor = createEditor({
+            content: '<ol class="zw-list--latin"><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse latin type by lower attribute', () => {
+        const editor = createEditor({
+            content: '<ol type="i"><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should parse latin type by upper attribute', () => {
+        const editor = createEditor({
+            content: '<ol type="I"><li>lorem ipsum</li></ol>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+});