fix: diffing text node and virtual

Varixo · Varixo · commit 364937febec9 · 2025-11-03T19:39:09.000+01:00
diff --git a/packages/qwik/src/core/client/vnode-diff.ts b/packages/qwik/src/core/client/vnode-diff.ts
@@ -1163,11 +1163,8 @@ export const vnode_diff = (
   function expectVirtual(type: VirtualType, jsxKey: string | null) {
     const checkKey = type === VirtualType.Fragment;
     const currentKey = getKey(vCurrent);
-    const isSameNode =
-      vCurrent &&
-      vnode_isVirtualVNode(vCurrent) &&
-      currentKey === jsxKey &&
-      (checkKey ? !!jsxKey : true);
+    const currentIsVirtual = vCurrent && vnode_isVirtualVNode(vCurrent);
+    const isSameNode = currentIsVirtual && currentKey === jsxKey && (checkKey ? !!jsxKey : true);
 
     if (isSameNode) {
       // All is good.
@@ -1186,7 +1183,7 @@ export const vnode_diff = (
       isDev && (vNewNode as VirtualVNode).setProp(DEBUG_TYPE, type);
     };
     // For fragments without a key, always create a new virtual node (ensures rerender semantics)
-    if (checkKey && jsxKey === null) {
+    if (jsxKey === null) {
       createNew();
       return;
     }
diff --git a/packages/qwik/src/core/client/vnode-diff.unit.tsx b/packages/qwik/src/core/client/vnode-diff.unit.tsx
@@ -1,4 +1,4 @@
-import { Fragment, _fnSignal, _jsxSorted, component$ } from '@qwik.dev/core';
+import { Fragment, _fnSignal, _jsxSorted, component$, type JSXOutput } from '@qwik.dev/core';
 import { vnode_fromJSX } from '@qwik.dev/core/testing';
 import { describe, expect, it } from 'vitest';
 import type { SignalImpl } from '../reactive-primitives/impl/signal-impl';
@@ -534,6 +534,19 @@ describe('vNode-diff', () => {
       expect(vNode).toMatchVDOM(test);
       expect(fragment).not.toBe(vnode_getFirstChild(vNode!));
     });
+
+    it('should render fragment if only text was available', async () => {
+      const { vParent, container } = vnode_fromJSX('1');
+      const test = Promise.resolve('2') as unknown as JSXOutput; //_jsxSorted(Fragment, {}, null, ['1'], 0, null);
+
+      await vnode_diff(container, test, vParent, null);
+      vnode_applyJournal(container.$journal$);
+      expect(vParent).toMatchVDOM(
+        <body>
+          <Fragment>2</Fragment>
+        </body>
+      );
+    });
   });
   describe('attributes', () => {
     describe('const props', () => {
diff --git a/packages/qwik/src/core/tests/use-visible-task.spec.tsx b/packages/qwik/src/core/tests/use-visible-task.spec.tsx
@@ -4,6 +4,7 @@ import {
   createContextId,
   Fragment,
   Fragment as Projection,
+  Fragment as Awaited,
   Fragment as Signal,
   type Signal as SignalType,
   Slot,
@@ -728,9 +729,9 @@ describe.each([
         <Component ssr-required>
           <p>
             Should have a number: "
-            <Fragment ssr-required>
-              <Signal ssr-required>{'2'}</Signal>
-            </Fragment>
+            <Signal ssr-required>
+              <Awaited ssr-required>{'2'}</Awaited>
+            </Signal>
             "
           </p>
         </Component>
diff --git a/packages/qwik/src/testing/vdom-diff.unit-util.ts b/packages/qwik/src/testing/vdom-diff.unit-util.ts
@@ -12,7 +12,7 @@ import type {
   JSXNodeInternal,
   ClientContainer,
 } from '@qwik.dev/core/internal';
-import { expect, vi } from 'vitest';
+import { expect } from 'vitest';
 import {
   vnode_applyJournal,
   vnode_getAttrKeys,
@@ -420,6 +420,10 @@ export function walkJSX(
       processChild(jsx.children);
     }
     apply.leave(jsx);
+  } else if (typeof jsx === 'string') {
+    apply.text(jsx);
+  } else if (typeof jsx === 'number') {
+    apply.text(String(jsx));
   } else {
     throw new Error('unsupported: ' + jsx);
   }
