Skip to content

chore(cxe-prg): migrate to new slot API #28752

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 1 commit into from
Aug 7, 2023
Merged

chore(cxe-prg): migrate to new slot API #28752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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-breadcrumb-preview-e98823c8-6e0e-423a-84ec-1460903ed55c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore(cxe-prg): migrate to new slot API",
"packageName": "@fluentui/react-breadcrumb-preview",
"email": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-card-e7457026-de8d-431e-8cfc-2a3090d613be.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore(cxe-prg): migrate to new slot API",
"packageName": "@fluentui/react-card",
"email": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-drawer-c779a059-cbcb-4524-a22f-cbead701d139.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "chore(cxe-prg): migrate to new slot API",
"packageName": "@fluentui/react-drawer",
"email": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-image-b85a2da6-d86f-457c-9b4d-51394fa66274.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore(cxe-prg): migrate to new slot API",
"packageName": "@fluentui/react-image",
"email": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-text-91815e90-f012-4dc0-9cc4-33f8140032e0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore(cxe-prg): migrate to new slot API",
"packageName": "@fluentui/react-text",
"email": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "patch"
}
11 changes: 5 additions & 6 deletions .../react-components/react-breadcrumb-preview/src/components/Breadcrumb/renderBreadcrumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@

import { createElement } from '@fluentui/react-jsx-runtime';

import { getSlotsNext } from '@fluentui/react-utilities';
import { assertSlots } from '@fluentui/react-utilities';
import { BreadcrumbProvider } from './BreadcrumbContext';
import type { BreadcrumbState, BreadcrumbSlots, BreadcrumbContextValues } from './Breadcrumb.types';
/**
* Render the final JSX of Breadcrumb
*/
export const renderBreadcrumb_unstable = (state: BreadcrumbState, contextValues: BreadcrumbContextValues) => {
const { slots, slotProps } = getSlotsNext<BreadcrumbSlots>(state);
const { root, list } = slotProps;
assertSlots<BreadcrumbSlots>(state);
return (
<slots.root {...root}>
<state.root>
<BreadcrumbProvider value={contextValues.breadcrumb}>
{slots.list && <slots.list {...list}>{root.children}</slots.list>}
{state.list && <state.list>{state.root.children}</state.list>}
</BreadcrumbProvider>
</slots.root>
</state.root>
);
};
19 changes: 11 additions & 8 deletions ...ages/react-components/react-breadcrumb-preview/src/components/Breadcrumb/useBreadcrumb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { getNativeElementProps, resolveShorthand } from '@fluentui/react-utilities';
import { getNativeElementProps, slot } from '@fluentui/react-utilities';
import type { BreadcrumbProps, BreadcrumbState } from './Breadcrumb.types';
import { useArrowNavigationGroup } from '@fluentui/react-tabster';

Expand Down Expand Up @@ -34,13 +34,16 @@ export const useBreadcrumb_unstable = (props: BreadcrumbProps, ref: React.Ref<HT
root: 'nav',
list: 'ol',
},
root: getNativeElementProps('nav', {
ref,
'aria-label': props['aria-label'] ?? 'breadcrumb',
...(focusMode === 'arrow' ? focusAttributes : {}),
...rest,
}),
list: resolveShorthand(list, { required: true, defaultProps: { role: 'list' } }),
root: slot.always(
getNativeElementProps('nav', {
ref,
'aria-label': props['aria-label'] ?? 'breadcrumb',
...(focusMode === 'arrow' ? focusAttributes : {}),
...rest,
}),
{ elementType: 'nav' },
),
list: slot.optional(list, { renderByDefault: true, defaultProps: { role: 'list' }, elementType: 'ol' }),
appearance,
dividerType,
iconPosition,
Expand Down
6 changes: 3 additions & 3 deletions ...nts/react-breadcrumb-preview/src/components/BreadcrumbDivider/renderBreadcrumbDivider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

import { createElement } from '@fluentui/react-jsx-runtime';

import { getSlotsNext } from '@fluentui/react-utilities';
import { assertSlots } from '@fluentui/react-utilities';
import type { BreadcrumbDividerState, BreadcrumbDividerSlots } from './BreadcrumbDivider.types';

/**
* Render the final JSX of BreadcrumbDivider
*/
export const renderBreadcrumbDivider_unstable = (state: BreadcrumbDividerState) => {
const { slots, slotProps } = getSlotsNext<BreadcrumbDividerSlots>(state);
assertSlots<BreadcrumbDividerSlots>(state);

return <slots.root {...slotProps.root} />;
return <state.root />;
};
17 changes: 10 additions & 7 deletions ...onents/react-breadcrumb-preview/src/components/BreadcrumbDivider/useBreadcrumbDivider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { getNativeElementProps } from '@fluentui/react-utilities';
import { getNativeElementProps, slot } from '@fluentui/react-utilities';
import type { BreadcrumbDividerProps, BreadcrumbDividerState } from './BreadcrumbDivider.types';
import {
ChevronRight20Regular,
Expand Down Expand Up @@ -34,12 +34,15 @@ export const useBreadcrumbDivider_unstable = (
components: {
root: 'li',
},
root: getNativeElementProps('li', {
ref,
'aria-hidden': true,
children: icon,
...props,
}),
root: slot.always(
getNativeElementProps('li', {
ref,
'aria-hidden': true,
children: icon,
...props,
}),
{ elementType: 'li' },
),
};
};

Expand Down
12 changes: 6 additions & 6 deletions ...omponents/react-breadcrumb-preview/src/components/BreadcrumbItem/renderBreadcrumbItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

import { createElement } from '@fluentui/react-jsx-runtime';

import { getSlotsNext } from '@fluentui/react-utilities';
import { assertSlots } from '@fluentui/react-utilities';
import type { BreadcrumbItemState, BreadcrumbItemSlots } from './BreadcrumbItem.types';

/**
* Render the final JSX of BreadcrumbItem
*/
export const renderBreadcrumbItem_unstable = (state: BreadcrumbItemState) => {
const { slots, slotProps } = getSlotsNext<BreadcrumbItemSlots>(state);
assertSlots<BreadcrumbItemSlots>(state);
const { iconOnly, iconPosition } = state;

return (
<slots.root {...slotProps.root}>
{iconPosition !== 'after' && slots.icon && <slots.icon {...slotProps.icon} />}
<state.root>
{iconPosition !== 'after' && state.icon && <state.icon />}
{!iconOnly && state.root.children}
{iconPosition === 'after' && slots.icon && <slots.icon {...slotProps.icon} />}
</slots.root>
{iconPosition === 'after' && state.icon && <state.icon />}
</state.root>
);
};
25 changes: 12 additions & 13 deletions ...ct-components/react-breadcrumb-preview/src/components/BreadcrumbItem/useBreadcrumbItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { getNativeElementProps, resolveShorthand } from '@fluentui/react-utilities';
import { getNativeElementProps, slot } from '@fluentui/react-utilities';
import type { BreadcrumbItemProps, BreadcrumbItemState } from './BreadcrumbItem.types';
import { useBreadcrumbContext_unstable } from '../Breadcrumb/BreadcrumbContext';

Expand All @@ -19,21 +19,20 @@ export const useBreadcrumbItem_unstable = (
const { size, iconPosition } = useBreadcrumbContext_unstable();
const { current = false, icon } = props;

const iconShorthand = resolveShorthand(icon);

const iconSlot = slot.optional(icon, { elementType: 'span' });
return {
components: {
root: 'li',
icon: 'span',
},
root: getNativeElementProps('li', {
ref,
...props,
}),
components: { root: 'li', icon: 'span' },
root: slot.always(
getNativeElementProps('li', {
ref,
...props,
}),
{ elementType: 'li' },
),
size,
current,
icon: iconShorthand,
iconOnly: Boolean(iconShorthand?.children && !props.children),
icon: iconSlot,
iconOnly: Boolean(iconSlot?.children && !props.children),
iconPosition: props.iconPosition || iconPosition,
};
};
12 changes: 6 additions & 6 deletions ...omponents/react-breadcrumb-preview/src/components/BreadcrumbLink/renderBreadcrumbLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@

import { createElement } from '@fluentui/react-jsx-runtime';

import { getSlotsNext } from '@fluentui/react-utilities';
import { assertSlots } from '@fluentui/react-utilities';
import type { BreadcrumbLinkState, BreadcrumbLinkSlots } from './BreadcrumbLink.types';

/**
* Render the final JSX of BreadcrumbLink
*/
export const renderBreadcrumbLink_unstable = (state: BreadcrumbLinkState) => {
const { slots, slotProps } = getSlotsNext<BreadcrumbLinkSlots>(state);
assertSlots<BreadcrumbLinkSlots>(state);
const { iconOnly, iconPosition } = state;
return (
<slots.root {...slotProps.root}>
{iconPosition !== 'after' && slots.icon && <slots.icon {...slotProps.icon} />}
<state.root>
{iconPosition !== 'after' && state.icon && <state.icon />}
{!iconOnly && state.root.children}
{iconPosition === 'after' && slots.icon && <slots.icon {...slotProps.icon} />}
</slots.root>
{iconPosition === 'after' && state.icon && <state.icon />}
</state.root>
);
};
23 changes: 11 additions & 12 deletions ...ct-components/react-breadcrumb-preview/src/components/BreadcrumbLink/useBreadcrumbLink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { getNativeElementProps, resolveShorthand } from '@fluentui/react-utilities';
import { getNativeElementProps, slot } from '@fluentui/react-utilities';
import type { BreadcrumbLinkProps, BreadcrumbLinkState } from './BreadcrumbLink.types';
import { Link } from '@fluentui/react-link';
import { useBreadcrumbContext_unstable } from '../Breadcrumb/BreadcrumbContext';
Expand All @@ -20,18 +20,17 @@ export const useBreadcrumbLink_unstable = (
const { current = false, disabled = false, icon, overflow = false, ...rest } = props;

const linkAppearance = props.appearance || appearance;
const iconShorthand = resolveShorthand(icon);

const iconShorthand = slot.optional(icon, { elementType: 'span' });
return {
components: {
root: Link,
icon: 'span',
},
root: getNativeElementProps('a', {
'aria-current': current ? props['aria-current'] ?? 'page' : undefined,
ref,
...rest,
}),
components: { root: Link, icon: 'span' },
root: slot.always(
getNativeElementProps('a', {
'aria-current': current ? props['aria-current'] ?? 'page' : undefined,
ref,
...rest,
}),
{ elementType: Link },
),
appearance: linkAppearance === 'subtle' ? 'subtle' : 'default',
current,
disabled,
Expand Down
14 changes: 7 additions & 7 deletions packages/react-components/react-card/src/components/Card/renderCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@

import { createElement } from '@fluentui/react-jsx-runtime';

import { getSlotsNext } from '@fluentui/react-utilities';
import { assertSlots } from '@fluentui/react-utilities';
import type { CardContextValue, CardSlots, CardState } from './Card.types';
import { CardProvider } from './CardContext';

/**
* Render the final JSX of Card.
*/
export const renderCard_unstable = (state: CardState, cardContextValue: CardContextValue) => {
const { slots, slotProps } = getSlotsNext<CardSlots>(state);
assertSlots<CardSlots>(state);

return (
<slots.root {...slotProps.root}>
<state.root>
<CardProvider value={cardContextValue}>
{slots.checkbox ? <slots.checkbox {...slotProps.checkbox} /> : null}
{slots.floatingAction ? <slots.floatingAction {...slotProps.floatingAction} /> : null}
{slotProps.root.children}
{state.checkbox ? <state.checkbox /> : null}
{state.floatingAction ? <state.floatingAction /> : null}
{state.root.children}
</CardProvider>
</slots.root>
</state.root>
);
};
19 changes: 11 additions & 8 deletions packages/react-components/react-card/src/components/Card/useCard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { getNativeElementProps, useMergedRefs } from '@fluentui/react-utilities';
import { getNativeElementProps, useMergedRefs, slot } from '@fluentui/react-utilities';
import { useFocusableGroup, useFocusWithin } from '@fluentui/react-tabster';

import type { CardProps, CardState } from './Card.types';
Expand Down Expand Up @@ -96,13 +96,16 @@ export const useCard_unstable = (props: CardProps, ref: React.Ref<HTMLDivElement
checkbox: 'input',
},

root: getNativeElementProps('div', {
ref: cardRef,
role: 'group',
...focusAttributes,
...props,
...selectableCardProps,
}),
root: slot.always(
getNativeElementProps('div', {
ref: cardRef,
role: 'group',
...focusAttributes,
...props,
...selectableCardProps,
}),
{ elementType: 'div' },
),

floatingAction: floatingActionSlot,
checkbox: checkboxSlot,
Expand Down
8 changes: 5 additions & 3 deletions packages/react-components/react-card/src/components/Card/useCardSelectable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { mergeCallbacks, resolveShorthand } from '@fluentui/react-utilities';
import { mergeCallbacks, slot } from '@fluentui/react-utilities';
import { Enter } from '@fluentui/keyboard-keys';
import { useFocusFinders } from '@fluentui/react-tabster';

Expand Down Expand Up @@ -89,7 +89,7 @@ export const useCardSelectable = (
selectableCheckboxProps['aria-label'] = referenceLabel;
}

return resolveShorthand(checkbox, {
return slot.optional(checkbox, {
defaultProps: {
ref: checkboxRef,
type: 'checkbox',
Expand All @@ -99,6 +99,7 @@ export const useCardSelectable = (
onBlur: () => setIsSelectFocused(false),
...selectableCheckboxProps,
},
elementType: 'input',
});
}, [checkbox, floatingAction, isCardSelected, isSelectable, onChangeHandler, referenceId, referenceLabel]);

Expand All @@ -107,10 +108,11 @@ export const useCardSelectable = (
return;
}

return resolveShorthand(floatingAction, {
return slot.optional(floatingAction, {
defaultProps: {
ref: checkboxRef,
},
elementType: 'div',
});
}, [floatingAction]);

Expand Down
12 changes: 6 additions & 6 deletions packages/react-components/react-card/src/components/CardFooter/renderCardFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@

import { createElement } from '@fluentui/react-jsx-runtime';

import { getSlotsNext } from '@fluentui/react-utilities';
import { assertSlots } from '@fluentui/react-utilities';
import type { CardFooterSlots, CardFooterState } from './CardFooter.types';

/**
* Render the final JSX of CardFooter.
*/
export const renderCardFooter_unstable = (state: CardFooterState) => {
const { slots, slotProps } = getSlotsNext<CardFooterSlots>(state);
assertSlots<CardFooterSlots>(state);

return (
<slots.root {...slotProps.root}>
{slotProps.root.children}
{slots.action && <slots.action {...slotProps.action} />}
</slots.root>
<state.root>
{state.root.children}
{state.action && <state.action />}
</state.root>
);
};
Loading