@zipify/wysiwyg 1.0.0-dev.10 → 1.0.0-dev.100

package/lib/extensions/TextDecoration.js

@@ -1,5 +1,5 @@
 import { Mark } from '@tiptap/vue-2';
-import { computed } from '@vue/composition-api';
+import { computed, unref } from 'vue';
 import { createCommand, createKeyboardShortcut, renderMark } from '../utils';
 import { TextSettings } from '../enums';
 
@@ -13,16 +13,16 @@ export const TextDecoration = Mark.create({
 
     addCommands() {
         return {
-            isUnderline: createCommand(({ commands }) => {
+            isUnderline: createCommand(({ commands, editor }) => {
                 const decoration = commands.getTextDecoration();
 
-                return computed(() => decoration.value.underline);
+                return computed(() => editor.isActive('link') || unref(decoration).underline);
             }),
 
             isStrikeThrough: createCommand(({ commands }) => {
                 const decoration = commands.getTextDecoration();
 
-                return computed(() => decoration.value.strike_through);
+                return computed(() => unref(decoration).strike_through);
             }),
 
             getTextDecoration: createCommand(({ editor, commands }) => {
@@ -32,8 +32,8 @@ export const TextDecoration = Mark.create({
                     const attrs = editor.getAttributes(this.name) ?? {};
 
                     return {
-                        underline: attrs.underline ?? defaultValue.value.underline,
-                        strike_through: attrs.strike_through ?? defaultValue.value.strike_through
+                        underline: attrs.underline ?? unref(defaultValue).underline,
+                        strike_through: attrs.strike_through ?? unref(defaultValue).strike_through
                     };
                 });
             }),
@@ -42,7 +42,7 @@ export const TextDecoration = Mark.create({
                 const preset = commands.getPreset();
 
                 return computed(() => {
-                    const decoration = preset.value.common.text_decoration;
+                    const decoration = unref(preset).common.text_decoration;
 
                     return {
                         underline: decoration.includes('underline'),
@@ -51,7 +51,9 @@ export const TextDecoration = Mark.create({
                 });
             }),
 
-            toggleUnderline: createCommand(({ commands }) => {
+            toggleUnderline: createCommand(({ commands, editor }) => {
+                if (editor.isActive('link')) return;
+
                 commands.toggleTextDecoration('underline');
             }),
 
@@ -60,7 +62,7 @@ export const TextDecoration = Mark.create({
             }),
 
             toggleTextDecoration: createCommand(({ commands }, name) => {
-                const isEnabled = commands.getTextDecoration().value[name];
+                const isEnabled = unref(commands.getTextDecoration())[name];
 
                 isEnabled ? commands.removeTextDecoration(name) : commands.applyTextDecoration(name);
             }),
@@ -71,7 +73,7 @@ export const TextDecoration = Mark.create({
 
             removeTextDecoration: createCommand(({ commands }, name) => {
                 const mark = {
-                    ...commands.getTextDecoration().value,
+                    ...unref(commands.getTextDecoration()),
                     [name]: false
                 };
                 const isRemoveMark = !mark.underline && !mark.strike_through;
@@ -86,16 +88,47 @@ export const TextDecoration = Mark.create({
         'Mod-U': createKeyboardShortcut('toggleUnderline')
     }),
 
-    parseHTML: () => [
-        {
-            style: 'text-decoration-line',
+    parseHTML() {
+        const getAttrs = (value) => {
+            const underline = value.includes('underline');
+            const strike_through = value.includes('line-through');
 
-            getAttrs: (value) => ({
-                underline: value.includes('underline'),
-                strike_through: value.includes('line-through')
-            })
-        }
-    ],
+            if (!underline && !strike_through) {
+                return false;
+            }
+
+            return { underline, strike_through };
+        };
+
+        return [
+            {
+                style: '--zw-text-decoration',
+                getAttrs
+            },
+            {
+                style: 'text-decoration-line',
+                getAttrs
+            },
+            {
+                style: 'text-decoration',
+                getAttrs
+            },
+            {
+                tag: 's',
+                attrs: {
+                    underline: false,
+                    strike_through: true
+                }
+            },
+            {
+                tag: 'u',
+                attrs: {
+                    underline: true,
+                    strike_through: false
+                }
+            }
+        ];
+    },
 
     renderHTML({ HTMLAttributes: attrs }) {
         const decorations = [];

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

@@ -1,12 +1,11 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
-import { NodeFactory } from '../../__tests__/utils';
+import { ref } from 'vue';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { Alignment } from '../Alignment';
 import { DeviceManager } from '../DeviceManager';
 import { Alignments } from '../../enums';
-import { ContentNormalizer } from '../../services';
+import { ContentNormalizer, NodeFactory } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -23,13 +22,11 @@ const MockStylePreset = Extension.create({
 });
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(
             MockStylePreset,
-            DeviceManager.configure({ deviceRef: ref('desktop') }),
+            DeviceManager.configure({ device: ref('desktop') }),
             Alignment
         )
     });
@@ -118,6 +115,14 @@ describe('parsing html', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 
+    test('should get alignment from rendered view', () => {
+        const editor = createEditor({
+            content: '<p style="--zw-text-align-mobile:center;--zw-text-align-desktop:right">test</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
     test('should set null if no alignment', () => {
         const editor = createEditor({
             content: '<p>test</p>'

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

@@ -1,10 +1,9 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
-import { NodeFactory } from '../../__tests__/utils';
+import { ref } from 'vue';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { BackgroundColor } from '../BackgroundColor';
-import { ContentNormalizer } from '../../services';
+import { ContentNormalizer, NodeFactory } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -19,11 +18,9 @@ const MockStylePreset = Extension.create({
 });
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(MockStylePreset, BackgroundColor)
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(MockStylePreset, BackgroundColor)
     });
 }
 
@@ -94,6 +91,14 @@ describe('parsing html', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 
+    test('should get value from rendered view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-background-color: red">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
     test('should merge paragraph and text settings', () => {
         const editor = createEditor({
             content: '<p style="background-color: red"><span style="background-color: #000">lorem</span> ipsum</p>'

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

@@ -1,16 +1,13 @@
 import { Editor } from '@tiptap/vue-2';
-import { NodeFactory } from '../../__tests__/utils';
 import { CaseStyles } from '../../enums';
-import { CORE_EXTENSIONS } from '../core';
 import { CaseStyle } from '../CaseStyle';
-import { ContentNormalizer } from '../../services';
+import { ContentNormalizer, NodeFactory } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(CaseStyle)
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(CaseStyle)
     });
 }
 

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

@@ -1,10 +1,9 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
-import { NodeFactory } from '../../__tests__/utils';
+import { ref } from 'vue';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { FontColor } from '../FontColor';
-import { ContentNormalizer } from '../../services';
+import { ContentNormalizer, NodeFactory } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -19,11 +18,9 @@ const MockStylePreset = Extension.create({
 });
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(MockStylePreset, FontColor)
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(MockStylePreset, FontColor)
     });
 }
 
@@ -104,6 +101,14 @@ describe('parsing html', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 
+    test('should get value from parsed view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-color: red">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
     test('should merge paragraph and text settings', () => {
         const editor = createEditor({
             content: '<p style="color: red"><span style="color: #000">lorem</span> ipsum</p>'

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

@@ -1,13 +1,12 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
-import { NodeFactory } from '../../__tests__/utils';
+import { ref } from 'vue';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { Font } from '../../models';
 import { FontFamily } from '../FontFamily';
 import { FontWeight } from '../FontWeight';
 import { FontStyle } from '../FontStyle';
-import { ContentNormalizer } from '../../services';
+import { ContentNormalizer, NodeFactory } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -25,17 +24,18 @@ const MockStylePreset = Extension.create({
 });
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(
             MockStylePreset,
             FontFamily.configure({
                 fonts: [
                     new Font({ name: 'Lato', styles: ['400', '700', '700i'] }),
-                    new Font({ name: 'Bungee', styles: ['400'] })
-                ]
+                    new Font({ name: 'Bungee', styles: ['400'] }),
+                    new Font({ name: 'Roboto', styles: ['400'] }),
+                    new Font({ name: 'Josefin Slab', styles: ['400'] })
+                ],
+                defaultFont: 'Lato'
             }),
             FontWeight,
             FontStyle
@@ -190,6 +190,22 @@ describe('parsing html', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 
+    test('should get value from rendered view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-font-family: Lato">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should get set default if undefined font', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-font-family: Arial">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
     test('should merge paragraph and text settings', () => {
         const editor = createEditor({
             content: '<p style="font-family: Lato"><span style="font-family: Roboto">lorem</span> ipsum</p>'
@@ -197,4 +213,12 @@ describe('parsing html', () => {
 
         expect(editor.getJSON()).toMatchSnapshot();
     });
+
+    test('should get parse font name with quotes', () => {
+        const editor = createEditor({
+            content: '<p>hello <span style="font-family: &quot;Josefin Slab&quot;;">world</span></p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
 });

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

@@ -1,11 +1,10 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
-import { NodeFactory } from '../../__tests__/utils';
+import { ref } from 'vue';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { FontSize } from '../FontSize';
 import { DeviceManager } from '../DeviceManager';
-import { ContentNormalizer } from '../../services';
+import { ContentNormalizer, NodeFactory } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -22,18 +21,17 @@ const MockStylePreset = Extension.create({
 });
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(
             MockStylePreset,
             DeviceManager.configure({
-                deviceRef: ref('desktop')
+                device: ref('desktop')
             }),
             FontSize.configure({
                 minSize: 5,
-                maxSize: 20
+                maxSize: 20,
+                wrapperRef: ref(document.createElement('div'))
             })
         )
     });
@@ -202,6 +200,14 @@ describe('parsing html', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 
+    test('should get value from rendered view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-font-size-mobile: 24px; --zw-font-size-desktop:30px">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
     test('should merge paragraph and text settings', () => {
         const editor = createEditor({
             content: '<p style="font-size: 24px"><span style="font-size: 20px">lorem</span> ipsum</p>'

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

@@ -1,13 +1,12 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
-import { NodeFactory } from '../../__tests__/utils';
+import { ref } from 'vue';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { FontStyle } from '../FontStyle';
 import { FontFamily } from '../FontFamily';
 import { Font } from '../../models';
 import { FontWeight } from '../FontWeight';
-import { ContentNormalizer } from '../../services';
+import { ContentNormalizer, NodeFactory } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -26,11 +25,9 @@ const MockStylePreset = Extension.create({
 });
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(
             MockStylePreset,
             FontStyle,
             FontWeight,
@@ -155,6 +152,14 @@ describe('parsing html', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 
+    test('should get value from rendered view', () => {
+        const editor = createEditor({
+            content: '<p><span style="--zw-font-style: italic">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
     test('should get value from i tag', () => {
         const editor = createEditor({
             content: '<p><i>lorem</i> ipsum</p>'

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

@@ -1,13 +1,12 @@
 import { Editor, Extension } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
-import { NodeFactory } from '../../__tests__/utils';
+import { ref } from 'vue';
 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 { ContentNormalizer, NodeFactory } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -25,11 +24,9 @@ const MockStylePreset = Extension.create({
 });
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(
             MockStylePreset,
             FontFamily.configure({
                 fonts: [
@@ -182,6 +179,14 @@ describe('parsing html', () => {
         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>'
@@ -205,4 +210,12 @@ describe('parsing html', () => {
 
         expect(editor.getJSON()).toMatchSnapshot();
     });
+
+    test('should ignore invalid value', () => {
+        const editor = createEditor({
+            content: '<p><span style="font-weight: var(--font-weight)">lorem</span> ipsum</p>'
+        });
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
 });

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

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