@tiptap/core 2.3.1 → 2.3.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -32,7 +32,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/pm": "^2.3.1"
+    "@tiptap/pm": "^2.3.2"
   },
   "peerDependencies": {
     "@tiptap/pm": "^2.0.0"

package/src/NodePos.ts

@@ -64,7 +64,7 @@ export class NodePos {
     this.editor.commands.insertContentAt({ from, to }, content)
   }
 
-  get attributes() : { [key: string]: any } {
+  get attributes(): { [key: string]: any } {
     return this.node.attrs
   }
 
@@ -200,34 +200,35 @@ export class NodePos {
   querySelectorAll(selector: string, attributes: { [key: string]: any } = {}, firstItemOnly = false): NodePos[] {
     let nodes: NodePos[] = []
 
-    // iterate through children recursively finding all nodes which match the selector with the node name
     if (!this.children || this.children.length === 0) {
       return nodes
     }
+    const attrKeys = Object.keys(attributes)
 
+    /**
+     * Finds all children recursively that match the selector and attributes
+     * If firstItemOnly is true, it will return the first item found
+     */
     this.children.forEach(childPos => {
-      if (childPos.node.type.name === selector) {
-        if (Object.keys(attributes).length > 0) {
-          const nodeAttributes = childPos.node.attrs
-          const attrKeys = Object.keys(attributes)
+      // If we already found a node and we only want the first item, we dont need to keep going
+      if (firstItemOnly && nodes.length > 0) {
+        return
+      }
 
-          for (let index = 0; index < attrKeys.length; index += 1) {
-            const key = attrKeys[index]
+      if (childPos.node.type.name === selector) {
+        const doesAllAttributesMatch = attrKeys.every(key => attributes[key] === childPos.node.attrs[key])
 
-            if (nodeAttributes[key] !== attributes[key]) {
-              return
-            }
-          }
+        if (doesAllAttributesMatch) {
+          nodes.push(childPos)
         }
+      }
 
-        nodes.push(childPos)
-
-        if (firstItemOnly) {
-          return
-        }
+      // If we already found a node and we only want the first item, we can stop here and skip the recursion
+      if (firstItemOnly && nodes.length > 0) {
+        return
       }
 
-      nodes = nodes.concat(childPos.querySelectorAll(selector))
+      nodes = nodes.concat(childPos.querySelectorAll(selector, attributes, firstItemOnly))
     })
 
     return nodes