Merge pull request #8070 from QwikDev/v2-blocking-parent-order

fix: blocking slot parent and parent order

Author: Varixo

.changeset/ninety-pets-win.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': patch
+---
+
+fix: blocking slot parent and parent order

packages/qwik/src/core/client/vnode.ts

@@ -1701,7 +1701,7 @@ export const vnode_isDescendantOf = (vnode: VNode, ancestor: VNode): boolean =>
 };
 
 export const vnode_getProjectionParentOrParent = (vnode: VNode): VNode | null => {
-  return vnode.slotParent || vnode.parent;
+  return vnode.parent || vnode.slotParent;
 };
 
 export const vnode_getNode = (vnode: VNode | null): Element | Text | null => {

packages/qwik/src/core/shared/scheduler-rules.unit.tsx

@@ -784,6 +784,97 @@ describe('findBlockingChore', () => {
       );
       expect(result).toBe(ancestorProjectionChore);
     });
+
+    it('should check parent before slotParent when both are set', () => {
+      // This test verifies that vnode_getProjectionParentOrParent checks parent first
+      // Set up: child has both parent and slotParent
+      // parent has a blocking chore, slotParent does not
+      const parentVNode = vnode_newVirtual();
+      const slotParentVNode = vnode_newVirtual();
+      const childVNode = vnode_newVirtual();
+
+      childVNode.parent = parentVNode;
+      childVNode.slotParent = slotParentVNode;
+
+      const blockingChore = createMockChore(ChoreType.COMPONENT, parentVNode);
+      (blockingChore.$host$ as VNode).chores = new ChoreArray();
+      (blockingChore.$host$ as VNode).chores?.add(blockingChore);
+
+      const descendantChore = createMockChore(ChoreType.VISIBLE, childVNode);
+      const choreQueue = new ChoreArray();
+      const blockedChores = new Set<Chore>();
+      const runningChores = new Set<Chore>();
+
+      const result = findBlockingChore(
+        descendantChore,
+        choreQueue,
+        blockedChores,
+        runningChores,
+        container
+      );
+      // Should find the blocking chore on parent (not look at slotParent)
+      expect(result).toBe(blockingChore);
+    });
+
+    it('should not find slotParent blocking chore when parent exists', () => {
+      // This test verifies that if parent is set (even if null/no chores),
+      // slotParent is not checked
+      const parentVNode = vnode_newVirtual();
+      const slotParentVNode = vnode_newVirtual();
+      const childVNode = vnode_newVirtual();
+
+      childVNode.parent = parentVNode; // parent set but no blocking chore
+      childVNode.slotParent = slotParentVNode;
+
+      // Put a blocking chore on slotParent
+      const blockingChore = createMockChore(ChoreType.COMPONENT, slotParentVNode);
+      (blockingChore.$host$ as VNode).chores = new ChoreArray();
+      (blockingChore.$host$ as VNode).chores?.add(blockingChore);
+
+      const descendantChore = createMockChore(ChoreType.VISIBLE, childVNode);
+      const choreQueue = new ChoreArray();
+      const blockedChores = new Set<Chore>();
+      const runningChores = new Set<Chore>();
+
+      const result = findBlockingChore(
+        descendantChore,
+        choreQueue,
+        blockedChores,
+        runningChores,
+        container
+      );
+      // Should NOT find the blocking chore on slotParent because parent is checked first
+      // and we don't continue to slotParent when parent exists
+      expect(result).toBeNull();
+    });
+
+    it('should fall back to slotParent only when parent is null', () => {
+      // This test verifies that slotParent is checked when parent is null
+      const slotParentVNode = vnode_newVirtual();
+      const childVNode = vnode_newVirtual();
+
+      childVNode.parent = null; // explicitly null
+      childVNode.slotParent = slotParentVNode;
+
+      const blockingChore = createMockChore(ChoreType.COMPONENT, slotParentVNode);
+      (blockingChore.$host$ as VNode).chores = new ChoreArray();
+      (blockingChore.$host$ as VNode).chores?.add(blockingChore);
+
+      const descendantChore = createMockChore(ChoreType.VISIBLE, childVNode);
+      const choreQueue = new ChoreArray();
+      const blockedChores = new Set<Chore>();
+      const runningChores = new Set<Chore>();
+
+      const result = findBlockingChore(
+        descendantChore,
+        choreQueue,
+        blockedChores,
+        runningChores,
+        container
+      );
+      // Should find the blocking chore on slotParent since parent is null
+      expect(result).toBe(blockingChore);
+    });
   });
 });