@zipify/wysiwyg 3.2.0 → 3.3.0-1

package/dist/wysiwyg.mjs

@@ -16352,6 +16352,9 @@ const TextSettings = Object.freeze({
   get attributes() {
     return [this.ALIGNMENT, this.LINE_HEIGHT, this.MARGIN];
   },
+  get presetAttributes() {
+    return [this.LINE_HEIGHT];
+  },
   get inlineMarks() {
     return [this.TEXT_DECORATION, this.LINK, this.SUPERSCRIPT, this.BACKGROUND_COLOR];
   },
@@ -18782,7 +18785,7 @@ const StylePreset = Extension.create({
       }),
       isSettingCustomized: createCommand(({ commands: commands2 }, name) => {
         const customization = commands2.getPresetCustomization();
-        const group = TextSettings.attributes.includes(name) ? "attributes" : "marks";
+        const group = TextSettings.presetAttributes.includes(name) ? "attributes" : "marks";
         return computed(() => {
           var _a;
           return ((_a = unref(customization)[group]) == null ? void 0 : _a.includes(name)) ?? false;
@@ -18800,7 +18803,7 @@ const StylePreset = Extension.create({
         const attributes = /* @__PURE__ */ new Set();
         doc2.nodesBetween(from2, to, (node) => {
           for (const [name, value] of Object.entries(node.attrs)) {
-            const isSetting = TextSettings.attributes.includes(name);
+            const isSetting = TextSettings.presetAttributes.includes(name);
             if (isSetting && value)
               attributes.add(name);
           }
@@ -18816,7 +18819,7 @@ const StylePreset = Extension.create({
         };
       }),
       removePresetCustomization: createCommand(({ chain }) => {
-        chain().storeSelection().expandSelectionToBlock().removeMarks(TextSettings.marks).resetAttributes(NodeTypes.PARAGRAPH, TextSettings.attributes).resetAttributes(NodeTypes.HEADING, TextSettings.attributes).restoreSelection().run();
+        chain().storeSelection().expandSelectionToBlock().removeMarks(TextSettings.marks).resetAttributes(NodeTypes.PARAGRAPH, TextSettings.presetAttributes).resetAttributes(NodeTypes.HEADING, TextSettings.presetAttributes).restoreSelection().run();
       }),
       removeFormat: createCommand(({ chain }) => {
         chain().storeSelection().expandSelectionToBlock().removeAllMarks().applyDefaultPreset().restoreSelection().run();
@@ -19326,9 +19329,7 @@ const Alignment = Extension.create({
   addCommands() {
     return {
       toggleAlignment: createCommand(({ commands: commands2 }, value) => {
-        const currentValue = commands2.getAlignment();
-        const isCurrentValue = unref(currentValue) === value;
-        !isCurrentValue ? commands2.applyAlignment(value) : commands2.removeAlignment();
+        commands2.applyAlignment(value);
       }),
       applyAlignment: createCommand(({ commands: commands2 }, value) => {
         const device = unref(commands2.getDevice());
@@ -26732,7 +26733,7 @@ var render = function __render__45() {
   })], 1);
 };
 var staticRenderFns = [];
-const main_css_vue_type_style_index_0_from__2FUsers_2Fmaster_2FProjects_2FZipifyWysiwyg_2Flib_2FWysiwyg_vue_src_lang = "";
+const main_css_vue_type_style_index_0_from__2FUsers_2Fmaster_2Fwork_2FZipifyWysiwyg_2Flib_2FWysiwyg_vue_src_lang = "";
 const MIN_FONT_SIZE = 5;
 const MAX_FONT_SIZE = 112;
 const __vue2_script = {

package/lib/enums/TextSettings.js

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

package/lib/extensions/Alignment.js

@@ -52,10 +52,7 @@ export const Alignment = Extension.create({
     addCommands() {
         return {
             toggleAlignment: createCommand(({ commands }, value) => {
-                const currentValue = commands.getAlignment();
-                const isCurrentValue = unref(currentValue) === value;
-
-                !isCurrentValue ? commands.applyAlignment(value) : commands.removeAlignment();
+                commands.applyAlignment(value);
             }),
 
             applyAlignment: createCommand(({ commands }, value) => {

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.presetAttributes.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.presetAttributes.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.presetAttributes)
+                    .resetAttributes(NodeTypes.HEADING, TextSettings.presetAttributes)
                     .restoreSelection()
                     .run();
             }),

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

@@ -26,22 +26,6 @@ const MockFontWeight = Mark.create({
     renderHTML: () => ['span', {}, 0]
 });
 
-const MockAlignment = Extension.create({
-    name: TextSettings.ALIGNMENT,
-
-    addGlobalAttributes: () => [
-        {
-            types: [NodeTypes.PARAGRAPH, NodeTypes.HEADING],
-            attributes: {
-                [TextSettings.ALIGNMENT]: {
-                    default: null,
-                    renderHTML: () => ({})
-                }
-            }
-        }
-    ]
-});
-
 const MockBackgroundColor = Mark.create({
     name: TextSettings.BACKGROUND_COLOR,
 
@@ -118,6 +102,22 @@ 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}` })
+                }
+            }
+        }
+    ]
+});
+
 function createEditor({ content, presets, defaultId, link }) {
     return new Editor({
         content: ContentNormalizer.normalize(content),
@@ -139,11 +139,11 @@ function createEditor({ content, presets, defaultId, link }) {
                 }),
                 MockFontSize,
                 MockFontWeight,
-                MockAlignment,
                 MockBackgroundColor,
                 MockFontColor,
                 MockFontFamily,
                 MockFontStyle,
+                MockLineHeight,
                 MockTextDecoration,
                 MockSuperscript,
                 MockLink.configure(link)
@@ -347,7 +347,7 @@ describe('apply preset', () => {
             content: NodeFactory.doc([
                 NodeFactory.paragraph({
                     preset: { id: 'regular-1' },
-                    alignment: { value: 'center' }
+                    line_height: { value: '1.1' }
                 }, 'test')
             ]),
             presets: [
@@ -385,10 +385,8 @@ describe('get preset customization', () => {
         });
 
         const isFontSizeCustomized = editor.commands.isSettingCustomized(TextSettings.FONT_SIZE);
-        const isAlignmentCustomized = editor.commands.isSettingCustomized(TextSettings.ALIGNMENT);
 
         expect(isFontSizeCustomized.value).toBe(false);
-        expect(isAlignmentCustomized.value).toBe(false);
     });
 
     test('should find marks', () => {
@@ -435,7 +433,7 @@ 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' })]
@@ -453,16 +451,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);
     });
 });
 
@@ -502,7 +500,7 @@ describe('get content customization', () => {
             content: NodeFactory.doc([
                 NodeFactory.paragraph({
                     preset: { id: 'regular-2' },
-                    alignment: { value: 'right' }
+                    line_height: { value: '1.1' }
                 }, 'test')
             ]),
             presets: [createPreset({ id: 'regular-2' })]
@@ -542,12 +540,12 @@ describe('remove preset customization', () => {
             content: NodeFactory.doc([
                 NodeFactory.heading(1, {
                     preset: { id: 'regular-1' },
-                    alignment: { value: 'center' }
+                    line_height: { value: '1.1' }
                 }, 'heading'),
 
                 NodeFactory.paragraph({
                     preset: { id: 'regular-1' },
-                    alignment: { value: 'center' }
+                    line_height: { value: '1.1' }
                 }, 'paragraph')
             ]),
 

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

@@ -5,7 +5,7 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -28,7 +28,6 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
         "level": 1,
         "preset": Object {
           "id": "h1",
@@ -44,7 +43,6 @@ Object {
     },
     Object {
       "attrs": Object {
-        "alignment": null,
         "level": 1,
         "preset": Object {
           "id": "h1",
@@ -68,7 +66,6 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
         "level": 1,
         "preset": Object {
           "id": "h1",
@@ -92,7 +89,7 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -115,7 +112,7 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -130,7 +127,7 @@ Object {
     },
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -153,7 +150,6 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
         "level": 1,
         "preset": Object {
           "id": "h1",
@@ -177,8 +173,8 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": Object {
-          "value": "center",
+        "line_height": Object {
+          "value": "1.1",
         },
         "preset": Object {
           "id": "regular-2",
@@ -200,7 +196,7 @@ Object {
 exports[`get content customization should find attributes 1`] = `
 Object {
   "attributes": Array [
-    "alignment",
+    "line_height",
   ],
   "marks": Array [],
 }
@@ -226,7 +222,7 @@ Object {
 exports[`get preset customization should find attributes 1`] = `
 Object {
   "attributes": Array [
-    "alignment",
+    "line_height",
   ],
   "marks": Array [],
 }
@@ -292,7 +288,7 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-2",
         },
@@ -315,7 +311,6 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
         "level": 3,
         "preset": Object {
           "id": "h3",
@@ -339,7 +334,7 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-2",
         },
@@ -362,7 +357,7 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -394,7 +389,7 @@ Object {
           "content": Array [
             Object {
               "attrs": Object {
-                "alignment": null,
+                "line_height": null,
                 "preset": Object {
                   "id": "regular-1",
                 },
@@ -432,7 +427,7 @@ Object {
           "content": Array [
             Object {
               "attrs": Object {
-                "alignment": null,
+                "line_height": null,
                 "preset": Object {
                   "id": "regular-1",
                 },
@@ -461,7 +456,6 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
         "level": 1,
         "preset": Object {
           "id": "regular-1",
@@ -477,7 +471,7 @@ Object {
     },
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -500,7 +494,7 @@ Object {
   "content": Array [
     Object {
       "attrs": Object {
-        "alignment": null,
+        "line_height": null,
         "preset": Object {
           "id": "regular-1",
         },
@@ -518,6 +512,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zipify/wysiwyg",
-  "version": "3.2.0",
+  "version": "3.3.0-1",
   "description": "Zipify modification of TipTap text editor",
   "main": "dist/wysiwyg.mjs",
   "bin": {
@@ -72,9 +72,9 @@
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.4.0",
-    "@vue/test-utils": "^1.3.3",
+    "@vue/test-utils": "^1.3.4",
     "@vue/vue2-jest": "^29.2.2",
-    "@zipify/colorpicker": "^2.2.1",
+    "@zipify/colorpicker": "^2.2.2",
     "@zipify/eslint-config": "^1.1.2",
     "babel-jest": "^29.4.2",
     "eslint": "8.33.0",