Skip to content

Made BreadcrumbButton consistent with Item and Link #28672

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
ValentinaKozlova merged 2 commits into from
Aug 3, 2023
Merged

Made BreadcrumbButton consistent with Item and Link #28672

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
5f9b714
Made BreadcrumbButton consistent with Item and Link
ValentinaKozlova Jul 28, 2023
b5dfe9c
change files
ValentinaKozlova Aug 2, 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-breadcrumb-preview-4a519bc6-2ba9-46ca-9959-8a0ca5985548.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: made BreadcrumbButton consistent with other items",
"packageName": "@fluentui/react-breadcrumb-preview",
"email": "[email protected]",
"dependentChangeType": "patch"
}
2 changes: 2 additions & 0 deletions ...ct-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButtonStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ const defaultButtonStyles = {
const useStyles = makeStyles({
root: {
...shorthands.padding(tokens.spacingHorizontalNone),
minWidth: 'unset',
textWrap: 'nowrap',
},
small: {
height: '24px',
Expand Down
52 changes: 51 additions & 1 deletion ...s/react-components/react-breadcrumb-preview/stories/Breadcrumb/BreadcrumbSize.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import * as React from 'react';
import { Breadcrumb, BreadcrumbItem, BreadcrumbDivider, BreadcrumbProps } from '@fluentui/react-breadcrumb-preview';
import {
Breadcrumb,
BreadcrumbItem,
BreadcrumbDivider,
BreadcrumbProps,
BreadcrumbButton,
BreadcrumbLink,
} from '@fluentui/react-breadcrumb-preview';
import { RadioGroup, Radio, Label } from '@fluentui/react-components';

type Item = {
Expand Down Expand Up @@ -34,6 +41,31 @@ function renderItem(item: Item, size: BreadcrumbProps['size']) {
</React.Fragment>
);
}

function renderButton(item: Item) {
const isLastItem = items.length - 1 === item.key;
return (
<React.Fragment key={`button-item-${item.key}`}>
<BreadcrumbItem current={isLastItem}>
<BreadcrumbButton>{item.value}</BreadcrumbButton>
</BreadcrumbItem>
{!isLastItem && <BreadcrumbDivider />}
</React.Fragment>
);
}

function renderLink(item: Item) {
const isLastItem = items.length - 1 === item.key;
return (
<React.Fragment key={`link-item-${item.key}`}>
<BreadcrumbItem current={isLastItem}>
<BreadcrumbLink>{item.value}</BreadcrumbLink>
</BreadcrumbItem>
{!isLastItem && <BreadcrumbDivider />}
</React.Fragment>
);
}

export const BreadcrumbSize = () => {
const [dividerType, setDividerType] = React.useState('chevron' as BreadcrumbProps['dividerType']);
return (
Expand All @@ -52,12 +84,30 @@ export const BreadcrumbSize = () => {
<Breadcrumb aria-label="Small breadcrumb example with slashes" size="small" dividerType={dividerType}>
{items.map(item => renderItem(item, 'small'))}
</Breadcrumb>
<Breadcrumb aria-label="Small breadcrumb example with buttons" size="small">
{items.map(item => renderButton(item))}
</Breadcrumb>
<Breadcrumb aria-label="Small breadcrumb example with links" size="small">
{items.map(item => renderLink(item))}
</Breadcrumb>
<h2>Medium</h2>
<Breadcrumb aria-label="Default breadcrumb">{items.map(item => renderItem(item, 'medium'))}</Breadcrumb>
<Breadcrumb aria-label="Medium breadcrumb example with buttons" size="medium">
{items.map(item => renderButton(item))}
</Breadcrumb>
<Breadcrumb aria-label="Medium breadcrumb example with links" size="medium">
{items.map(item => renderLink(item))}
</Breadcrumb>
<h2>Large</h2>
<Breadcrumb aria-label="Large breadcrumb" size="large">
{items.map(item => renderItem(item, 'large'))}
</Breadcrumb>
<Breadcrumb aria-label="Large breadcrumb example with buttons" size="large">
{items.map(item => renderButton(item))}
</Breadcrumb>
<Breadcrumb aria-label="Large breadcrumb example with links" size="large">
{items.map(item => renderLink(item))}
</Breadcrumb>
</>
);
};
2 changes: 1 addition & 1 deletion ...components/react-breadcrumb-preview/stories/Breadcrumb/BreadcrumbWithOverflow.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ const BreadcrumbControlledOverflowExample = () => {

return (
<div className={mergeClasses(styles.example, styles.horizontal)}>
<Overflow>
<Overflow padding={40}>
<Breadcrumb>
{startDisplayedItems.map((item: ButtonItem) => renderButton(item, false))}
<ControlledOverflowMenu
Expand Down