p-sw/pswui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove asChild from prop propagation in Slot

Browse Source
This commit is contained in:
p-sw 2024-05-26 20:01:09 +09:00
parent de9b27b1c9
commit 37e6733fe7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/react/shared.tsx
View File

@ -321,11 +321,13 @@ interface SlotProps {
export const Slot = React.forwardRef<any, SlotProps & Record<string, any>>( export const Slot = React.forwardRef<any, SlotProps & Record<string, any>>(
(props, ref) => { (props, ref) => {
const { children, ...slotProps } = props; const { children, ...slotProps } = props;
const { asChild: _1, ...safeSlotProps } = slotProps;
if (!React.isValidElement(children)) { if (!React.isValidElement(children)) {
console.warn(`given children "${children}" is not valid for asChild`);
return null; return null;
} }
return React.cloneElement(children, { return React.cloneElement(children, {
...mergeReactProps(slotProps, children.props), ...mergeReactProps(safeSlotProps, children.props),
ref: combinedRef([ref, (children as any).ref]), ref: combinedRef([ref, (children as any).ref]),
} as any); } as any);
} }