@zipify/wysiwyg 3.1.3 → 3.3.0-0

package/lib/enums/TextSettings.js

@@ -17,6 +17,10 @@ export const TextSettings = Object.freeze({
         return [this.ALIGNMENT, this.LINE_HEIGHT, this.MARGIN];
     },
 
+    get resetAttributes() {
+        return [this.LINE_HEIGHT, this.MARGIN];
+    },
+
     get inlineMarks() {
         return [this.TEXT_DECORATION, this.LINK, this.SUPERSCRIPT, this.BACKGROUND_COLOR];
     },

package/lib/extensions/StylePreset.js

@@ -135,7 +135,7 @@ export const StylePreset = Extension.create({
 
             isSettingCustomized: createCommand(({ commands }, name) => {
                 const customization = commands.getPresetCustomization();
-                const group = TextSettings.attributes.includes(name) ? 'attributes' : 'marks';
+                const group = TextSettings.resetAttributes.includes(name) ? 'attributes' : 'marks';
 
                 return computed(() => unref(customization)[group]?.includes(name) ?? false);
             }),
@@ -156,7 +156,7 @@ export const StylePreset = Extension.create({
 
                 doc.nodesBetween(from, to, (node) => {
                     for (const [name, value] of Object.entries(node.attrs)) {
-                        const isSetting = TextSettings.attributes.includes(name);
+                        const isSetting = TextSettings.resetAttributes.includes(name);
 
                         if (isSetting && value) attributes.add(name);
                     }
@@ -179,8 +179,8 @@ export const StylePreset = Extension.create({
                     .storeSelection()
                     .expandSelectionToBlock()
                     .removeMarks(TextSettings.marks)
-                    .resetAttributes(NodeTypes.PARAGRAPH, TextSettings.attributes)
-                    .resetAttributes(NodeTypes.HEADING, TextSettings.attributes)
+                    .resetAttributes(NodeTypes.PARAGRAPH, TextSettings.resetAttributes)
+                    .resetAttributes(NodeTypes.HEADING, TextSettings.resetAttributes)
                     .restoreSelection()
                     .run();
             }),

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

@@ -118,6 +118,25 @@ const MockLink = Extension.create({
     }
 });
 
+const MockLineHeight = Extension.create({
+    name: TextSettings.LINE_HEIGHT,
+
+    addGlobalAttributes: () => [
+        {
+            types: [NodeTypes.PARAGRAPH],
+            attributes: {
+                line_height: {
+                    isRequired: false,
+                    renderHTML: (attrs) => ({ style: `line-height: ${attrs.line_height}` })
+                },
+                alignment: {
+                    isRequired: false
+                }
+            }
+        }
+    ]
+});
+
 function createEditor({ content, presets, defaultId, link }) {
     return new Editor({
         content: ContentNormalizer.normalize(content),
@@ -144,6 +163,7 @@ function createEditor({ content, presets, defaultId, link }) {
                 MockFontColor,
                 MockFontFamily,
                 MockFontStyle,
+                MockLineHeight,
                 MockTextDecoration,
                 MockSuperscript,
                 MockLink.configure(link)
@@ -453,16 +473,16 @@ describe('get preset customization', () => {
             content: NodeFactory.doc([
                 NodeFactory.paragraph({
                     preset: { id: 'regular-1' },
-                    alignment: { value: 'center' }
+                    line_height: { value: '1.1' }
                 }, 'test')
             ]),
             presets: [createPreset({ id: 'regular-1' })]
         });
 
         editor.commands.selectAll();
-        const isAlignmentCustomized = editor.commands.isSettingCustomized(TextSettings.ALIGNMENT);
+        const isLineHeightCustomized = editor.commands.isSettingCustomized(TextSettings.LINE_HEIGHT);
 
-        expect(isAlignmentCustomized.value).toBe(true);
+        expect(isLineHeightCustomized.value).toBe(true);
     });
 });
 

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

@@ -6,6 +6,7 @@ Object {
     Object {
       "attrs": Object {
         "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -93,6 +94,7 @@ Object {
     Object {
       "attrs": Object {
         "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -116,6 +118,7 @@ Object {
     Object {
       "attrs": Object {
         "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -131,6 +134,7 @@ Object {
     Object {
       "attrs": Object {
         "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -180,6 +184,7 @@ Object {
         "alignment": Object {
           "value": "center",
         },
+        "line_height": null,
         "preset": Object {
           "id": "regular-2",
         },
@@ -199,9 +204,7 @@ Object {
 
 exports[`get content customization should find attributes 1`] = `
 Object {
-  "attributes": Array [
-    "alignment",
-  ],
+  "attributes": Array [],
   "marks": Array [],
 }
 `;
@@ -225,9 +228,7 @@ Object {
 
 exports[`get preset customization should find attributes 1`] = `
 Object {
-  "attributes": Array [
-    "alignment",
-  ],
+  "attributes": Array [],
   "marks": Array [],
 }
 `;
@@ -293,6 +294,7 @@ Object {
     Object {
       "attrs": Object {
         "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-2",
         },
@@ -340,6 +342,7 @@ Object {
     Object {
       "attrs": Object {
         "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-2",
         },
@@ -363,6 +366,7 @@ Object {
     Object {
       "attrs": Object {
         "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -395,6 +399,7 @@ Object {
             Object {
               "attrs": Object {
                 "alignment": null,
+                "line_height": null,
                 "preset": Object {
                   "id": "regular-1",
                 },
@@ -433,6 +438,7 @@ Object {
             Object {
               "attrs": Object {
                 "alignment": null,
+                "line_height": null,
                 "preset": Object {
                   "id": "regular-1",
                 },
@@ -461,7 +467,9 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
+        "alignment": Object {
+          "value": "center",
+        },
         "level": 1,
         "preset": Object {
           "id": "regular-1",
@@ -477,7 +485,10 @@ Object {
     },
     Object {
       "attrs": Object {
-        "alignment": null,
+        "alignment": Object {
+          "value": "center",
+        },
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -501,6 +512,7 @@ Object {
     Object {
       "attrs": Object {
         "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -518,6 +530,6 @@ Object {
 }
 `;
 
-exports[`render preset styles should render node without preset 1`] = `"<p class="zw-style">test</p>"`;
+exports[`render preset styles should render node without preset 1`] = `"<p class="zw-style" style="line-height: null">test</p>"`;
 
-exports[`render preset styles should render preset class 1`] = `"<p class="zw-style zw ts-regular-1">test</p>"`;
+exports[`render preset styles should render preset class 1`] = `"<p class="zw-style zw ts-regular-1" style="line-height: null">test</p>"`;

package/lib/extensions/proseMirror/PlaceholderPlugin.js

@@ -1,4 +1,4 @@
-import { Decoration, DecorationSet } from 'prosemirror-view';
+import { Decoration, DecorationSet } from '@tiptap/pm/view';
 import { ProseMirrorPlugin } from './ProseMirrorPlugin';
 
 export class PlaceholderPlugin extends ProseMirrorPlugin {

package/lib/extensions/proseMirror/ProseMirrorPlugin.js

@@ -1,4 +1,4 @@
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { Plugin, PluginKey } from '@tiptap/pm/state';
 
 export class ProseMirrorPlugin {
     static create(editor, options) {

package/lib/services/ContentSerializer.js

@@ -1,6 +1,6 @@
 import { ref } from 'vue';
 import { getSchema } from '@tiptap/core';
-import { DOMParser } from 'prosemirror-model';
+import { DOMParser } from '@tiptap/pm/model';
 import { buildExtensions } from '../extensions';
 import { Devices } from '../enums';
 import { ContentNormalizer } from './normalizer';

package/lib/services/__tests__/NodeSelector.test.js

@@ -1,4 +1,4 @@
-import { Schema } from 'prosemirror-model';
+import { Schema } from '@tiptap/pm/model';
 import { NodeFactory } from '../NodeFactory';
 import { NodeSelector } from '../NodeSelector';
 import { NodeTypes, TextSettings } from '../../enums';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zipify/wysiwyg",
-  "version": "3.1.3",
+  "version": "3.3.0-0",
   "description": "Zipify modification of TipTap text editor",
   "main": "dist/wysiwyg.mjs",
   "bin": {
@@ -32,19 +32,20 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.11.6",
-    "@tiptap/core": "2.0.0-beta.209",
-    "@tiptap/extension-document": "2.0.0-beta.209",
-    "@tiptap/extension-heading": "2.0.0-beta.209",
-    "@tiptap/extension-history": "2.0.0-beta.209",
-    "@tiptap/extension-link": "2.0.0-beta.209",
-    "@tiptap/extension-list-item": "2.0.0-beta.209",
-    "@tiptap/extension-paragraph": "2.0.0-beta.209",
-    "@tiptap/extension-text": "2.0.0-beta.209",
-    "@tiptap/vue-2": "2.0.0-beta.209",
-    "commander": "^9.4.1",
-    "jsdom": "^20.0.3",
+    "@tiptap/core": "2.0.0-beta.215",
+    "@tiptap/extension-document": "2.0.0-beta.215",
+    "@tiptap/extension-heading": "2.0.0-beta.215",
+    "@tiptap/extension-history": "2.0.0-beta.215",
+    "@tiptap/extension-link": "2.0.0-beta.215",
+    "@tiptap/extension-list-item": "2.0.0-beta.215",
+    "@tiptap/extension-paragraph": "2.0.0-beta.215",
+    "@tiptap/extension-text": "2.0.0-beta.215",
+    "@tiptap/pm": "^2.0.0-beta.215",
+    "@tiptap/vue-2": "2.0.0-beta.215",
+    "commander": "^10.0.0",
+    "jsdom": "^21.1.0",
     "lodash": "^4.17.21",
-    "simplebar": "^5.3.9"
+    "simplebar": "^6.2.0"
   },
   "peerDependencies": {
     "@zipify/colorpicker": "^2.2",
@@ -59,38 +60,38 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.20.7",
+    "@babel/core": "^7.20.12",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-transform-runtime": "^7.19.6",
     "@babel/preset-env": "^7.20.2",
-    "@babel/runtime": "^7.20.7",
-    "@optimize-lodash/rollup-plugin": "^4.0.1",
+    "@babel/runtime": "^7.20.13",
+    "@optimize-lodash/rollup-plugin": "^4.0.3",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-commonjs": "^24.0.0",
+    "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
-    "@rollup/plugin-terser": "^0.2.1",
-    "@vue/test-utils": "^1.3.3",
+    "@rollup/plugin-terser": "^0.4.0",
+    "@vue/test-utils": "^1.3.4",
     "@vue/vue2-jest": "^29.2.2",
-    "@zipify/colorpicker": "^2.2.1",
-    "@zipify/eslint-config": "^1.0.0",
-    "babel-jest": "^29.3.1",
-    "eslint": "8.30.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^27.1.7",
-    "eslint-plugin-vue": "^9.8.0",
+    "@zipify/colorpicker": "^2.2.2",
+    "@zipify/eslint-config": "^1.1.2",
+    "babel-jest": "^29.4.2",
+    "eslint": "8.33.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-vue": "^9.9.0",
     "gzipper": "^7.2.0",
-    "husky": "^8.0.2",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "^29.3.1",
-    "lint-staged": "^13.1.0",
+    "husky": "^8.0.3",
+    "jest": "^29.4.2",
+    "jest-environment-jsdom": "^29.4.2",
+    "lint-staged": "^13.1.1",
     "postcss-html": "^1.5.0",
     "release-it": "^15.6.0",
-    "rollup": "^3.9.0",
-    "stylelint": "^14.16.0",
+    "rollup": "^3.14.0",
+    "stylelint": "^14.16.1",
     "svgo": "^3.0.2",
-    "vite": "^4.0.3",
+    "vite": "^4.1.1",
     "vite-plugin-vue2": "^2.0.3",
     "vue": "^2.7.14",
     "vue-template-compiler": "^2.7.14"