Skip to content

feat(react-infobutton): Add inline prop to InfoButton and make it inline by default #28605

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
sopranopillow merged 6 commits into from
Aug 24, 2023
Merged

feat(react-infobutton): Add inline prop to InfoButton and make it inline by default #28605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0498a46
adding inline prop
sopranopillow Jul 18, 2023
425a449
Merge branch 'master' of https://www.github.com/microsoft/fluentui in…
sopranopillow Jul 18, 2023
18adee9
testing example
sopranopillow Jul 20, 2023
6f82b98
making infobutton inline
sopranopillow Jul 21, 2023
a87738f
change file
sopranopillow Jul 21, 2023
bf2a8d6
Merge branch 'master' into infobutton-inline
sopranopillow Aug 23, 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-infobutton-6eb516f4-2e97-48b6-94fe-3fa3c4261826.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix(react-infobutton): Making InfoButton's PopoverSurface inline by default.",
"packageName": "@fluentui/react-infobutton",
"email": "esteban.230@hotmail.com",
"dependentChangeType": "patch"
}
3 changes: 2 additions & 1 deletion packages/react-components/react-infobutton/etc/react-infobutton.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const infoButtonClassNames: SlotClassNames<InfoButtonSlots>;
// @public
export type InfoButtonProps = Omit<ComponentProps<Partial<InfoButtonSlots>>, 'disabled'> & {
size?: 'small' | 'medium' | 'large';
inline?: boolean;
};

// @public (undocumented)
Expand All @@ -35,7 +36,7 @@ export type InfoButtonSlots = {
};

// @public
export type InfoButtonState = ComponentState<InfoButtonSlots> & Required<Pick<InfoButtonProps, 'size'>>;
export type InfoButtonState = ComponentState<InfoButtonSlots> & Required<Pick<InfoButtonProps, 'inline' | 'size'>>;

// @public
export const InfoLabel: ForwardRefComponent<InfoLabelProps>;
Expand Down
9 changes: 8 additions & 1 deletion packages/react-components/react-infobutton/src/components/InfoButton/InfoButton.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,16 @@ export type InfoButtonProps = Omit<ComponentProps<Partial<InfoButtonSlots>>, 'di
* @default medium
*/
size?: 'small' | 'medium' | 'large';

/**
* Whether the InfoButton should be rendered inline or on a Portal.
*
* @default true
*/
inline?: boolean;
};

/**
* State used in rendering InfoButton
*/
export type InfoButtonState = ComponentState<InfoButtonSlots> & Required<Pick<InfoButtonProps, 'size'>>;
export type InfoButtonState = ComponentState<InfoButtonSlots> & Required<Pick<InfoButtonProps, 'inline' | 'size'>>;
4 changes: 3 additions & 1 deletion packages/react-components/react-infobutton/src/components/InfoButton/useInfoButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ const popoverSizeMap = {
* @param ref - reference to root HTMLElement of InfoButton
*/
export const useInfoButton_unstable = (props: InfoButtonProps, ref: React.Ref<HTMLElement>): InfoButtonState => {
const { size = 'medium' } = props;
const { size = 'medium', inline = true } = props;

const state: InfoButtonState = {
inline,
size,

components: {
Expand All @@ -50,6 +51,7 @@ export const useInfoButton_unstable = (props: InfoButtonProps, ref: React.Ref<HT
),
popover: slot.always(props.popover, {
defaultProps: {
inline,
positioning: 'above-start',
size: popoverSizeMap[size],
withArrow: true,
Expand Down