Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
125 changes: 88 additions & 37 deletions packages/qwik/src/core/shared/jsx/jsx-internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ export const _jsxSplit = <T extends string | FunctionComponent<any>>(
): JSXNodeInternal<T> => {
return untrack(() => {
let toSort = false;
let constPropsCopied = false;
let varPropsCopied = false;
let bindValueSignal: any = null;
let bindCheckedSignal: any = null;

// Apply transformations for native HTML elements only
if (typeof type === 'string') {
Expand All @@ -80,7 +84,11 @@ export const _jsxSplit = <T extends string | FunctionComponent<any>>(
for (const k in constProps) {
const attr = jsxEventToHtmlAttribute(k);
if (attr) {
mergeHandlers(constProps, attr, constProps[k] as any);
if (!constPropsCopied) {
constProps = { ...constProps };
constPropsCopied = true;
}
constProps[attr] = constProps[k];
delete constProps[k];
}
}
Expand All @@ -89,54 +97,74 @@ export const _jsxSplit = <T extends string | FunctionComponent<any>>(
for (const k in varProps) {
const attr = jsxEventToHtmlAttribute(k);
if (attr) {
if (!constProps || !_hasOwnProperty.call(constProps, k)) {
toSort = mergeHandlers(varProps, attr, varProps[k] as any) || toSort;
if (!varPropsCopied) {
varProps = { ...varProps };
varPropsCopied = true;
}
// Transform event name in place
varProps[attr] = varProps[k];
delete varProps[k];
}
}
}

// Handle bind:*
if (varProps) {
if (_hasOwnProperty.call(varProps, BIND_CHECKED)) {
const value = varProps[BIND_CHECKED];
delete varProps[BIND_CHECKED];
if (value) {
varProps.checked = value;
varProps['on:input'] = createQRL(null, '_chk', _chk, null, null, [value]);
toSort = true;
}
} else if (_hasOwnProperty.call(varProps, BIND_VALUE)) {
const value = varProps[BIND_VALUE];
delete varProps[BIND_VALUE];
if (value) {
varProps.value = value;
varProps['on:input'] = createQRL(null, '_val', _val, null, null, [value]);
toSort = true;
} else if (k === BIND_CHECKED) {
// Set flag, will process after walk
bindCheckedSignal = varProps[k];
} else if (k === BIND_VALUE) {
// Set flag, will process after walk
bindValueSignal = varProps[k];
}
}
}
if (constProps) {
if (_hasOwnProperty.call(constProps, BIND_CHECKED)) {
const value = constProps[BIND_CHECKED];
delete constProps[BIND_CHECKED];
if (value) {
constProps.checked = value;
constProps['on:input'] = createQRL(null, '_chk', _chk, null, null, [value]);

// Handle bind:* - only in varProps (constProps are transformed by Rust)
if (bindCheckedSignal || bindValueSignal) {
if (!varPropsCopied) {
varProps = { ...varProps };
varPropsCopied = true;
}
} else if (_hasOwnProperty.call(constProps, BIND_VALUE)) {
const value = constProps[BIND_VALUE];
delete constProps[BIND_VALUE];
if (value) {
constProps.value = value;
constProps['on:input'] = createQRL(null, '_val', _val, null, null, [value]);

if (bindCheckedSignal) {
delete varProps[BIND_CHECKED];
varProps.checked = bindCheckedSignal;
const handler = createQRL(null, '_chk', _chk, null, null, [bindCheckedSignal]);

// Move on:input from constProps if it exists
if (constProps && _hasOwnProperty.call(constProps, 'on:input')) {
if (!constPropsCopied) {
constProps = { ...constProps };
constPropsCopied = true;
}
const existingHandler = constProps['on:input'];
delete constProps['on:input'];
toSort = mergeHandlers(varProps, 'on:input', existingHandler as any) || toSort;
}

toSort = mergeHandlers(varProps, 'on:input', handler) || toSort;
} else if (bindValueSignal) {
delete varProps[BIND_VALUE];
varProps.value = bindValueSignal;
const handler = createQRL(null, '_val', _val, null, null, [bindValueSignal]);

// Move on:input from constProps if it exists
if (constProps && _hasOwnProperty.call(constProps, 'on:input')) {
if (!constPropsCopied) {
constProps = { ...constProps };
constPropsCopied = true;
}
const existingHandler = constProps['on:input'];
delete constProps['on:input'];
toSort = mergeHandlers(varProps, 'on:input', existingHandler as any) || toSort;
}

toSort = mergeHandlers(varProps, 'on:input', handler) || toSort;
}
}
}

// Transform className -> class
if (varProps && _hasOwnProperty.call(varProps, 'className')) {
if (!varPropsCopied) {
varProps = { ...varProps };
varPropsCopied = true;
}
varProps.class = varProps.className;
varProps.className = undefined;
toSort = true;
Expand All @@ -149,6 +177,10 @@ export const _jsxSplit = <T extends string | FunctionComponent<any>>(
}
}
if (constProps && _hasOwnProperty.call(constProps, 'className')) {
if (!constPropsCopied) {
constProps = { ...constProps };
constPropsCopied = true;
}
constProps.class = constProps.className;
constProps.className = undefined;
if (qDev) {
Expand All @@ -164,12 +196,31 @@ export const _jsxSplit = <T extends string | FunctionComponent<any>>(
if (varProps) {
for (const k in varProps) {
if (k === 'children') {
if (!varPropsCopied) {
varProps = { ...varProps };
varPropsCopied = true;
}
children ||= varProps.children as JSXChildren;
delete varProps.children;
} else if (k === 'key') {
if (!varPropsCopied) {
varProps = { ...varProps };
varPropsCopied = true;
}
key ||= varProps.key as string;
delete varProps.key;
} else if (constProps && k in constProps) {
if (!varPropsCopied) {
varProps = { ...varProps };
varPropsCopied = true;
}
delete varProps[k];
} else if (varProps[k] === null) {
if (!varPropsCopied) {
varProps = { ...varProps };
varPropsCopied = true;
}
// Clean up null markers (from event conversions)
delete varProps[k];
}
}
Expand Down
Loading
Loading