@zipify/wysiwyg 1.0.0-dev.9 → 1.0.0-dev.90

package/lib/extensions/core/TextProcessor.js

@@ -1,22 +1,21 @@
 import { Extension } from '@tiptap/vue-2';
 import { createCommand } from '../../utils';
-import {
-    emDash,
-    registeredTrademark,
-    trademark,
-    ellipsis,
-    openDoubleQuote,
-    openSingleQuote,
-    closeDoubleQuote,
-    closeSingleQuote,
-    copyright
-} from './inputRules';
 
 export const TextProcessor = Extension.create({
     name: 'text_processor',
 
     addCommands() {
         return {
+            getSelectedText: createCommand(({ state }) => {
+                const { from, to } = state.selection;
+
+                return state.doc.textBetween(from, to, ' ');
+            }),
+
+            unsetMarks: createCommand(({ commands }, marks) => {
+                marks.forEach((mark) => commands.unsetMark(mark));
+            }),
+
             transformText: createCommand(({ state }, transform) => {
                 const { selection } = state.tr;
 
@@ -41,17 +40,5 @@ export const TextProcessor = Extension.create({
                 });
             })
         };
-    },
-
-    addInputRules: () => [
-        emDash,
-        registeredTrademark,
-        trademark,
-        ellipsis,
-        openDoubleQuote,
-        openSingleQuote,
-        closeDoubleQuote,
-        closeSingleQuote,
-        copyright
-    ]
+    }
 });

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

@@ -1,8 +1,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';
+import { ContentNormalizer, NodeFactory } from '../../../services';
+import { buildCoreExtensions } from '../index';
 
 const LineHeight = Extension.create({
     name: 'line_height',
@@ -21,11 +20,9 @@ const LineHeight = Extension.create({
 });
 
 function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
-
     return new Editor({
-        content: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS.concat(LineHeight) // Included to core extensions
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions().concat(LineHeight) // Included to core extensions
     });
 }
 

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

@@ -1,19 +1,16 @@
 import { Editor } from '@tiptap/vue-2';
-import { CORE_EXTENSIONS } from '../index';
-import { NodeFactory } from '../../../__tests__/utils';
-import { ContentNormalizer } from '../../../services';
+import { ContentNormalizer, NodeFactory } from '../../../services';
+import { buildCoreExtensions } from '../index';
 
 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: normalizer.normalize(content),
-        extensions: CORE_EXTENSIONS // included to core
+        content: ContentNormalizer.normalize(content),
+        extensions: buildCoreExtensions() // included to core
     });
 }
 

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

@@ -1,29 +1,119 @@
-import { Editor, Mark } from '@tiptap/vue-2';
-import { NodeFactory } from '../../../__tests__/utils';
-import { CORE_EXTENSIONS } from '../index';
-import { ContentNormalizer } from '../../../services';
+import { Editor, Mark, Extension } from '@tiptap/vue-2';
+import { ContentNormalizer, NodeFactory } from '../../../services';
+import { NodeTypes, TextSettings } from '../../../enums';
+import { buildCoreExtensions } from '../index';
+
+const MockFontSize = Mark.create({
+    name: TextSettings.FONT_SIZE,
+
+    addAttributes: () => ({
+        value: { default: null }
+    }),
+
+    renderHTML: () => ['span', {}, 0]
+});
 
 const MockFontWeight = Mark.create({
-    name: 'font_weight',
+    name: TextSettings.FONT_WEIGHT,
 
     addAttributes: () => ({
-        value: { required: true }
+        value: { default: null }
     }),
 
-    renderHTML(context) {
-        const { value } = context.HTMLAttributes;
+    renderHTML: () => ['span', {}, 0]
+});
+
+const MockAlignment = Extension.create({
+    name: TextSettings.ALIGNMENT,
 
-        return ['span', { style: `font-weight: ${value}` }, 0];
-    }
+    addGlobalAttributes: () => [
+        {
+            types: [NodeTypes.PARAGRAPH, NodeTypes.HEADING],
+            attributes: {
+                [TextSettings.ALIGNMENT]: {
+                    default: null,
+                    renderHTML: () => ({})
+                }
+            }
+        }
+    ]
 });
 
-function createEditor({ content }) {
-    const normalizer = new ContentNormalizer();
+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 }) {
     return new Editor({
-        content: normalizer.normalize(content),
+        content: ContentNormalizer.normalize(content),
         element: document.createElement('div'),
-        extensions: CORE_EXTENSIONS.concat(MockFontWeight)
+        extensions: buildCoreExtensions().concat(
+            MockFontSize,
+            MockFontWeight,
+            MockAlignment,
+            MockBackgroundColor,
+            MockFontColor,
+            MockFontFamily,
+            MockFontStyle,
+            MockTextDecoration,
+            MockSuperscript
+        )
     });
 }
 
@@ -62,3 +152,38 @@ describe('transform text', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 });
+
+describe('selected text', () => {
+    test('should return selected text', () => {
+        const editor = createEditor({
+            content: NodeFactory.doc([
+                NodeFactory.paragraph('hello world')
+            ])
+        });
+
+        editor.commands.setTextSelection({ from: 5, to: 11 });
+
+        expect(editor.commands.getSelectedText()).toEqual('o worl');
+    });
+});
+
+describe('unset marks', () => {
+    test('should reset all marks', () => {
+        const editor = createEditor({
+            content: NodeFactory.doc([
+                NodeFactory.paragraph([
+                    NodeFactory.text('hello world', [
+                        NodeFactory.mark('font_weight', { value: '700' })
+                    ])
+                ])
+            ])
+        });
+
+        editor.chain()
+            .selectAll()
+            .unsetMarks(TextSettings.marks)
+            .run();
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+});

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

@@ -4,6 +4,9 @@ exports[`transform text should keep text marks 1`] = `
 Object {
   "content": Array [
     Object {
+      "attrs": Object {
+        "alignment": null,
+      },
       "content": Array [
         Object {
           "marks": Array [
@@ -29,6 +32,9 @@ exports[`transform text should transform selected text 1`] = `
 Object {
   "content": Array [
     Object {
+      "attrs": Object {
+        "alignment": null,
+      },
       "content": Array [
         Object {
           "text": "hELLO world",
@@ -41,3 +47,23 @@ Object {
   "type": "doc",
 }
 `;
+
+exports[`unset marks should reset all marks 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "attrs": Object {
+        "alignment": null,
+      },
+      "content": Array [
+        Object {
+          "text": "hello world",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;

package/lib/extensions/core/index.js

@@ -1,17 +1,26 @@
 import Document from '@tiptap/extension-document';
 import Paragraph from '@tiptap/extension-paragraph';
 import Text from '@tiptap/extension-text';
+import Placeholder from '@tiptap/extension-placeholder';
+import History from '@tiptap/extension-history';
 import { NodeProcessor } from './NodeProcessor';
 import { TextProcessor } from './TextProcessor';
 import { SelectionProcessor } from './SelectionProcessor';
+import { CopyPasteProcessor } from './CopyPasteProcessor';
 
-export const CORE_EXTENSIONS = [
+export const buildCoreExtensions = () => [
     Document,
     Paragraph.configure({
         HTMLAttributes: { class: 'zw-style' }
     }),
+    Placeholder.configure({
+        placeholder: 'Type your text here...',
+        emptyNodeClass: 'zw-wysiwyg__placeholder'
+    }),
     Text,
+    History,
     NodeProcessor,
     TextProcessor,
-    SelectionProcessor
+    SelectionProcessor,
+    CopyPasteProcessor
 ];

package/lib/extensions/core/plugins/PastePlugin.js

@@ -0,0 +1,57 @@
+import { ContentNormalizer } from '../../../services';
+import { NodeTypes } from '../../../enums';
+import { ProseMirrorPlugin } from './ProseMirrorPlugin';
+
+export class PastePlugin extends ProseMirrorPlugin {
+    buildProps() {
+        return {
+            transformPastedHTML: ContentNormalizer.normalize,
+            handlePaste: this._handlePaste.bind(this)
+        };
+    }
+
+    _handlePaste(view, _, slice) {
+        const transaction = this._insertPastedContent(view, slice)
+            .scrollIntoView()
+            .setMeta('paste', true)
+            .setMeta('uiEvent', 'paste');
+
+        view.dispatch(transaction);
+
+        return true;
+    }
+
+    _insertPastedContent({ state, input }, slice) {
+        if (!this._isFullBlockSelected(state)) {
+            return state.tr.replaceSelection(slice);
+        }
+
+        return state.tr.replaceSelectionWith(slice.content, input.shiftKey);
+    }
+
+    _isFullBlockSelected(state) {
+        const blocksSelection = this._expandSelectionToBlocks(state);
+        const isFromMatch = this._isMatchPosition(blocksSelection.from, state.selection.from);
+        const isToMatch = this._isMatchPosition(blocksSelection.to, state.selection.to);
+
+        return isFromMatch && isToMatch;
+    }
+
+    _expandSelectionToBlocks({ selection, doc }) {
+        let from = selection.from;
+        let to = selection.to;
+
+        doc.nodesBetween(from, to, (node, position, parent) => {
+            if (parent.type.name !== NodeTypes.DOCUMENT) return;
+
+            from = Math.min(from, position + 1);
+            to = Math.max(to, position + node.nodeSize - 1);
+        });
+
+        return { from, to };
+    }
+
+    _isMatchPosition(position1, position2) {
+        return Math.abs(position1 - position2) < 5;
+    }
+}

package/lib/extensions/core/plugins/ProseMirrorPlugin.js

@@ -0,0 +1,20 @@
+import { Plugin, PluginKey } from 'prosemirror-state';
+
+export class ProseMirrorPlugin {
+    static create(options) {
+        const plugin = new this(options || {});
+
+        return new Plugin({
+            key: new PluginKey(this.name),
+            props: plugin.buildProps()
+        });
+    }
+
+    constructor(options) {
+        this.options = options;
+    }
+
+    buildProps() {
+        return {};
+    }
+}

package/lib/extensions/core/plugins/index.js

@@ -0,0 +1 @@
+export { PastePlugin } from './PastePlugin';

package/lib/extensions/index.js

@@ -1,5 +1,3 @@
-import History from '@tiptap/extension-history';
-import { CORE_EXTENSIONS } from './core';
 import { FontFamily } from './FontFamily';
 import { StylePreset } from './StylePreset';
 import { FontWeight } from './FontWeight';
@@ -13,38 +11,52 @@ import { CaseStyle } from './CaseStyle';
 import { Alignment } from './Alignment';
 import { LineHeight } from './LineHeight';
 import { List } from './list';
+import { Link } from './Link';
 import { Superscript } from './Superscript';
+import { buildCoreExtensions } from './core';
 
-export { CORE_EXTENSIONS };
+export function buildExtensions(options) {
+    const getPresetById = (id) => options.presetsRef.value.find((preset) => preset.id === id);
+    const defaultPreset = getPresetById(options.defaultPresetId);
+    const linkPreset = getPresetById(options.linkPresetId);
 
-export const getExtensions = (options) => CORE_EXTENSIONS.concat([
-    History,
-    StylePreset.configure({
-        presetsRef: options.presetsRef,
-        defaultId: options.defaultPresetId,
-        baseClass: options.basePresetClass,
-        makeVariable: options.makePresetVariable
-    }),
-    List.configure({
-        baseClass: options.baseListClass
-    }),
-    DeviceManager.configure({
-        deviceRef: options.deviceRef
-    }),
-    FontFamily.configure({
-        fonts: options.fonts
-    }),
-    FontWeight,
-    FontSize.configure({
-        minSize: options.minFontSize,
-        maxSize: options.maxFontSize
-    }),
-    FontColor,
-    BackgroundColor,
-    FontStyle,
-    TextDecoration,
-    CaseStyle,
-    Superscript,
-    Alignment,
-    LineHeight
-]);
+    return buildCoreExtensions(options).concat([
+        StylePreset.configure({
+            presets: options.presetsRef,
+            defaultId: options.defaultPresetId,
+            baseClass: options.basePresetClass,
+            makeVariable: options.makePresetVariable
+        }),
+        List.configure({
+            baseClass: options.baseListClass
+        }),
+        DeviceManager.configure({
+            device: options.deviceRef
+        }),
+        FontFamily.configure({
+            fonts: options.fonts,
+            defaultFont: defaultPreset.common.font_family
+        }),
+        FontWeight,
+        FontSize.configure({
+            minSize: options.minFontSize,
+            maxSize: options.maxFontSize,
+            wrapperRef: options.wrapperRef
+        }),
+        FontColor,
+        BackgroundColor,
+        FontStyle,
+        TextDecoration,
+        CaseStyle,
+        Superscript,
+        Alignment,
+        LineHeight.configure({
+            wrapperRef: options.wrapperRef
+        }),
+        Link.configure({
+            preset: linkPreset,
+            basePresetClass: options.basePresetClass,
+            pageBlocks: options.pageBlocksRef
+        })
+    ]);
+}

package/lib/extensions/list/List.js

@@ -1,5 +1,5 @@
 import { Node, wrappingInputRule } from '@tiptap/vue-2';
-import { computed } from '@vue/composition-api';
+import { computed } from 'vue';
 import { createCommand } from '../../utils';
 import { ListTypes, NodeTypes } from '../../enums';
 import { ListItem } from './ListItem';
@@ -18,7 +18,9 @@ export const List = Node.create({
     }),
 
     addAttributes: () => ({
-        bullet: { isRequired: true }
+        bullet: {
+            default: { type: ListTypes.DISC }
+        }
     }),
 
     parseHTML() {
@@ -80,12 +82,11 @@ export const List = Node.create({
                     return;
                 }
 
-                return chain().removeList()._addList(type).run();
+                return chain().applyDefaultPreset()._addList(type).run();
             }),
 
             _addList: createCommand(({ chain }, type) => {
                 return chain()
-                    .removePreset()
                     .toggleList(NodeTypes.LIST, NodeTypes.LIST_ITEM)
                     .setBlockAttributes('bullet', { type })
                     .run();

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

@@ -1,24 +1,20 @@
 import { Editor } from '@tiptap/vue-2';
-import { ref } from '@vue/composition-api';
-import { NodeFactory } from '../../../__tests__/utils';
 import { ListTypes } from '../../../enums';
-import { CORE_EXTENSIONS } from '../../core';
 import { StylePreset } from '../../StylePreset';
 import { List } from '../List';
-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),
+        content: ContentNormalizer.normalize(content),
         element: document.createElement('div'),
-        extensions: CORE_EXTENSIONS.concat(
+        extensions: buildCoreExtensions().concat(
             List.configure({
                 baseClass: 'zw-list--'
             }),
             StylePreset.configure({
-                presetsRef: ref([
+                presets: [
                     {
                         id: 'regular-1',
                         common: {},
@@ -26,7 +22,7 @@ function createEditor({ content }) {
                         tablet: {},
                         desktop: {}
                     }
-                ]),
+                ],
                 defaultId: 'regular-1',
                 baseClass: 'zw ts-'
             })