Skip to content
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

Jump to bottom

fix: BreadcrumbItem should use makeResetStyles for base styles #29278

Merged
merged 2 commits into from
Sep 25, 2023
Merged

fix: BreadcrumbItem should use makeResetStyles for base styles #29278

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
f67ad9c
Added makeResetStyles and disableFocusable prop
ValentinaKozlova Sep 22, 2023
62304fb
change files
ValentinaKozlova Sep 25, 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-7e120363-acbe-4042-a23f-87482c4bb9f1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: used makeResetStyles instead of makeStyles",
"packageName": "@fluentui/react-breadcrumb-preview",
"email": "vkozlova@microsoft.com",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion ...s/react-components/react-breadcrumb-preview/etc/react-breadcrumb-preview.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const BreadcrumbButton: ForwardRefComponent<BreadcrumbButtonProps>;
export const breadcrumbButtonClassNames: SlotClassNames<BreadcrumbButtonSlots>;

// @public
export type BreadcrumbButtonProps = ComponentProps<BreadcrumbButtonSlots> & Pick<BreadcrumbProps, 'appearance' | 'size'> & Pick<ButtonProps, 'disabled'> & {
export type BreadcrumbButtonProps = ComponentProps<BreadcrumbButtonSlots> & Pick<BreadcrumbProps, 'appearance' | 'size'> & Pick<ButtonProps, 'disabled' | 'disabledFocusable'> & {
current?: boolean;
};

Expand Down
2 changes: 1 addition & 1 deletion ...onents/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export type BreadcrumbButtonSlots = ButtonSlots;
*/
export type BreadcrumbButtonProps = ComponentProps<BreadcrumbButtonSlots> &
Pick<BreadcrumbProps, 'appearance' | 'size'> &
Pick<ButtonProps, 'disabled'> & {
Pick<ButtonProps, 'disabled' | 'disabledFocusable'> & {
/**
* Defines current sate of BreadcrumbButton.
*
Expand Down
39 changes: 23 additions & 16 deletions .../react-breadcrumb-preview/src/components/BreadcrumbItem/useBreadcrumbItemStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles, mergeClasses, shorthands } from '@griffel/react';
import { makeStyles, makeResetStyles, mergeClasses, shorthands } from '@griffel/react';
import type { BreadcrumbItemSlots, BreadcrumbItemState } from './BreadcrumbItem.types';
import type { SlotClassNames } from '@fluentui/react-utilities';
import { tokens, typographyStyles } from '@fluentui/react-theme';
Expand All @@ -9,17 +9,23 @@ export const breadcrumbItemClassNames: SlotClassNames<BreadcrumbItemSlots> = {
icon: 'fui-BreadcrumbItem__icon',
};

const useBreadcrumbItemResetStyles = makeResetStyles({
display: 'flex',
alignItems: 'center',
color: tokens.colorNeutralForeground2,
boxSizing: 'border-box',
textWrap: 'nowrap',

// Styles for the medium (default) size
height: '32px',
...shorthands.padding(tokens.spacingHorizontalSNudge),
...typographyStyles.body1,
});

/**
* Styles for the root slot
*/
const useStyles = makeStyles({
root: {
display: 'flex',
alignItems: 'center',
color: tokens.colorNeutralForeground2,
boxSizing: 'border-box',
textWrap: 'nowrap',
},
icon: {
display: 'inline-flex',
alignItems: 'center',
Expand All @@ -31,11 +37,6 @@ const useStyles = makeStyles({
...shorthands.padding(tokens.spacingHorizontalSNudge),
...typographyStyles.caption1,
},
medium: {
height: '32px',
...shorthands.padding(tokens.spacingHorizontalSNudge),
...typographyStyles.body1,
},
large: {
height: '40px',
...shorthands.padding(tokens.spacingHorizontalS),
Expand All @@ -59,21 +60,27 @@ const useStyles = makeStyles({
* Apply styling to the BreadcrumbItem slots based on the state
*/
export const useBreadcrumbItemStyles_unstable = (state: BreadcrumbItemState): BreadcrumbItemState => {
const resetStyles = useBreadcrumbItemResetStyles();
const styles = useStyles();
const iconStyles = useIconStyles();
const size = state.size || 'medium';
const sizeMap = {
small: styles.small,
medium: '', // Medium is the default. No need to apply any styles
large: styles.large,
} as const;
const currentSizeMap = {
small: styles.currentSmall,
medium: styles.currentMedium,
large: styles.currentLarge,
};
} as const;
const noSpacingStyle =
state.isInteractive || (!state.isInteractive && state.size === 'small') ? styles.noSpacing : '';

state.root.className = mergeClasses(
breadcrumbItemClassNames.root,
styles.root,
styles[size],
resetStyles,
sizeMap[size],
state.current && currentSizeMap[size],
noSpacingStyle,
state.root.className,
Expand Down
Loading