@lexical/mark 0.4.0 → 0.5.0

package/LexicalMark.dev.js

@@ -214,15 +214,16 @@ function $wrapSelectionInMarkNode(selection, isBackward, id) {
   const startOffset = isBackward ? focusOffset : anchorOffset;
   const endOffset = isBackward ? anchorOffset : focusOffset;
   let currentNodeParent;
-  let currentMarkNode; // We only want wrap adjacent text nodes, line break nodes
+  let lastCreatedMarkNode; // We only want wrap adjacent text nodes, line break nodes
   // and inline element nodes. For decorator nodes and block
-  // element nodes, we stop out their boundary and start again
-  // after, if there are more nodes.
+  // element nodes, we step out of their boundary and start
+  // again after, if there are more nodes.
 
   for (let i = 0; i < nodesLength; i++) {
     const node = nodes[i];
 
-    if (lexical.$isElementNode(currentMarkNode) && currentMarkNode.isParentOf(node)) {
+    if (lexical.$isElementNode(lastCreatedMarkNode) && lastCreatedMarkNode.isParentOf(node)) {
+      // If the current node is a child of the last created mark node, there is nothing to do here
       continue;
     }
 
@@ -231,6 +232,7 @@ function $wrapSelectionInMarkNode(selection, isBackward, id) {
     let targetNode = null;
 
     if (lexical.$isTextNode(node)) {
+      // Case 1: The node is a text node and we can split it
       const textContentSize = node.getTextContentSize();
       const startTextOffset = isFirstNode ? startOffset : 0;
       const endTextOffset = isLastNode ? endOffset : textContentSize;
@@ -241,32 +243,51 @@ function $wrapSelectionInMarkNode(selection, isBackward, id) {
 
       const splitNodes = node.splitText(startTextOffset, endTextOffset);
       targetNode = splitNodes.length > 1 && (splitNodes.length === 3 || isFirstNode && !isLastNode || endTextOffset === textContentSize) ? splitNodes[1] : splitNodes[0];
+    } else if ($isMarkNode(node)) {
+      // Case 2: the node is a mark node and we can ignore it as a target,
+      // moving on to its children. Note that when we make a mark inside
+      // another mark, it may utlimately be unnested by a call to
+      // `registerNestedElementResolver<MarkNode>` somewhere else in the
+      // codebase.
+      continue;
     } else if (lexical.$isElementNode(node) && node.isInline()) {
+      // Case 3: inline element nodes can be added in their entirety to the new
+      // mark
       targetNode = node;
     }
 
     if (targetNode !== null) {
+      // Now that we have a target node for wrapping with a mark, we can run
+      // through special cases.
       if (targetNode && targetNode.is(currentNodeParent)) {
+        // The current node is a child of the target node to be wrapped, there
+        // is nothing to do here.
         continue;
       }
 
       const parentNode = targetNode.getParent();
 
       if (parentNode == null || !parentNode.is(currentNodeParent)) {
-        currentMarkNode = undefined;
+        // If the parent node is not the current node's parent node, we can
+        // clear the last created mark node.
+        lastCreatedMarkNode = undefined;
       }
 
       currentNodeParent = parentNode;
 
-      if (currentMarkNode === undefined) {
-        currentMarkNode = $createMarkNode([id]);
-        targetNode.insertBefore(currentMarkNode);
-      }
+      if (lastCreatedMarkNode === undefined) {
+        // If we don't have a created mark node, we can make one
+        lastCreatedMarkNode = $createMarkNode([id]);
+        targetNode.insertBefore(lastCreatedMarkNode);
+      } // Add the target node to be wrapped in the latest created mark node
+
 
-      currentMarkNode.append(targetNode);
+      lastCreatedMarkNode.append(targetNode);
     } else {
+      // If we don't have a target node to wrap we can clear our state and
+      // continue on with the next node
       currentNodeParent = undefined;
-      currentMarkNode = undefined;
+      lastCreatedMarkNode = undefined;
     }
   }
 }

package/LexicalMark.prod.js

@@ -10,5 +10,5 @@ m.addClassNamesToElement(b,a.theme.markOverlap);return b}updateDOM(a,b,c){a=a.__
 this.getWritable();if(q(b)){let c=b.__ids;b.__ids=c;for(b=0;b<c.length;b++)if(a===c[b]){c.splice(b,1);break}}}insertNewAfter(a){a=this.getParentOrThrow().insertNewAfter(a);if(l.$isElementNode(a)){let b=p(this.__ids);a.append(b);return b}return null}canInsertTextBefore(){return!1}canInsertTextAfter(){return!1}canBeEmpty(){return!1}isInline(){return!0}extractWithChild(a,b,c){if(!l.$isRangeSelection(b)||"html"===c)return!1;let e=b.anchor,d=b.focus;a=e.getNode();c=d.getNode();b=b.isBackward()?e.offset-
 d.offset:d.offset-e.offset;return this.isParentOf(a)&&this.isParentOf(c)&&this.getTextContent().length===b}excludeFromCopy(a){return"clone"!==a}}function p(a){return new n(a)}function q(a){return a instanceof n}exports.$createMarkNode=p;exports.$getMarkIDs=function(a,b){for(;null!==a;){if(q(a))return a.getIDs();if(l.$isTextNode(a)&&b===a.getTextContentSize()){let c=a.getNextSibling();if(q(c))return c.getIDs()}a=a.getParent()}return null};exports.$isMarkNode=q;
 exports.$unwrapMarkNode=function(a){let b=a.getChildren(),c=null;for(let e=0;e<b.length;e++){let d=b[e];null===c?a.insertBefore(d):c.insertAfter(d);c=d}a.remove()};
-exports.$wrapSelectionInMarkNode=function(a,b,c){let e=a.getNodes();var d=a.anchor.offset,h=a.focus.offset;a=e.length;let w=b?h:d;b=b?d:h;let r,k;for(d=0;d<a;d++){var f=e[d];if(l.$isElementNode(k)&&k.isParentOf(f))continue;h=0===d;let u=d===a-1;var g=null;if(l.$isTextNode(f)){g=f.getTextContentSize();let v=h?w:0,t=u?b:g;if(0===v&&0===t)continue;f=f.splitText(v,t);g=1<f.length&&(3===f.length||h&&!u||t===g)?f[1]:f[0]}else l.$isElementNode(f)&&f.isInline()&&(g=f);null!==g?g&&g.is(r)||(h=g.getParent(),
-null!=h&&h.is(r)||(k=void 0),r=h,void 0===k&&(k=p([c]),g.insertBefore(k)),k.append(g)):k=r=void 0}};exports.MarkNode=n
+exports.$wrapSelectionInMarkNode=function(a,b,c){let e=a.getNodes();var d=a.anchor.offset,h=a.focus.offset;a=e.length;let w=b?h:d;b=b?d:h;let r,k;for(d=0;d<a;d++){var f=e[d];if(l.$isElementNode(k)&&k.isParentOf(f))continue;h=0===d;let u=d===a-1;var g=null;if(l.$isTextNode(f)){g=f.getTextContentSize();let v=h?w:0,t=u?b:g;if(0===v&&0===t)continue;f=f.splitText(v,t);g=1<f.length&&(3===f.length||h&&!u||t===g)?f[1]:f[0]}else if(q(f))continue;else l.$isElementNode(f)&&f.isInline()&&(g=f);null!==g?g&&g.is(r)||
+(h=g.getParent(),null!=h&&h.is(r)||(k=void 0),r=h,void 0===k&&(k=p([c]),g.insertBefore(k)),k.append(g)):k=r=void 0}};exports.MarkNode=n

package/package.json

@@ -8,13 +8,13 @@
     "mark"
   ],
   "license": "MIT",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "main": "LexicalMark.js",
   "peerDependencies": {
-    "lexical": "0.4.0"
+    "lexical": "0.5.0"
   },
   "dependencies": {
-    "@lexical/utils": "0.4.0"
+    "@lexical/utils": "0.5.0"
   },
   "repository": {
     "type": "git",