@zipify/wysiwyg 2.0.0-0 → 2.0.0-10

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

@@ -6,19 +6,19 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": "hello world",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": false,
-            "underline": true,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -71,19 +71,19 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": "hello world",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": false,
-            "underline": true,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -97,19 +97,19 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": "hello world",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": true,
-            "underline": true,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -123,19 +123,19 @@ Object {
     Object {
       "content": Array [
         Object {
-          "text": "lorem ipsum",
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": false,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "hello world",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": false,
-            "underline": false,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -149,19 +149,19 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": false,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": "hello world",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": true,
-            "underline": false,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -175,19 +175,19 @@ Object {
     Object {
       "content": Array [
         Object {
-          "text": "lorem ipsum",
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": false,
+              },
+              "type": "text_decoration",
+            },
+          ],
+          "text": "hello world",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": false,
-            "underline": false,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -201,19 +201,19 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": "hello world",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": false,
-            "underline": true,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -227,19 +227,19 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": "test",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": true,
-            "underline": true,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -343,19 +343,19 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": true,
+                "underline": false,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": "test",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": true,
-            "underline": false,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -429,19 +429,19 @@ Object {
     Object {
       "content": Array [
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": "test",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": false,
-            "underline": true,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],
@@ -519,7 +519,7 @@ Object {
             Object {
               "attrs": Object {
                 "strike_through": true,
-                "underline": false,
+                "underline": true,
               },
               "type": "text_decoration",
             },
@@ -528,19 +528,19 @@ Object {
           "type": "text",
         },
         Object {
+          "marks": Array [
+            Object {
+              "attrs": Object {
+                "strike_through": false,
+                "underline": true,
+              },
+              "type": "text_decoration",
+            },
+          ],
           "text": " ipsum",
           "type": "text",
         },
       ],
-      "marks": Array [
-        Object {
-          "attrs": Object {
-            "strike_through": false,
-            "underline": true,
-          },
-          "type": "text_decoration",
-        },
-      ],
       "type": "paragraph",
     },
   ],

package/lib/extensions/core/Document.js

@@ -1,5 +1,6 @@
 import { Document as Base } from '@tiptap/extension-document';
+import { MarkGroups } from '../../enums';
 
 export const Document = Base.extend({
-    marks: 'settings'
+    marks: MarkGroups.SETTINGS
 });

package/lib/extensions/core/Heading.js

@@ -1,7 +1,8 @@
 import { Heading as Base } from '@tiptap/extension-heading';
+import { MarkGroups } from '../../enums';
 
 export const Heading = Base.extend({
-    marks: '_',
+    marks: MarkGroups.ALL,
 
     addOptions: () => ({
         levels: [1, 2, 3, 4],

package/lib/extensions/core/NodeProcessor.js

@@ -7,22 +7,24 @@ import {
     isNodeFullySelected,
     resolveTextPosition
 } from '../../utils';
-import { NodeTypes } from '../../enums';
-import { AddNodeMarkStep } from './steps';
+import { MarkGroups, NodeTypes } from '../../enums';
+import { AddNodeMarkStep, AttrStep, RemoveNodeMarkStep } from './steps';
 
 export const NodeProcessor = Extension.create({
     name: 'node_processor',
 
     addCommands() {
         return {
-            setBlockAttributes: createCommand(({ commands }, name, attrs, defaults = {}) => {
+            setBlockAttributes: createCommand(({ commands, state }, name, attrs, defaults = {}) => {
                 const current = unref(commands.getBlockAttributes(name)) ?? {};
+                const { doc, tr } = state;
+                const { from, to } = tr.selection;
 
-                for (const type of NodeTypes.blocks) {
-                    commands.updateAttributes(type, {
-                        [name]: { ...defaults, ...current, ...attrs }
-                    });
-                }
+                doc.nodesBetween(from, to, (node, position) => {
+                    if (!NodeTypes.blocks.includes(node.type.name)) return;
+
+                    tr.step(new AttrStep(position, name, { ...defaults, ...current, ...attrs }));
+                });
             }),
 
             getBlockAttributes: createCommand(({ editor }, name, defaults) => computed(() => {
@@ -35,16 +37,16 @@ export const NodeProcessor = Extension.create({
                 return Object.keys(attrs).length ? attrs : null;
             })),
 
-            applyMark: createCommand(({ state }, name, value, customizer = {}) => {
+            applyMark: createCommand(({ state, commands }, name, value) => {
                 const { tr, doc, schema } = state;
                 const { $from, $to } = tr.selection;
                 const markType = getMarkType(name, schema);
+                const markGroup = markType.spec.group || '';
 
-                const onAppliedToParent = customizer.onAppliedToParent || ((context) => {
-                    const { tr, textPosition, applyingMark } = context;
-
-                    tr.removeMark(textPosition.from, textPosition.to, applyingMark.type);
-                });
+                if (!markGroup.includes(MarkGroups.SETTINGS)) {
+                    // Apply inline mark if block level not supported
+                    return commands.setMark(name, value);
+                }
 
                 if ($from.pos === $to.pos) return;
 
@@ -55,9 +57,8 @@ export const NodeProcessor = Extension.create({
                     const applyingMark = markType.create({ ...(initialMark?.attrs || {}), ...value });
                     const textPosition = resolveTextPosition($from, $to, node, position);
 
-                    if (isMarkAppliedToParent(tr, position, applyingMark, customizer.compareParentMark)) {
-                        onAppliedToParent({ tr, textPosition, applyingMark, initialMark, node });
-                        return;
+                    if (isMarkAppliedToParent(tr.doc, position, applyingMark)) {
+                        return commands._removeNodeMark({ tr, node, position, mark: markType });
                     }
 
                     if (node.isText) {
@@ -65,7 +66,7 @@ export const NodeProcessor = Extension.create({
                         return;
                     }
 
-                    if (isNodeFullySelected($from, $to, node, position)) {
+                    if (isNodeFullySelected(tr.doc, tr.selection, node, position)) {
                         tr.step(new AddNodeMarkStep(position, applyingMark));
                     }
                 });
@@ -102,10 +103,52 @@ export const NodeProcessor = Extension.create({
             }),
 
             getDeviceSettingMark: createCommand(({ commands }, name, defaultRef) => {
-                const selectionRef = commands.getMark(name);
+                const selectionRef = commands.getMarks(name);
                 const deviceRef = commands.getDevice();
 
-                return computed(() => unref(selectionRef)?.[unref(deviceRef)] ?? unref(defaultRef));
+                return computed(() => {
+                    for (const attrs of unref(selectionRef)) {
+                        const value = attrs[unref(deviceRef)];
+
+                        if (value) return value;
+                    }
+
+                    return unref(defaultRef);
+                });
+            }),
+
+            removeAllMarks: createCommand(({ state, commands }) => {
+                const { tr, doc } = state;
+                const { from, to } = tr.selection;
+
+                doc.nodesBetween(from, to, (node, position) => {
+                    for (const mark of node.marks) {
+                        commands._removeNodeMark({ tr, node, position, mark });
+                    }
+                });
+            }),
+
+            removeMarks: createCommand(({ state, commands }, marks) => {
+                const { tr, doc } = state;
+                const { from, to } = tr.selection;
+
+                doc.nodesBetween(from, to, (node, position) => {
+                    const removingMarks = node.marks.filter((mark) => marks.includes(mark.type.name));
+
+                    for (const mark of removingMarks) {
+                        commands._removeNodeMark({ tr, node, position, mark });
+                    }
+                });
+            }),
+
+            removeMark: createCommand(({ commands, state }, node, position, mark) => {
+                commands._removeNodeMark({ tr: state.tr, node, position, mark });
+            }),
+
+            _removeNodeMark: createCommand((context, { tr, node, position, mark }) => {
+                return node.isText
+                    ? tr.removeMark(position, position + node.nodeSize, mark)
+                    : tr.step(new RemoveNodeMarkStep(position, mark));
             })
         };
     }

package/lib/extensions/core/Paragraph.js

@@ -1,7 +1,8 @@
 import { Paragraph as Base } from '@tiptap/extension-paragraph';
+import { MarkGroups } from '../../enums';
 
 export const Paragraph = Base.extend({
-    marks: '_',
+    marks: MarkGroups.ALL,
 
     addOptions: () => ({
         HTMLAttributes: { class: 'zw-style' }

package/lib/extensions/core/TextProcessor.js

@@ -12,11 +12,6 @@ export const TextProcessor = Extension.create({
                 return state.doc.textBetween(from, to, ' ');
             }),
 
-            unsetMarks: createCommand(({ commands }, marks) => {
-                // TODO check unset mark
-                marks.forEach((mark) => commands.unsetMark(mark));
-            }),
-
             transformText: createCommand(({ state }, transform) => {
                 const { $from, $to } = state.tr.selection;