Skip to content

Commit

Permalink
chore: adds disableButtonEnhancement on triggers (microsoft#25211)
Browse files Browse the repository at this point in the history
* chore: adds disableButtonEnhancement on triggers

* chore: removes unnecessary tests
  • Loading branch information
bsunderhus authored and NotWoods committed Nov 18, 2022
1 parent 2ba98cf commit abff7a4
Show file tree
Hide file tree
Showing 95 changed files with 262 additions and 351 deletions.
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": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "none"
}
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": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "none"
}
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": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "none"
}
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": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "none"
}
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
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit abff7a4

Please sign in to comment.