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

package/lib/extensions/__tests__/FontWeight.test.js

@@ -1,12 +1,13 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
+import { ref } from 'vue';
 import { NodeFactory } from '../../__tests__/utils';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { Font } from '../../models';
 import { FontWeight } from '../FontWeight';
 import { FontFamily } from '../FontFamily';
 import { FontStyle } from '../FontStyle';
+import { ContentNormalizer } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -25,8 +26,8 @@ const MockStylePreset = Extension.create({
 
 function createEditor({ content }) {
     return new Editor({
-        content,
-        extensions: CORE_EXTENSIONS.concat(
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(
             MockStylePreset,
             FontFamily.configure({
                 fonts: [
@@ -74,6 +75,18 @@ describe('get font weight', () => {
 
         expect(editor.commands.getFontWeight().value).toEqual('400');
     });
+
+    test('should get closest available font weight', () => {
+        const editor = createEditor({
+            content: createContent(NodeFactory.text('hello world', [
+                NodeFactory.mark('font_weight', { value: '800' })
+            ]))
+        });
+
+        editor.commands.selectAll();
+
+        expect(editor.commands.getFontWeight().value).toEqual('700');
+    });
 });
 
 describe('apply font weight', () => {
@@ -149,3 +162,53 @@ describe('rendering', () => {
         expect(editor.getHTML()).toMatchSnapshot();
     });
 });
+
+describe('parsing html', () => {
+    test('should get value from paragraph', () => {
+        const editor = createEditor({
+            content: '<p style="font-weight: 700">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get value from text', () => {
+        const editor = createEditor({
+            content: '<p><span style="font-weight: 700">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get value from rendered view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-font-weight: 700">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get value from b tag', () => {
+        const editor = createEditor({
+            content: '<p><b>lorem</b> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get value from strong tag', () => {
+        const editor = createEditor({
+            content: '<p><strong>lorem</strong> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should merge paragraph and text settings', () => {
+        const editor = createEditor({
+            content: '<p style="font-weight: 500"><span style="font-weight: 700">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+});

package/lib/extensions/__tests__/LineHeight.test.js

@@ -1,10 +1,11 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
+import { ref } from 'vue';
 import { NodeFactory } from '../../__tests__/utils';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { DeviceManager } from '../DeviceManager';
 import { LineHeight } from '../LineHeight';
+import { ContentNormalizer } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -22,10 +23,10 @@ const MockStylePreset = Extension.create({
 
 function createEditor({ content }) {
     return new Editor({
-        content,
-        extensions: CORE_EXTENSIONS.concat(
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(
             MockStylePreset,
-            DeviceManager.configure({ deviceRef: ref('desktop') }),
+            DeviceManager.configure({ device: ref('desktop') }),
             LineHeight
         )
     });
@@ -104,3 +105,48 @@ describe('rendering', () => {
         expect(editor.getHTML()).toMatchSnapshot();
     });
 });
+
+describe('parsing html', () => {
+    test('should get value from text in relative units', () => {
+        const editor = createEditor({
+            content: '<p style="line-height: 1.2">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get value from text in px units with font size', () => {
+        const editor = createEditor({
+            content: '<p style="line-height: 24px; font-size: 20px;">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get value from text in px units with no font size', () => {
+        global.document.body.style.fontSize = '20px';
+
+        const editor = createEditor({
+            content: '<p style="line-height: 24px">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+        global.document.body.style.removeProperty('font-size');
+    });
+
+    test('should get value from rendered view', () => {
+        const editor = createEditor({
+            content: '<p style="--zw-line-height-mobile:1.2;--zw-line-height-desktop:1.4">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should set null if no alignment', () => {
+        const editor = createEditor({
+            content: '<p>test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+});

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

@@ -1,10 +1,10 @@
 import { Editor, Extension, Mark } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
 import { NodeFactory } from '../../__tests__/utils';
-import { CORE_EXTENSIONS } from '../core';
 import { StylePreset } from '../StylePreset';
 import { List } from '../list';
 import { ListTypes, NodeTypes, TextSettings } from '../../enums';
+import { ContentNormalizer } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockFontSize = Mark.create({
     name: TextSettings.FONT_SIZE,
@@ -42,15 +42,76 @@ const MockAlignment = Extension.create({
     ]
 });
 
+const MockBackgroundColor = Mark.create({
+    name: TextSettings.BACKGROUND_COLOR,
+
+    addAttributes: () => ({
+        value: { default: null }
+    }),
+
+    renderHTML: () => ['span', {}, 0]
+});
+
+const MockFontColor = Mark.create({
+    name: TextSettings.FONT_COLOR,
+
+    addAttributes: () => ({
+        value: { default: null }
+    }),
+
+    renderHTML: () => ['span', {}, 0]
+});
+
+const MockFontFamily = Mark.create({
+    name: TextSettings.FONT_FAMILY,
+
+    addAttributes: () => ({
+        value: { default: null }
+    }),
+
+    renderHTML: () => ['span', {}, 0]
+});
+
+const MockFontStyle = Mark.create({
+    name: TextSettings.FONT_STYLE,
+
+    addAttributes: () => ({
+        value: { default: null }
+    }),
+
+    renderHTML: () => ['span', {}, 0]
+});
+
+const MockTextDecoration = Mark.create({
+    name: TextSettings.TEXT_DECORATION,
+
+    addAttributes: () => ({
+        value: { default: null }
+    }),
+
+    renderHTML: () => ['span', {}, 0]
+});
+
+const MockSuperscript = Mark.create({
+    name: TextSettings.SUPERSCRIPT,
+
+    addAttributes: () => ({
+        value: { default: null }
+    }),
+
+    renderHTML: () => ['span', {}, 0]
+});
+
 function createEditor({ content, presets, defaultId }) {
     return new Promise((resolve) => {
         const editor = new Editor({
-            content,
+            content: ContentNormalizer.normalize(content),
             onCreate: () => resolve(editor),
 
-            extensions: CORE_EXTENSIONS.concat(
+            extensions: buildCoreExtensions().concat(
                 StylePreset.configure({
-                    presetsRef: ref(presets),
+                    presets: presets,
+                    baseClass: 'zw ts-',
                     defaultId,
 
                     makeVariable({ device, preset, property }) {
@@ -64,7 +125,13 @@ function createEditor({ content, presets, defaultId }) {
                 }),
                 MockFontSize,
                 MockFontWeight,
-                MockAlignment
+                MockAlignment,
+                MockBackgroundColor,
+                MockFontColor,
+                MockFontFamily,
+                MockFontStyle,
+                MockTextDecoration,
+                MockSuperscript
             )
         });
     });
@@ -398,3 +465,74 @@ describe('remove preset customization', () => {
         );
     });
 });
+
+describe('parsing html', () => {
+    test('should get by fallback class', async () => {
+        const editor = await createEditor({
+            content: '<p class="zpa-regular2">lorem ipsum</p>',
+            defaultId: 'regular-1',
+            presets: [
+                createPreset({ id: 'regular-1' }),
+                createPreset({ id: 'regular-2', fallbackClass: 'zpa-regular2' })
+            ]
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get by preset class', async () => {
+        const editor = await createEditor({
+            content: '<p class="zw ts-regular-2">lorem ipsum</p>',
+            defaultId: 'regular-1',
+            presets: [
+                createPreset({ id: 'regular-1' }),
+                createPreset({ id: 'regular-2' })
+            ]
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get by heading tag', async () => {
+        const editor = await createEditor({
+            content: '<h3>lorem ipsum</h3>',
+            defaultId: 'regular-1',
+            presets: [
+                createPreset({ id: 'regular-1' }),
+                createPreset({ id: 'h3', node: { type: 'heading', level: 3 } })
+            ]
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should set default preset to unstyled paragraph', async () => {
+        const editor = await createEditor({
+            content: '<p>lorem ipsum</p>',
+            defaultId: 'regular-1',
+            presets: [createPreset({ id: 'regular-1' })]
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should set null to list item', async () => {
+        const editor = await createEditor({
+            content: '<ul><li>lorem ipsum</li></ul>',
+            defaultId: 'regular-1',
+            presets: [createPreset({ id: 'regular-1' })]
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should set null to list item with preset', async () => {
+        const editor = await createEditor({
+            content: '<ul class="zw regular-1"><li>lorem ipsum</li></ul>',
+            defaultId: 'regular-1',
+            presets: [createPreset({ id: 'regular-1' })]
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+});

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

@@ -1,9 +1,10 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
+import { ref } from 'vue';
 import { NodeFactory } from '../../__tests__/utils';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { TextDecoration } from '../TextDecoration';
+import { ContentNormalizer } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -19,8 +20,8 @@ const MockStylePreset = Extension.create({
 
 function createEditor({ content }) {
     return new Editor({
-        content,
-        extensions: CORE_EXTENSIONS.concat(MockStylePreset, TextDecoration)
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(MockStylePreset, TextDecoration)
     });
 }
 
@@ -256,3 +257,86 @@ describe('rendering', () => {
         expect(editor.getHTML()).toMatchSnapshot();
     });
 });
+
+
+describe('parsing html', () => {
+    test('should get underline from paragraph', () => {
+        const editor = createEditor({
+            content: '<p style="text-decoration-line: underline">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get strike through from paragraph', () => {
+        const editor = createEditor({
+            content: '<p style="text-decoration-line: line-through">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get both from paragraph', () => {
+        const editor = createEditor({
+            content: '<p style="text-decoration-line: line-through underline">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get underline from text', () => {
+        const editor = createEditor({
+            content: '<p><span style="text-decoration-line: underline">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get underline from rendered view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-text-decoration: underline">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get strike through from text', () => {
+        const editor = createEditor({
+            content: '<p><span style="text-decoration-line: line-through">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get strike through from rendered view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-text-decoration: line-through">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get both from text', () => {
+        const editor = createEditor({
+            content: '<p><span style="text-decoration-line: underline line-through">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get both from rendered view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-text-decoration: underline line-through">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should merge paragraph and text settings', () => {
+        const editor = createEditor({
+            content: '<p style="text-decoration-line: underline"><span style="text-decoration-line: line-through">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+});

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

@@ -24,6 +24,74 @@ Object {
 }
 `;
 
-exports[`rendering should render all devices 1`] = `"<p class=\\"zw-style\\" style=\\"--zw-mobile-text-align: left; --zw-tablet-text-align: right; --zw-desktop-text-align: center;\\">hello world</p>"`;
+exports[`parsing html should get alignment from rendered view 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "alignment": Object {
+          "desktop": "right",
+          "mobile": "center",
+          "tablet": null,
+        },
+      },
+      "content": Array [
+        Object {
+          "text": "test",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get alignment from text 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "alignment": Object {
+          "desktop": "center",
+          "mobile": "center",
+          "tablet": "center",
+        },
+      },
+      "content": Array [
+        Object {
+          "text": "test",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should set null if no alignment 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "alignment": null,
+      },
+      "content": Array [
+        Object {
+          "text": "test",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`rendering should render all devices 1`] = `"<p class=\\"zw-style\\" style=\\"--zw-text-align-mobile:left;--zw-text-align-tablet:right;--zw-text-align-desktop:center;\\">hello world</p>"`;
 
-exports[`rendering should render only desktop 1`] = `"<p class=\\"zw-style\\" style=\\"--zw-desktop-text-align: center;\\">hello world</p>"`;
+exports[`rendering should render only desktop 1`] = `"<p class=\\"zw-style\\" style=\\"--zw-text-align-desktop:center;\\">hello world</p>"`;

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

@@ -25,4 +25,124 @@ Object {
 }
 `;
 
-exports[`rendering should render html 1`] = `"<p class=\\"zw-style\\"><span style=\\"--zw-background-color: green;\\" class=\\"zw-style\\">hello world</span></p>"`;
+exports[`parsing html should get value from paragraph 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "value": "#FF0000",
+              },
+              "type": "background_color",
+            },
+          ],
+          "text": "test",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get value from rendered view 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "value": "#FF0000",
+              },
+              "type": "background_color",
+            },
+          ],
+          "text": "lorem",
+          "type": "text",
+        },
+        Object {
+          "text": " ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`parsing html should get value from text 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "value": "#FF0000",
+              },
+              "type": "background_color",
+            },
+          ],
+          "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 {
+                "value": "#000000",
+              },
+              "type": "background_color",
+            },
+          ],
+          "text": "lorem",
+          "type": "text",
+        },
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "value": "#FF0000",
+              },
+              "type": "background_color",
+            },
+          ],
+          "text": " ipsum",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
+exports[`rendering should render html 1`] = `"<p class=\\"zw-style\\"><span style=\\"--zw-background-color:green;\\" class=\\"zw-style\\">hello world</span></p>"`;