feat(cursors): fix diff props

Author: Varixo

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

@@ -1,5 +1,4 @@
 import { isDev } from '@qwik.dev/core/build';
-import { _CONST_PROPS, _EFFECT_BACK_REF, _VAR_PROPS } from '../internal';
 import { clearAllEffects, clearEffectSubscription } from '../reactive-primitives/cleanup';
 import { WrappedSignalImpl } from '../reactive-primitives/impl/wrapped-signal-impl';
 import type { Signal } from '../reactive-primitives/signal.public';
@@ -31,7 +30,7 @@ import type { QRL } from '../shared/qrl/qrl.public';
 import type { HostElement, QElement, QwikLoaderEventScope, qWindow } from '../shared/types';
 import { DEBUG_TYPE, QContainerValue, VirtualType } from '../shared/types';
 import { escapeHTML } from '../shared/utils/character-escaping';
-import { _OWNER, _PROPS_HANDLER } from '../shared/utils/constants';
+import { _CONST_PROPS, _OWNER, _PROPS_HANDLER, _VAR_PROPS } from '../shared/utils/constants';
 import {
   fromCamelToKebabCase,
   getEventDataFromHtmlAttribute,
@@ -97,6 +96,7 @@ import type { VirtualVNode } from '../shared/vnode/virtual-vnode';
 import type { TextVNode } from '../shared/vnode/text-vnode';
 import { markVNodeDirty } from '../shared/vnode/vnode-dirty';
 import { ChoreBits } from '../shared/vnode/enums/chore-bits.enum';
+import { _EFFECT_BACK_REF } from '../reactive-primitives/backref';
 
 export const vnode_diff = (
   container: ClientContainer,
@@ -819,8 +819,8 @@ export const vnode_diff = (
 
   function diffProps(
     vnode: ElementVNode,
-    srcAttrs: Record<string, any>,
-    dstAttrs: Record<string, any>,
+    newAttrs: Record<string, any>,
+    oldAttrs: Record<string, any>,
     currentFile: string | null
   ): boolean {
     vnode_ensureElementInflated(vnode);
@@ -904,21 +904,27 @@ export const vnode_diff = (
     };
 
     // Actual diffing logic
-    for (const key in srcAttrs) {
-      const srcValue = srcAttrs[key];
+    // Apply all new attributes
+    for (const key in newAttrs) {
+      const newValue = newAttrs[key];
       const isEvent = isHtmlAttributeAnEventName(key);
 
-      if (key in dstAttrs) {
-        if (srcValue !== dstAttrs[key]) {
-          isEvent ? recordJsxEvent(key, srcValue) : record(key, srcValue);
+      if (key in oldAttrs) {
+        if (newValue !== oldAttrs[key]) {
+          isEvent ? recordJsxEvent(key, newValue) : record(key, newValue);
         }
       } else {
-        isEvent ? recordJsxEvent(key, srcValue) : record(key, srcValue);
+        isEvent ? recordJsxEvent(key, newValue) : record(key, newValue);
       }
     }
 
-    for (const key in dstAttrs) {
-      if (!(key in srcAttrs) && !isHtmlAttributeAnEventName(key)) {
+    // Remove attributes that no longer exist in new props
+    for (const key in oldAttrs) {
+      if (
+        !(key in newAttrs) &&
+        !key.startsWith(HANDLER_PREFIX) &&
+        !isHtmlAttributeAnEventName(key)
+      ) {
         record(key, null);
       }
     }

packages/qwik/src/core/shared/cursor/cursor-flush.ts

@@ -91,6 +91,8 @@ function flushChanges(
           }
         }
       }
+      vNode.operation = null;
+      vNode.dirty &= ~ChoreBits.OPERATION;
     }
   }
 

packages/qwik/src/core/shared/cursor/cursor-walker.ts

@@ -65,11 +65,8 @@ export function processCursorQueue(
 ): void {
   isNextTickScheduled = false;
 
-  console.log('processCursorQueue');
-
   let cursor: Cursor | null = null;
   while ((cursor = getHighestPriorityCursor())) {
-    console.log('while loop');
     walkCursor(cursor, options);
     if (!(cursor.dirty & ChoreBits.DIRTY_MASK)) {
       removeCursorFromQueue(cursor);
@@ -164,7 +161,6 @@ export function walkCursor(cursor: Cursor, options: WalkOptions): void {
     }
 
     let result: ValueOrPromise<void> | undefined;
-    console.log('executeChoreSequence', currentVNode.dirty);
     // Execute chores in order
     if (currentVNode.dirty & ChoreBits.TASKS) {
       result = executeTasks(currentVNode, container, cursor);