@zipify/wysiwyg 2.4.3 → 2.4.4-1

package/lib/components/toolbar/controls/AlignmentDeviceControl.vue

@@ -7,7 +7,7 @@
             @click="toggler.open"
             v-tooltip="'Alignment'"
         >
-            <Icon :name="`alignment-${currentValue}`" size="28px" auto-color />
+            <Icon :name="icon" size="28px" auto-color />
         </Button>
 
         <Modal class="zw-alignment-control__modal" ref="modalRef" :toggler="toggler">
@@ -17,10 +17,11 @@
 </template>
 
 <script>
-import { inject, ref } from 'vue';
+import { computed, inject, ref, unref } from 'vue';
 import { InjectionTokens } from '../../../injectionTokens';
-import { Button, Icon, Modal, useModalToggler } from '../../base';
 import { tooltip } from '../../../directives';
+import { Alignments } from '../../../enums';
+import { Button, Icon, Modal, useModalToggler } from '../../base';
 import AlignmentControl from './AlignmentControl';
 
 export default {
@@ -43,12 +44,22 @@ export default {
         const wrapperRef = ref(null);
         const modalRef = ref(null);
 
-        const toggler = useModalToggler({ wrapperRef, modalRef });
+        const toggler = useModalToggler({
+            wrapperRef,
+            modalRef
+        });
+
+        const icon = computed(() => {
+            const name = unref(currentValue) || Alignments.LEFT;
+
+            return `alignment-${name}`;
+        });
 
         return {
             wrapperRef,
             modalRef,
             currentValue,
+            icon,
             toggler,
             isOpened: toggler.isOpened
         };

package/lib/components/toolbar/controls/link/composables/__tests__/useLink.test.js

@@ -8,6 +8,7 @@ const createEditor = (text, destination) => ({
     commands: {
         storeSelection: jest.fn(),
         restoreSelection: jest.fn(),
+        expandSelectionToLink: jest.fn(),
         getSelectedText: jest.fn(() => text ?? ''),
         focus: jest.fn().mockReturnThis(),
         unsetLink: jest.fn().mockReturnThis(),

package/lib/components/toolbar/controls/link/composables/useLink.js

@@ -16,15 +16,15 @@ export function useLink() {
     }
 
     function prepareInitialFields() {
-        const link = editor.getAttributes(TextSettings.LINK);
-
+        editor.commands.expandSelectionToLink();
         linkData.value.text = editor.commands.getSelectedText();
-        currentDestination.value.id = link.destination || LinkDestinations.URL;
-        linkData.value.target = link.target || LinkTargets.SELF;
 
-        if (link.href) {
-            destinationHrefs.value[currentDestination.value.id] = link.href;
-        }
+        const { destination, href, target } = editor.getAttributes(TextSettings.LINK);
+
+        currentDestination.value.id = destination || LinkDestinations.URL;
+        linkData.value.target = target || LinkTargets.SELF;
+
+        if (href) destinationHrefs.value[currentDestination.value.id] = href;
     }
 
     function resetDestinations() {

package/lib/extensions/Alignment.js

@@ -59,12 +59,9 @@ export const Alignment = Extension.create({
             }),
 
             applyAlignment: createCommand(({ commands }, value) => {
-                // const device = unref(commands.getDevice());
-                //
-                // commands.setBlockAttributes(this.name, { [device]: value }, DEFAULTS);
+                const device = unref(commands.getDevice());
 
-                // Temporary until release BUILDER_MODES
-                commands.setBlockAttributes(this.name, { desktop: value, tablet: value, mobile: value });
+                commands.setBlockAttributes(this.name, { [device]: value }, DEFAULTS);
             }),
 
             removeAlignment: createCommand(({ commands }) => commands.removeBlockAttributes(this.name)),

package/lib/extensions/FontSize.js

@@ -2,6 +2,7 @@ import { Mark } from '@tiptap/vue-2';
 import { computed, unref } from 'vue';
 import { convertFontSize, createCommand, createKeyboardShortcut, renderMark } from '../utils';
 import { MarkGroups, TextSettings } from '../enums';
+import { AddNodeMarkStep } from './core';
 
 export const FontSize = Mark.create({
     name: TextSettings.FONT_SIZE,
@@ -34,12 +35,31 @@ export const FontSize = Mark.create({
             }),
 
             applyFontSize: createCommand(({ commands }, value) => {
-                // const device = unref(commands.getDevice());
+                const device = unref(commands.getDevice());
 
-                // commands.applyMark(this.name, { [device]: value });
+                commands.applyMark(this.name, { [device]: value }, {
+                    isAppliedToParent: (parentMark, mark) => {
+                        if (parentMark.type.name !== mark.type.name) return false;
 
-                // Temporary until release BUILDER_MODES
-                commands.applyMark(this.name, { desktop: value, tablet: value, mobile: null });
+                        return parentMark.attrs[device] === mark.attrs[device];
+                    },
+
+                    onAppliedToParent: ({ tr, node, position, mark }) => {
+                        const attrs = { ...mark.attrs, [device]: null };
+                        const canRemove = !Object.values(attrs).some((value) => !!value);
+
+                        if (canRemove) return false;
+
+                        const updated = mark.type.create(attrs);
+
+                        if (node.isText) {
+                            tr.addMark(position, position + node.nodeSize, updated);
+                            return;
+                        }
+
+                        tr.step(new AddNodeMarkStep(position, updated));
+                    }
+                });
             }),
 
             increaseFontSize: createCommand(({ commands }) => {
@@ -89,8 +109,6 @@ export const FontSize = Mark.create({
                 getAttrs: (input) => {
                     const value = parseSize(input);
 
-                    // return { desktop: value, tablet: value, mobile: value };
-                    // Temporary until release BUILDER_MODES
                     return { desktop: value, tablet: value, mobile: null };
                 }
             }

package/lib/extensions/LineHeight.js

@@ -36,9 +36,6 @@ export const LineHeight = Extension.create({
                             const wrapperEl = unref(this.options.wrapperRef);
                             const converted = convertLineHeight(value, element, wrapperEl);
 
-                            // return { desktop: converted, tablet: converted, mobile: converted };
-
-                            // Temporary until release BUILDER_MODES
                             return { desktop: converted, tablet: converted, mobile: null };
                         },
 
@@ -75,12 +72,9 @@ export const LineHeight = Extension.create({
             }),
 
             applyLineHeight: createCommand(({ commands }, value) => {
-                // const device = unref(commands.getDevice());
-                //
-                // commands.setBlockAttributes(this.name, { [device]: value }, DEFAULTS);
+                const device = unref(commands.getDevice());
 
-                // Temporary until release BUILDER_MODES
-                commands.setBlockAttributes(this.name, { desktop: value, tablet: value, mobile: null }, DEFAULTS);
+                commands.setBlockAttributes(this.name, { [device]: value }, DEFAULTS);
             })
         };
     }

package/lib/extensions/Link.js

@@ -63,27 +63,28 @@ export const Link = Base.extend({
 
                 return chain()
                     .applyMark(this.name, attributes)
-                    .transformText(() => attributes.text)
-                    .extendMarkRange(TextSettings.LINK)
+                    .expandSelectionToLink()
+                    .command(({ tr }) => {
+                        tr.insertText(attributes.text, tr.selection.from, tr.selection.to);
+                        return true;
+                    })
                     .run();
             }),
 
-            isLink: createCommand(({ editor }) => computed(() => editor.isActive(TextSettings.LINK))),
+            expandSelectionToLink: createCommand(({ commands }) => {
+                commands.expandSelection(({ node }) => this.type.isInSet(node.marks));
+            }),
+
+            isLink: createCommand(({ commands }) => commands.hasMark(this.name)),
             getLinkPreset: createCommand(() => computed(() => this.options.preset))
         };
     },
 
     renderHTML({ HTMLAttributes: attrs }) {
         const href = attrs.destination === LinkDestinations.BLOCK ? `#${attrs.href}` : attrs.href;
-
-        const presetClass = this.options.basePresetClass + this.options.preset.id;
+        const presetClass = unref(this.options.basePresetClass) + unref(this.options.preset).id;
         const classes = `${presetClass} zw-style`;
-
-        const linkAttrs = {
-            href,
-            target: attrs.target,
-            class: classes
-        };
+        const linkAttrs = { href, target: attrs.target, class: classes };
 
         return ['a', linkAttrs, 0];
     }

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

@@ -1,8 +1,15 @@
 import { ref } from 'vue';
-import { Editor } from '@tiptap/vue-2';
+import { Editor, Mark } from '@tiptap/vue-2';
 import { buildTestExtensions } from '../../__tests__/utils';
 import { ContentNormalizer, NodeFactory } from '../../services';
 import { Link } from '../Link';
+import { TextSettings } from '../../enums';
+
+const MockFontWeight = Mark.create({
+    name: TextSettings.FONT_WEIGHT,
+    addAttributes: () => ({ value: { required: true } }),
+    renderHTML: () => ['span', {}, 0]
+});
 
 function createEditor({ content }) {
     return new Editor({
@@ -13,42 +20,91 @@ function createEditor({ content }) {
                     preset: 'link',
                     baseClass: 'zw ts-',
                     pageBlocks: ref([{ id: 987654 }])
-                })
+                }),
+                MockFontWeight
             ]
         })
     });
 }
 
-const createContent = (text) => NodeFactory.doc([
-    NodeFactory.paragraph([text])
-]);
-
-const linkAttributes = (href) => ({
+const createLink = (href) => ({
     href: href ?? '/test',
     text: 'Hello world link',
     target: '_self',
     destination: 'url'
 });
 
+describe('get link', () => {
+    test('should check is link active', () => {
+        const editor = createEditor({
+            content: NodeFactory.doc([
+                NodeFactory.paragraph([
+                    NodeFactory.text('hello world', [
+                        NodeFactory.mark(TextSettings.LINK, createLink())
+                    ])
+                ])
+            ])
+        });
+
+        editor.commands.selectAll();
+
+        expect(editor.commands.isLink().value).toBe(true);
+    });
+
+    test('should check is link inactive', () => {
+        const editor = createEditor({
+            content: NodeFactory.doc([
+                NodeFactory.paragraph('hello world')
+            ])
+        });
+
+        editor.commands.selectAll();
+
+        expect(editor.commands.isLink().value).toBe(false);
+    });
+});
+
 describe('apply link', () => {
     test('should apply link', () => {
         const editor = createEditor({
-            content: createContent(NodeFactory.text('hello world'))
+            content: NodeFactory.doc([
+                NodeFactory.paragraph('hello world')
+            ])
         });
 
         editor.commands.selectAll();
-        editor.commands.applyLink(linkAttributes());
+        editor.commands.applyLink(createLink());
 
         expect(editor.getJSON()).toMatchSnapshot();
     });
 
     test('should apply link when no selected text', () => {
         const editor = createEditor({
-            content: createContent(NodeFactory.text('Some  text'))
+            content: NodeFactory.doc([
+                NodeFactory.paragraph('Some  text')
+            ])
         });
 
         editor.commands.setTextSelection(6);
-        editor.commands.applyLink(linkAttributes());
+        editor.commands.applyLink(createLink());
+
+        expect(editor.getJSON()).toMatchSnapshot();
+    });
+
+    test('should apply link to multiple selected nodes', () => {
+        const editor = createEditor({
+            content: NodeFactory.doc([
+                NodeFactory.paragraph([
+                    NodeFactory.text('hello', [
+                        NodeFactory.mark(TextSettings.FONT_WEIGHT, { value: '700' })
+                    ]),
+                    NodeFactory.text(' world')
+                ])
+            ])
+        });
+
+        editor.commands.selectAll();
+        editor.commands.applyLink(createLink());
 
         expect(editor.getJSON()).toMatchSnapshot();
     });

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

@@ -7,8 +7,8 @@ Object {
       "attrs": Object {
         "alignment": Object {
           "desktop": "right",
-          "mobile": "right",
-          "tablet": "right",
+          "mobile": null,
+          "tablet": null,
         },
       },
       "content": Array [
@@ -51,8 +51,8 @@ Object {
       "attrs": Object {
         "alignment": Object {
           "desktop": "right",
-          "mobile": "right",
-          "tablet": "right",
+          "mobile": null,
+          "tablet": null,
         },
       },
       "content": Array [

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

@@ -15,7 +15,7 @@ Object {
           "attrs": Object {
             "desktop": "16",
             "mobile": null,
-            "tablet": "16",
+            "tablet": null,
           },
           "type": "font_size",
         },
@@ -42,7 +42,7 @@ Object {
           "attrs": Object {
             "desktop": "13",
             "mobile": null,
-            "tablet": "13",
+            "tablet": null,
           },
           "type": "font_size",
         },
@@ -69,7 +69,7 @@ Object {
           "attrs": Object {
             "desktop": "15",
             "mobile": null,
-            "tablet": "15",
+            "tablet": null,
           },
           "type": "font_size",
         },
@@ -96,7 +96,7 @@ Object {
           "attrs": Object {
             "desktop": "5",
             "mobile": null,
-            "tablet": "5",
+            "tablet": null,
           },
           "type": "font_size",
         },
@@ -123,7 +123,7 @@ Object {
           "attrs": Object {
             "desktop": "20",
             "mobile": null,
-            "tablet": "20",
+            "tablet": null,
           },
           "type": "font_size",
         },

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

@@ -8,7 +8,7 @@ Object {
         "line_height": Object {
           "desktop": "1.41",
           "mobile": null,
-          "tablet": "1.41",
+          "tablet": null,
         },
       },
       "content": Array [

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

@@ -27,6 +27,39 @@ Object {
 }
 `;
 
+exports[`apply link should apply link to multiple selected nodes 1`] = `
+Object {
+  "content": Array [
+    Object {
+      "content": Array [
+        Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "destination": "url",
+                "href": "/test",
+                "target": "_self",
+              },
+              "type": "link",
+            },
+            Object {
+              "attrs": Object {
+                "value": "700",
+              },
+              "type": "font_weight",
+            },
+          ],
+          "text": "Hello world link",
+          "type": "text",
+        },
+      ],
+      "type": "paragraph",
+    },
+  ],
+  "type": "doc",
+}
+`;
+
 exports[`apply link should apply link when no selected text 1`] = `
 Object {
   "content": Array [

package/lib/extensions/core/NodeProcessor.js

@@ -43,7 +43,7 @@ export const NodeProcessor = Extension.create({
                 }
             }),
 
-            applyMark: createCommand(({ state, commands }, name, value) => {
+            applyMark: createCommand(({ state, commands }, name, value, customizer = {}) => {
                 const { tr, doc, schema } = state;
                 const { $from, $to } = tr.selection;
                 const markType = getMarkType(name, schema);
@@ -56,6 +56,14 @@ export const NodeProcessor = Extension.create({
 
                 if ($from.pos === $to.pos) return;
 
+                const onAppliedToParent = (context) => {
+                    if (!customizer.onAppliedToParent || customizer.onAppliedToParent(context) === false) {
+                        const { tr, node, position, mark } = context;
+
+                        commands._removeNodeMark({ tr, node, position, mark: mark.type });
+                    }
+                };
+
                 doc.nodesBetween($from.pos, $to.pos, (node, position) => {
                     if (node.type.name === NodeTypes.LIST) return;
 
@@ -63,8 +71,8 @@ export const NodeProcessor = Extension.create({
                     const applyingMark = markType.create({ ...(initialMark?.attrs || {}), ...value });
                     const textPosition = resolveTextPosition($from, $to, node, position);
 
-                    if (isMarkAppliedToParent(tr.doc, position, applyingMark)) {
-                        return commands._removeNodeMark({ tr, node, position, mark: markType });
+                    if (isMarkAppliedToParent(tr.doc, position, applyingMark, customizer.isAppliedToParent)) {
+                        return onAppliedToParent({ tr, node, position, mark: applyingMark });
                     }
 
                     if (node.isText) {
@@ -102,6 +110,12 @@ export const NodeProcessor = Extension.create({
                 return computed(() => unref(marksRef)[0] ?? null);
             }),
 
+            hasMark: createCommand(({ commands }, name) => {
+                const mark = commands.getMark(name);
+
+                return computed(() => !!unref(mark));
+            }),
+
             getCommonSettingMark: createCommand(({ commands }, name, defaultRef) => {
                 const selectionRef = commands.getMark(name);
 

package/lib/extensions/core/SelectionProcessor.js

@@ -1,5 +1,5 @@
 import { Extension } from '@tiptap/vue-2';
-import { createCommand } from '../../utils';
+import { createCommand, resolvePositionOffset } from '../../utils';
 import { NodeTypes } from '../../enums';
 
 export const SelectionProcessor = Extension.create({
@@ -19,18 +19,24 @@ export const SelectionProcessor = Extension.create({
                 this.storage.selection && commands.setTextSelection(this.storage.selection);
             }),
 
-            expandSelectionToBlock: createCommand(({ state, commands }) => {
-                let from = state.selection.from;
-                let to = state.selection.to;
+            expandSelection: createCommand(({ tr, commands }, predicate) => {
+                let from = tr.selection.from;
+                let to = tr.selection.to;
 
-                state.doc.nodesBetween(from, to, (node, position, parent) => {
-                    if (parent.type.name !== NodeTypes.DOCUMENT) return;
+                tr.doc.nodesBetween(from, to, (node, position, parent) => {
+                    if (predicate({ node, parent })) {
+                        const offset = node.isText ? 0 : resolvePositionOffset(tr.doc, position);
 
-                    from = Math.min(from, position + 1);
-                    to = Math.max(to, position + node.nodeSize - 1);
+                        from = Math.min(from, position + offset);
+                        to = Math.max(to, position + node.nodeSize - offset);
+                    }
                 });
 
                 commands.setTextSelection({ from, to });
+            }),
+
+            expandSelectionToBlock: createCommand(({ commands }) => {
+                commands.expandSelection(({ parent }) => parent.type.name === NodeTypes.DOCUMENT);
             })
         };
     }

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

@@ -442,6 +442,32 @@ describe('get mark', () => {
     });
 });
 
+describe('has mark', () => {
+    test('should detect mark', () => {
+        const editor = createEditor({
+            content: NodeFactory.doc([
+                NodeFactory.paragraph([
+                    NodeFactory.text('lorem ipsum', [
+                        NodeFactory.mark(TextSettings.FONT_WEIGHT, { value: '700' })
+                    ])
+                ])
+            ])
+        });
+
+        expect(editor.commands.hasMark(TextSettings.FONT_WEIGHT).value).toBe(true);
+    });
+
+    test('should not detect mark', () => {
+        const editor = createEditor({
+            content: NodeFactory.doc([
+                NodeFactory.paragraph('lorem ipsum')
+            ])
+        });
+
+        expect(editor.commands.hasMark(TextSettings.FONT_WEIGHT).value).toBe(false);
+    });
+});
+
 describe('get setting mark', () => {
     test('should get common setting mark', () => {
         const editor = createEditor({

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

@@ -49,8 +49,22 @@ describe('store/restore selection', () => {
     });
 });
 
-describe('expand selection to block', () => {
-    test('should exand selection to one block', () => {
+describe('expand selection', () => {
+    test('should expand selection by condition', () => {
+        const editor = createEditor();
+
+        editor
+            .chain()
+            .setTextSelection({ from: 10, to: 20 })
+            .expandSelection(({ node }) => node.isText)
+            .run();
+
+        expect(editor.state.selection).toEqual(
+            expect.objectContaining({ from: 1, to: 27 })
+        );
+    });
+
+    test('should expand selection to one block', () => {
         const editor = createEditor();
 
         editor

package/lib/extensions/core/index.js

@@ -31,3 +31,5 @@ export const buildCoreExtensions = () => [
     SelectionProcessor,
     ProseMirrorPlugins
 ];
+
+export * from './steps';

package/lib/services/NodeFactory.js

@@ -136,9 +136,6 @@ export class NodeFactory {
      * @returns {{tablet, desktop, mobile}}
      */
     static populateAllDevices(value) {
-        // return { mobile: value, tablet: value, desktop: value };
-
-        // Temporary until release BUILDER_MODES
-        return { mobile: null, tablet: value, desktop: value };
+        return { mobile: value, tablet: value, desktop: value };
     }
 }

package/lib/services/__tests__/__snapshots__/NodeFactory.test.js.snap

@@ -320,7 +320,7 @@ Object {
 exports[`build node should populate value to all devices 1`] = `
 Object {
   "desktop": "18",
-  "mobile": null,
+  "mobile": "18",
   "tablet": "18",
 }
 `;

package/lib/utils/__tests__/isMarkAppliedToParent.test.js

@@ -1,8 +1,8 @@
 import { isMarkAppliedToParent } from '../isMarkAppliedToParent';
 
 const createMark = (attrs = {}) => ({
-    isInSet(set) {
-        return set.includes(this);
+    eq(another) {
+        return JSON.stringify(this) === JSON.stringify(another);
     },
     ...attrs
 });
@@ -34,15 +34,15 @@ describe('is mark applied to parent', () => {
     });
 
     test('should return false if not applied to parent', () => {
-        const checkingMark = createMark();
+        const checkingMark = createMark({ attrs: { value: '400' } });
         const doc = createNode();
 
         doc.resolve.mockReturnValue({
             path: [
-                createNode({ marks: [createMark()] }),
+                createNode({ marks: [createMark({ attrs: { value: '700' } })] }),
                 0,
                 0,
-                createNode({ marks: [createMark()] }),
+                createNode({ marks: [createMark({ attrs: { value: '700' } })] }),
                 0,
                 1
             ]

package/lib/utils/index.js

@@ -9,6 +9,7 @@ export { convertAlignment } from './convertAlignment';
 export { importIcon } from './importIcon';
 export { isWysiwygContent, markWysiwygContent, unmarkWysiwygContent } from './isWysiwygContent';
 export { resolveTextPosition } from './resolveTextPosition';
+export { resolvePositionOffset } from './resolvePositionOffset';
 export { isNodeFullySelected } from './isNodeFullySelected';
 export { isMarkAppliedToParent } from './isMarkAppliedToParent';
 export { findMarkByType } from './findMarkByType';