@zipify/wysiwyg 2.5.1 → 2.5.3

package/lib/cli/ContentSerializer.js

@@ -1,14 +1,15 @@
 import { ref } from 'vue';
 import { getSchema } from '@tiptap/core';
 import { DOMParser } from 'prosemirror-model';
-import { JSDOM } from 'jsdom';
 import { buildExtensions } from '../extensions';
 import { Devices } from '../enums';
-import { ContentNormalizer } from '../services';
+import { ContentNormalizer, ContextWindow } from '../services';
 import { NodeDomParser } from './NodeDomParser';
 
 export class ContentSerializer {
     static build(options) {
+        ContextWindow.use(NodeDomParser.createWindow());
+
         const extensions = buildExtensions({
             fonts: options.fonts,
             minFontSize: 0,
@@ -21,7 +22,7 @@ export class ContentSerializer {
             baseListClass: options.baseListClass,
             deviceRef: ref(Devices.DESKTOP),
             pageBlocksRef: ref([]),
-            wrapperRef: JSDOM.fragment('<p></p>').firstElementChild
+            wrapperRef: ContextWindow.document.createElement('p')
         });
         const schema = getSchema(extensions);
 

package/lib/cli/NodeDomParser.js

@@ -1,6 +1,10 @@
 import { JSDOM } from 'jsdom';
 
 export class NodeDomParser {
+    static createWindow() {
+        return new JSDOM().window;
+    }
+
     types;
 
     parse(html) {

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

@@ -3,6 +3,7 @@ import { LinkTargets, LinkDestinations, TextSettings } from '../../../../../enum
 import { InjectionTokens } from '../../../../../injectionTokens';
 import { RegExps } from '../../../../../regExps';
 
+// TODO NEED refactor it
 export function useLink() {
     const editor = inject(InjectionTokens.EDITOR);
     const pageBlocks = inject(InjectionTokens.PAGE_BLOCKS);
@@ -16,15 +17,14 @@ 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;
+        destinationHrefs.value[currentDestination.value.id] = href || '';
     }
 
     function resetDestinations() {

package/lib/extensions/LineHeight.js

@@ -36,7 +36,7 @@ export const LineHeight = Extension.create({
                             const wrapperEl = unref(this.options.wrapperRef);
                             const converted = convertLineHeight(value, element, wrapperEl);
 
-                            return { desktop: converted, tablet: converted, mobile: null };
+                            return converted ? { desktop: converted, tablet: converted, mobile: null } : null;
                         },
 
                         renderHTML(attrs) {

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__/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

@@ -110,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/utils/convertFontSize.js

@@ -1,7 +1,9 @@
+import { ContextWindow } from '../services';
+
 export function convertFontSize(value, wrapperEl) {
     if (!value.includes('em')) return parseInt(value);
 
-    const containerValue = window.getComputedStyle(wrapperEl).fontSize;
+    const containerValue = ContextWindow.getComputedStyle(wrapperEl).fontSize;
     const size = parseFloat(value) * parseFloat(containerValue);
 
     return Math.round(size);

package/lib/utils/convertLineHeight.js

@@ -1,10 +1,11 @@
+import { ContextWindow } from '../services';
 import { convertFontSize } from './convertFontSize';
 
 function getFontSize(sourceEl, wrapperEl) {
     const source = sourceEl.firstElementChild || sourceEl;
     const fontSize = source.style.fontSize;
 
-    return fontSize || window.getComputedStyle(wrapperEl).fontSize;
+    return fontSize || ContextWindow.getComputedStyle(wrapperEl).fontSize;
 }
 
 export function convertLineHeight(value, sourceEl, wrapperEl) {
@@ -13,5 +14,5 @@ export function convertLineHeight(value, sourceEl, wrapperEl) {
     const rawFontSize = getFontSize(sourceEl, wrapperEl);
     const fontSize = convertFontSize(rawFontSize, wrapperEl);
 
-    return (parseInt(value) / fontSize).toFixed(2);
+    return fontSize ? (parseInt(value) / fontSize).toFixed(2) : null;
 }

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';

package/lib/utils/isNodeFullySelected.js

@@ -1,5 +1,7 @@
+import { resolvePositionOffset } from './resolvePositionOffset';
+
 export function isNodeFullySelected(doc, selection, node, position) {
-    const offset = doc.resolve(position).depth + 1;
+    const offset = resolvePositionOffset(doc, position);
     const isFromMatch = selection.from - offset <= position;
     const isToMatch = selection.to + offset >= node.nodeSize + position;
 

package/lib/utils/resolvePositionOffset.js

@@ -0,0 +1,3 @@
+export function resolvePositionOffset(doc, position) {
+    return doc.resolve(position).depth + 1;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zipify/wysiwyg",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "Zipify modification of TipTap text editor",
   "main": "dist/wysiwyg.mjs",
   "bin": {