Skip to content

feat(react-tags): use simple button for TagButton content instead of aria button #28033

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
YuanboXue-Amber merged 3 commits into from
May 30, 2023
Merged

feat(react-tags): use simple button for TagButton content instead of aria button #28033

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
5c49342
update
YuanboXue-Amber May 29, 2023
bc154d7
Update packages/react-components/react-tags/src/components/TagButton/…
YuanboXue-Amber May 30, 2023
e74c8ba
api update after adding NonNullable
YuanboXue-Amber May 30, 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
3 changes: 1 addition & 2 deletions packages/react-components/react-tags/etc/react-tags.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { AvatarShape } from '@fluentui/react-avatar';
import { AvatarSize } from '@fluentui/react-avatar';
import { ComponentProps } from '@fluentui/react-utilities';
import { ComponentState } from '@fluentui/react-utilities';
import type { ExtractSlotProps } from '@fluentui/react-utilities';
import type { ForwardRefComponent } from '@fluentui/react-utilities';
import * as React_2 from 'react';
import { Slot } from '@fluentui/react-utilities';
Expand Down Expand Up @@ -41,7 +40,7 @@ export type TagButtonProps = ComponentProps<Partial<TagButtonSlots>> & Omit<TagP
export type TagButtonSlots = Omit<TagSlots, 'root' | 'dismissIcon'> & {
root: NonNullable<Slot<'div'>>;
dismissButton?: Slot<'button'>;
content: NonNullable<ARIAButtonSlotProps<'div'>>;
content: NonNullable<Slot<'button'>>;
};

// @public
Expand Down
3 changes: 1 addition & 2 deletions packages/react-components/react-tags/src/components/TagButton/TagButton.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { ComponentProps, ComponentState, Slot } from '@fluentui/react-utilities';
import { TagContextValues, TagProps, TagSlots, TagState } from '../Tag/index';
import { ARIAButtonSlotProps } from '../../../../react-aria/src/index';

export type TagButtonContextValues = TagContextValues;

export type TagButtonSlots = Omit<TagSlots, 'root' | 'dismissIcon'> & {
root: NonNullable<Slot<'div'>>;
dismissButton?: Slot<'button'>;
content: NonNullable<ARIAButtonSlotProps<'div'>>;
content: NonNullable<Slot<'button'>>;
};

/**
Expand Down
6 changes: 2 additions & 4 deletions packages/react-components/react-tags/src/components/TagButton/useTagButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as React from 'react';
import { getNativeElementProps, resolveShorthand, useEventCallback, useId } from '@fluentui/react-utilities';
import { DismissRegular, bundleIcon, DismissFilled } from '@fluentui/react-icons';
import type { TagButtonProps, TagButtonState } from './TagButton.types';
import { useARIAButtonShorthand } from '@fluentui/react-aria';
import { Delete, Backspace } from '@fluentui/keyboard-keys';
import { useTagGroupContext_unstable } from '../../contexts/TagGroupContext';

Expand Down Expand Up @@ -76,7 +75,7 @@ export const useTagButton_unstable = (props: TagButtonProps, ref: React.Ref<HTML

components: {
root: 'div',
content: 'div',
content: 'button',
media: 'span',
icon: 'span',
primaryText: 'span',
Expand All @@ -90,11 +89,10 @@ export const useTagButton_unstable = (props: TagButtonProps, ref: React.Ref<HTML
id,
}),

content: useARIAButtonShorthand(props.content, {
content: resolveShorthand(props.content, {
required: true,
defaultProps: {
disabled,
tabIndex: 0,
type: 'button',
},
}),
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/react-tags/src/components/TagButton/useTagButtonStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export const useTagButtonStyles_unstable = (state: TagButtonState): TagButtonSta
state.content.className = mergeClasses(
tagButtonClassNames.content,

resetButtonStyles.resetButton,
styles.content,
state.shape === 'circular' && styles.circularContent,
!state.media && !state.icon && styles.contentWithoutMedia,
Expand Down