@zipify/wysiwyg 1.1.0 → 1.1.1-0

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

@@ -4,9 +4,10 @@ import { createCommand } from '../../utils';
 import { TextDecoration } from '../TextDecoration';
 import { ContentNormalizer, NodeFactory } from '../../services';
 import { buildCoreExtensions } from '../core';
+import { TextSettings } from '../../enums';
 
 const MockStylePreset = Extension.create({
-    name: 'style_preset',
+    name: TextSettings.TEXT_DECORATION,
 
     addCommands() {
         return {
@@ -17,10 +18,26 @@ const MockStylePreset = Extension.create({
     }
 });
 
-function createEditor({ content }) {
+const MockLink = Extension.create({
+    name: TextSettings.LINK,
+
+    addOptions: () => ({
+        isLink: false,
+        preset: {}
+    }),
+
+    addCommands() {
+        return {
+            isLink: createCommand(() => this.options.isLink),
+            getLinkPreset: createCommand(() => this.options.preset)
+        };
+    }
+});
+
+function createEditor({ content, link }) {
     return new Editor({
         content: ContentNormalizer.normalize(content),
-        extensions: buildCoreExtensions().concat(MockStylePreset, TextDecoration)
+        extensions: buildCoreExtensions().concat(MockStylePreset, TextDecoration, MockLink.configure(link))
     });
 }
 
@@ -32,7 +49,7 @@ describe('get decoration', () => {
     test('should get from selection', () => {
         const editor = createEditor({
             content: createContent(NodeFactory.text('hello world', [
-                NodeFactory.mark('text_decoration', {
+                NodeFactory.mark(TextSettings.TEXT_DECORATION, {
                     underline: true,
                     strike_through: true
                 })
@@ -60,7 +77,7 @@ describe('get decoration', () => {
         test('should get from selection', () => {
             const editor = createEditor({
                 content: createContent(NodeFactory.text('hello world', [
-                    NodeFactory.mark('text_decoration', { underline: true })
+                    NodeFactory.mark(TextSettings.TEXT_DECORATION, { underline: true })
                 ]))
             });
 
@@ -78,13 +95,57 @@ describe('get decoration', () => {
 
             expect(editor.commands.isUnderline().value).toBe(false);
         });
+
+        test('should get true from link preset', () => {
+            const editor = createEditor({
+                content: createContent(NodeFactory.text('hello world')),
+                link: {
+                    isLink: true,
+                    preset: { common: { text_decoration: 'underline' } }
+                }
+            });
+
+            editor.commands.selectAll();
+
+            expect(editor.commands.isUnderline().value).toBe(true);
+        });
+
+        test('should get false from link preset', () => {
+            const editor = createEditor({
+                content: createContent(NodeFactory.text('hello world')),
+                link: {
+                    isLink: true,
+                    preset: { common: { text_decoration: 'none' } }
+                }
+            });
+
+            editor.commands.selectAll();
+
+            expect(editor.commands.isUnderline().value).toBe(false);
+        });
+
+        test('should override link by local', () => {
+            const editor = createEditor({
+                content: createContent(NodeFactory.text('hello world', [
+                    NodeFactory.mark(TextSettings.TEXT_DECORATION, { underline: false })
+                ])),
+                link: {
+                    isLink: true,
+                    preset: { common: { text_decoration: 'underline' } }
+                }
+            });
+
+            editor.commands.selectAll();
+
+            expect(editor.commands.isUnderline().value).toBe(false);
+        });
     });
 
     describe('strike through', () => {
         test('should get from selection', () => {
             const editor = createEditor({
                 content: createContent(NodeFactory.text('hello world', [
-                    NodeFactory.mark('text_decoration', { strike_through: true })
+                    NodeFactory.mark(TextSettings.TEXT_DECORATION, { strike_through: true })
                 ]))
             });
 
@@ -119,7 +180,7 @@ describe('apply decoration', () => {
     test('should second decoration', () => {
         const editor = createEditor({
             content: createContent(NodeFactory.text('hello world', [
-                NodeFactory.mark('text_decoration', {
+                NodeFactory.mark(TextSettings.TEXT_DECORATION, {
                     strike_through: false,
                     underline: true
                 })
@@ -131,41 +192,11 @@ describe('apply decoration', () => {
         expect(editor.getJSON()).toMatchSnapshot();
     });
 
-    test('should remove decoration', () => {
-        const editor = createEditor({
-            content: createContent(NodeFactory.text('hello world', [
-                NodeFactory.mark('text_decoration', {
-                    strike_through: true,
-                    underline: true
-                })
-            ]))
-        });
-
-        editor.chain().selectAll().removeTextDecoration('strike_through').run();
-
-        expect(editor.getJSON()).toMatchSnapshot();
-    });
-
-    test('should remove mark if no decoration', () => {
-        const editor = createEditor({
-            content: createContent(NodeFactory.text('hello world', [
-                NodeFactory.mark('text_decoration', {
-                    strike_through: false,
-                    underline: true
-                })
-            ]))
-        });
-
-        editor.chain().selectAll().removeTextDecoration('underline').run();
-
-        expect(editor.getJSON()).toMatchSnapshot();
-    });
-
     describe('underline', () => {
         test('should toggle to removed', () => {
             const editor = createEditor({
                 content: createContent(NodeFactory.text('hello world', [
-                    NodeFactory.mark('text_decoration', {
+                    NodeFactory.mark(TextSettings.TEXT_DECORATION, {
                         strike_through: true,
                         underline: true
                     })
@@ -192,7 +223,7 @@ describe('apply decoration', () => {
         test('should toggle to removed', () => {
             const editor = createEditor({
                 content: createContent(NodeFactory.text('hello world', [
-                    NodeFactory.mark('text_decoration', {
+                    NodeFactory.mark(TextSettings.TEXT_DECORATION, {
                         strike_through: true,
                         underline: true
                     })
@@ -220,7 +251,7 @@ describe('rendering', () => {
     test('should render underline only', () => {
         const editor = createEditor({
             content: createContent(NodeFactory.text('hello world', [
-                NodeFactory.mark('text_decoration', {
+                NodeFactory.mark(TextSettings.TEXT_DECORATION, {
                     strike_through: false,
                     underline: true
                 })
@@ -233,7 +264,7 @@ describe('rendering', () => {
     test('should render strike through only', () => {
         const editor = createEditor({
             content: createContent(NodeFactory.text('hello world', [
-                NodeFactory.mark('text_decoration', {
+                NodeFactory.mark(TextSettings.TEXT_DECORATION, {
                     strike_through: true,
                     underline: false
                 })
@@ -246,7 +277,7 @@ describe('rendering', () => {
     test('should render both', () => {
         const editor = createEditor({
             content: createContent(NodeFactory.text('hello world', [
-                NodeFactory.mark('text_decoration', {
+                NodeFactory.mark(TextSettings.TEXT_DECORATION, {
                     strike_through: true,
                     underline: true
                 })

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

@@ -19,6 +19,12 @@ Object {
               },
               "type": "font_weight",
             },
+            Object {
+              "attrs": Object {
+                "italic": false,
+              },
+              "type": "font_style",
+            },
           ],
           "text": "hello world",
           "type": "text",
@@ -44,6 +50,12 @@ Object {
               },
               "type": "font_family",
             },
+            Object {
+              "attrs": Object {
+                "italic": false,
+              },
+              "type": "font_style",
+            },
           ],
           "text": "hello world",
           "type": "text",
@@ -143,6 +155,12 @@ Object {
               },
               "type": "font_weight",
             },
+            Object {
+              "attrs": Object {
+                "italic": false,
+              },
+              "type": "font_style",
+            },
           ],
           "text": "hello world",
           "type": "text",

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

@@ -31,6 +31,14 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "italic": false,
+              },
+              "type": "font_style",
+            },
+          ],
           "text": "hello world",
           "type": "text",
         },
@@ -48,6 +56,14 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "italic": false,
+              },
+              "type": "font_style",
+            },
+          ],
           "text": "hello world",
           "type": "text",
         },

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

@@ -26,49 +26,6 @@ Object {
 }
 `;
 
-exports[`apply decoration should remove decoration 1`] = `
-Object {
-  "content": Array [
-    Object {
-      "content": Array [
-        Object {
-          "marks": Array [
-            Object {
-              "attrs": Object {
-                "strike_through": false,
-                "underline": true,
-              },
-              "type": "text_decoration",
-            },
-          ],
-          "text": "hello world",
-          "type": "text",
-        },
-      ],
-      "type": "paragraph",
-    },
-  ],
-  "type": "doc",
-}
-`;
-
-exports[`apply decoration should remove mark if no decoration 1`] = `
-Object {
-  "content": Array [
-    Object {
-      "content": Array [
-        Object {
-          "text": "hello world",
-          "type": "text",
-        },
-      ],
-      "type": "paragraph",
-    },
-  ],
-  "type": "doc",
-}
-`;
-
 exports[`apply decoration should second decoration 1`] = `
 Object {
   "content": Array [

package/package.json

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