@zipify/wysiwyg 1.0.0-dev.17 → 1.0.0-dev.18

package/lib/enums/TextSettings.js

@@ -8,6 +8,7 @@ export const TextSettings = Object.freeze({
     FONT_WEIGHT: 'font_weight',
     LINE_HEIGHT: 'line_height',
     TEXT_DECORATION: 'text_decoration',
+    SUPERSCRIPT: 'superscript',
 
     get attributes() {
         return [
@@ -24,7 +25,8 @@ export const TextSettings = Object.freeze({
             this.FONT_SIZE,
             this.FONT_STYLE,
             this.FONT_WEIGHT,
-            this.TEXT_DECORATION
+            this.TEXT_DECORATION,
+            this.SUPERSCRIPT
         ];
     }
 });

package/lib/enums/index.js

@@ -4,3 +4,5 @@ export { Alignments } from './Alignments';
 export { NodeTypes } from './NodeTypes';
 export { ListTypes } from './ListTypes';
 export { TextSettings } from './TextSettings';
+export { LinkTargets } from './LinkTargets';
+export { LinkDestinations } from './LinkDestinations';

package/lib/extensions/Alignment.js

@@ -19,19 +19,31 @@ export const Alignment = Extension.create({
                 [TextSettings.ALIGNMENT]: {
                     isRequired: false,
 
-                    parseHTML(el) {
-                        const value = el.style.textAlign;
+                    parseHTML({ style }) {
+                        if (style.textAlign) {
+                            return {
+                                desktop: style.textAlign,
+                                tablet: style.textAlign,
+                                mobile: style.textAlign
+                            };
+                        }
 
-                        return value ? { desktop: value, tablet: value, mobile: value } : null;
+                        const mobile = style.getPropertyValue('--zw-text-align-mobile') || null;
+                        const tablet = style.getPropertyValue('--zw-text-align-tablet') || null;
+                        const desktop = style.getPropertyValue('--zw-text-align-desktop') || null;
+
+                        if (!mobile && !tablet && !desktop) return null;
+
+                        return { desktop, tablet, mobile };
                     },
 
                     renderHTML(attrs) {
                         if (!attrs.alignment) return null;
 
                         return renderInlineSetting({
-                            mobile_text_align: attrs.alignment.mobile,
-                            tablet_text_align: attrs.alignment.tablet,
-                            desktop_text_align: attrs.alignment.desktop
+                            text_align_mobile: attrs.alignment.mobile,
+                            text_align_tablet: attrs.alignment.tablet,
+                            text_align_desktop: attrs.alignment.desktop
                         });
                     }
                 }

package/lib/extensions/BackgroundColor.js

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

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

@@ -62,25 +62,38 @@ export const FontSize = Mark.create({
         'Mod-Shift--': createKeyboardShortcut('decreaseFontSize')
     }),
 
-    parseHTML: () => [
-        {
-            style: 'font-size',
-
-            getAttrs: (input) => {
-                const value = String(parseInt(input));
-
-                return { desktop: value, tablet: value, mobile: value };
+    parseHTML() {
+        const parseSize = (value) => value ? String(parseInt(value)) : null;
+
+        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,28 @@ 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) => ({ value });
+
+        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

@@ -21,6 +21,14 @@ export const LineHeight = Extension.create({
                     isRequired: false,
 
                     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;
+
+                            return { mobile, tablet, desktop };
+                        }
+
                         const value = element.style.lineHeight;
 
                         if (!value) return null;
@@ -41,9 +49,9 @@ export const LineHeight = Extension.create({
                         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
+                            line_height_mobile: attrs.line_height.mobile,
+                            line_height_tablet: attrs.line_height.tablet,
+                            line_height_desktop: attrs.line_height.desktop
                         });
                     }
                 }

package/lib/extensions/Link.js

@@ -0,0 +1,101 @@
+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,
+            HTMLAttributes: {
+                target: LinkTargets.SELF
+            },
+            preset: {},
+            basePresetClass: null,
+            pageBlocks: []
+        };
+    },
+
+    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: this.options.target,
+                parseHTML: (element) => {
+                    const target = element.getAttribute('target');
+
+                    if (!target) return LinkTargets.SELF;
+
+                    return target;
+                }
+            },
+
+            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.pageBlocks.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

@@ -39,11 +39,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);
 
@@ -148,7 +150,7 @@ export const StylePreset = Extension.create({
                 chain()
                     .storeSelection()
                     .expandSelectionToBlock()
-                    .unsetAllMarks()
+                    .unsetMarks(TextSettings.marks)
                     .resetAttributes(NodeTypes.PARAGRAPH, TextSettings.attributes)
                     .resetAttributes(NodeTypes.HEADING, TextSettings.attributes)
                     .restoreSelection()

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,29 @@ 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
+            }
+        ];
+    },
 
     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>'

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

@@ -1,16 +1,14 @@
 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 { 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

@@ -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 { FontColor } from '../FontColor';
 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, FontColor)
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(MockStylePreset, FontColor)
     });
 }
 
@@ -104,6 +102,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>'