Skip to content

fix(react-avatar): Remove warning from AvatarGroup and fix problem with fragments in AvatarGroup #23628

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

Closed
sopranopillow wants to merge 6 commits into from
Closed

fix(react-avatar): Remove warning from AvatarGroup and fix problem with fragments in AvatarGroup #23628

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
8abf4d7
adding Fragment fix
sopranopillow Jun 21, 2022
19f5010
change files
sopranopillow Jun 21, 2022
e392900
updating yarn.lock
sopranopillow Jun 21, 2022
1d5e4ef
updating tabster in react-avatar
sopranopillow Jun 21, 2022
713ee38
Merge branch 'master' of https://github.com/microsoft/fluentui into a…
sopranopillow Jun 22, 2022
292b883
updating yarn lock file
sopranopillow Jun 22, 2022
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-avatar-e3c57ed3-0a50-418f-bcc8-0ce6273ff0b2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: Remove AvatarGroup and AvatarGroupItem warnings since they break the composition pattern and fixed issue when the children in AvatarGroup is a Fragment containing the AvatarGroupItems.",
"packageName": "@fluentui/react-avatar",
"email": "esteban.230@hotmail.com",
"dependentChangeType": "none"
}
13 changes: 3 additions & 10 deletions packages/react-components/react-avatar/src/components/AvatarGroup/useAvatarGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { AvatarGroupItem } from '../AvatarGroupItem/AvatarGroupItem';
import { getNativeElementProps, resolveShorthand } from '@fluentui/react-utilities';
import { MoreHorizontalRegular } from '@fluentui/react-icons';
import { PopoverSurface } from '@fluentui/react-popover';
Expand All @@ -17,15 +16,9 @@ import type { AvatarGroupProps, AvatarGroupState } from './AvatarGroup.types';
export const useAvatarGroup_unstable = (props: AvatarGroupProps, ref: React.Ref<HTMLElement>): AvatarGroupState => {
const { children, layout = 'spread', maxAvatars = 5, size = defaultAvatarGroupSize } = props;
const { overflowIndicator = size < 24 ? 'icon' : 'count' } = props;
const childrenArray = React.Children.toArray(children);

if (
process.env.NODE_ENV !== 'production' &&
childrenArray.find(child => React.isValidElement(child) && child.type !== AvatarGroupItem)
) {
// eslint-disable-next-line no-console
console.warn("AvatarGroup's children must be of type AvatarGroupItems.");
}
const childrenArray = React.Children.toArray(
React.isValidElement(children) && children.type === React.Fragment ? children.props.children : children,
);
Comment on lines +19 to +21

@layershifter layershifter Jun 23, 2022 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't want to make it worse, but the tree could be nested...

<AvatarGroup>
  <>
    <AvatarGroupItem />
    <AvatarGroupItem />
    <>
      <AvatarGroupItem />
      <AvatarGroupItem />
      <AvatarGroupItem />
    </>
  </>
</AvatarGroup>

TBH Not sure if it worth fixing currently, I would rather fix it properly 🐱


let rootChildren = childrenArray;
let overflowChildren;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-avatar/src/components/AvatarGroupItem/useAvatarGroupItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ export const useAvatarGroupItem_unstable = (
const groupIsOverflow = useContextSelector(AvatarGroupContext, ctx => ctx.isOverflow);
const layout = useContextSelector(AvatarGroupContext, ctx => ctx.layout);
const groupSize = useContextSelector(AvatarGroupContext, ctx => ctx.size);
const hasAvatarGroupContext = useHasParentContext(AvatarGroupContext);
// Since the primary slot is not an intrinsic element, getPartitionedNativeProps cannot be used here.
const { style, className, ...avatarSlotProps } = props;
const size = groupSize ?? defaultAvatarGroupSize;
const hasAvatarGroupContext = useHasParentContext(AvatarGroupContext);

if (process.env.NODE_ENV !== 'production' && !hasAvatarGroupContext) {
Comment thread
sopranopillow marked this conversation as resolved.
// eslint-disable-next-line no-console
Expand Down