Skip to content

fix: Fix slot render functions #27561

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 3 commits into from
Apr 14, 2023
Merged

fix: Fix slot render functions #27561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a6da34
fix: Fix slot render functions
behowell Apr 13, 2023
2800bb6
Merge branch 'master' of https://github.com/microsoft/fluentui into s…
behowell Apr 13, 2023
3894bc2
Clean up
behowell Apr 13, 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-utilities-1e1f8bd6-b059-4823-9a8d-f58d44482c6e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Fix slot render functions",
"packageName": "@fluentui/react-utilities",
"email": "[email protected]",
"dependentChangeType": "patch"
}
12 changes: 9 additions & 3 deletions packages/react-components/react-utilities/src/compose/getSlots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as React from 'react';

import { omit } from '../utils/omit';
import { SLOT_RENDER_FUNCTION_SYMBOL } from './constants';
import type {
AsIntrinsicElement,
ComponentState,
Expand Down Expand Up @@ -75,16 +76,21 @@ function getSlot<R extends SlotPropsRecord, K extends keyof R>(
return [null, undefined as R[K]];
}

const { children, as: asProp, ...rest } = props;
const {
children,
as: asProp,
[SLOT_RENDER_FUNCTION_SYMBOL]: renderFunction,
...rest
} = props as typeof props & { [SLOT_RENDER_FUNCTION_SYMBOL]?: SlotRenderFunction<R[K]> };

const slot = (
state.components?.[slotName] === undefined || typeof state.components[slotName] === 'string'
? asProp || state.components?.[slotName] || 'div'
: state.components[slotName]
) as React.ElementType<R[K]>;

if (typeof children === 'function') {
const render = children as SlotRenderFunction<R[K]>;
if (renderFunction || typeof children === 'function') {
const render = renderFunction || (children as SlotRenderFunction<R[K]>);
return [
React.Fragment,
{
Expand Down