Skip to content

chore(react-jsx-runtime): simplify createElement method #27573

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

Merged
bsunderhus merged 2 commits into from
Apr 18, 2023
Merged

chore(react-jsx-runtime): simplify createElement method #27573

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
ec56979
chore(react-jsx-runtime): simplify createElement method
bsunderhus Apr 14, 2023
93c9fe7
chore: rename internal methods
bsunderhus Apr 14, 2023
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-jsx-runtime-e321b00b-0fc8-427c-bb82-36948756d961.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "chore: simplify createElement method",
"packageName": "@fluentui/react-jsx-runtime",
"email": "[email protected]",
"dependentChangeType": "patch"
}
43 changes: 16 additions & 27 deletions packages/react-components/react-jsx-runtime/src/createElement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,29 @@ export function createElement<P extends {}>(
props?: P | null,
...children: React.ReactNode[]
): React.ReactElement<P> | null {
if (!isSlotComponent(props)) {
return React.createElement(type, props, ...children);
return hasRenderFunction(props)
? createElementFromRenderFunction(type, props, children)
: React.createElement(type, props, ...children);
}

function createElementFromRenderFunction<P extends UnknownSlotProps>(
type: React.ElementType<P>,
props: WithMetadata<P>,
overrideChildren: React.ReactNode[],
): React.ReactElement<P> | null {
const { [SLOT_RENDER_FUNCTION_SYMBOL]: renderFunction, ...renderProps } = props;

if (overrideChildren.length > 0) {
renderProps.children = React.createElement(React.Fragment, {}, ...overrideChildren);
}

const result = normalizeRenderFunction(props, children);
return React.createElement(
React.Fragment,
{},
result.renderFunction(type, { ...result.props, children: result.children }),
renderFunction(type, renderProps as UnknownSlotProps as P),
) as React.ReactElement<P>;
}

function normalizeRenderFunction<Props extends UnknownSlotProps>(
propsWithMetadata: WithMetadata<Props>,
overrideChildren?: React.ReactNode[],
): {
props: Props;
children: React.ReactNode;
renderFunction: SlotRenderFunction<Props>;
} {
const { [SLOT_RENDER_FUNCTION_SYMBOL]: renderFunction, children: externalChildren, ...props } = propsWithMetadata;

const children: React.ReactNode =
Array.isArray(overrideChildren) && overrideChildren.length > 0
? React.createElement(React.Fragment, {}, ...overrideChildren)
: externalChildren;

return {
children,
renderFunction,
props: props as UnknownSlotProps as Props,
};
}

export function isSlotComponent<Props extends {}>(props?: Props | null): props is WithMetadata<Props> {
export function hasRenderFunction<Props extends {}>(props?: Props | null): props is WithMetadata<Props> {
return Boolean(props?.hasOwnProperty(SLOT_RENDER_FUNCTION_SYMBOL));
}