wip fixes

Author: wmertens

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

@@ -864,7 +864,7 @@ export const vnode_diff = (
     const recordJsxEvent = (key: string, value: any) => {
       const data = getEventDataFromHtmlAttribute(key);
       if (data) {
-        const [eventName, scope] = data;
+        const [scope, eventName] = data;
         record(':' + scope + ':' + eventName, value);
         // register an event for qwik loader
         registerQwikLoaderEvent(eventName);
@@ -908,10 +908,18 @@ export const vnode_diff = (
         // Keys match: update if values differ
         const srcValue = srcAttrs[srcIdx + 1];
         const dstValue = dstAttrs[dstIdx + 1];
+        const isEventHandler = isHtmlAttributeAnEventName(srcKey);
         if (srcValue !== dstValue) {
-          record(srcKey, srcValue);
-          // Update in place doesn't change array length
+          if (isEventHandler) {
+            recordJsxEvent(srcKey, srcValue);
+          } else {
+            record(srcKey, srcValue);
+          }
+        } else if (isEventHandler && !vnode.element.qDispatchEvent) {
+          // Special case: add event handlers after resume
+          recordJsxEvent(srcKey, srcValue);
         }
+        // Update in place doesn't change array length
         srcIdx += 2; // skip key and value
         dstIdx += 2; // skip key and value
       } else if (srcKey < dstKey) {

packages/qwik/src/core/shared/jsx/jsx-node.ts

@@ -61,17 +61,17 @@ export class JSXNodeImpl<T = unknown> implements JSXNodeInternal<T> {
         if (attr) {
           // constProps always wins
           if (!constProps || !(k in constProps)) {
-            toSort ||= mergeHandlers(this.varProps, attr, this.varProps[k] as QRL);
+            toSort = mergeHandlers(this.varProps, attr, this.varProps[k] as QRL) || toSort;
           }
           delete this.varProps[k];
         }
       }
 
       // bind:*
       if (BIND_CHECKED in this.varProps) {
-        toSort ||= handleBindProp(this.varProps, BIND_CHECKED)!;
+        toSort = handleBindProp(this.varProps, BIND_CHECKED)! || toSort;
       } else if (BIND_VALUE in this.varProps) {
-        toSort ||= handleBindProp(this.varProps, BIND_VALUE)!;
+        toSort = handleBindProp(this.varProps, BIND_VALUE)! || toSort;
       } else if (this.constProps) {
         if (BIND_CHECKED in this.constProps) {
           handleBindProp(this.constProps, BIND_CHECKED);