Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(v2): attribute setting and CSR event registration #6649

Merged
merged 2 commits into from
Jul 8, 2024
Merged

fix(v2): attribute setting and CSR event registration #6649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3d150
fix register events on CSR
Varixo Jul 6, 2024
30bc77e
fix toggling attributes
Varixo Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions packages/qwik/src/core/v2/client/vnode-diff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ import {
} from '../shared/event-names';
import { ChoreType } from '../shared/scheduler';
import { hasClassAttr } from '../shared/scoped-styles';
import type { HostElement, QElement2, QwikLoaderEventScope, fixMeAny } from '../shared/types';
import type {
HostElement,
QElement2,
QwikLoaderEventScope,
fixMeAny,
qWindow,
} from '../shared/types';
import { DEBUG_TYPE, QContainerValue, VirtualType } from '../shared/types';
import type { DomContainer } from './dom-container';
import {
Expand Down Expand Up @@ -592,6 +598,9 @@ export const vnode_diff = (
HANDLER_PREFIX + ':' + scope + ':' + eventName,
value
);
if (eventName) {
registerQwikLoaderEvent(eventName);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we don't need to add the scope to the event name, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

}
needsQDispatchEventPatch = true;
continue;
}
Expand Down Expand Up @@ -670,10 +679,7 @@ export const vnode_diff = (
vCurrent && vnode_isElementVNode(vCurrent) && elementName === vnode_getElementName(vCurrent);
const jsxKey: string | null = jsx.key;
let needsQDispatchEventPatch = false;
if (
!isSameElementName ||
jsxKey !== vnode_getProp(vCurrent as ElementVNode, ELEMENT_KEY, null)
) {
if (!isSameElementName || jsxKey !== getKey(vCurrent)) {
// So we have a key and it does not match the current node.
// We need to do a forward search to find it.
// The complication is that once we start taking nodes out of order we can't use `vnode_getNextSibling`
Expand Down Expand Up @@ -770,7 +776,9 @@ export const vnode_diff = (
}

// register an event for qwik loader
((globalThis as fixMeAny).qwikevents ||= []).push(eventName);
if (eventName) {
registerQwikLoaderEvent(eventName);
}
};

while (srcKey !== null || dstKey !== null) {
Expand All @@ -783,10 +791,11 @@ export const vnode_diff = (
// Source has more keys, so we need to remove them from destination
if (dstKey && isHtmlAttributeAnEventName(dstKey)) {
patchEventDispatch = true;
dstIdx++;
} else {
record(dstKey!, null);
dstIdx--;
}
dstIdx++; // skip the destination value, we don't care about it.
dstKey = dstIdx < dstLength ? dstAttrs[dstIdx++] : null;
} else if (dstKey == null) {
// Destination has more keys, so we need to insert them from source.
Expand Down Expand Up @@ -817,23 +826,36 @@ export const vnode_diff = (
} else {
record(srcKey, srcAttrs[srcIdx]);
}

srcIdx++;
// advance srcValue
srcKey = srcIdx < srcLength ? srcAttrs[srcIdx++] : null;
// we need to increment dstIdx too, because we added destination key and value to the VNode
// and dstAttrs is a reference to the VNode
dstIdx++;
dstKey = dstIdx < dstLength ? dstAttrs[dstIdx++] : null;
} else {
// Source is missing the key, so we need to remove it from destination.
if (isHtmlAttributeAnEventName(dstKey)) {
patchEventDispatch = true;
dstIdx++;
} else {
record(dstKey!, null);
dstIdx--;
}
dstIdx++; // skip the destination value, we don't care about it.
dstKey = dstIdx < dstLength ? dstAttrs[dstIdx++] : null;
}
}
return patchEventDispatch;
}

function registerQwikLoaderEvent(eventName: string) {
const window = container.document.defaultView as qWindow | null;
if (window) {
(window.qwikevents ||= [] as string[]).push(eventName);
}
}

/**
* Retrieve the child with the given key.
*
Expand Down
Loading
Loading