Skip to content

chore: adds disableButtonEnhancement on triggers #25211

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
miroslavstastny merged 2 commits into from
Oct 27, 2022
Merged

chore: adds disableButtonEnhancement on triggers #25211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
390ac1f
chore: adds disableButtonEnhancement on triggers
bsunderhus Oct 13, 2022
9e33b17
chore: removes unnecessary tests
bsunderhus Oct 13, 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-73954508-ffed-4bfe-a16f-39fd287dafd4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: adds disableButtonEnhancement on triggers",
"packageName": "@fluentui/react-avatar",
"email": "[email protected]",
"dependentChangeType": "none"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-dialog-914ff253-e601-4337-91a3-f7f8648eb1a5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: adds disableButtonEnhancement on triggers",
"packageName": "@fluentui/react-dialog",
"email": "[email protected]",
"dependentChangeType": "none"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-menu-4dd93206-2702-4680-829c-617e8b250bc0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: adds disableButtonEnhancement on triggers",
"packageName": "@fluentui/react-menu",
"email": "[email protected]",
"dependentChangeType": "none"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-popover-c9f8a637-4cdc-438c-b74a-b38279f3e1df.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: adds disableButtonEnhancement on triggers",
"packageName": "@fluentui/react-popover",
"email": "[email protected]",
"dependentChangeType": "none"
}
2 changes: 1 addition & 1 deletion ...ct-components/react-avatar/src/components/AvatarGroupPopover/renderAvatarGroupPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const renderAvatarGroupPopover_unstable = (

return (
<slots.root {...(slotProps.root as PopoverProps)}>
<PopoverTrigger>
<PopoverTrigger disableButtonEnhancement>
<slots.tooltip {...(slotProps.tooltip as TooltipProps)}>
<slots.triggerButton {...slotProps.triggerButton} />
</slots.tooltip>
Expand Down
10 changes: 5 additions & 5 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonAppearance.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const Appearance = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton>Default</MenuButton>
</MenuTrigger>

Expand All @@ -27,7 +27,7 @@ export const Appearance = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton appearance="primary">Primary</MenuButton>
</MenuTrigger>

Expand All @@ -40,7 +40,7 @@ export const Appearance = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton appearance="outline">Outline</MenuButton>
</MenuTrigger>

Expand All @@ -53,7 +53,7 @@ export const Appearance = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton appearance="subtle">Subtle</MenuButton>
</MenuTrigger>

Expand All @@ -66,7 +66,7 @@ export const Appearance = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton appearance="transparent">Transparent</MenuButton>
</MenuTrigger>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-button/stories/MenuButton/MenuButtonDefault.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Menu, MenuButton, MenuItem, MenuList, MenuPopover, MenuTrigger } from '

export const Default = () => (
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton>Example</MenuButton>
</MenuTrigger>

Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonDisabled.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const Disabled = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton>Enabled state</MenuButton>
</MenuTrigger>

Expand All @@ -26,7 +26,7 @@ export const Disabled = () => {
</MenuPopover>
</Menu>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton disabled>Disabled state</MenuButton>
</MenuTrigger>

Expand All @@ -38,7 +38,7 @@ export const Disabled = () => {
</MenuPopover>
</Menu>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton disabledFocusable>Disabled focusable state</MenuButton>
</MenuTrigger>

Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonIcon.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const Icon = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton icon={<CalendarMonth />}>With calendar icon</MenuButton>
</MenuTrigger>
<MenuPopover>
Expand All @@ -45,7 +45,7 @@ export const Icon = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton icon={<CalendarMonth />} menuIcon={<Filter />}>
With calendar icon and custom filter menu icon
</MenuButton>
Expand All @@ -59,7 +59,7 @@ export const Icon = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<Tooltip content="With calendar icon and no contents" relationship="label">
<MenuButton icon={<CalendarMonth />} />
</Tooltip>
Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonShape.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const Shape = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton>Rounded</MenuButton>
</MenuTrigger>

Expand All @@ -27,7 +27,7 @@ export const Shape = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton shape="circular">Circular</MenuButton>
</MenuTrigger>

Expand All @@ -40,7 +40,7 @@ export const Shape = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton shape="square">Square</MenuButton>
</MenuTrigger>

Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonSize.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const Size = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton size="small">Size: small</MenuButton>
</MenuTrigger>

Expand All @@ -28,7 +28,7 @@ export const Size = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton size="medium">Size: medium</MenuButton>
</MenuTrigger>

Expand All @@ -41,7 +41,7 @@ export const Size = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton size="large">Size: large</MenuButton>
</MenuTrigger>

Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonSizeLarge.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const SizeLarge = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton size="large">Large</MenuButton>
</MenuTrigger>

Expand All @@ -39,7 +39,7 @@ export const SizeLarge = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton icon={<CalendarMonth />} size="large">
Large with calendar icon
</MenuButton>
Expand All @@ -54,7 +54,7 @@ export const SizeLarge = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<Tooltip content="Large with calendar icon only" relationship="label">
<MenuButton icon={<CalendarMonth />} size="large" />
</Tooltip>
Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonSizeMedium.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const SizeMedium = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton size="medium">Medium</MenuButton>
</MenuTrigger>

Expand All @@ -39,7 +39,7 @@ export const SizeMedium = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton icon={<CalendarMonth />} size="medium">
Medium with calendar icon
</MenuButton>
Expand All @@ -54,7 +54,7 @@ export const SizeMedium = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<Tooltip content="Medium with calendar icon only" relationship="label">
<MenuButton icon={<CalendarMonth />} size="medium" />
</Tooltip>
Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonSizeSmall.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const SizeSmall = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton size="small">Small</MenuButton>
</MenuTrigger>

Expand All @@ -39,7 +39,7 @@ export const SizeSmall = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton icon={<CalendarMonth />} size="small">
Small with calendar icon
</MenuButton>
Expand All @@ -54,7 +54,7 @@ export const SizeSmall = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<Tooltip content="Small with calendar icon only" relationship="label">
<MenuButton icon={<CalendarMonth />} size="small" />
</Tooltip>
Expand Down
4 changes: 2 additions & 2 deletions packages/react-components/react-button/stories/MenuButton/MenuButtonWithLongText.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const WithLongText = () => {
return (
<div className={styles.wrapper}>
<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton>Short text</MenuButton>
</MenuTrigger>

Expand All @@ -31,7 +31,7 @@ export const WithLongText = () => {
</Menu>

<Menu>
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
<MenuButton className={styles.longText}>
Long text wraps after it hits the max width of the component
</MenuButton>
Expand Down
10 changes: 5 additions & 5 deletions packages/react-components/react-button/stories/SplitButton/SplitButtonAppearance.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const Appearance = () => {
return (
<div className={styles.wrapper}>
<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => <SplitButton menuButton={triggerProps}>Default</SplitButton>}
</MenuTrigger>

Expand All @@ -36,7 +36,7 @@ export const Appearance = () => {
</Menu>

<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => (
<SplitButton menuButton={triggerProps} appearance="primary">
Primary
Expand All @@ -53,7 +53,7 @@ export const Appearance = () => {
</Menu>

<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => (
<SplitButton menuButton={triggerProps} appearance="outline">
Outline
Expand All @@ -70,7 +70,7 @@ export const Appearance = () => {
</Menu>

<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => (
<SplitButton menuButton={triggerProps} appearance="subtle">
Subtle
Expand All @@ -87,7 +87,7 @@ export const Appearance = () => {
</Menu>

<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => (
<SplitButton menuButton={triggerProps} appearance="transparent">
Transparent
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-button/stories/SplitButton/SplitButtonDefault.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { MenuButtonProps } from '@fluentui/react-components';

export const Default = () => (
<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => <SplitButton menuButton={triggerProps}>Example</SplitButton>}
</MenuTrigger>

Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/react-button/stories/SplitButton/SplitButtonDisabled.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const Disabled = () => {
return (
<div className={styles.wrapper}>
<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => <SplitButton menuButton={triggerProps}>Enabled state</SplitButton>}
</MenuTrigger>

Expand All @@ -35,7 +35,7 @@ export const Disabled = () => {
</MenuPopover>
</Menu>
<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => (
<SplitButton menuButton={triggerProps} disabled>
Disabled state
Expand All @@ -51,7 +51,7 @@ export const Disabled = () => {
</MenuPopover>
</Menu>
<Menu positioning="below-end">
<MenuTrigger>
<MenuTrigger disableButtonEnhancement>
{(triggerProps: MenuButtonProps) => (
<SplitButton menuButton={triggerProps} disabledFocusable>
Disabled focusable state
Expand Down
Loading