Skip to content

refactor(mergeProps): mergeProps by removing redundant undefined check and simplifying style merging logic #279

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

Open
wo-o29 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor(mergeProps): mergeProps by removing redundant undefined check and simplifying style merging logic #279

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d62a553
refactor: remove redundant undefined check and simplify mergeStyle in…
wo-o29 Sep 15, 2025
2292cf3
refactor: simplify function merging logic in pushProp
wo-o29 Feb 21, 2026
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
6 changes: 3 additions & 3 deletions src/utils/mergeProps/mergeProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ function pushProp(prev: BaseProps, curr: BaseProps): BaseProps {

if (mergedFunction) {
prev[key] = mergedFunction;
} else if (curr[key] !== undefined) {
prev[key] = curr[key];
break;
}

prev[key] = curr[key];
}
}
}
return prev;
}

function mergeStyle(a?: CSSProperties, b?: CSSProperties): CSSProperties | undefined {
if (a == null) return b;
return { ...a, ...b };
}

Expand Down
Loading