@zipify/wysiwyg 2.0.0-4 → 2.0.0-5

package/dist/wysiwyg.mjs

@@ -21024,8 +21024,8 @@ iterateNodes_fn2 = function(handler) {
 _iterateChildNodes = new WeakSet();
 iterateChildNodes_fn = function(node, handler) {
   for (const child of node.content) {
-    handler.call(this, child);
     child.content && __privateMethod(this, _iterateChildNodes, iterateChildNodes_fn).call(this, child, handler);
+    handler.call(this, child);
   }
 };
 _bubbleMarks = new WeakSet();
@@ -21056,6 +21056,8 @@ canBubbleMark_fn = function(node, childMark) {
   if (__privateMethod(this, _includesMarkType, includesMarkType_fn).call(this, node, childMark.type))
     return false;
   for (const child of node.content) {
+    if (!child.content && node.type === NodeTypes.LIST_ITEM)
+      continue;
     if (!child.marks)
       return false;
     if (!__privateMethod(this, _includesMark, includesMark_fn).call(this, child, childMark))

package/lib/services/normalizer/JsonNormalizer.js

@@ -14,8 +14,8 @@ export class JsonNormalizer extends BaseNormalizer {
 
     #iterateChildNodes(node, handler) {
         for (const child of node.content) {
-            handler.call(this, child);
             child.content && this.#iterateChildNodes(child, handler);
+            handler.call(this, child);
         }
     }
 
@@ -45,6 +45,7 @@ export class JsonNormalizer extends BaseNormalizer {
         if (this.#includesMarkType(node, childMark.type)) return false;
 
         for (const child of node.content) {
+            if (!child.content && node.type === NodeTypes.LIST_ITEM) continue;
             if (!child.marks) return false;
             if (!this.#includesMark(child, childMark)) return false;
         }

package/lib/services/normalizer/__tests__/JsonNormalizer.test.js

@@ -34,9 +34,11 @@ describe('normalize json content', () => {
     test('should bubble mark from text to list item', () => {
         const input = NodeFactory.doc([
             NodeFactory.list(ListTypes.DISC, [
-                NodeFactory.paragraph(null, [
-                    NodeFactory.mark(TextSettings.FONT_WEIGHT, { value: '700' })
-                ], 'lorem ipsum')
+                NodeFactory.paragraph([
+                    NodeFactory.text('lorem ipsum', [
+                        NodeFactory.mark(TextSettings.FONT_WEIGHT, { value: '700' })
+                    ])
+                ])
             ])
         ]);
 

package/package.json

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