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

package/lib/extensions/DeviceManager.js

@@ -4,10 +4,6 @@ import { createCommand } from '../utils';
 export const DeviceManager = Extension.create({
     name: 'device_manager',
 
-    addOptions: () => ({
-        deviceRef: null
-    }),
-
     addCommands() {
         return {
             getDevice: createCommand(() => this.options.deviceRef)

package/lib/extensions/FontColor.js

@@ -30,12 +30,20 @@ export const FontColor = Mark.create({
         };
     },
 
-    parseHTML: () => [
-        {
-            style: 'color',
-            getAttrs: (value) => ({ value: convertColor(value) })
-        }
-    ],
+    parseHTML() {
+        const getAttrs = (value) => ({ value: convertColor(value) });
+
+        return [
+            {
+                style: '--zw-font-color',
+                getAttrs
+            },
+            {
+                style: 'color',
+                getAttrs
+            }
+        ];
+    },
 
     renderHTML({ HTMLAttributes: attrs }) {
         return renderMark({ font_color: attrs.value });

package/lib/extensions/FontFamily.js

@@ -7,7 +7,8 @@ export const FontFamily = Mark.create({
     name: TextSettings.FONT_FAMILY,
 
     addOptions: () => ({
-        fonts: []
+        fonts: [],
+        defaultFont: ''
     }),
 
     addAttributes: () => ({
@@ -56,14 +57,30 @@ export const FontFamily = Mark.create({
         };
     },
 
-    parseHTML: () => [
-        {
-            style: 'font-family',
-            getAttrs: (value) => ({ value })
-        }
-    ],
+    parseHTML() {
+        const getAttrs = (input) => {
+            const parsed = input.replace(/"/g, '');
+            const isExists = this.options.fonts.some((font) => font.name === parsed);
+            const value = isExists ? parsed : this.options.defaultFont;
+
+            return { value };
+        };
+
+        return [
+            {
+                style: '--zw-font-family',
+                getAttrs
+            },
+            {
+                style: 'font-family',
+                getAttrs
+            }
+        ];
+    },
 
     renderHTML({ HTMLAttributes: attrs }) {
-        return renderMark({ font_family: attrs.value });
+        const font_family = attrs.value ? `"${attrs.value}"` : null;
+
+        return renderMark({ font_family });
     }
 });

package/lib/extensions/FontSize.js

@@ -1,6 +1,6 @@
 import { Mark } from '@tiptap/vue-2';
 import { computed } from '@vue/composition-api';
-import { createCommand, createKeyboardShortcut, renderMark } from '../utils';
+import { convertFontSize, createCommand, createKeyboardShortcut, renderMark } from '../utils';
 import { TextSettings } from '../enums';
 
 export const FontSize = Mark.create({
@@ -62,25 +62,44 @@ export const FontSize = Mark.create({
         'Mod-Shift--': createKeyboardShortcut('decreaseFontSize')
     }),
 
-    parseHTML: () => [
-        {
-            style: 'font-size',
+    parseHTML() {
+        const parseSize = (value) => {
+            if (!value) return null;
 
-            getAttrs: (input) => {
-                const value = String(parseInt(input));
+            const converted = convertFontSize(value, this.options.wrapperRef.value);
 
-                return { desktop: value, tablet: value, mobile: value };
+            return String(converted);
+        };
+
+        return [
+            {
+                tag: '[style*="--zw-font-size"]',
+
+                getAttrs: ({ style }) => ({
+                    mobile: parseSize(style.getPropertyValue('--zw-font-size-mobile')),
+                    tablet: parseSize(style.getPropertyValue('--zw-font-size-tablet')),
+                    desktop: parseSize(style.getPropertyValue('--zw-font-size-desktop'))
+                })
+            },
+            {
+                style: 'font-size',
+
+                getAttrs: (input) => {
+                    const value = parseSize(input);
+
+                    return { desktop: value, tablet: value, mobile: value };
+                }
             }
-        }
-    ],
+        ];
+    },
 
     renderHTML({ HTMLAttributes: attrs }) {
         const addUnits = (value) => value ? `${value}px` : null;
 
         return renderMark({
-            mobile_font_size: addUnits(attrs.mobile),
-            tablet_font_size: addUnits(attrs.tablet),
-            desktop_font_size: addUnits(attrs.desktop)
+            font_size_mobile: addUnits(attrs.mobile),
+            font_size_tablet: addUnits(attrs.tablet),
+            font_size_desktop: addUnits(attrs.desktop)
         });
     }
 });

package/lib/extensions/FontStyle.js

@@ -56,18 +56,28 @@ export const FontStyle = Mark.create({
         'Mod-I': createKeyboardShortcut('toggleItalic')
     }),
 
-    parseHTML: () => [
-        {
-            tag: 'i',
-            attrs: { italic: true }
-        },
-        {
-            style: 'font-style',
-            getAttrs: (value) => ({ italic: value.includes('italic') })
-        }
-    ],
-
-    renderHTML() {
-        return renderMark({ font_style: 'italic' });
+    parseHTML() {
+        const getAttrs = (value) => value.includes('italic') && { italic: true };
+
+        return [
+            {
+                style: '--zw-font-style',
+                getAttrs
+            },
+            {
+                style: 'font-style',
+                getAttrs
+            },
+            {
+                tag: 'i',
+                attrs: { italic: true }
+            }
+        ];
+    },
+
+    renderHTML({ HTMLAttributes: attrs }) {
+        const font_style = attrs.italic ? 'italic' : null;
+
+        return renderMark({ font_style });
     }
 });

package/lib/extensions/FontWeight.js

@@ -59,20 +59,30 @@ export const FontWeight = Mark.create({
         'Mod-B': createKeyboardShortcut('toggleBold')
     }),
 
-    parseHTML: () => [
-        {
-            tag: 'b',
-            attrs: { value: '700' }
-        },
-        {
-            tag: 'strong',
-            attrs: { value: '700' }
-        },
-        {
-            style: 'font-weight',
-            getAttrs: (value) => ({ value })
-        }
-    ],
+    parseHTML() {
+        const getAttrs = (value) => {
+            return Number(value) ? { value } : false;
+        };
+
+        return [
+            {
+                style: '--zw-font-weight',
+                getAttrs
+            },
+            {
+                style: 'font-weight',
+                getAttrs
+            },
+            {
+                tag: 'b',
+                attrs: { value: '700' }
+            },
+            {
+                tag: 'strong',
+                attrs: { value: '700' }
+            }
+        ];
+    },
 
     renderHTML({ HTMLAttributes: attrs }) {
         return renderMark({ font_weight: attrs.value });

package/lib/extensions/LineHeight.js

@@ -1,6 +1,6 @@
 import { Extension } from '@tiptap/vue-2';
 import { computed } from '@vue/composition-api';
-import { createCommand, renderInlineSetting } from '../utils';
+import { createCommand, renderInlineSetting, convertLineHeight } from '../utils';
 import { NodeTypes, TextSettings } from '../enums';
 
 const DEFAULTS = {
@@ -12,43 +12,46 @@ const DEFAULTS = {
 export const LineHeight = Extension.create({
     name: TextSettings.LINE_HEIGHT,
 
-    addGlobalAttributes: () => [
-        {
-            types: [NodeTypes.PARAGRAPH, NodeTypes.HEADING],
-            attributes: {
-                [TextSettings.LINE_HEIGHT]: {
-                    isRequired: false,
+    addGlobalAttributes() {
+        return [
+            {
+                types: [NodeTypes.PARAGRAPH, NodeTypes.HEADING],
+                attributes: {
+                    [TextSettings.LINE_HEIGHT]: {
+                        isRequired: false,
 
-                    parseHTML(element) {
-                        const value = element.style.lineHeight;
+                        parseHTML: (element) => {
+                            if (element.matches('[style*="--zw-line-height"]')) {
+                                const mobile = element.style.getPropertyValue('--zw-line-height-mobile') || null;
+                                const tablet = element.style.getPropertyValue('--zw-line-height-tablet') || null;
+                                const desktop = element.style.getPropertyValue('--zw-line-height-desktop') || null;
 
-                        if (!value) return null;
+                                return { mobile, tablet, desktop };
+                            }
 
-                        if (!value.includes('px')) {
-                            return { desktop: value, tablet: value, mobile: value };
-                        }
+                            const value = element.style.lineHeight;
+
+                            if (!value) return null;
 
-                        // element is not connected to window so getComputedStyle is not working on element
-                        const childFontSize = element.firstElementChild.style.fontSize;
-                        const fontSize = childFontSize || window.getComputedStyle(document.body).fontSize;
-                        const relative = (parseFloat(value) / parseFloat(fontSize)).toFixed(2);
+                            const converted = convertLineHeight(value, element, this.options.wrapperRef.value);
 
-                        return { desktop: relative, tablet: relative, mobile: relative };
-                    },
+                            return { desktop: converted, tablet: converted, mobile: converted };
+                        },
 
-                    renderHTML(attrs) {
-                        if (!attrs.line_height) return null;
+                        renderHTML(attrs) {
+                            if (!attrs.line_height) return null;
 
-                        return renderInlineSetting({
-                            mobile_line_height: attrs.line_height.mobile,
-                            tablet_line_height: attrs.line_height.tablet,
-                            desktop_line_height: attrs.line_height.desktop
-                        });
+                            return renderInlineSetting({
+                                line_height_mobile: attrs.line_height.mobile,
+                                line_height_tablet: attrs.line_height.tablet,
+                                line_height_desktop: attrs.line_height.desktop
+                            });
+                        }
                     }
                 }
             }
-        }
-    ],
+        ];
+    },
 
     addCommands() {
         return {

package/lib/extensions/Link.js

@@ -0,0 +1,89 @@
+import Base from '@tiptap/extension-link';
+import { createCommand } from '../utils';
+import { LinkDestinations, LinkTargets } from '../enums';
+
+export const Link = Base.extend({
+    name: 'link',
+
+    addOptions() {
+        return {
+            ...this.parent?.(),
+            openOnClick: false
+        };
+    },
+
+    addAttributes() {
+        return {
+            href: {
+                default: null,
+                parseHTML: (element) => {
+                    const href = element.getAttribute('href');
+
+                    if (!href.startsWith('#')) return href;
+
+                    return parseFloat(element.getAttribute('href').replace('#', ''));
+                }
+            },
+
+            target: {
+                default: LinkTargets.SELF,
+                parseHTML: (element) => element.getAttribute('target') || LinkTargets.SELF
+            },
+
+            destination: {
+                default: LinkDestinations.URL,
+                parseHTML: (element) => {
+                    const href = element.getAttribute('href');
+
+                    if (!href.startsWith('#')) return LinkDestinations.URL;
+
+                    const id = href.replace('#', '');
+                    const block = this.options.pageBlocksRef.value.find((block) => block.id === parseInt(id));
+
+                    return block ? LinkDestinations.BLOCK : LinkDestinations.URL;
+                }
+            }
+        };
+    },
+
+    addCommands() {
+        return {
+            ...this.parent?.(),
+            applyLink: createCommand(({ commands, chain }, attributes) => {
+                if (!commands.getSelectedText()) {
+                    return commands.insertContent({
+                        type: 'text',
+                        marks: [
+                            {
+                                type: 'link',
+                                attrs: { ...attributes }
+                            }
+                        ],
+                        text: attributes.text
+                    });
+                }
+
+                return chain()
+                    .setMark(this.name, attributes)
+                    .transformText(() => attributes.text)
+                    .extendMarkRange('link')
+                    .run();
+            })
+        };
+    },
+
+    renderHTML({ HTMLAttributes: attrs }) {
+        const href = attrs.destination === LinkDestinations.BLOCK ? `#${attrs.href}` : attrs.href;
+
+        const presetClass = this.options.basePresetClass + this.options.preset.id;
+        const classes = `${presetClass} zw-style`;
+
+        const linkAttrs = {
+            href,
+            target: attrs.target,
+            class: classes
+        };
+
+        return ['a', linkAttrs, 0];
+    }
+});

package/lib/extensions/StylePreset.js

@@ -3,6 +3,7 @@ import { computed, toRef } from '@vue/composition-api';
 import { Heading } from '@tiptap/extension-heading';
 import { createCommand } from '../utils';
 import { Devices, NodeTypes, TextSettings } from '../enums';
+import { ContextWindow } from '../services';
 
 function makePresetClass(base, preset) {
     const baseClass = base.split(' ').map((part) => `.${part}`).join('');
@@ -20,13 +21,6 @@ export const StylePreset = Extension.create({
         })
     ],
 
-    addOptions: () => ({
-        presetsRef: null,
-        defaultId: null,
-        baseClass: null,
-        makeVariable: null
-    }),
-
     addStorage: () => ({
         presetStyleEl: null
     }),
@@ -38,11 +32,13 @@ export const StylePreset = Extension.create({
                 attributes: {
                     preset: {
                         isRequired: false,
-                        default: null,
+                        default: { id: this.options.defaultId },
 
                         parseHTML: (element) => {
                             const presets = this.options.presetsRef.value;
 
+                            if (element.parentElement.tagName === 'LI') return null;
+
                             for (const { id, node, fallbackClass } of presets) {
                                 const isFallback = fallbackClass && element.classList.contains(fallbackClass);
 
@@ -147,29 +143,34 @@ export const StylePreset = Extension.create({
                 chain()
                     .storeSelection()
                     .expandSelectionToBlock()
-                    .unsetAllMarks()
+                    .unsetMarks(TextSettings.marks)
                     .resetAttributes(NodeTypes.PARAGRAPH, TextSettings.attributes)
                     .resetAttributes(NodeTypes.HEADING, TextSettings.attributes)
                     .restoreSelection()
                     .run();
             }),
 
-            removeFormat: createCommand(({ commands }) => {
-                commands.removePresetCustomization();
-                commands.applyDefaultPreset();
+            removeFormat: createCommand(({ chain }) => {
+                chain()
+                    .storeSelection()
+                    .expandSelectionToBlock()
+                    .unsetAllMarks()
+                    .applyDefaultPreset()
+                    .restoreSelection()
+                    .run();
             })
         };
     },
 
     onCreate() {
-        const existingStyleEl = document.querySelector('[data-zw-styles]');
+        const existingStyleEl = ContextWindow.document.querySelector('[data-zw-styles]');
 
         if (existingStyleEl) {
             this.storage.presetStyleEl = existingStyleEl;
             return;
         }
 
-        this.storage.presetStyleEl = document.createElement('style');
+        this.storage.presetStyleEl = ContextWindow.document.createElement('style');
         this.storage.presetStyleEl.dataset.zwStyles = '';
 
         for (const preset of this.options.presetsRef.value) {
@@ -190,6 +191,6 @@ export const StylePreset = Extension.create({
             this.storage.presetStyleEl.innerHTML += css.join(' ');
         }
 
-        document.head.append(this.storage.presetStyleEl);
+        ContextWindow.head.append(this.storage.presetStyleEl);
     }
 });

package/lib/extensions/TextDecoration.js

@@ -13,10 +13,10 @@ 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') || decoration.value.underline);
             }),
 
             isStrikeThrough: createCommand(({ commands }) => {
@@ -51,7 +51,9 @@ export const TextDecoration = Mark.create({
                 });
             }),
 
-            toggleUnderline: createCommand(({ commands }) => {
+            toggleUnderline: createCommand(({ commands, editor }) => {
+                if (editor.isActive('link')) return;
+
                 commands.toggleTextDecoration('underline');
             }),
 
@@ -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

@@ -2,11 +2,11 @@ import { Editor, Extension } from '@tiptap/vue-2';
 import { ref } from '@vue/composition-api';
 import { NodeFactory } from '../../__tests__/utils';
 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 { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -23,11 +23,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,
             DeviceManager.configure({ deviceRef: ref('desktop') }),
             Alignment
@@ -118,6 +116,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

@@ -2,9 +2,9 @@ import { Editor, Extension } from '@tiptap/vue-2';
 import { ref } from '@vue/composition-api';
 import { NodeFactory } from '../../__tests__/utils';
 import { createCommand } from '../../utils';
-import { CORE_EXTENSIONS } from '../core';
 import { BackgroundColor } from '../BackgroundColor';
 import { ContentNormalizer } from '../../services';
+import { buildCoreExtensions } from '../core';
 
 const MockStylePreset = Extension.create({
     name: 'style_preset',
@@ -19,11 +19,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 +92,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>'